From 33e6ce1673bd005feb9ce3b3936b59cf0c1e00b8 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Sun, 23 Feb 2020 10:57:37 +0100 Subject: [PATCH] UI defaults: get rid of unused Aqua UI defaults on macOS UI defaults on macOS are now (nearly) equal to other platforms. There are only minor platform specific differences. InputMaps are still used from Aqua LaF. --- .../com/formdev/flatlaf/FlatInputMaps.java | 31 ++- .../java/com/formdev/flatlaf/FlatLaf.java | 76 +++--- .../formdev/flatlaf/UIDefaultsRemover.java | 57 ----- .../com/formdev/flatlaf/FlatLaf.properties | 3 +- .../uidefaults/FlatDarkLaf_1.8.0_202-mac.txt | 223 +----------------- .../uidefaults/FlatLightLaf_1.8.0_202-mac.txt | 223 +----------------- 6 files changed, 75 insertions(+), 538 deletions(-) delete mode 100644 flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsRemover.java diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatInputMaps.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatInputMaps.java index 91e8dfb9..74a93239 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatInputMaps.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatInputMaps.java @@ -31,11 +31,11 @@ import com.formdev.flatlaf.util.SystemInfo; */ class FlatInputMaps { - static void initInputMaps( UIDefaults defaults ) { + static void initInputMaps( UIDefaults defaults, UIDefaults baseDefaults ) { if( !SystemInfo.IS_MAC ) initBasicInputMaps( defaults ); else - initMacInputMaps( defaults ); + initMacInputMaps( defaults, baseDefaults ); } private static void initBasicInputMaps( UIDefaults defaults ) { @@ -233,7 +233,26 @@ class FlatInputMaps defaults.put( "EditorPane.focusInputMap", multiLineInputMap ); } - private static void initMacInputMaps( UIDefaults defaults ) { + private static void initMacInputMaps( UIDefaults defaults, UIDefaults baseDefaults ) { + // copy Aqua LaF input maps + copyInputMaps( baseDefaults, defaults, + "Button.focusInputMap", + "EditorPane.focusInputMap", + "FormattedTextField.focusInputMap", + "List.focusInputMap", + "PasswordField.focusInputMap", + "ScrollBar.focusInputMap.RightToLeft", + "ScrollBar.focusInputMap", + "ScrollPane.ancestorInputMap.RightToLeft", + "ScrollPane.ancestorInputMap", + "Table.ancestorInputMap.RightToLeft", + "Table.ancestorInputMap", + "TextArea.focusInputMap", + "TextField.focusInputMap", + "TextPane.focusInputMap", + "Tree.focusInputMap" ); + + // AquaLookAndFeel (the base for UI defaults on macOS) uses special // action keys (e.g. "aquaExpandNode") for some macOS specific behaviour. // Those action keys are not available in FlatLaf, which makes it @@ -277,6 +296,12 @@ class FlatInputMaps } ) ); } + private static void copyInputMaps( UIDefaults src, UIDefaults dest, String... keys ) { + // Note: not using `src.get(key)` here because this would resolve the lazy value + for( String key : keys ) + dest.put( key, src.remove( key ) ); + } + private static void modifyInputMap( UIDefaults defaults, String key, Object... bindings ) { // Note: not using `defaults.get(key)` here because this would resolve the lazy value defaults.put( key, new LazyModifyInputMap( defaults.remove( key ), bindings ) ); diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java index 0f893c0b..76384815 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java @@ -64,7 +64,7 @@ public abstract class FlatLaf static final Logger LOG = Logger.getLogger( FlatLaf.class.getName() ); private static final String DESKTOPFONTHINTS = "awt.font.desktophints"; - private BasicLookAndFeel base; + private BasicLookAndFeel aquaLaf; private String desktopPropertyName; private PropertyChangeListener desktopPropertyListener; @@ -114,10 +114,11 @@ public abstract class FlatLaf @Override public void initialize() { - initBase(); + createAquaLaf(); - if( base != null ) - base.initialize(); + // this is required for using Mac screen menubar + if( aquaLaf != null ) + aquaLaf.initialize(); super.initialize(); @@ -195,40 +196,39 @@ public abstract class FlatLaf new HTMLEditorKit().getStyleSheet().addRule( "a { color: blue; }" ); postInitialization = null; - if( base != null ) - base.uninitialize(); + if( aquaLaf != null ) + aquaLaf.uninitialize(); super.uninitialize(); } /** - * Create base LaF. This is used to grab base UI defaults from different LaFs. - * On Mac from Aqua LaF, otherwise from Basic LaF. + * Create Aqua LaF on macOS. + * Initializing Aqua LaF is required for using Mac screen menubar. */ - private void initBase() { - if( SystemInfo.IS_MAC && base == null ) { - // use Mac Aqua LaF as base - String aquaLafClassName = "com.apple.laf.AquaLookAndFeel"; - try { - if( SystemInfo.IS_JAVA_9_OR_LATER ) { - Method m = UIManager.class.getMethod( "createLookAndFeel", String.class ); - base = (BasicLookAndFeel) m.invoke( null, "Mac OS X" ); - } else - base = (BasicLookAndFeel) Class.forName( aquaLafClassName ).newInstance(); - } catch( Exception ex ) { - LOG.log( Level.SEVERE, "FlatLaf: Failed to initialize base look and feel '" + aquaLafClassName + "'.", ex ); - throw new IllegalStateException(); - } + private void createAquaLaf() { + if( !SystemInfo.IS_MAC || aquaLaf != null ) + return; + + // create macOS Aqua LaF + String aquaLafClassName = "com.apple.laf.AquaLookAndFeel"; + try { + if( SystemInfo.IS_JAVA_9_OR_LATER ) { + Method m = UIManager.class.getMethod( "createLookAndFeel", String.class ); + aquaLaf = (BasicLookAndFeel) m.invoke( null, "Mac OS X" ); + } else + aquaLaf = (BasicLookAndFeel) Class.forName( aquaLafClassName ).newInstance(); + } catch( Exception ex ) { + LOG.log( Level.SEVERE, "FlatLaf: Failed to initialize base look and feel '" + aquaLafClassName + "'.", ex ); + throw new IllegalStateException(); } } @Override public UIDefaults getDefaults() { - initBase(); + createAquaLaf(); - UIDefaults defaults = (base != null) ? base.getDefaults() : super.getDefaults(); - if( base != null ) - UIDefaultsRemover.removeDefaults( defaults ); + UIDefaults defaults = super.getDefaults(); // add Metal resource bundle, which is required for FlatFileChooserUI defaults.addResourceBundle( "com.sun.swing.internal.plaf.metal.resources.metal" ); @@ -259,13 +259,9 @@ public abstract class FlatLaf putDefaults( defaults, defaults.getColor( "textText" ), "DesktopIcon.foreground" ); - // remember MenuBarUI from Mac Aqua LaF if Mac screen menubar is enabled - boolean useScreenMenuBar = SystemInfo.IS_MAC && "true".equals( System.getProperty( "apple.laf.useScreenMenuBar" ) ); - Object aquaMenuBarUI = useScreenMenuBar ? defaults.get( "MenuBarUI" ) : null; - initFonts( defaults ); initIconColors( defaults, isDark() ); - FlatInputMaps.initInputMaps( defaults ); + FlatInputMaps.initInputMaps( defaults, (aquaLaf != null) ? aquaLaf.getDefaults() : null ); // load defaults from properties List> lafClassesForDefaultsLoading = getLafClassesForDefaultsLoading(); @@ -275,12 +271,11 @@ public abstract class FlatLaf UIDefaultsLoader.loadDefaultsFromProperties( getClass(), defaults ); // use Aqua MenuBarUI if Mac screen menubar is enabled - if( useScreenMenuBar ) - defaults.put( "MenuBarUI", aquaMenuBarUI ); + if( SystemInfo.IS_MAC && Boolean.getBoolean( "apple.laf.useScreenMenuBar" ) ) + defaults.put( "MenuBarUI", "com.apple.laf.AquaMenuBarUI" ); // initialize text antialiasing - if( !SystemInfo.IS_MAC ) - putAATextInfo( defaults ); + putAATextInfo( defaults ); invokePostInitialization( defaults ); @@ -307,14 +302,15 @@ public abstract class FlatLaf uiFont = new FontUIResource( winFont ); } else if( SystemInfo.IS_MAC ) { - Font font = defaults.getFont( "Label.font" ); - + String fontName; if( SystemInfo.IS_MAC_OS_10_11_EL_CAPITAN_OR_LATER ) { // use San Francisco Text font - font = new FontUIResource( ".SF NS Text", font.getStyle(), font.getSize() ); + fontName = ".SF NS Text"; + } else { + // default font on older systems (see com.apple.laf.AquaFonts) + fontName = "Lucida Grande"; } - - uiFont = (font instanceof FontUIResource) ? (FontUIResource) font : new FontUIResource( font ); + uiFont = new FontUIResource( fontName, Font.PLAIN, 13 ); } else if( SystemInfo.IS_LINUX ) { Font font = LinuxFontPolicy.getFont(); diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsRemover.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsRemover.java deleted file mode 100644 index 763e1f94..00000000 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsRemover.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2020 FormDev Software GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.formdev.flatlaf; - -import javax.swing.UIDefaults; - -/** - * Removes UI defaults that are defined in "base" LaF (Aqua), but not used in FlatLaf. - * - * This is a temporary class that can be removed when dropping "base" LaF. - * - * @author Karl Tauber - */ -class UIDefaultsRemover -{ - static final String[] REMOVE_KEYS = { - "Button.select", - - "CheckBox.select", - - "RadioButton.select", - - "Tree.line", - }; - - static void removeDefaults( UIDefaults defaults ) { - for( String key : REMOVE_KEYS ) - defaults.remove( key ); - -/* - Iterator itr = defaults.keySet().iterator(); - while( itr.hasNext() ) { - Object key = itr.next(); - if( key instanceof String && - (((String)key).endsWith( ".gradient" ) || - ((String)key).endsWith( "Sound" )) ) - { - itr.remove(); - } - } -*/ - } -} diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties index 8c6695ed..496e64a8 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties @@ -40,8 +40,7 @@ PopupMenuSeparatorUI=com.formdev.flatlaf.ui.FlatPopupMenuSeparatorUI ProgressBarUI=com.formdev.flatlaf.ui.FlatProgressBarUI RadioButtonUI=com.formdev.flatlaf.ui.FlatRadioButtonUI RadioButtonMenuItemUI=com.formdev.flatlaf.ui.FlatRadioButtonMenuItemUI -[win]RootPaneUI=com.formdev.flatlaf.ui.FlatRootPaneUI -[linux]RootPaneUI=com.formdev.flatlaf.ui.FlatRootPaneUI +RootPaneUI=com.formdev.flatlaf.ui.FlatRootPaneUI ScrollBarUI=com.formdev.flatlaf.ui.FlatScrollBarUI ScrollPaneUI=com.formdev.flatlaf.ui.FlatScrollPaneUI SeparatorUI=com.formdev.flatlaf.ui.FlatSeparatorUI diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt index 83b4c45c..55440701 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt @@ -10,26 +10,6 @@ OS Mac OS X AATextInfoPropertyKey [unknown type] sun.swing.SwingUtilities2$AATextInfo -#---- AbstractButton ---- - -AbstractButton.click.textAndMnemonic click - - -#---- AbstractDocument ---- - -AbstractDocument.addition.textAndMnemonic addition -AbstractDocument.deletion.textAndMnemonic deletion -AbstractDocument.redo.textAndMnemonic Redo -AbstractDocument.styleChange.textAndMnemonic style change -AbstractDocument.undo.textAndMnemonic Undo - - -#---- AbstractUndoableEdit ---- - -AbstractUndoableEdit.redo.textAndMnemonic Redo -AbstractUndoableEdit.undo.textAndMnemonic Undo - - #---- Actions ---- Actions.Blue #3592c4 javax.swing.plaf.ColorUIResource [UI] @@ -109,7 +89,6 @@ Button.iconTextGap 4 Button.light #313131 javax.swing.plaf.ColorUIResource [UI] Button.margin 2,14,2,14 javax.swing.plaf.InsetsUIResource [UI] Button.minimumWidth 72 -Button.opaque false Button.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] Button.rollover true Button.shadow #646464 javax.swing.plaf.ColorUIResource [UI] @@ -158,7 +137,6 @@ CheckBox.textShiftOffset 0 #---- CheckBoxMenuItem ---- -CheckBoxMenuItem.acceleratorDelimiter CheckBoxMenuItem.acceleratorFont .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] CheckBoxMenuItem.acceleratorForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.acceleratorSelectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] @@ -167,8 +145,6 @@ CheckBoxMenuItem.background #303234 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] CheckBoxMenuItem.borderPainted true CheckBoxMenuItem.checkIcon [lazy] 15,15 com.formdev.flatlaf.icons.FlatCheckBoxMenuItemIcon [UI] -CheckBoxMenuItem.dashIcon [lazy] 10,2 com.apple.laf.AquaImageFactory$InvertableImageIcon [UI] (sun.awt.image.MultiResolutionCachedImage) -CheckBoxMenuItem.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.disabledForeground #777777 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] CheckBoxMenuItem.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] @@ -187,27 +163,9 @@ CheckBoxUI com.formdev.flatlaf.ui.FlatCheckBoxUI #---- ColorChooser ---- ColorChooser.background #3c3f41 javax.swing.plaf.ColorUIResource [UI] -ColorChooser.cancel.textAndMnemonic Cancel ColorChooser.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] ColorChooser.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] -ColorChooser.hsb.textAndMnemonic &HSB -ColorChooser.hsbBlue.textAndMnemonic B -ColorChooser.hsbBrightness.textAndMnemonic B -ColorChooser.hsbGreen.textAndMnemonic G -ColorChooser.hsbHue.textAndMnemonic H -ColorChooser.hsbRed.textAndMnemonic R -ColorChooser.hsbSaturation.textAndMnemonic S -ColorChooser.ok.textAndMnemonic OK -ColorChooser.preview.textAndMnemonic Preview -ColorChooser.reset.textAndMnemonic &Reset -ColorChooser.rgb.textAndMnemonic R&GB -ColorChooser.rgbBlue.textAndMnemonic &Blue -ColorChooser.rgbGreen.textAndMnemonic Gree&n -ColorChooser.rgbRed.textAndMnemonic Re&d -ColorChooser.sample.textAndMnemonic Sample Text Sample Text -ColorChooser.swatches.textAndMnemonic &Swatches ColorChooser.swatchesDefaultRecentColor #3c3f41 javax.swing.plaf.ColorUIResource [UI] -ColorChooser.swatchesRecent.textAndMnemonic Recent: ColorChooser.swatchesRecentSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIResource [UI] ColorChooser.swatchesSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIResource [UI] ColorChooserUI com.formdev.flatlaf.ui.FlatColorChooserUI @@ -235,7 +193,6 @@ ComboBox.padding 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI] ComboBox.selectionBackground #4b6eaf javax.swing.plaf.ColorUIResource [UI] ComboBox.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] ComboBox.timeFactor 1000 -ComboBox.togglePopup.textAndMnemonic togglePopup ComboBoxUI com.formdev.flatlaf.ui.FlatComboBoxUI @@ -269,13 +226,10 @@ Desktop.minOnScreenInsets 3,3,3,3 javax.swing.plaf.InsetsUIResource [UI] DesktopIcon.background #555c68 javax.swing.plaf.ColorUIResource [UI] DesktopIcon.border [lazy] 4,4,4,4 false com.formdev.flatlaf.ui.FlatEmptyBorder [UI] -DesktopIcon.borderColor #98000000 javax.swing.plaf.ColorUIResource [UI] -DesktopIcon.borderRimColor #c0c0c0c0 javax.swing.plaf.ColorUIResource [UI] DesktopIcon.closeIcon [lazy] 24,24 com.formdev.flatlaf.icons.FlatInternalFrameCloseIcon [UI] DesktopIcon.closeSize 20,20 javax.swing.plaf.DimensionUIResource [UI] DesktopIcon.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] DesktopIcon.iconSize 64,64 javax.swing.plaf.DimensionUIResource [UI] -DesktopIcon.labelBackground #64000000 javax.swing.plaf.ColorUIResource [UI] DesktopIconUI com.formdev.flatlaf.ui.FlatDesktopIconUI @@ -303,56 +257,12 @@ EditorPaneUI com.formdev.flatlaf.ui.FlatEditorPaneUI #---- FileChooser ---- -FileChooser.acceptAllFileFilter.textAndMnemonic All Files -FileChooser.by.textAndMnemonic Name -FileChooser.byDate.textAndMnemonic Date Modified -FileChooser.cancelButton.textAndMnemonic Cancel -FileChooser.cancelButtonMnemonic 0 -FileChooser.chooseButton.textAndMnemonic Choose -FileChooser.createButton.textAndMnemonic Create -FileChooser.desktopName Desktop FileChooser.detailsViewIcon [lazy] 16,16 com.formdev.flatlaf.icons.FlatFileChooserDetailsViewIcon [UI] -FileChooser.directoryDescription.textAndMnemonic Directory -FileChooser.directoryOpenButton.textAndMnemonic Open -FileChooser.directoryOpenButtonMnemonic 0 -FileChooser.fileDescription.textAndMnemonic Generic File -FileChooser.fileNameLabel.textAndMnemonic File: -FileChooser.fileNameLabelMnemonic 0 -FileChooser.fileSizeGigaBytes {0} GB -FileChooser.fileSizeKiloBytes {0} KB -FileChooser.fileSizeMegaBytes {0} MB -FileChooser.filesOfTypeLabel.textAndMnemonic File Format: -FileChooser.filesOfTypeLabelMnemonic 0 -FileChooser.helpButton.textAndMnemonic Help -FileChooser.helpButtonMnemonic 0 FileChooser.homeFolderIcon [lazy] 16,16 com.formdev.flatlaf.icons.FlatFileChooserHomeFolderIcon [UI] FileChooser.listViewIcon [lazy] 16,16 com.formdev.flatlaf.icons.FlatFileChooserListViewIcon [UI] -FileChooser.lookInLabelMnemonic 0 -FileChooser.mac.newFolder.subsequent untitled folder {0} -FileChooser.mac.newFolder untitled folder -FileChooser.newFolderAccessibleName New Folder -FileChooser.newFolderButton.textAndMnemonic New Folder -FileChooser.newFolderError.textAndMnemonic Error occurred during folder creation -FileChooser.newFolderErrorSeparator : -FileChooser.newFolderExistsError.textAndMnemonic That name is already taken FileChooser.newFolderIcon [lazy] 16,16 com.formdev.flatlaf.icons.FlatFileChooserNewFolderIcon [UI] -FileChooser.newFolderPrompt.textAndMnemonic Name of new folder: -FileChooser.newFolderTitle.textAndMnemonic New Folder -FileChooser.openButton.textAndMnemonic Open -FileChooser.openButtonMnemonic 0 -FileChooser.openDialogTitle.textAndMnemonic Open -FileChooser.openTitle.textAndMnemonic Open FileChooser.readOnly false -FileChooser.saveButton.textAndMnemonic Save -FileChooser.saveButtonMnemonic 0 -FileChooser.saveDialogFileNameLabel.textAndMnemonic Save As: -FileChooser.saveDialogTitle.textAndMnemonic Save -FileChooser.saveTitle.textAndMnemonic Save -FileChooser.untitledFileName untitled -FileChooser.untitledFolderName untitled folder FileChooser.upFolderIcon [lazy] 16,16 com.formdev.flatlaf.icons.FlatFileChooserUpFolderIcon [UI] -FileChooser.updateButton.textAndMnemonic Update -FileChooser.updateButtonMnemonic 0 FileChooser.useSystemExtensionHiding false FileChooser.usesSingleFilePane true FileChooserUI com.formdev.flatlaf.ui.FlatFileChooserUI @@ -367,18 +277,6 @@ FileView.floppyDriveIcon [lazy] 16,16 com.formdev.flatlaf.icons.FlatFil FileView.hardDriveIcon [lazy] 16,16 com.formdev.flatlaf.icons.FlatFileViewHardDriveIcon [UI] -#---- Focus ---- - -Focus.color #3f074cf1 com.apple.laf.AquaImageFactory$SystemColorProxy [UI] - - -#---- FormView ---- - -FormView.browseFileButton.textAndMnemonic Browse... -FormView.resetButton.textAndMnemonic Reset -FormView.submitButton.textAndMnemonic Submit Query - - #---- FormattedTextField ---- FormattedTextField.background #45494a javax.swing.plaf.ColorUIResource [UI] @@ -425,22 +323,11 @@ Hyperlink.visitedColor #589df6 javax.swing.plaf.ColorUIResource [UI] HyperlinkUI com.formdev.flatlaf.swingx.ui.FlatHyperlinkUI -#---- IconButton ---- - -IconButton.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] - - -#---- InsetBorder ---- - -InsetBorder.aquaVariant [lazy] 8,12,8,12 false com.apple.laf.AquaGroupBorder$Titleless [UI] - - #---- InternalFrame ---- InternalFrame.activeBorderColor #7e7e7e javax.swing.plaf.ColorUIResource [UI] InternalFrame.activeTitleBackground #242526 javax.swing.plaf.ColorUIResource [UI] InternalFrame.activeTitleForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] -InternalFrame.background #3c3f41 javax.swing.plaf.ColorUIResource [UI] InternalFrame.border [lazy] 6,6,6,6 false com.formdev.flatlaf.ui.FlatInternalFrameUI$FlatInternalFrameBorder [UI] InternalFrame.borderColor #3c3f41 javax.swing.plaf.ColorUIResource [UI] InternalFrame.borderDarkShadow #7e7e7e javax.swing.plaf.ColorUIResource [UI] @@ -452,44 +339,27 @@ InternalFrame.borderShadow #646464 javax.swing.plaf.ColorUIResource [UI] InternalFrame.buttonHoverBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] InternalFrame.buttonPressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] InternalFrame.buttonSize 24,24 javax.swing.plaf.DimensionUIResource [UI] -InternalFrame.closeButtonToolTip Close InternalFrame.closeHoverBackground [lazy] #c75450 javax.swing.plaf.ColorUIResource [UI] InternalFrame.closeHoverForeground #ffffff javax.swing.plaf.ColorUIResource [UI] InternalFrame.closeIcon [lazy] 24,24 com.formdev.flatlaf.icons.FlatInternalFrameCloseIcon [UI] InternalFrame.closePressedBackground [lazy] #ad3b37 javax.swing.plaf.ColorUIResource [UI] InternalFrame.closePressedForeground #ffffff javax.swing.plaf.ColorUIResource [UI] -InternalFrame.iconButtonToolTip Minimize +InternalFrame.icon [lazy] 16,16 sun.swing.ImageIconUIResource [UI] (sun.awt.image.ToolkitImage) InternalFrame.iconifyIcon [lazy] 24,24 com.formdev.flatlaf.icons.FlatInternalFrameIconifyIcon [UI] InternalFrame.inactiveBorderColor #646464 javax.swing.plaf.ColorUIResource [UI] InternalFrame.inactiveTitleBackground #303234 javax.swing.plaf.ColorUIResource [UI] InternalFrame.inactiveTitleForeground #777777 javax.swing.plaf.ColorUIResource [UI] -InternalFrame.maxButtonToolTip Maximize InternalFrame.maximizeIcon [lazy] 24,24 com.formdev.flatlaf.icons.FlatInternalFrameMaximizeIcon [UI] InternalFrame.minimizeIcon [lazy] 24,24 com.formdev.flatlaf.icons.FlatInternalFrameMinimizeIcon [UI] -InternalFrame.opaque false -InternalFrame.optionDialogBackground #eeeeee com.apple.laf.AquaImageFactory$SystemColorProxy [UI] -InternalFrame.optionDialogTitleFont .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] -InternalFrame.paletteBackground #eeeeee com.apple.laf.AquaImageFactory$SystemColorProxy [UI] -InternalFrame.paletteTitleFont .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] -InternalFrame.restoreButtonToolTip Restore InternalFrame.titleFont .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] #---- InternalFrameTitlePane ---- InternalFrameTitlePane.border [lazy] 0,8,0,0 false com.formdev.flatlaf.ui.FlatEmptyBorder [UI] -InternalFrameTitlePane.closeButton.textAndMnemonic Close -InternalFrameTitlePane.closeButtonAccessibleName Close InternalFrameTitlePane.closeButtonOpacity true -InternalFrameTitlePane.iconifyButtonAccessibleName Iconify InternalFrameTitlePane.iconifyButtonOpacity true -InternalFrameTitlePane.maximizeButton.textAndMnemonic Maximize -InternalFrameTitlePane.maximizeButtonAccessibleName Maximize InternalFrameTitlePane.maximizeButtonOpacity true -InternalFrameTitlePane.minimizeButton.textAndMnemonic Minimize -InternalFrameTitlePane.moveButton.textAndMnemonic Move -InternalFrameTitlePane.restoreButton.textAndMnemonic Restore -InternalFrameTitlePane.sizeButton.textAndMnemonic Size #---- InternalFrame ---- @@ -497,11 +367,6 @@ InternalFrameTitlePane.sizeButton.textAndMnemonic Size InternalFrameUI com.formdev.flatlaf.ui.FlatInternalFrameUI -#---- IsindexView ---- - -IsindexView.prompt This is a searchable index. Enter search keywords: - - #---- JXBusyLabel ---- JXBusyLabel.baseColor #777777 javax.swing.plaf.ColorUIResource [UI] @@ -565,7 +430,6 @@ Label.disabledForeground #777777 javax.swing.plaf.ColorUIResource [UI] Label.disabledShadow #646464 javax.swing.plaf.ColorUIResource [UI] Label.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] Label.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] -Label.opaque true LabelUI com.formdev.flatlaf.ui.FlatLabelUI @@ -580,20 +444,15 @@ List.cellRenderer [active] javax.swing.DefaultListCellRenderer$UIRe List.dropCellBackground [lazy] #3c588b javax.swing.plaf.ColorUIResource [UI] List.dropCellForeground [lazy] #bbbbbb javax.swing.plaf.ColorUIResource [UI] List.dropLineColor [lazy] #6d8ac0 javax.swing.plaf.ColorUIResource [UI] -List.evenRowBackgroundPainter [lazy] 0,0,0,0 false com.apple.laf.AquaListUI$ComponentPainter [UI] List.focusCellHighlightBorder [lazy] 1,6,1,6 false com.formdev.flatlaf.ui.FlatListCellBorder$Focused [UI] List.focusSelectedCellHighlightBorder [lazy] 1,6,1,6 false com.formdev.flatlaf.ui.FlatListCellBorder$Selected [UI] List.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] List.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] List.noFocusBorder 1,1,1,1 false javax.swing.plaf.BorderUIResource$EmptyBorderUIResource [UI] -List.oddRowBackgroundPainter [lazy] 0,0,0,0 false com.apple.laf.AquaListUI$ComponentPainter [UI] List.selectionBackground #4b6eaf javax.swing.plaf.ColorUIResource [UI] List.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] List.selectionInactiveBackground #0d293e javax.swing.plaf.ColorUIResource [UI] List.selectionInactiveForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] -List.sourceListBackgroundPainter [lazy] 0,0,0,0 false com.apple.laf.AquaListUI$ComponentPainter [UI] -List.sourceListFocusedSelectionBackgroundPainter [lazy] 0,0,0,0 false com.apple.laf.AquaListUI$ComponentPainter [UI] -List.sourceListSelectionBackgroundPainter [lazy] 0,0,0,0 false com.apple.laf.AquaListUI$ComponentPainter [UI] List.timeFactor 1000 ListUI com.formdev.flatlaf.ui.FlatListUI @@ -608,9 +467,7 @@ Menu.background #303234 javax.swing.plaf.ColorUIResource [UI] Menu.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] Menu.borderPainted true Menu.cancelMode hideLastSubmenu -Menu.consumesTabs true Menu.crossMenuMnemonic true -Menu.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI] Menu.disabledForeground #777777 javax.swing.plaf.ColorUIResource [UI] Menu.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] Menu.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] @@ -618,7 +475,7 @@ Menu.icon.arrowColor #a7a7a7 javax.swing.plaf.ColorUIResource [UI] Menu.icon.disabledArrowColor #606060 javax.swing.plaf.ColorUIResource [UI] Menu.margin 2,8,2,8 javax.swing.plaf.InsetsUIResource [UI] Menu.menuPopupOffsetX 0 -Menu.menuPopupOffsetY 1 +Menu.menuPopupOffsetY 0 Menu.opaque false Menu.preserveTopLevelSelection false Menu.selectionBackground #4b6eaf javax.swing.plaf.ColorUIResource [UI] @@ -632,20 +489,13 @@ Menu.submenuPopupOffsetY [active] -4 #---- MenuBar ---- MenuBar.background #303234 javax.swing.plaf.ColorUIResource [UI] -MenuBar.backgroundPainter [lazy] 0,0,0,0 false com.apple.laf.AquaBorder$Default [UI] MenuBar.border [lazy] 0,0,1,0 false com.formdev.flatlaf.ui.FlatMenuBarBorder [UI] MenuBar.borderColor #515151 javax.swing.plaf.ColorUIResource [UI] -MenuBar.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI] -MenuBar.disabledForeground #777777 javax.swing.plaf.ColorUIResource [UI] MenuBar.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] MenuBar.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] MenuBar.highlight #242424 javax.swing.plaf.ColorUIResource [UI] MenuBar.hoverBackground #484c4f javax.swing.plaf.ColorUIResource [UI] MenuBar.itemMargins 3,3,3,3 javax.swing.plaf.InsetsUIResource [UI] -MenuBar.margin 0,8,0,8 javax.swing.plaf.InsetsUIResource [UI] -MenuBar.selectedBackgroundPainter [lazy] 0,0,0,0 false com.apple.laf.AquaBorder$Default [UI] -MenuBar.selectionBackground #4b6eaf javax.swing.plaf.ColorUIResource [UI] -MenuBar.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] MenuBar.shadow #646464 javax.swing.plaf.ColorUIResource [UI] MenuBar.windowBindings length=2 [Ljava.lang.Object; [0] F10 @@ -663,13 +513,11 @@ MenuItem.arrowIcon [lazy] 6,10 com.formdev.flatlaf.icons.FlatMenu MenuItem.background #303234 javax.swing.plaf.ColorUIResource [UI] MenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] MenuItem.borderPainted true -MenuItem.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI] MenuItem.disabledForeground #777777 javax.swing.plaf.ColorUIResource [UI] MenuItem.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] MenuItem.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] MenuItem.margin 2,8,2,8 javax.swing.plaf.InsetsUIResource [UI] MenuItem.opaque false -MenuItem.selectedBackgroundPainter [lazy] 0,0,0,0 false com.apple.laf.AquaBorder$Default [UI] MenuItem.selectionBackground #4b6eaf javax.swing.plaf.ColorUIResource [UI] MenuItem.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] @@ -716,39 +564,26 @@ OptionPane.background #3c3f41 javax.swing.plaf.ColorUIResource [UI] OptionPane.border [lazy] 12,12,12,12 false com.formdev.flatlaf.ui.FlatEmptyBorder [UI] OptionPane.buttonAreaBorder [lazy] 12,0,0,0 false com.formdev.flatlaf.ui.FlatEmptyBorder [UI] OptionPane.buttonClickThreshhold 500 -OptionPane.buttonFont .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] OptionPane.buttonMinimumWidth [active] 72 OptionPane.buttonOrientation 4 OptionPane.buttonPadding 8 -OptionPane.cancelButton.textAndMnemonic Cancel -OptionPane.cancelButtonMnemonic OptionPane.errorIcon [lazy] 32,32 com.formdev.flatlaf.icons.FlatOptionPaneErrorIcon [UI] OptionPane.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] OptionPane.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] OptionPane.iconMessageGap 16 OptionPane.informationIcon [lazy] 32,32 com.formdev.flatlaf.icons.FlatOptionPaneInformationIcon [UI] -OptionPane.inputDialog.titleAndMnemonic Input OptionPane.isYesLast true OptionPane.maxCharactersPerLine 80 OptionPane.messageAreaBorder [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatEmptyBorder [UI] -OptionPane.messageDialog.titleAndMnemonic Message -OptionPane.messageFont .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] OptionPane.messagePadding 3 OptionPane.minimumSize 262,90 javax.swing.plaf.DimensionUIResource [UI] -OptionPane.noButton.textAndMnemonic &No -OptionPane.noButtonMnemonic -OptionPane.okButton.textAndMnemonic OK -OptionPane.okButtonMnemonic OptionPane.questionIcon [lazy] 32,32 com.formdev.flatlaf.icons.FlatOptionPaneQuestionIcon [UI] OptionPane.sameSizeButtons true OptionPane.setButtonMargin false -OptionPane.title.textAndMnemonic Select an Option OptionPane.warningIcon [lazy] 32,32 com.formdev.flatlaf.icons.FlatOptionPaneWarningIcon [UI] OptionPane.windowBindings length=2 [Ljava.lang.Object; [0] ESCAPE [1] close -OptionPane.yesButton.textAndMnemonic &Yes -OptionPane.yesButtonMnemonic OptionPaneUI com.formdev.flatlaf.ui.FlatOptionPaneUI @@ -757,7 +592,6 @@ OptionPaneUI com.formdev.flatlaf.ui.FlatOptionPaneUI Panel.background #3c3f41 javax.swing.plaf.ColorUIResource [UI] Panel.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] Panel.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] -Panel.opaque true PanelUI com.formdev.flatlaf.ui.FlatPanelUI @@ -765,7 +599,6 @@ PanelUI com.formdev.flatlaf.ui.FlatPanelUI PasswordField.background #45494a javax.swing.plaf.ColorUIResource [UI] PasswordField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI] -PasswordField.capsLockIconColor #64000000 javax.swing.plaf.ColorUIResource [UI] PasswordField.caretBlinkRate 500 PasswordField.caretForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] PasswordField.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI] @@ -790,9 +623,6 @@ PopupMenu.borderInsets 4,1,4,1 javax.swing.plaf.InsetsUIResource [UI] PopupMenu.consumeEventOnClose false PopupMenu.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] PopupMenu.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] -PopupMenu.selectionBackground #4b6eaf javax.swing.plaf.ColorUIResource [UI] -PopupMenu.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] -PopupMenu.translucentBackground #ffffff javax.swing.plaf.ColorUIResource [UI] #---- PopupMenuSeparator ---- @@ -808,17 +638,6 @@ PopupMenuSeparatorUI com.formdev.flatlaf.ui.FlatPopupMenuSeparatorUI PopupMenuUI com.formdev.flatlaf.ui.FlatPopupMenuUI -#---- PrintingDialog ---- - -PrintingDialog.abortButton.textAndMnemonic &Abort -PrintingDialog.abortButtonToolTip.textAndMnemonic Abort Printing -PrintingDialog.contentAborting.textAndMnemonic Printing aborting... -PrintingDialog.contentInitial.textAndMnemonic Printing in progress... -PrintingDialog.contentProgress.textAndMnemonic Printed page {0}... -PrintingDialog.titleAborting.textAndMnemonic Printing (Aborting) -PrintingDialog.titleProgress.textAndMnemonic Printing - - #---- ProgressBar ---- ProgressBar.arc 4 @@ -837,11 +656,6 @@ ProgressBar.verticalSize 4,146 javax.swing.plaf.DimensionUIResource [UI ProgressBarUI com.formdev.flatlaf.ui.FlatProgressBarUI -#---- ProgressMonitor ---- - -ProgressMonitor.progress.textAndMnemonic Progress... - - #---- RadioButton ---- RadioButton.background #3c3f41 javax.swing.plaf.ColorUIResource [UI] @@ -864,7 +678,6 @@ RadioButton.textShiftOffset 0 #---- RadioButtonMenuItem ---- -RadioButtonMenuItem.acceleratorDelimiter RadioButtonMenuItem.acceleratorFont .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] RadioButtonMenuItem.acceleratorForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.acceleratorSelectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] @@ -873,8 +686,6 @@ RadioButtonMenuItem.background #303234 javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] RadioButtonMenuItem.borderPainted true RadioButtonMenuItem.checkIcon [lazy] 15,15 com.formdev.flatlaf.icons.FlatRadioButtonMenuItemIcon [UI] -RadioButtonMenuItem.dashIcon [lazy] 10,2 com.apple.laf.AquaImageFactory$InvertableImageIcon [UI] (sun.awt.image.MultiResolutionCachedImage) -RadioButtonMenuItem.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.disabledForeground #777777 javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] RadioButtonMenuItem.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] @@ -906,7 +717,7 @@ RootPane.defaultButtonWindowKeyBindings length=8 [Ljava.lang.Object; [5] press [6] ctrl released ENTER [7] release -RootPaneUI com.apple.laf.AquaRootPaneUI +RootPaneUI com.formdev.flatlaf.ui.FlatRootPaneUI #---- ScrollBar ---- @@ -945,6 +756,7 @@ ScrollPaneUI com.formdev.flatlaf.ui.FlatScrollPaneUI #---- Separator ---- +Separator.background #3c3f41 javax.swing.plaf.ColorUIResource [UI] Separator.foreground #515151 javax.swing.plaf.ColorUIResource [UI] Separator.height 3 Separator.highlight #242424 javax.swing.plaf.ColorUIResource [UI] @@ -1005,17 +817,14 @@ SplitPane.continuousLayout true SplitPane.darkShadow #7e7e7e javax.swing.plaf.ColorUIResource [UI] SplitPane.dividerSize 5 SplitPane.highlight #242424 javax.swing.plaf.ColorUIResource [UI] -SplitPane.leftButton.textAndMnemonic left button SplitPane.oneTouchButtonOffset [active] 2 SplitPane.oneTouchButtonSize [active] 6 -SplitPane.rightButton.textAndMnemonic right button SplitPane.shadow #646464 javax.swing.plaf.ColorUIResource [UI] #---- SplitPaneDivider ---- SplitPaneDivider.draggingColor #646464 javax.swing.plaf.ColorUIResource [UI] -SplitPaneDivider.horizontalGradientVariant [lazy] 0,0,0,0 true com.apple.laf.AquaSplitPaneDividerUI$HorizontalSplitDividerGradientPainter SplitPaneDivider.oneTouchArrowColor #9a9da1 javax.swing.plaf.ColorUIResource [UI] SplitPaneDivider.oneTouchHoverArrowColor #7a7d81 javax.swing.plaf.ColorUIResource [UI] @@ -1042,21 +851,11 @@ TabbedPane.hasFullBorder false TabbedPane.highlight #242424 javax.swing.plaf.ColorUIResource [UI] TabbedPane.hoverColor #2e3133 javax.swing.plaf.ColorUIResource [UI] TabbedPane.labelShift 1 -TabbedPane.leftTabInsets 0,10,3,10 javax.swing.plaf.InsetsUIResource [UI] TabbedPane.light #313131 javax.swing.plaf.ColorUIResource [UI] -TabbedPane.nonSelectedTabTitleNormalColor #000000 javax.swing.plaf.ColorUIResource [UI] -TabbedPane.opaque true -TabbedPane.rightTabInsets 0,10,3,10 javax.swing.plaf.InsetsUIResource [UI] TabbedPane.selectedLabelShift -1 TabbedPane.selectedTabPadInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI] -TabbedPane.selectedTabTitleDisabledColor #8cffffff javax.swing.plaf.ColorUIResource [UI] -TabbedPane.selectedTabTitleNormalColor #ffffff javax.swing.plaf.ColorUIResource [UI] -TabbedPane.selectedTabTitlePressedColor #f0f0f0 javax.swing.plaf.ColorUIResource [UI] -TabbedPane.selectedTabTitleShadowDisabledColor #40000000 javax.swing.plaf.ColorUIResource [UI] -TabbedPane.selectedTabTitleShadowNormalColor #64000000 javax.swing.plaf.ColorUIResource [UI] TabbedPane.selectionFollowsFocus true TabbedPane.shadow #3c3f41 javax.swing.plaf.ColorUIResource [UI] -TabbedPane.smallFont .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] TabbedPane.tabAreaInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI] TabbedPane.tabHeight 32 TabbedPane.tabInsets 0,12,0,12 javax.swing.plaf.InsetsUIResource [UI] @@ -1066,7 +865,6 @@ TabbedPane.tabsOpaque true TabbedPane.tabsOverlapBorder true TabbedPane.textIconGap 4 TabbedPane.underlineColor #4a88c7 javax.swing.plaf.ColorUIResource [UI] -TabbedPane.useSmallLayout false TabbedPaneUI com.formdev.flatlaf.ui.FlatTabbedPaneUI @@ -1159,7 +957,6 @@ TextAreaUI com.formdev.flatlaf.ui.FlatTextAreaUI TextComponent.arc 0 TextComponent.selectAllOnFocusPolicy once -TextComponent.selectionBackgroundInactive #d4d4d4 javax.swing.plaf.ColorUIResource [UI] #---- TextField ---- @@ -1203,7 +1000,6 @@ TextPaneUI com.formdev.flatlaf.ui.FlatTextPaneUI #---- TitledBorder ---- -TitledBorder.aquaVariant [lazy] 16,20,16,20 false com.apple.laf.AquaGroupBorder$Titled [UI] TitledBorder.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatLineBorder [UI] TitledBorder.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] TitledBorder.titleColor #bbbbbb javax.swing.plaf.ColorUIResource [UI] @@ -1249,7 +1045,6 @@ ToggleButtonUI com.formdev.flatlaf.ui.FlatToggleButtonUI ToolBar.background #3c3f41 javax.swing.plaf.ColorUIResource [UI] ToolBar.border [lazy] 2,2,2,2 false com.formdev.flatlaf.ui.FlatToolBarBorder [UI] -ToolBar.borderHandleColor #8c8c8c javax.swing.plaf.ColorUIResource [UI] ToolBar.borderMargins 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI] ToolBar.darkShadow #7e7e7e javax.swing.plaf.ColorUIResource [UI] ToolBar.dockingBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI] @@ -1268,12 +1063,6 @@ ToolBar.shadow #646464 javax.swing.plaf.ColorUIResource [UI] ToolBar.spacingBorder [lazy] 1,2,1,2 false com.formdev.flatlaf.ui.FlatEmptyBorder [UI] -#---- ToolBarButton ---- - -ToolBarButton.insets 1,1,1,1 javax.swing.plaf.InsetsUIResource [UI] -ToolBarButton.margin 3,3,3,3 javax.swing.plaf.InsetsUIResource [UI] - - #---- ToolBarSeparator ---- ToolBarSeparatorUI com.formdev.flatlaf.ui.FlatToolBarSeparatorUI @@ -1333,9 +1122,8 @@ Tree.paintLines false Tree.rendererFillBackground false Tree.rendererMargins 1,2,1,2 javax.swing.plaf.InsetsUIResource [UI] Tree.rightChildIndent 11 -Tree.rightToLeftCollapsedIcon [lazy] 20,20 com.apple.laf.AquaIcon$1 [UI] Tree.rowHeight 0 -Tree.scrollsOnExpand false +Tree.scrollsOnExpand true Tree.selectionBackground #4b6eaf javax.swing.plaf.ColorUIResource [UI] Tree.selectionBorderColor #000000 javax.swing.plaf.ColorUIResource [UI] Tree.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] @@ -1358,7 +1146,6 @@ ViewportUI com.formdev.flatlaf.ui.FlatViewportUI #---- ---- -_SecurityDecisionIcon [lazy] 64,64 javax.swing.plaf.IconUIResource [UI] activeCaption #434e60 javax.swing.plaf.ColorUIResource [UI] activeCaptionBorder #434e60 javax.swing.plaf.ColorUIResource [UI] activeCaptionText #bbbbbb javax.swing.plaf.ColorUIResource [UI] diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt index 6c504885..711a7adf 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt @@ -10,26 +10,6 @@ OS Mac OS X AATextInfoPropertyKey [unknown type] sun.swing.SwingUtilities2$AATextInfo -#---- AbstractButton ---- - -AbstractButton.click.textAndMnemonic click - - -#---- AbstractDocument ---- - -AbstractDocument.addition.textAndMnemonic addition -AbstractDocument.deletion.textAndMnemonic deletion -AbstractDocument.redo.textAndMnemonic Redo -AbstractDocument.styleChange.textAndMnemonic style change -AbstractDocument.undo.textAndMnemonic Undo - - -#---- AbstractUndoableEdit ---- - -AbstractUndoableEdit.redo.textAndMnemonic Redo -AbstractUndoableEdit.undo.textAndMnemonic Undo - - #---- Actions ---- Actions.Blue #389fd6 javax.swing.plaf.ColorUIResource [UI] @@ -110,7 +90,6 @@ Button.iconTextGap 4 Button.light #e3e3e3 javax.swing.plaf.ColorUIResource [UI] Button.margin 2,14,2,14 javax.swing.plaf.InsetsUIResource [UI] Button.minimumWidth 72 -Button.opaque false Button.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] Button.rollover true Button.shadow #c4c4c4 javax.swing.plaf.ColorUIResource [UI] @@ -159,7 +138,6 @@ CheckBox.textShiftOffset 0 #---- CheckBoxMenuItem ---- -CheckBoxMenuItem.acceleratorDelimiter CheckBoxMenuItem.acceleratorFont .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] CheckBoxMenuItem.acceleratorForeground #505050 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.acceleratorSelectionForeground #ffffff javax.swing.plaf.ColorUIResource [UI] @@ -168,8 +146,6 @@ CheckBoxMenuItem.background #ffffff javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] CheckBoxMenuItem.borderPainted true CheckBoxMenuItem.checkIcon [lazy] 15,15 com.formdev.flatlaf.icons.FlatCheckBoxMenuItemIcon [UI] -CheckBoxMenuItem.dashIcon [lazy] 10,2 com.apple.laf.AquaImageFactory$InvertableImageIcon [UI] (sun.awt.image.MultiResolutionCachedImage) -CheckBoxMenuItem.disabledBackground #f2f2f2 javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.disabledForeground #8c8c8c javax.swing.plaf.ColorUIResource [UI] CheckBoxMenuItem.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] CheckBoxMenuItem.foreground #000000 javax.swing.plaf.ColorUIResource [UI] @@ -188,27 +164,9 @@ CheckBoxUI com.formdev.flatlaf.ui.FlatCheckBoxUI #---- ColorChooser ---- ColorChooser.background #f2f2f2 javax.swing.plaf.ColorUIResource [UI] -ColorChooser.cancel.textAndMnemonic Cancel ColorChooser.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] ColorChooser.foreground #000000 javax.swing.plaf.ColorUIResource [UI] -ColorChooser.hsb.textAndMnemonic &HSB -ColorChooser.hsbBlue.textAndMnemonic B -ColorChooser.hsbBrightness.textAndMnemonic B -ColorChooser.hsbGreen.textAndMnemonic G -ColorChooser.hsbHue.textAndMnemonic H -ColorChooser.hsbRed.textAndMnemonic R -ColorChooser.hsbSaturation.textAndMnemonic S -ColorChooser.ok.textAndMnemonic OK -ColorChooser.preview.textAndMnemonic Preview -ColorChooser.reset.textAndMnemonic &Reset -ColorChooser.rgb.textAndMnemonic R&GB -ColorChooser.rgbBlue.textAndMnemonic &Blue -ColorChooser.rgbGreen.textAndMnemonic Gree&n -ColorChooser.rgbRed.textAndMnemonic Re&d -ColorChooser.sample.textAndMnemonic Sample Text Sample Text -ColorChooser.swatches.textAndMnemonic &Swatches ColorChooser.swatchesDefaultRecentColor #f2f2f2 javax.swing.plaf.ColorUIResource [UI] -ColorChooser.swatchesRecent.textAndMnemonic Recent: ColorChooser.swatchesRecentSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIResource [UI] ColorChooser.swatchesSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIResource [UI] ColorChooserUI com.formdev.flatlaf.ui.FlatColorChooserUI @@ -236,7 +194,6 @@ ComboBox.padding 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI] ComboBox.selectionBackground #2675bf javax.swing.plaf.ColorUIResource [UI] ComboBox.selectionForeground #ffffff javax.swing.plaf.ColorUIResource [UI] ComboBox.timeFactor 1000 -ComboBox.togglePopup.textAndMnemonic togglePopup ComboBoxUI com.formdev.flatlaf.ui.FlatComboBoxUI @@ -270,13 +227,10 @@ Desktop.minOnScreenInsets 3,3,3,3 javax.swing.plaf.InsetsUIResource [UI] DesktopIcon.background #c6d2dd javax.swing.plaf.ColorUIResource [UI] DesktopIcon.border [lazy] 4,4,4,4 false com.formdev.flatlaf.ui.FlatEmptyBorder [UI] -DesktopIcon.borderColor #98000000 javax.swing.plaf.ColorUIResource [UI] -DesktopIcon.borderRimColor #c0c0c0c0 javax.swing.plaf.ColorUIResource [UI] DesktopIcon.closeIcon [lazy] 24,24 com.formdev.flatlaf.icons.FlatInternalFrameCloseIcon [UI] DesktopIcon.closeSize 20,20 javax.swing.plaf.DimensionUIResource [UI] DesktopIcon.foreground #000000 javax.swing.plaf.ColorUIResource [UI] DesktopIcon.iconSize 64,64 javax.swing.plaf.DimensionUIResource [UI] -DesktopIcon.labelBackground #64000000 javax.swing.plaf.ColorUIResource [UI] DesktopIconUI com.formdev.flatlaf.ui.FlatDesktopIconUI @@ -304,56 +258,12 @@ EditorPaneUI com.formdev.flatlaf.ui.FlatEditorPaneUI #---- FileChooser ---- -FileChooser.acceptAllFileFilter.textAndMnemonic All Files -FileChooser.by.textAndMnemonic Name -FileChooser.byDate.textAndMnemonic Date Modified -FileChooser.cancelButton.textAndMnemonic Cancel -FileChooser.cancelButtonMnemonic 0 -FileChooser.chooseButton.textAndMnemonic Choose -FileChooser.createButton.textAndMnemonic Create -FileChooser.desktopName Desktop FileChooser.detailsViewIcon [lazy] 16,16 com.formdev.flatlaf.icons.FlatFileChooserDetailsViewIcon [UI] -FileChooser.directoryDescription.textAndMnemonic Directory -FileChooser.directoryOpenButton.textAndMnemonic Open -FileChooser.directoryOpenButtonMnemonic 0 -FileChooser.fileDescription.textAndMnemonic Generic File -FileChooser.fileNameLabel.textAndMnemonic File: -FileChooser.fileNameLabelMnemonic 0 -FileChooser.fileSizeGigaBytes {0} GB -FileChooser.fileSizeKiloBytes {0} KB -FileChooser.fileSizeMegaBytes {0} MB -FileChooser.filesOfTypeLabel.textAndMnemonic File Format: -FileChooser.filesOfTypeLabelMnemonic 0 -FileChooser.helpButton.textAndMnemonic Help -FileChooser.helpButtonMnemonic 0 FileChooser.homeFolderIcon [lazy] 16,16 com.formdev.flatlaf.icons.FlatFileChooserHomeFolderIcon [UI] FileChooser.listViewIcon [lazy] 16,16 com.formdev.flatlaf.icons.FlatFileChooserListViewIcon [UI] -FileChooser.lookInLabelMnemonic 0 -FileChooser.mac.newFolder.subsequent untitled folder {0} -FileChooser.mac.newFolder untitled folder -FileChooser.newFolderAccessibleName New Folder -FileChooser.newFolderButton.textAndMnemonic New Folder -FileChooser.newFolderError.textAndMnemonic Error occurred during folder creation -FileChooser.newFolderErrorSeparator : -FileChooser.newFolderExistsError.textAndMnemonic That name is already taken FileChooser.newFolderIcon [lazy] 16,16 com.formdev.flatlaf.icons.FlatFileChooserNewFolderIcon [UI] -FileChooser.newFolderPrompt.textAndMnemonic Name of new folder: -FileChooser.newFolderTitle.textAndMnemonic New Folder -FileChooser.openButton.textAndMnemonic Open -FileChooser.openButtonMnemonic 0 -FileChooser.openDialogTitle.textAndMnemonic Open -FileChooser.openTitle.textAndMnemonic Open FileChooser.readOnly false -FileChooser.saveButton.textAndMnemonic Save -FileChooser.saveButtonMnemonic 0 -FileChooser.saveDialogFileNameLabel.textAndMnemonic Save As: -FileChooser.saveDialogTitle.textAndMnemonic Save -FileChooser.saveTitle.textAndMnemonic Save -FileChooser.untitledFileName untitled -FileChooser.untitledFolderName untitled folder FileChooser.upFolderIcon [lazy] 16,16 com.formdev.flatlaf.icons.FlatFileChooserUpFolderIcon [UI] -FileChooser.updateButton.textAndMnemonic Update -FileChooser.updateButtonMnemonic 0 FileChooser.useSystemExtensionHiding false FileChooser.usesSingleFilePane true FileChooserUI com.formdev.flatlaf.ui.FlatFileChooserUI @@ -368,18 +278,6 @@ FileView.floppyDriveIcon [lazy] 16,16 com.formdev.flatlaf.icons.FlatFil FileView.hardDriveIcon [lazy] 16,16 com.formdev.flatlaf.icons.FlatFileViewHardDriveIcon [UI] -#---- Focus ---- - -Focus.color #3f074cf1 com.apple.laf.AquaImageFactory$SystemColorProxy [UI] - - -#---- FormView ---- - -FormView.browseFileButton.textAndMnemonic Browse... -FormView.resetButton.textAndMnemonic Reset -FormView.submitButton.textAndMnemonic Submit Query - - #---- FormattedTextField ---- FormattedTextField.background #ffffff javax.swing.plaf.ColorUIResource [UI] @@ -427,22 +325,11 @@ Hyperlink.visitedColor #2470b3 javax.swing.plaf.ColorUIResource [UI] HyperlinkUI com.formdev.flatlaf.swingx.ui.FlatHyperlinkUI -#---- IconButton ---- - -IconButton.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] - - -#---- InsetBorder ---- - -InsetBorder.aquaVariant [lazy] 8,12,8,12 false com.apple.laf.AquaGroupBorder$Titleless [UI] - - #---- InternalFrame ---- InternalFrame.activeBorderColor #919191 javax.swing.plaf.ColorUIResource [UI] InternalFrame.activeTitleBackground #ffffff javax.swing.plaf.ColorUIResource [UI] InternalFrame.activeTitleForeground #000000 javax.swing.plaf.ColorUIResource [UI] -InternalFrame.background #f2f2f2 javax.swing.plaf.ColorUIResource [UI] InternalFrame.border [lazy] 6,6,6,6 false com.formdev.flatlaf.ui.FlatInternalFrameUI$FlatInternalFrameBorder [UI] InternalFrame.borderColor #f2f2f2 javax.swing.plaf.ColorUIResource [UI] InternalFrame.borderDarkShadow #9e9e9e javax.swing.plaf.ColorUIResource [UI] @@ -454,44 +341,27 @@ InternalFrame.borderShadow #c4c4c4 javax.swing.plaf.ColorUIResource [UI] InternalFrame.buttonHoverBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] InternalFrame.buttonPressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] InternalFrame.buttonSize 24,24 javax.swing.plaf.DimensionUIResource [UI] -InternalFrame.closeButtonToolTip Close InternalFrame.closeHoverBackground [lazy] #db5860 javax.swing.plaf.ColorUIResource [UI] InternalFrame.closeHoverForeground #ffffff javax.swing.plaf.ColorUIResource [UI] InternalFrame.closeIcon [lazy] 24,24 com.formdev.flatlaf.icons.FlatInternalFrameCloseIcon [UI] InternalFrame.closePressedBackground [lazy] #d22e38 javax.swing.plaf.ColorUIResource [UI] InternalFrame.closePressedForeground #ffffff javax.swing.plaf.ColorUIResource [UI] -InternalFrame.iconButtonToolTip Minimize +InternalFrame.icon [lazy] 16,16 sun.swing.ImageIconUIResource [UI] (sun.awt.image.ToolkitImage) InternalFrame.iconifyIcon [lazy] 24,24 com.formdev.flatlaf.icons.FlatInternalFrameIconifyIcon [UI] InternalFrame.inactiveBorderColor #c4c4c4 javax.swing.plaf.ColorUIResource [UI] InternalFrame.inactiveTitleBackground #fafafa javax.swing.plaf.ColorUIResource [UI] InternalFrame.inactiveTitleForeground #8c8c8c javax.swing.plaf.ColorUIResource [UI] -InternalFrame.maxButtonToolTip Maximize InternalFrame.maximizeIcon [lazy] 24,24 com.formdev.flatlaf.icons.FlatInternalFrameMaximizeIcon [UI] InternalFrame.minimizeIcon [lazy] 24,24 com.formdev.flatlaf.icons.FlatInternalFrameMinimizeIcon [UI] -InternalFrame.opaque false -InternalFrame.optionDialogBackground #eeeeee com.apple.laf.AquaImageFactory$SystemColorProxy [UI] -InternalFrame.optionDialogTitleFont .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] -InternalFrame.paletteBackground #eeeeee com.apple.laf.AquaImageFactory$SystemColorProxy [UI] -InternalFrame.paletteTitleFont .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] -InternalFrame.restoreButtonToolTip Restore InternalFrame.titleFont .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] #---- InternalFrameTitlePane ---- InternalFrameTitlePane.border [lazy] 0,8,0,0 false com.formdev.flatlaf.ui.FlatEmptyBorder [UI] -InternalFrameTitlePane.closeButton.textAndMnemonic Close -InternalFrameTitlePane.closeButtonAccessibleName Close InternalFrameTitlePane.closeButtonOpacity true -InternalFrameTitlePane.iconifyButtonAccessibleName Iconify InternalFrameTitlePane.iconifyButtonOpacity true -InternalFrameTitlePane.maximizeButton.textAndMnemonic Maximize -InternalFrameTitlePane.maximizeButtonAccessibleName Maximize InternalFrameTitlePane.maximizeButtonOpacity true -InternalFrameTitlePane.minimizeButton.textAndMnemonic Minimize -InternalFrameTitlePane.moveButton.textAndMnemonic Move -InternalFrameTitlePane.restoreButton.textAndMnemonic Restore -InternalFrameTitlePane.sizeButton.textAndMnemonic Size #---- InternalFrame ---- @@ -499,11 +369,6 @@ InternalFrameTitlePane.sizeButton.textAndMnemonic Size InternalFrameUI com.formdev.flatlaf.ui.FlatInternalFrameUI -#---- IsindexView ---- - -IsindexView.prompt This is a searchable index. Enter search keywords: - - #---- JXBusyLabel ---- JXBusyLabel.baseColor #c4c4c4 javax.swing.plaf.ColorUIResource [UI] @@ -567,7 +432,6 @@ Label.disabledForeground #8c8c8c javax.swing.plaf.ColorUIResource [UI] Label.disabledShadow #c4c4c4 javax.swing.plaf.ColorUIResource [UI] Label.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] Label.foreground #000000 javax.swing.plaf.ColorUIResource [UI] -Label.opaque true LabelUI com.formdev.flatlaf.ui.FlatLabelUI @@ -582,20 +446,15 @@ List.cellRenderer [active] javax.swing.DefaultListCellRenderer$UIRe List.dropCellBackground [lazy] #3f8fd9 javax.swing.plaf.ColorUIResource [UI] List.dropCellForeground [lazy] #ffffff javax.swing.plaf.ColorUIResource [UI] List.dropLineColor [lazy] #6aa7e1 javax.swing.plaf.ColorUIResource [UI] -List.evenRowBackgroundPainter [lazy] 0,0,0,0 false com.apple.laf.AquaListUI$ComponentPainter [UI] List.focusCellHighlightBorder [lazy] 1,6,1,6 false com.formdev.flatlaf.ui.FlatListCellBorder$Focused [UI] List.focusSelectedCellHighlightBorder [lazy] 1,6,1,6 false com.formdev.flatlaf.ui.FlatListCellBorder$Selected [UI] List.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] List.foreground #000000 javax.swing.plaf.ColorUIResource [UI] List.noFocusBorder 1,1,1,1 false javax.swing.plaf.BorderUIResource$EmptyBorderUIResource [UI] -List.oddRowBackgroundPainter [lazy] 0,0,0,0 false com.apple.laf.AquaListUI$ComponentPainter [UI] List.selectionBackground #2675bf javax.swing.plaf.ColorUIResource [UI] List.selectionForeground #ffffff javax.swing.plaf.ColorUIResource [UI] List.selectionInactiveBackground #d4d4d4 javax.swing.plaf.ColorUIResource [UI] List.selectionInactiveForeground #000000 javax.swing.plaf.ColorUIResource [UI] -List.sourceListBackgroundPainter [lazy] 0,0,0,0 false com.apple.laf.AquaListUI$ComponentPainter [UI] -List.sourceListFocusedSelectionBackgroundPainter [lazy] 0,0,0,0 false com.apple.laf.AquaListUI$ComponentPainter [UI] -List.sourceListSelectionBackgroundPainter [lazy] 0,0,0,0 false com.apple.laf.AquaListUI$ComponentPainter [UI] List.timeFactor 1000 ListUI com.formdev.flatlaf.ui.FlatListUI @@ -610,9 +469,7 @@ Menu.background #ffffff javax.swing.plaf.ColorUIResource [UI] Menu.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] Menu.borderPainted true Menu.cancelMode hideLastSubmenu -Menu.consumesTabs true Menu.crossMenuMnemonic true -Menu.disabledBackground #f2f2f2 javax.swing.plaf.ColorUIResource [UI] Menu.disabledForeground #8c8c8c javax.swing.plaf.ColorUIResource [UI] Menu.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] Menu.foreground #000000 javax.swing.plaf.ColorUIResource [UI] @@ -620,7 +477,7 @@ Menu.icon.arrowColor #666666 javax.swing.plaf.ColorUIResource [UI] Menu.icon.disabledArrowColor #ababab javax.swing.plaf.ColorUIResource [UI] Menu.margin 2,8,2,8 javax.swing.plaf.InsetsUIResource [UI] Menu.menuPopupOffsetX 0 -Menu.menuPopupOffsetY 1 +Menu.menuPopupOffsetY 0 Menu.opaque false Menu.preserveTopLevelSelection false Menu.selectionBackground #2675bf javax.swing.plaf.ColorUIResource [UI] @@ -634,20 +491,13 @@ Menu.submenuPopupOffsetY [active] -4 #---- MenuBar ---- MenuBar.background #ffffff javax.swing.plaf.ColorUIResource [UI] -MenuBar.backgroundPainter [lazy] 0,0,0,0 false com.apple.laf.AquaBorder$Default [UI] MenuBar.border [lazy] 0,0,1,0 false com.formdev.flatlaf.ui.FlatMenuBarBorder [UI] MenuBar.borderColor #cdcdcd javax.swing.plaf.ColorUIResource [UI] -MenuBar.disabledBackground #f2f2f2 javax.swing.plaf.ColorUIResource [UI] -MenuBar.disabledForeground #8c8c8c javax.swing.plaf.ColorUIResource [UI] MenuBar.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] MenuBar.foreground #000000 javax.swing.plaf.ColorUIResource [UI] MenuBar.highlight #ffffff javax.swing.plaf.ColorUIResource [UI] MenuBar.hoverBackground #e6e6e6 javax.swing.plaf.ColorUIResource [UI] MenuBar.itemMargins 3,3,3,3 javax.swing.plaf.InsetsUIResource [UI] -MenuBar.margin 0,8,0,8 javax.swing.plaf.InsetsUIResource [UI] -MenuBar.selectedBackgroundPainter [lazy] 0,0,0,0 false com.apple.laf.AquaBorder$Default [UI] -MenuBar.selectionBackground #2675bf javax.swing.plaf.ColorUIResource [UI] -MenuBar.selectionForeground #ffffff javax.swing.plaf.ColorUIResource [UI] MenuBar.shadow #c4c4c4 javax.swing.plaf.ColorUIResource [UI] MenuBar.windowBindings length=2 [Ljava.lang.Object; [0] F10 @@ -665,13 +515,11 @@ MenuItem.arrowIcon [lazy] 6,10 com.formdev.flatlaf.icons.FlatMenu MenuItem.background #ffffff javax.swing.plaf.ColorUIResource [UI] MenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] MenuItem.borderPainted true -MenuItem.disabledBackground #f2f2f2 javax.swing.plaf.ColorUIResource [UI] MenuItem.disabledForeground #8c8c8c javax.swing.plaf.ColorUIResource [UI] MenuItem.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] MenuItem.foreground #000000 javax.swing.plaf.ColorUIResource [UI] MenuItem.margin 2,8,2,8 javax.swing.plaf.InsetsUIResource [UI] MenuItem.opaque false -MenuItem.selectedBackgroundPainter [lazy] 0,0,0,0 false com.apple.laf.AquaBorder$Default [UI] MenuItem.selectionBackground #2675bf javax.swing.plaf.ColorUIResource [UI] MenuItem.selectionForeground #ffffff javax.swing.plaf.ColorUIResource [UI] @@ -718,39 +566,26 @@ OptionPane.background #f2f2f2 javax.swing.plaf.ColorUIResource [UI] OptionPane.border [lazy] 12,12,12,12 false com.formdev.flatlaf.ui.FlatEmptyBorder [UI] OptionPane.buttonAreaBorder [lazy] 12,0,0,0 false com.formdev.flatlaf.ui.FlatEmptyBorder [UI] OptionPane.buttonClickThreshhold 500 -OptionPane.buttonFont .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] OptionPane.buttonMinimumWidth [active] 72 OptionPane.buttonOrientation 4 OptionPane.buttonPadding 8 -OptionPane.cancelButton.textAndMnemonic Cancel -OptionPane.cancelButtonMnemonic OptionPane.errorIcon [lazy] 32,32 com.formdev.flatlaf.icons.FlatOptionPaneErrorIcon [UI] OptionPane.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] OptionPane.foreground #000000 javax.swing.plaf.ColorUIResource [UI] OptionPane.iconMessageGap 16 OptionPane.informationIcon [lazy] 32,32 com.formdev.flatlaf.icons.FlatOptionPaneInformationIcon [UI] -OptionPane.inputDialog.titleAndMnemonic Input OptionPane.isYesLast true OptionPane.maxCharactersPerLine 80 OptionPane.messageAreaBorder [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatEmptyBorder [UI] -OptionPane.messageDialog.titleAndMnemonic Message -OptionPane.messageFont .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] OptionPane.messagePadding 3 OptionPane.minimumSize 262,90 javax.swing.plaf.DimensionUIResource [UI] -OptionPane.noButton.textAndMnemonic &No -OptionPane.noButtonMnemonic -OptionPane.okButton.textAndMnemonic OK -OptionPane.okButtonMnemonic OptionPane.questionIcon [lazy] 32,32 com.formdev.flatlaf.icons.FlatOptionPaneQuestionIcon [UI] OptionPane.sameSizeButtons true OptionPane.setButtonMargin false -OptionPane.title.textAndMnemonic Select an Option OptionPane.warningIcon [lazy] 32,32 com.formdev.flatlaf.icons.FlatOptionPaneWarningIcon [UI] OptionPane.windowBindings length=2 [Ljava.lang.Object; [0] ESCAPE [1] close -OptionPane.yesButton.textAndMnemonic &Yes -OptionPane.yesButtonMnemonic OptionPaneUI com.formdev.flatlaf.ui.FlatOptionPaneUI @@ -759,7 +594,6 @@ OptionPaneUI com.formdev.flatlaf.ui.FlatOptionPaneUI Panel.background #f2f2f2 javax.swing.plaf.ColorUIResource [UI] Panel.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] Panel.foreground #000000 javax.swing.plaf.ColorUIResource [UI] -Panel.opaque true PanelUI com.formdev.flatlaf.ui.FlatPanelUI @@ -767,7 +601,6 @@ PanelUI com.formdev.flatlaf.ui.FlatPanelUI PasswordField.background #ffffff javax.swing.plaf.ColorUIResource [UI] PasswordField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI] -PasswordField.capsLockIconColor #64000000 javax.swing.plaf.ColorUIResource [UI] PasswordField.caretBlinkRate 500 PasswordField.caretForeground #000000 javax.swing.plaf.ColorUIResource [UI] PasswordField.disabledBackground #f2f2f2 javax.swing.plaf.ColorUIResource [UI] @@ -792,9 +625,6 @@ PopupMenu.borderInsets 4,1,4,1 javax.swing.plaf.InsetsUIResource [UI] PopupMenu.consumeEventOnClose false PopupMenu.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] PopupMenu.foreground #000000 javax.swing.plaf.ColorUIResource [UI] -PopupMenu.selectionBackground #2675bf javax.swing.plaf.ColorUIResource [UI] -PopupMenu.selectionForeground #ffffff javax.swing.plaf.ColorUIResource [UI] -PopupMenu.translucentBackground #ffffff javax.swing.plaf.ColorUIResource [UI] #---- PopupMenuSeparator ---- @@ -810,17 +640,6 @@ PopupMenuSeparatorUI com.formdev.flatlaf.ui.FlatPopupMenuSeparatorUI PopupMenuUI com.formdev.flatlaf.ui.FlatPopupMenuUI -#---- PrintingDialog ---- - -PrintingDialog.abortButton.textAndMnemonic &Abort -PrintingDialog.abortButtonToolTip.textAndMnemonic Abort Printing -PrintingDialog.contentAborting.textAndMnemonic Printing aborting... -PrintingDialog.contentInitial.textAndMnemonic Printing in progress... -PrintingDialog.contentProgress.textAndMnemonic Printed page {0}... -PrintingDialog.titleAborting.textAndMnemonic Printing (Aborting) -PrintingDialog.titleProgress.textAndMnemonic Printing - - #---- ProgressBar ---- ProgressBar.arc 4 @@ -839,11 +658,6 @@ ProgressBar.verticalSize 4,146 javax.swing.plaf.DimensionUIResource [UI ProgressBarUI com.formdev.flatlaf.ui.FlatProgressBarUI -#---- ProgressMonitor ---- - -ProgressMonitor.progress.textAndMnemonic Progress... - - #---- RadioButton ---- RadioButton.background #f2f2f2 javax.swing.plaf.ColorUIResource [UI] @@ -866,7 +680,6 @@ RadioButton.textShiftOffset 0 #---- RadioButtonMenuItem ---- -RadioButtonMenuItem.acceleratorDelimiter RadioButtonMenuItem.acceleratorFont .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] RadioButtonMenuItem.acceleratorForeground #505050 javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.acceleratorSelectionForeground #ffffff javax.swing.plaf.ColorUIResource [UI] @@ -875,8 +688,6 @@ RadioButtonMenuItem.background #ffffff javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] RadioButtonMenuItem.borderPainted true RadioButtonMenuItem.checkIcon [lazy] 15,15 com.formdev.flatlaf.icons.FlatRadioButtonMenuItemIcon [UI] -RadioButtonMenuItem.dashIcon [lazy] 10,2 com.apple.laf.AquaImageFactory$InvertableImageIcon [UI] (sun.awt.image.MultiResolutionCachedImage) -RadioButtonMenuItem.disabledBackground #f2f2f2 javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.disabledForeground #8c8c8c javax.swing.plaf.ColorUIResource [UI] RadioButtonMenuItem.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] RadioButtonMenuItem.foreground #000000 javax.swing.plaf.ColorUIResource [UI] @@ -908,7 +719,7 @@ RootPane.defaultButtonWindowKeyBindings length=8 [Ljava.lang.Object; [5] press [6] ctrl released ENTER [7] release -RootPaneUI com.apple.laf.AquaRootPaneUI +RootPaneUI com.formdev.flatlaf.ui.FlatRootPaneUI #---- ScrollBar ---- @@ -947,6 +758,7 @@ ScrollPaneUI com.formdev.flatlaf.ui.FlatScrollPaneUI #---- Separator ---- +Separator.background #f2f2f2 javax.swing.plaf.ColorUIResource [UI] Separator.foreground #d1d1d1 javax.swing.plaf.ColorUIResource [UI] Separator.height 3 Separator.highlight #ffffff javax.swing.plaf.ColorUIResource [UI] @@ -1007,17 +819,14 @@ SplitPane.continuousLayout true SplitPane.darkShadow #9e9e9e javax.swing.plaf.ColorUIResource [UI] SplitPane.dividerSize 5 SplitPane.highlight #ffffff javax.swing.plaf.ColorUIResource [UI] -SplitPane.leftButton.textAndMnemonic left button SplitPane.oneTouchButtonOffset [active] 2 SplitPane.oneTouchButtonSize [active] 6 -SplitPane.rightButton.textAndMnemonic right button SplitPane.shadow #c4c4c4 javax.swing.plaf.ColorUIResource [UI] #---- SplitPaneDivider ---- SplitPaneDivider.draggingColor #c4c4c4 javax.swing.plaf.ColorUIResource [UI] -SplitPaneDivider.horizontalGradientVariant [lazy] 0,0,0,0 true com.apple.laf.AquaSplitPaneDividerUI$HorizontalSplitDividerGradientPainter SplitPaneDivider.oneTouchArrowColor #666666 javax.swing.plaf.ColorUIResource [UI] SplitPaneDivider.oneTouchHoverArrowColor #333333 javax.swing.plaf.ColorUIResource [UI] @@ -1044,21 +853,11 @@ TabbedPane.hasFullBorder false TabbedPane.highlight #ffffff javax.swing.plaf.ColorUIResource [UI] TabbedPane.hoverColor #d9d9d9 javax.swing.plaf.ColorUIResource [UI] TabbedPane.labelShift 1 -TabbedPane.leftTabInsets 0,10,3,10 javax.swing.plaf.InsetsUIResource [UI] TabbedPane.light #e3e3e3 javax.swing.plaf.ColorUIResource [UI] -TabbedPane.nonSelectedTabTitleNormalColor #000000 javax.swing.plaf.ColorUIResource [UI] -TabbedPane.opaque true -TabbedPane.rightTabInsets 0,10,3,10 javax.swing.plaf.InsetsUIResource [UI] TabbedPane.selectedLabelShift -1 TabbedPane.selectedTabPadInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI] -TabbedPane.selectedTabTitleDisabledColor #8cffffff javax.swing.plaf.ColorUIResource [UI] -TabbedPane.selectedTabTitleNormalColor #ffffff javax.swing.plaf.ColorUIResource [UI] -TabbedPane.selectedTabTitlePressedColor #f0f0f0 javax.swing.plaf.ColorUIResource [UI] -TabbedPane.selectedTabTitleShadowDisabledColor #40000000 javax.swing.plaf.ColorUIResource [UI] -TabbedPane.selectedTabTitleShadowNormalColor #64000000 javax.swing.plaf.ColorUIResource [UI] TabbedPane.selectionFollowsFocus true TabbedPane.shadow #f2f2f2 javax.swing.plaf.ColorUIResource [UI] -TabbedPane.smallFont .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] TabbedPane.tabAreaInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI] TabbedPane.tabHeight 32 TabbedPane.tabInsets 0,12,0,12 javax.swing.plaf.InsetsUIResource [UI] @@ -1068,7 +867,6 @@ TabbedPane.tabsOpaque true TabbedPane.tabsOverlapBorder true TabbedPane.textIconGap 4 TabbedPane.underlineColor #4083c9 javax.swing.plaf.ColorUIResource [UI] -TabbedPane.useSmallLayout false TabbedPaneUI com.formdev.flatlaf.ui.FlatTabbedPaneUI @@ -1161,7 +959,6 @@ TextAreaUI com.formdev.flatlaf.ui.FlatTextAreaUI TextComponent.arc 0 TextComponent.selectAllOnFocusPolicy once -TextComponent.selectionBackgroundInactive #d4d4d4 javax.swing.plaf.ColorUIResource [UI] #---- TextField ---- @@ -1205,7 +1002,6 @@ TextPaneUI com.formdev.flatlaf.ui.FlatTextPaneUI #---- TitledBorder ---- -TitledBorder.aquaVariant [lazy] 16,20,16,20 false com.apple.laf.AquaGroupBorder$Titled [UI] TitledBorder.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatLineBorder [UI] TitledBorder.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] TitledBorder.titleColor #000000 javax.swing.plaf.ColorUIResource [UI] @@ -1251,7 +1047,6 @@ ToggleButtonUI com.formdev.flatlaf.ui.FlatToggleButtonUI ToolBar.background #f2f2f2 javax.swing.plaf.ColorUIResource [UI] ToolBar.border [lazy] 2,2,2,2 false com.formdev.flatlaf.ui.FlatToolBarBorder [UI] -ToolBar.borderHandleColor #8c8c8c javax.swing.plaf.ColorUIResource [UI] ToolBar.borderMargins 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI] ToolBar.darkShadow #9e9e9e javax.swing.plaf.ColorUIResource [UI] ToolBar.dockingBackground #f2f2f2 javax.swing.plaf.ColorUIResource [UI] @@ -1270,12 +1065,6 @@ ToolBar.shadow #c4c4c4 javax.swing.plaf.ColorUIResource [UI] ToolBar.spacingBorder [lazy] 1,2,1,2 false com.formdev.flatlaf.ui.FlatEmptyBorder [UI] -#---- ToolBarButton ---- - -ToolBarButton.insets 1,1,1,1 javax.swing.plaf.InsetsUIResource [UI] -ToolBarButton.margin 3,3,3,3 javax.swing.plaf.InsetsUIResource [UI] - - #---- ToolBarSeparator ---- ToolBarSeparatorUI com.formdev.flatlaf.ui.FlatToolBarSeparatorUI @@ -1335,9 +1124,8 @@ Tree.paintLines false Tree.rendererFillBackground false Tree.rendererMargins 1,2,1,2 javax.swing.plaf.InsetsUIResource [UI] Tree.rightChildIndent 11 -Tree.rightToLeftCollapsedIcon [lazy] 20,20 com.apple.laf.AquaIcon$1 [UI] Tree.rowHeight 0 -Tree.scrollsOnExpand false +Tree.scrollsOnExpand true Tree.selectionBackground #2675bf javax.swing.plaf.ColorUIResource [UI] Tree.selectionBorderColor #000000 javax.swing.plaf.ColorUIResource [UI] Tree.selectionForeground #ffffff javax.swing.plaf.ColorUIResource [UI] @@ -1360,7 +1148,6 @@ ViewportUI com.formdev.flatlaf.ui.FlatViewportUI #---- ---- -_SecurityDecisionIcon [lazy] 64,64 javax.swing.plaf.IconUIResource [UI] activeCaption #99b4d1 javax.swing.plaf.ColorUIResource [UI] activeCaptionBorder #99b4d1 javax.swing.plaf.ColorUIResource [UI] activeCaptionText #000000 javax.swing.plaf.ColorUIResource [UI]