From 6f187222f831720a25cf6c6f8d12ad0857629565 Mon Sep 17 00:00:00 2001 From: Robert Vokac Date: Thu, 28 Mar 2024 09:26:51 +0100 Subject: [PATCH] Added Fuel Gauge Icon - work in progress I --- fuel_gauge_icon.odg | Bin 0 -> 11675 bytes .../timecalc/app/TimeCalcConfiguration.java | 3 ++ .../utils/timecalc/app/TimeCalcProperty.java | 1 + .../swing/progress/FuelGaugeIcon.java | 41 ++++++++++++++++++ .../swing/progress/ProgressFuelGauge.java | 34 +++++++++++++++ .../timecalc/swing/windows/ConfigWindow.java | 5 ++- .../timecalc/swing/windows/MainWindow.java | 2 + .../fuel_gauge/fuel_gauge_icon_orange.gif | Bin 0 -> 4000 bytes .../fuel_gauge/fuel_gauge_icon_white.gif | Bin 0 -> 3982 bytes .../src/main/resources/timecalc-default.conf | 1 + 10 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 fuel_gauge_icon.odg create mode 100644 modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/progress/FuelGaugeIcon.java create mode 100644 modules/time-calc-app/src/main/resources/fuel_gauge/fuel_gauge_icon_orange.gif create mode 100644 modules/time-calc-app/src/main/resources/fuel_gauge/fuel_gauge_icon_white.gif diff --git a/fuel_gauge_icon.odg b/fuel_gauge_icon.odg new file mode 100644 index 0000000000000000000000000000000000000000..be24a41f0c88d51f66544b999f4b1e7173500971 GIT binary patch literal 11675 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 cache + = new HashMap<>(); + @Getter + private boolean reserve; + @Getter + private final ImageIcon icon; + + private FuelGaugeIcon(boolean reserve) { + this.reserve = reserve; + java.net.URL smileyUrl = getClass() + .getResource("/fuel_gauge/fuel_gauge_icon_" + (reserve + ? "orange" : "white") + ".gif"); + ImageIcon tmpIcon = new ImageIcon(smileyUrl); + this.icon = new ImageIcon(tmpIcon.getImage() + .getScaledInstance(32, 132, Image.SCALE_SMOOTH)); + } + + public static FuelGaugeIcon getInstance(boolean reserve) { + if (!cache.containsKey(reserve)) { + cache.put(reserve, new FuelGaugeIcon(reserve)); + } + return cache.get(reserve); + } + +} diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/progress/ProgressFuelGauge.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/progress/ProgressFuelGauge.java index b0c1756..fd49246 100644 --- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/progress/ProgressFuelGauge.java +++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/progress/ProgressFuelGauge.java @@ -1,6 +1,7 @@ package org.nanoboot.utils.timecalc.swing.progress; import org.nanoboot.utils.timecalc.app.GetProperty; +import org.nanoboot.utils.timecalc.app.TimeCalcProperty; import org.nanoboot.utils.timecalc.entity.Visibility; import org.nanoboot.utils.timecalc.entity.WidgetType; import org.nanoboot.utils.timecalc.swing.common.Brush; @@ -9,8 +10,10 @@ import org.nanoboot.utils.timecalc.swing.common.Widget; import org.nanoboot.utils.timecalc.swing.progress.battery.Battery; import org.nanoboot.utils.timecalc.swing.windows.MainWindow; import org.nanoboot.utils.timecalc.utils.common.NumberFormats; +import org.nanoboot.utils.timecalc.utils.property.BooleanProperty; import org.nanoboot.utils.timecalc.utils.property.Property; +import javax.swing.JLabel; import javax.swing.JMenuItem; import javax.swing.Timer; import java.awt.BasicStroke; @@ -33,6 +36,13 @@ public class ProgressFuelGauge extends Widget implements GetProperty { public static final Color BLACK2 = new Color(64, 64,64); public static final Color LIGHT_GRAY2 = new Color(160,160,160); + + protected JLabel fuelIconOrange = null; + protected JLabel fuelIconWhite = null; + + public final BooleanProperty fuelIconVisibleProperty + = new BooleanProperty(TimeCalcProperty.FUEL_ICON_VISIBLE.getKey()); + private List menuItems = null; public ProgressFuelGauge() { @@ -42,6 +52,17 @@ public class ProgressFuelGauge extends Widget implements GetProperty { setFocusable(false); setForeground(Color.GRAY); setBackground(MainWindow.BACKGROUND_COLOR); + + this.fuelIconOrange = new JLabel(FuelGaugeIcon.getInstance(true)); + this.fuelIconWhite = new JLabel(FuelGaugeIcon.getInstance(false)); + fuelIconOrange.setVisible(false); + fuelIconWhite.setVisible(false); + add(fuelIconOrange); + add(fuelIconWhite); + this.setLayout(null); + fuelIconOrange.setBounds(1, 1, 40, 40); + fuelIconWhite.setBounds(fuelIconOrange.getBounds()); + this.typeProperty.setValue(WidgetType.DAY.name().toLowerCase(Locale.ROOT)); new Timer(100, e -> { @@ -156,6 +177,19 @@ public class ProgressFuelGauge extends Widget implements GetProperty { ); brush.setColor(Color.WHITE); + if (fuelIconVisibleProperty.isEnabled()) { + if (donePercent() <= 0.15d) { + this.fuelIconOrange.setVisible(true); + this.fuelIconWhite.setVisible(false); + } else { + this.fuelIconOrange.setVisible(false); + this.fuelIconWhite.setVisible(true); + } + } else { + this.fuelIconOrange.setVisible(false); + this.fuelIconWhite.setVisible(false); + } + //tBrush.drawBorder(startX, startY, 10, length_ - 4 - 5, getAngle.apply(donePercent()), 3f, brush.getColor()); this.setToolTipText(NumberFormats.FORMATTER_TWO_DECIMAL_PLACES.format(donePercent() * 100d) + "%"); } diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/windows/ConfigWindow.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/windows/ConfigWindow.java index f1f4b28..a91f88f 100644 --- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/windows/ConfigWindow.java +++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/windows/ConfigWindow.java @@ -241,6 +241,8 @@ public class ConfigWindow extends TWindow { new JTextField(TimeCalcProperty.FUEL_TYPE.getKey()); private final JCheckBox fuelHiddenProperty = new JCheckBox(TimeCalcProperty.FUEL_HIDDEN.getKey()); + private final JCheckBox fuelIconVisibleProperty + = new JCheckBox(TimeCalcProperty.FUEL_ICON_VISIBLE.getKey()); // public final JCheckBox clockHiddenProperty = new JCheckBox(TimeCalcProperty.CLOCK_HIDDEN.getKey()); @@ -462,6 +464,7 @@ public class ConfigWindow extends TWindow { swingQuarterIconVisibleProperty.setSelected(enable); walkingHumanVisibleProperty.setSelected(enable); fuelVisibleProperty.setSelected(enable); + fuelIconVisibleProperty.setSelected(enable); // clockHiddenProperty.setSelected(!enable); // batteryMinuteHiddenProperty.setSelected(!enable); // batteryHourHiddenProperty.setSelected(!enable); @@ -547,7 +550,7 @@ public class ConfigWindow extends TWindow { squareVisibleProperty,squareHiddenProperty,squareTypeProperty, circleVisibleProperty,circleHiddenProperty,circleTypeProperty, dotVisibleProperty,dotHiddenProperty,dotTypeProperty, - fuelVisibleProperty,fuelTypeProperty,fuelHiddenProperty, + fuelVisibleProperty,fuelTypeProperty,fuelHiddenProperty,fuelIconVisibleProperty, swingVisibleProperty,swingHiddenProperty,swingTypeProperty,swingQuarterIconVisibleProperty, walkingHumanVisibleProperty,walkingHumanHiddenProperty,walkingHumanTypeProperty, lifeVisibleProperty,lifeHiddenProperty,lifeTypeProperty,lifeBirthDateProperty, diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/windows/MainWindow.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/windows/MainWindow.java index e2b6679..d7b1f44 100644 --- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/windows/MainWindow.java +++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/windows/MainWindow.java @@ -423,6 +423,8 @@ public class MainWindow extends TWindow { .bindTo(timeCalcConfiguration.fuelTypeProperty); progressFuelGauge.hiddenProperty .bindTo(timeCalcConfiguration.fuelHiddenProperty); + progressFuelGauge.fuelIconVisibleProperty + .bindTo(timeCalcConfiguration.fuelIconVisibleProperty); add(progressFuelGauge); diff --git a/modules/time-calc-app/src/main/resources/fuel_gauge/fuel_gauge_icon_orange.gif b/modules/time-calc-app/src/main/resources/fuel_gauge/fuel_gauge_icon_orange.gif new file mode 100644 index 0000000000000000000000000000000000000000..39775579f599acbc0d17f5b4594b347926fe6104 GIT binary patch literal 4000 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 literal 0 HcmV?d00001 diff --git a/modules/time-calc-app/src/main/resources/fuel_gauge/fuel_gauge_icon_white.gif b/modules/time-calc-app/src/main/resources/fuel_gauge/fuel_gauge_icon_white.gif new file mode 100644 index 0000000000000000000000000000000000000000..e1738a624b7e82722473e532afb213e525b9aa62 GIT binary patch literal 3982 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 literal 0 HcmV?d00001 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 4b795e5..8129cc9 100644 --- a/modules/time-calc-app/src/main/resources/timecalc-default.conf +++ b/modules/time-calc-app/src/main/resources/timecalc-default.conf @@ -64,6 +64,7 @@ dot.hidden=false fuel.visible=true fuel.type=day fuel.hidden=false +fuel.icon.visible=true swing.visible=true swing.type=day swing.hidden=false