Merge remote-tracking branch 'origin/121-settings-menu' into UI

# Conflicts: # app/src/main/java/org/toop/app/menu/OptionsMenu.java # app/src/main/resources/assets/localization/localization_de.properties # app/src/main/resources/assets/localization/localization_en_US.properties # app/src/main/resources/assets/localization/localization_es.properties # app/src/main/resources/assets/localization/localization_fr.properties # app/src/main/resources/assets/localization/localization_it.properties # app/src/main/resources/assets/localization/localization_nl.properties # app/src/main/resources/assets/localization/localization_zh.properties
2026-02-04 19:04:49 +00:00 · 2025-10-03 03:25:20 +02:00
parent 3471ae54a5 547ea55300
commit a5513bf87b
13 changed files with 219 additions and 25 deletions
--- a/app/src/main/java/org/toop/app/menu/CreditsMenu.java
+++ b/app/src/main/java/org/toop/app/menu/CreditsMenu.java
@@ -11,7 +11,7 @@ import java.util.Locale;

 public final class CreditsMenu extends Menu {
    private Locale currentLocale = AppContext.getLocale();
-    private LocalizationAsset loc = ResourceManager.get("localization.properties");
+    private LocalizationAsset loc = ResourceManager.get("localization_en_us.properties");
    public CreditsMenu() {
        try {
            new EventFlow()
--- a/app/src/main/java/org/toop/app/menu/OptionsMenu.java
+++ b/app/src/main/java/org/toop/app/menu/OptionsMenu.java
@@ -14,10 +14,14 @@ import org.toop.framework.eventbus.EventFlow;
 import org.toop.local.AppContext;
 import org.toop.local.LocalizationEvents;

+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
 import java.util.Locale;

 public final class OptionsMenu extends Menu {
    private Locale currentLocale = AppContext.getLocale();
+    private LocalizationAsset loc = ResourceManager.get("localization");
+
    private final LocalizationAsset loc = ResourceManager.get("localization.properties");
    private Text chooseLang;
    private Button english,dutch,german,french,italian,spanish,chinese;
@@ -65,5 +69,65 @@ public final class OptionsMenu extends Menu {
            chinese.setText(loc.getString("languageChinese",currentLocale));
        });

+    }
+        final Region background = createBackground();
+
+        GraphicsDevice currentScreen = GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices()[0];
+
+        LocalizationAsset locFiles = ResourceManager.get(LocalizationAsset.class, "localization");
+        final Label selectLanguageLabel = new Label(loc.getString("optionsMenuLabelSelectLanguage", currentLocale));
+        final ChoiceBox<Locale> selectLanguage = new ChoiceBox<>();
+        selectLanguage.setValue(currentLocale);
+        for (Locale locFile : locFiles.getAvailableLocales()) {
+            selectLanguage.getItems().add(locFile);
+        }
+
+        selectLanguage.setOnAction((event) -> {
+            Locale selectedLocale = selectLanguage.getSelectionModel().getSelectedItem();
+            AppContext.setLocale(selectedLocale);
+            App.pop();
+            App.push(new OptionsMenu());
+        });
+
+//        GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
+//        GraphicsDevice[] devices = ge.getScreenDevices();
+//        final ChoiceBox<GraphicsDevice> selectScreen = new ChoiceBox<>();
+//        for (GraphicsDevice screen : devices) {
+//            selectScreen.getItems().add(screen);
+//        }
+//
+//        selectScreen.setOnAction((event) -> {
+//            int selectedIndex = selectScreen.getSelectionModel().getSelectedIndex();
+//            Object selectedItem = selectScreen.getSelectionModel().getSelectedItem();
+//
+//            System.out.println("Selection made: [" + selectedIndex + "] " + selectedItem);
+//            System.out.println("   ChoiceBox.getValue(): " + selectScreen.getValue());
+//        });
+//
+//        final ChoiceBox<DisplayMode> selectWindowSize = new ChoiceBox<>();
+//        for (DisplayMode displayMode : currentScreen.getDisplayModes()) {
+//            selectWindowSize.getItems().add(displayMode);
+//        }
+//
+////        if (currentScreen.isFullScreenSupported()) {}
+//        final CheckBox setFullscreen = new CheckBox("Fullscreen");
+
+        final VBox optionsBox = new VBox(10, selectLanguageLabel, selectLanguage);
+        optionsBox.setAlignment(Pos.CENTER);
+        optionsBox.setPickOnBounds(false);
+        optionsBox.setTranslateY(50);
+        optionsBox.setTranslateX(25);
+
+        final Button credits = createButton("Credits", () -> { App.push(new CreditsMenu()); });
+        final Button options = createButton("Exit Options", () -> { App.push(new MainMenu()); });
+        final Button quit = createButton("Quit", () -> { App.quitPopup(); });
+
+        final VBox controlBox = new VBox(10, credits, options, quit);
+        controlBox.setAlignment(Pos.BOTTOM_LEFT);
+        controlBox.setPickOnBounds(false);
+        controlBox.setTranslateY(-50);
+        controlBox.setTranslateX(25);
+
+        pane = new StackPane(background, optionsBox, controlBox);
    }
 }
--- a/app/src/main/java/org/toop/local/AppContext.java
+++ b/app/src/main/java/org/toop/local/AppContext.java
@@ -7,6 +7,10 @@ import java.util.Locale;
 public class AppContext {
    private static Locale currentLocale = Locale.getDefault();

+    public static void setLocale(Locale locale) {
+        currentLocale = locale;
+    }
+
    public static void setCurrentLocale(Locale locale) {
        currentLocale = locale;
        new EventFlow().addPostEvent(new LocalizationEvents.LanguageHasChanged(locale.getLanguage())).asyncPostEvent();
--- a/app/src/main/resources/assets/localization/localization_de.properties
+++ b/app/src/main/resources/assets/localization/localization_de.properties
@@ -34,3 +34,7 @@ gameSelectMenuEnterIP=Gib hier deine IP-Adresse ein:
 # Game Menu
 gameMenuHint=Tipp
 gameMenuBack=Zur\u00FCck
+
+
+# Options menu
+optionsMenuLabelSelectLanguage=Sprache:
--- a/app/src/main/resources/assets/localization/localization_en_US.properties
+++ b/app/src/main/resources/assets/localization/localization_en_US.properties
@@ -2,8 +2,8 @@
 windowTitle=ISY Games Selector

 # Main Menu buttons
-mainMenuSelectTicTacToe=Tic Tac Toe
-mainMenuSelectReversi=Reversi
+mainMenuSelectTicTacToe=Tic Tac Toe\u5426
+mainMenuSelectReversi=Reversi\u5426
 mainMenuSelectSudoku=Sudoku
 mainMenuSelectBattleship=Battleship
 mainMenuSelectOther=Other
@@ -33,4 +33,7 @@ gameSelectMenuEnterIP=Enter your IP address here:

 # Game Menu
 gameMenuHint=Hint
-gameMenuBack=Back
+gameMenuBack=Back
+
+# Options menu
+optionsMenuLabelSelectLanguage=Language:
--- a/app/src/main/resources/assets/localization/localization_es.properties
+++ b/app/src/main/resources/assets/localization/localization_es.properties
@@ -34,3 +34,7 @@ gameSelectMenuEnterIP=Introduce aqu\u00ED tu direcci\u00F3n IP:
 # Game Menu
 gameMenuHint=Pista
 gameMenuBack=Atr\u00E1s
+
+
+# Options menu
+optionsMenuLabelSelectLanguage=Idioma:
--- a/app/src/main/resources/assets/localization/localization_fr.properties
+++ b/app/src/main/resources/assets/localization/localization_fr.properties
@@ -34,3 +34,7 @@ gameSelectMenuEnterIP=Entrez votre adresse IP ici :
 # Game Menu
 gameMenuHint=Indice
 gameMenuBack=Retour
+
+
+# Options menu
+optionsMenuLabelSelectLanguage=Langue:
--- a/app/src/main/resources/assets/localization/localization_it.properties
+++ b/app/src/main/resources/assets/localization/localization_it.properties
@@ -35,3 +35,7 @@ gameSelectMenuEnterIP=Inserisci qui il tuo indirizzo IP:
 gameMenuHint=Suggerimento
 gameMenuBack=Indietro

+
+
+# Options menu
+optionsMenuLabelSelectLanguage=Lingua:
--- a/app/src/main/resources/assets/localization/localization_nl.properties
+++ b/app/src/main/resources/assets/localization/localization_nl.properties
@@ -34,3 +34,7 @@ gameSelectMenuEnterIP=Voer hier je IP-adres in:
 # Game Menu
 gameMenuHint=Hint
 gameMenuBack=Terug
+
+
+# Options menu
+optionsMenuLabelSelectLanguage=Taal:
--- a/app/src/main/resources/assets/localization/localization_zh.properties
+++ b/app/src/main/resources/assets/localization/localization_zh.properties
@@ -46,3 +46,7 @@ gameSelectMenuEnterIP=\u5728\u6B64\u8F93\u5165\u4F60\u7684IP\u5730\u5740\uFF1A
 # Game Menu
 gameMenuHint=\u63D0\u793A
 gameMenuBack=\u8FD4\u56DE
+
+
+# Options menu
+optionsMenuLabelSelectLanguage=\u8BED\u8A00: