diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/app/TimeCalcProperty.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/app/TimeCalcProperty.java index 41ff24f..484616c 100644 --- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/app/TimeCalcProperty.java +++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/app/TimeCalcProperty.java @@ -18,16 +18,16 @@ public enum TimeCalcProperty { VISIBILITY_DEFAULT("visibility.default", "Default Visibility"), VISIBILITY_SUPPORTED_COLORED("visibility.supported.colored", "Visibility : Supported : Colored"), // - CLOCK_HANDS_LONG_VISIBLE("clock.hands.long.visible", "Visibility : Clock : Hands are long"), - CLOCK_HANDS_MINUTE_VISIBLE("clock.hands.minute.visible", "Visibility : Clock : Minute hand"), - CLOCK_HANDS_SECOND_VISIBLE("clock.hands.second.visible", "Visibility : Clock : Second hand"), - CLOCK_HANDS_MILLISECOND_VISIBLE("clock.hands.millisecond.visible", "Visibility : Clock : Millisecond hand"), + CLOCK_HANDS_LONG_VISIBLE("clock.hands.long.visible", "Clock : Hands are long"), + CLOCK_HANDS_MINUTE_VISIBLE("clock.hands.minute.visible", "Clock : Minute hand"), + CLOCK_HANDS_SECOND_VISIBLE("clock.hands.second.visible", "Clock : Second hand"), + CLOCK_HANDS_MILLISECOND_VISIBLE("clock.hands.millisecond.visible", "Clock : Millisecond hand"), // - BATTERY_WAVES_VISIBLE("battery.waves.visible", "Visibility : Battery : Waves"), - JOKES_VISIBLE("jokes.visible", "Visibility : Jokes"), - COMMANDS_VISIBLE("commands.visible", "Visibility : Commands"), - NOTIFICATIONS_VISIBLE("notifications.visible", "Visibility : Toasts"), - SMILEYS_COLORED("smileys.colored", "Visibility : Smileys"); + BATTERY_WAVES_VISIBLE("battery.waves.visible", "Battery : Waves"), + JOKES_VISIBLE("jokes.visible", "Jokes"), + COMMANDS_VISIBLE("commands.visible", "Commands"), + NOTIFICATIONS_VISIBLE("notifications.visible", "Notifications"), + SMILEYS_COLORED("smileys.colored", "Smileys : Colored"); @Getter private final String key; diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/MainWindow.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/MainWindow.java index 93fdef0..6098d87 100644 --- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/MainWindow.java +++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/MainWindow.java @@ -311,7 +311,7 @@ public class MainWindow extends TimeCalcWindow{ //System.out.println("timeCalcConfiguration.handsLongProperty=" + timeCalcConfiguration.clockHandLongProperty.isEnabled()); Visibility currentVisibility = Visibility .valueOf(timeCalcApp.visibilityProperty.getValue()); - if(timeCalcConfiguration.visibilitySupportedColoredProperty.isEnabled() && currentVisibility.isColored() ){ + if(!timeCalcConfiguration.visibilitySupportedColoredProperty.isEnabled() && currentVisibility.isColored() ){ timeCalcApp.visibilityProperty.setValue(Visibility.GRAY.name()); } if (stopBeforeEnd) { diff --git a/modules/time-calc-app/src/main/resources/timecalc-default.conf b/modules/time-calc-app/src/main/resources/timecalc-default.conf index b8e3e59..b8aaf20 100644 --- a/modules/time-calc-app/src/main/resources/timecalc-default.conf +++ b/modules/time-calc-app/src/main/resources/timecalc-default.conf @@ -11,7 +11,7 @@ battery.waves.visible=true jokes.visible=true commands.visible=true notifications.visible=true -smileys.colored=false +smileys.colored=true #todo logs.detailed=false diff --git a/timecalc.conf b/timecalc.conf index 2594d4c..60fc1c4 100644 --- a/timecalc.conf +++ b/timecalc.conf @@ -1,9 +1,9 @@ -#Wed Feb 28 12:20:58 CET 2024 +#Wed Feb 28 14:01:26 CET 2024 battery.charging-unicode-character.visible=true battery.week.visible=true -smileys.colored=false +smileys.colored=true circle.smileys.visible=true -notifications.visible=true +notifications.visible=false clock.hands.second.visible=true battery.hour.visible=true widgets.clock.visible=true @@ -11,19 +11,19 @@ battery.visible=true clock.hands.millisecond.visible=false commands.visible=true battery.percent-precision.count-of-decimal-points=5 -visibility.supported.colored=false +visibility.supported.colored=true jokes.visible=true -visibility.default=GRAY +visibility.default=STRONGLY_COLORED square.smileys.visible=true battery.month.visible=true -battery.waves.visible=true battery.day.visible=true -battery.smileys.visible=true +battery.waves.visible=true clock.hands.minute.visible=true +battery.smileys.visible=true circle.visible=true -logs.detailed=false -clock.hands.long.visible=true square.visible=true +clock.hands.long.visible=true +logs.detailed=false walking-human.visible=true battery.label.finished-from-total.visible=true smileys.visible=true