Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-07 06:20:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

replaced prefix @@ with $ in .properties files

Browse Source
This commit is contained in:
Karl Tauber
2019-12-23 00:18:27 +01:00
parent 16146f4c88
commit 32ceb168d5
11 changed files with 73 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -14,6 +14,7 @@ FlatLaf Change Log
`rgba(red,green,blue,alpha)`, `hsl(hue,saturation,lightness)`, `rgba(red,green,blue,alpha)`, `hsl(hue,saturation,lightness)`,
`hsla(hue,saturation,lightness,alpha)`, `lighten(color,amount[,options])` and `hsla(hue,saturation,lightness,alpha)`, `lighten(color,amount[,options])` and
`darken(color,amount[,options])`. `darken(color,amount[,options])`.
- Replaced prefix `@@` with `$` in `.properties` files.
- Fixed link color (in HTML text) and separator color in IntelliJ platform - Fixed link color (in HTML text) and separator color in IntelliJ platform
themes. themes.

15
flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java
View File

@@ -61,7 +61,9 @@ class UIDefaultsLoader
private static final String TYPE_PREFIX = "{"; private static final String TYPE_PREFIX = "{";
private static final String TYPE_PREFIX_END = "}"; private static final String TYPE_PREFIX_END = "}";
private static final String VARIABLE_PREFIX = "@"; private static final String VARIABLE_PREFIX = "@";
@Deprecated
private static final String REF_PREFIX = VARIABLE_PREFIX + "@"; private static final String REF_PREFIX = VARIABLE_PREFIX + "@";
private static final String PROPERTY_PREFIX = "$";
private static final String OPTIONAL_PREFIX = "?"; private static final String OPTIONAL_PREFIX = "?";
private static final String GLOBAL_PREFIX = "*."; private static final String GLOBAL_PREFIX = "*.";
@@ -176,16 +178,21 @@ class UIDefaultsLoader
} }
static void logParseError( String key, String value, RuntimeException ex ) { static void logParseError( String key, String value, RuntimeException ex ) {
System.err.println( "Failed to parse: '" + key + '=' + value + '\'' ); System.err.println( "FlatLaf: Failed to parse: '" + key + '=' + value + '\'' );
System.err.println( " " + ex.getMessage() ); System.err.println( " " + ex.getMessage() );
} }
private static String resolveValue( Properties properties, String value ) { private static String resolveValue( Properties properties, String value ) {
if( !value.startsWith( VARIABLE_PREFIX ) ) if( value.startsWith( PROPERTY_PREFIX ) )
value = value.substring( PROPERTY_PREFIX.length() );
else if( !value.startsWith( VARIABLE_PREFIX ) )
return value; return value;
if( value.startsWith( REF_PREFIX ) ) // for compatibility
if( value.startsWith( REF_PREFIX ) ) {
System.err.println( "FlatLaf: Usage of '@@' in .properties files is deprecated. Use '$' instead." );
value = value.substring( REF_PREFIX.length() ); value = value.substring( REF_PREFIX.length() );
}
boolean optional = false; boolean optional = false;
if( value.startsWith( OPTIONAL_PREFIX ) ) { if( value.startsWith( OPTIONAL_PREFIX ) ) {
@@ -198,7 +205,7 @@ class UIDefaultsLoader
if( optional ) if( optional )
return "null"; return "null";
throw new IllegalArgumentException( "variable or reference '" + value + "' not found" ); throw new IllegalArgumentException( "variable or property '" + value + "' not found" );
} }
return resolveValue( properties, newValue ); return resolveValue( properties, newValue );

4
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties
View File

@@ -73,7 +73,7 @@ Button.pressedBackground=@buttonPressedBackground
Button.borderColor=#5e6060 Button.borderColor=#5e6060
Button.disabledBorderColor=#5e6060 Button.disabledBorderColor=#5e6060
Button.focusedBorderColor=#466d94 Button.focusedBorderColor=#466d94
Button.hoverBorderColor=@@Button.focusedBorderColor Button.hoverBorderColor=$Button.focusedBorderColor
Button.default.background=#365880 Button.default.background=#365880
Button.default.foreground=#bbbbbb Button.default.foreground=#bbbbbb
@@ -95,7 +95,7 @@ CheckBox.icon.borderColor=#6B6B6B
CheckBox.icon.disabledBorderColor=#545556 CheckBox.icon.disabledBorderColor=#545556
CheckBox.icon.selectedBorderColor=#6B6B6B CheckBox.icon.selectedBorderColor=#6B6B6B
CheckBox.icon.focusedBorderColor=#466D94 CheckBox.icon.focusedBorderColor=#466D94
CheckBox.icon.hoverBorderColor=@@CheckBox.icon.focusedBorderColor CheckBox.icon.hoverBorderColor=$CheckBox.icon.focusedBorderColor
CheckBox.icon.selectedFocusedBorderColor=#466D94 CheckBox.icon.selectedFocusedBorderColor=#466D94
CheckBox.icon.background=#43494A CheckBox.icon.background=#43494A
CheckBox.icon.disabledBackground=@background CheckBox.icon.disabledBackground=@background

64
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
View File

@@ -65,9 +65,9 @@ ViewportUI=com.formdev.flatlaf.ui.FlatViewportUI
desktop=@textComponentBackground desktop=@textComponentBackground
activeCaptionText=@foreground activeCaptionText=@foreground
activeCaptionBorder=@@activeCaption activeCaptionBorder=$activeCaption
inactiveCaptionText=@foreground inactiveCaptionText=@foreground
inactiveCaptionBorder=@@inactiveCaption inactiveCaptionBorder=$inactiveCaption
window=@background window=@background
windowBorder=@foreground windowBorder=@foreground
windowText=@foreground windowText=@foreground
@@ -80,8 +80,8 @@ textHighlightText=@selectionForeground
textInactiveText=@disabledText textInactiveText=@disabledText
control=@background control=@background
controlText=@foreground controlText=@foreground
scrollbar=@@ScrollBar.track scrollbar=$ScrollBar.track
info=@@ToolTip.background info=$ToolTip.background
infoText=@foreground infoText=@foreground
@@ -180,17 +180,17 @@ FormattedTextField.placeholderForeground=@disabledText
#---- HelpButton ---- #---- HelpButton ----
HelpButton.icon=com.formdev.flatlaf.icons.FlatHelpButtonIcon HelpButton.icon=com.formdev.flatlaf.icons.FlatHelpButtonIcon
HelpButton.borderColor=@@CheckBox.icon.borderColor HelpButton.borderColor=$CheckBox.icon.borderColor
HelpButton.disabledBorderColor=@@CheckBox.icon.disabledBorderColor HelpButton.disabledBorderColor=$CheckBox.icon.disabledBorderColor
HelpButton.focusedBorderColor=@@CheckBox.icon.focusedBorderColor HelpButton.focusedBorderColor=$CheckBox.icon.focusedBorderColor
HelpButton.hoverBorderColor=@@?CheckBox.icon.hoverBorderColor HelpButton.hoverBorderColor=$?CheckBox.icon.hoverBorderColor
HelpButton.background=@@CheckBox.icon.background HelpButton.background=$CheckBox.icon.background
HelpButton.disabledBackground=@@CheckBox.icon.disabledBackground HelpButton.disabledBackground=$CheckBox.icon.disabledBackground
HelpButton.focusedBackground=@@?CheckBox.icon.focusedBackground HelpButton.focusedBackground=$?CheckBox.icon.focusedBackground
HelpButton.hoverBackground=@@?CheckBox.icon.hoverBackground HelpButton.hoverBackground=$?CheckBox.icon.hoverBackground
HelpButton.pressedBackground=@@?CheckBox.icon.pressedBackground HelpButton.pressedBackground=$?CheckBox.icon.pressedBackground
HelpButton.questionMarkColor=@@CheckBox.icon.checkmarkColor HelpButton.questionMarkColor=$CheckBox.icon.checkmarkColor
HelpButton.disabledQuestionMarkColor=@@CheckBox.icon.disabledCheckmarkColor HelpButton.disabledQuestionMarkColor=$CheckBox.icon.disabledCheckmarkColor
#---- List ---- #---- List ----
@@ -299,14 +299,14 @@ RadioButtonMenuItem.margin=2,2,2,2
ScrollBar.width=10 ScrollBar.width=10
ScrollBar.showButtons=false ScrollBar.showButtons=false
ScrollBar.squareButtons=false ScrollBar.squareButtons=false
ScrollBar.buttonArrowColor=@@ComboBox.buttonArrowColor ScrollBar.buttonArrowColor=$ComboBox.buttonArrowColor
ScrollBar.buttonDisabledArrowColor=@@ComboBox.buttonDisabledArrowColor ScrollBar.buttonDisabledArrowColor=$ComboBox.buttonDisabledArrowColor
#---- ScrollPane ---- #---- ScrollPane ----
ScrollPane.border=com.formdev.flatlaf.ui.FlatBorder ScrollPane.border=com.formdev.flatlaf.ui.FlatBorder
ScrollPane.background=@@ScrollBar.track ScrollPane.background=$ScrollBar.track
ScrollPane.fillUpperCorner=true ScrollPane.fillUpperCorner=true
@@ -328,10 +328,10 @@ Slider.thumbWidth=11
Spinner.border=com.formdev.flatlaf.ui.FlatRoundBorder Spinner.border=com.formdev.flatlaf.ui.FlatRoundBorder
Spinner.background=@textComponentBackground Spinner.background=@textComponentBackground
Spinner.buttonBackground=@@ComboBox.buttonEditableBackground Spinner.buttonBackground=$ComboBox.buttonEditableBackground
Spinner.buttonArrowColor=@@ComboBox.buttonArrowColor Spinner.buttonArrowColor=$ComboBox.buttonArrowColor
Spinner.buttonDisabledArrowColor=@@ComboBox.buttonDisabledArrowColor Spinner.buttonDisabledArrowColor=$ComboBox.buttonDisabledArrowColor
Spinner.buttonHoverArrowColor=@@ComboBox.buttonHoverArrowColor Spinner.buttonHoverArrowColor=$ComboBox.buttonHoverArrowColor
Spinner.padding=@textComponentMargin Spinner.padding=@textComponentMargin
Spinner.editorBorderPainted=false Spinner.editorBorderPainted=false
@@ -346,7 +346,7 @@ SplitPane.oneTouchButtonSize={scaledInteger}6
SplitPane.oneTouchButtonOffset={scaledInteger}2 SplitPane.oneTouchButtonOffset={scaledInteger}2
SplitPaneDivider.border=null SplitPaneDivider.border=null
SplitPaneDivider.oneTouchArrowColor=@@ComboBox.buttonArrowColor SplitPaneDivider.oneTouchArrowColor=$ComboBox.buttonArrowColor
#---- TabbedPane ---- #---- TabbedPane ----
@@ -360,7 +360,7 @@ TabbedPane.tabAreaInsets=0,0,0,0
TabbedPane.selectedTabPadInsets=0,0,0,0 TabbedPane.selectedTabPadInsets=0,0,0,0
TabbedPane.tabRunOverlay=0 TabbedPane.tabRunOverlay=0
TabbedPane.tabsOverlapBorder=true TabbedPane.tabsOverlapBorder=true
TabbedPane.shadow=@@ComboBox.buttonArrowColor TabbedPane.shadow=$ComboBox.buttonArrowColor
#---- Table ---- #---- Table ----
@@ -409,7 +409,7 @@ TextPane.background=@textComponentBackground
#---- TitledBorder ---- #---- TitledBorder ----
TitledBorder.titleColor=@foreground TitledBorder.titleColor=@foreground
TitledBorder.border=1,1,1,1,@@Separator.foreground TitledBorder.border=1,1,1,1,$Separator.foreground
#---- ToggleButton ---- #---- ToggleButton ----
@@ -419,11 +419,11 @@ ToggleButton.margin=2,14,2,14
ToggleButton.iconTextGap=4 ToggleButton.iconTextGap=4
ToggleButton.rollover=true ToggleButton.rollover=true
ToggleButton.background=@@Button.background ToggleButton.background=$Button.background
ToggleButton.pressedBackground=@@Button.pressedBackground ToggleButton.pressedBackground=$Button.pressedBackground
ToggleButton.toolbar.hoverBackground=@@Button.toolbar.hoverBackground ToggleButton.toolbar.hoverBackground=$Button.toolbar.hoverBackground
ToggleButton.toolbar.pressedBackground=@@Button.toolbar.pressedBackground ToggleButton.toolbar.pressedBackground=$Button.toolbar.pressedBackground
#---- ToolBar ---- #---- ToolBar ----
@@ -437,14 +437,14 @@ ToolBar.floatingBackground=@background
ToolBar.separatorSize=null ToolBar.separatorSize=null
ToolBar.separatorWidth=7 ToolBar.separatorWidth=7
ToolBar.separatorColor=@@Separator.foreground ToolBar.separatorColor=$Separator.foreground
#---- ToolTip ---- #---- ToolTip ----
ToolTip.border=4,6,4,6,@@Component.borderColor ToolTip.border=4,6,4,6,$Component.borderColor
ToolTip.borderInactive=null ToolTip.borderInactive=null
ToolTip.backgroundInactive=@@ToolTip.background ToolTip.backgroundInactive=$ToolTip.background
ToolTip.foregroundInactive=@disabledText ToolTip.foregroundInactive=@disabledText

24
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties
View File

@@ -71,20 +71,20 @@ Button.focusedBackground=#e3f1fa
Button.hoverBackground=@buttonHoverBackground Button.hoverBackground=@buttonHoverBackground
Button.pressedBackground=@buttonPressedBackground Button.pressedBackground=@buttonPressedBackground
Button.borderColor=@@Component.borderColor Button.borderColor=$Component.borderColor
Button.disabledBorderColor=@@Component.disabledBorderColor Button.disabledBorderColor=$Component.disabledBorderColor
Button.focusedBorderColor=@@Component.focusedBorderColor Button.focusedBorderColor=$Component.focusedBorderColor
Button.hoverBorderColor=@@Button.focusedBorderColor Button.hoverBorderColor=$Button.focusedBorderColor
Button.default.background=@@Button.background Button.default.background=$Button.background
Button.default.foreground=@foreground Button.default.foreground=@foreground
Button.default.focusedBackground=@@Button.focusedBackground Button.default.focusedBackground=$Button.focusedBackground
Button.default.hoverBackground=@buttonHoverBackground Button.default.hoverBackground=@buttonHoverBackground
Button.default.pressedBackground=@buttonPressedBackground Button.default.pressedBackground=@buttonPressedBackground
Button.default.borderColor=#4F9EE3 Button.default.borderColor=#4F9EE3
Button.default.hoverBorderColor=@@Button.hoverBorderColor Button.default.hoverBorderColor=$Button.hoverBorderColor
Button.default.focusedBorderColor=@@Button.focusedBorderColor Button.default.focusedBorderColor=$Button.focusedBorderColor
Button.default.focusColor=@@Component.focusColor Button.default.focusColor=$Component.focusColor
Button.default.borderWidth=2 Button.default.borderWidth=2
Button.toolbar.hoverBackground=#dfdfdf Button.toolbar.hoverBackground=#dfdfdf
@@ -95,12 +95,12 @@ Button.toolbar.pressedBackground=#d8d8d8
CheckBox.icon.borderColor=#b0b0b0 CheckBox.icon.borderColor=#b0b0b0
CheckBox.icon.disabledBorderColor=#BDBDBD CheckBox.icon.disabledBorderColor=#BDBDBD
CheckBox.icon.selectedBorderColor=@@CheckBox.icon.borderColor CheckBox.icon.selectedBorderColor=$CheckBox.icon.borderColor
CheckBox.icon.focusedBorderColor=#7B9FC7 CheckBox.icon.focusedBorderColor=#7B9FC7
CheckBox.icon.hoverBorderColor=@@CheckBox.icon.focusedBorderColor CheckBox.icon.hoverBorderColor=$CheckBox.icon.focusedBorderColor
CheckBox.icon.background=#FFFFFF CheckBox.icon.background=#FFFFFF
CheckBox.icon.disabledBackground=@background CheckBox.icon.disabledBackground=@background
CheckBox.icon.focusedBackground=@@Button.focusedBackground CheckBox.icon.focusedBackground=$Button.focusedBackground
CheckBox.icon.hoverBackground=@buttonHoverBackground CheckBox.icon.hoverBackground=@buttonHoverBackground
CheckBox.icon.pressedBackground=@buttonPressedBackground CheckBox.icon.pressedBackground=@buttonPressedBackground
CheckBox.icon.selectedBackground=#FFFFFF CheckBox.icon.selectedBackground=#FFFFFF

10
flatlaf-jide-oss/src/main/resources/com/formdev/flatlaf/jideoss/FlatLaf.properties
View File

@@ -21,7 +21,7 @@ JideTabbedPaneUI=com.formdev.flatlaf.jideoss.ui.FlatJideTabbedPaneUI
#---- JidePopup ---- #---- JidePopup ----
Resizable.resizeBorder=4,4,4,4,@@PopupMenu.borderColor Resizable.resizeBorder=4,4,4,4,$PopupMenu.borderColor
#---- JideTabbedPane ---- #---- JideTabbedPane ----
@@ -30,8 +30,8 @@ JideTabbedPane.background=@background
JideTabbedPane.foreground=@foreground JideTabbedPane.foreground=@foreground
JideTabbedPane.tabAreaBackground=@background JideTabbedPane.tabAreaBackground=@background
JideTabbedPane.tabInsets=@@TabbedPane.tabInsets JideTabbedPane.tabInsets=$TabbedPane.tabInsets
JideTabbedPane.tabAreaInsets=@@TabbedPane.tabAreaInsets JideTabbedPane.tabAreaInsets=$TabbedPane.tabAreaInsets
JideTabbedPane.contentBorderInsets=0,0,0,0 JideTabbedPane.contentBorderInsets=0,0,0,0
JideTabbedPane.tabRunOverlay=@@TabbedPane.tabRunOverlay JideTabbedPane.tabRunOverlay=$TabbedPane.tabRunOverlay
JideTabbedPane.shadow=@@TabbedPane.shadow JideTabbedPane.shadow=$TabbedPane.shadow

4
flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatDarkLaf.properties
View File

@@ -29,7 +29,7 @@ JXHeader.startBackground=#4c5052
#---- Hyperlink ---- #---- Hyperlink ----
Hyperlink.linkColor=#589df6 Hyperlink.linkColor=#589df6
Hyperlink.visitedColor=@@Hyperlink.linkColor Hyperlink.visitedColor=$Hyperlink.linkColor
Hyperlink.disabledText=@disabledText Hyperlink.disabledText=@disabledText
@@ -58,7 +58,7 @@ TaskPaneContainer.border=10,10,10,10
#---- TaskPane ---- #---- TaskPane ----
TaskPane.background=@background TaskPane.background=@background
TaskPane.borderColor=@@Button.borderColor TaskPane.borderColor=$Button.borderColor
TaskPane.contentInsets=10,10,10,10 TaskPane.contentInsets=10,10,10,10
TaskPane.titleBackgroundGradientStart=#4c5052 TaskPane.titleBackgroundGradientStart=#4c5052

6
flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatLaf.properties
View File

@@ -38,7 +38,7 @@ JXMonthView.monthUpFileName={icon}com.formdev.flatlaf.swingx.ui.FlatMonthUpIcon
#---- TitledPanel ---- #---- TitledPanel ----
JXTitledPanel.borderColor=@@Button.borderColor JXTitledPanel.borderColor=$Button.borderColor
JXTitledPanel.titleBackground=@@TaskPane.titleBackgroundGradientStart JXTitledPanel.titleBackground=$TaskPane.titleBackgroundGradientStart
JXTitledPanel.titleForeground=@@TaskPane.titleForeground JXTitledPanel.titleForeground=$TaskPane.titleForeground
JXTitledPanel.captionInsets=4,10,4,10 JXTitledPanel.captionInsets=4,10,4,10

6
flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatLightLaf.properties
View File

@@ -28,8 +28,8 @@ JXHeader.startBackground=#ffffff
#---- Hyperlink ---- #---- Hyperlink ----
Hyperlink.linkColor=@@Component.linkColor Hyperlink.linkColor=$Component.linkColor
Hyperlink.visitedColor=@@Hyperlink.linkColor Hyperlink.visitedColor=$Hyperlink.linkColor
Hyperlink.disabledText=@disabledText Hyperlink.disabledText=@disabledText
@@ -58,7 +58,7 @@ TaskPaneContainer.border=10,10,10,10
#---- TaskPane ---- #---- TaskPane ----
TaskPane.background=@background TaskPane.background=@background
TaskPane.borderColor=@@Button.borderColor TaskPane.borderColor=$Button.borderColor
TaskPane.contentInsets=10,10,10,10 TaskPane.contentInsets=10,10,10,10
TaskPane.titleBackgroundGradientStart=#dfdfdf TaskPane.titleBackgroundGradientStart=#dfdfdf

2
flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties
View File

@@ -214,7 +214,7 @@ Separator.stripeIndent=5
Slider.trackColor=#00bb00 Slider.trackColor=#00bb00
Slider.thumbColor=#880000 Slider.thumbColor=#880000
Slider.tickColor=#ff0000 Slider.tickColor=#ff0000
Slider.focusedColor=@@Component.focusColor Slider.focusedColor=$Component.focusColor
Slider.hoverColor=#0000ff Slider.hoverColor=#0000ff
Slider.disabledForeground=#000088 Slider.disabledForeground=#000088

2
flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/swingx/FlatTestLaf.properties
View File

@@ -73,4 +73,4 @@ TaskPane.specialTitleOver=#dd0000
#---- TitledPanel ---- #---- TitledPanel ----
JXTitledPanel.borderColor=@@Button.startBorderColor JXTitledPanel.borderColor=$Button.startBorderColor