Style choice box can be internationalized

adrianromero · Jul 31, 2019 · 18f3d82 · 18f3d82
1 parent 75aec35
commit 18f3d82
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 22 deletions.
diff --git a/src/main/java/com/adr/helloiot/ClientLoginNode.java b/src/main/java/com/adr/helloiot/ClientLoginNode.java
@@ -72,6 +72,7 @@
 import javafx.scene.text.Text;
 import javafx.scene.text.TextAlignment;
 import javafx.scene.text.TextFlow;
+import javafx.util.StringConverter;
 
 public class ClientLoginNode {
 
@@ -555,7 +556,17 @@ private void initialize() {
             updateDevicesUnitsList();
         });
         updateDevicesUnitsList();
-
+
+        skins.setConverter(new StringConverter<Style>() {
+            @Override
+            public String toString(Style style) {
+                return resources.getString("style." + style.name());
+            }
+            @Override
+            public Style fromString(String value) {
+                return null;
+            }
+        });
         skins.getItems().addAll(Style.values());
         skins.getSelectionModel().selectedItemProperty().addListener((ov, old_val, new_val) -> {
             if (!updating) {

diff --git a/src/main/java/com/adr/helloiot/Style.java b/src/main/java/com/adr/helloiot/Style.java
@@ -1,5 +1,5 @@
 //    HelloIoT is a dashboard creator for MQTT
-//    Copyright (C) 2018 Adrián Romero Corchado.
+//    Copyright (C) 2018-2019 Adrián Romero Corchado.
 //
 //    This file is part of HelloIot.
 //
@@ -20,38 +20,23 @@
 
 import javafx.scene.layout.StackPane;
 
-/**
- *
- * @author adrian
- */
 public enum Style {
 
-    PRETTY("Pretty", "/com/adr/helloiot/styles/main"),
-    LIGHT("Light", "/com/adr/helloiot/styles/main-light"),
-    DARK("Dark", "/com/adr/helloiot/styles/main-dark"),
-    CLASSIC("Classic", "/com/adr/helloiot/styles/empty");
+    PRETTY("/com/adr/helloiot/styles/main"),
+    LIGHT("/com/adr/helloiot/styles/main-light"),
+    DARK("/com/adr/helloiot/styles/main-dark"),
+    CLASSIC("/com/adr/helloiot/styles/empty");
 
-    private final String displayname;
     private final String styleurl;
 
-    private Style(String displayname, String styleurl) {
-        this.displayname = displayname;
+    private Style(String styleurl) {
         this.styleurl = styleurl;
     }
 
-    public String geDisplayName() {
-        return displayname;
-    }
-
     public String getStyleURL() {
         return styleurl;
     }
 
-    @Override
-    public String toString() {
-        return displayname;
-    }  
-
     public static void changeStyle(StackPane root, Style style) {
 
         Object currentstyle = root.getProperties().get("currentstyleurl");