From f7ff7497a28da5b868a22cca7449bf2028c8be7e Mon Sep 17 00:00:00 2001
From: Steven Liu <z.liu-74@student.tudelft.nl>
Date: Tue, 16 Dec 2025 13:07:15 +0100
Subject: [PATCH] feat: lang button into combo box

---
 .../client/scenes/FoodpalApplication.fxml     | 63 +++----------------
 1 file changed, 10 insertions(+), 53 deletions(-)

diff --git a/client/src/main/resources/client/scenes/FoodpalApplication.fxml b/client/src/main/resources/client/scenes/FoodpalApplication.fxml
index 27b5bc2..a621046 100644
--- a/client/src/main/resources/client/scenes/FoodpalApplication.fxml
+++ b/client/src/main/resources/client/scenes/FoodpalApplication.fxml
@@ -15,6 +15,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
+<?import javafx.scene.control.ComboBox?>
 <BorderPane prefHeight="800.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="client.scenes.FoodpalApplicationCtrl">
 
     <!-- TOP BAR -->
@@ -23,58 +24,12 @@
             <padding>
                 <Insets bottom="10" left="10" right="10" top="10" />
             </padding>
-            <GridPane>
-                <columnConstraints>
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="198.0" minWidth="10.0" prefWidth="130.0" />
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="95.0" minWidth="2.0" prefWidth="70.0" />
-                </columnConstraints>
-                <rowConstraints>
-                    <RowConstraints maxHeight="54.0" minHeight="10.0" prefHeight="54.0" vgrow="SOMETIMES" />
-                    <RowConstraints maxHeight="25.0" minHeight="6.0" prefHeight="6.0" vgrow="SOMETIMES" />
-                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                </rowConstraints>
-                <children>
-
-                    <Label prefHeight="56.0" prefWidth="158.0" text="FoodPal">
-                        <font>
-                            <Font name="System Bold" size="29.0" />
-                        </font>
-                    </Label>
-                    <ButtonBar prefHeight="40.0" prefWidth="200.0" GridPane.rowIndex="2">
-                        <buttons>
-                            <ToolBar prefHeight="35.0" prefWidth="123.0">
-                                <items>
-                                    <Button fx:id="flagEnButton" minWidth="33.0" onAction="#switchLocale" userData="en" prefHeight="25.0" prefWidth="33.0" text="EN" />
-                                    <Button fx:id="flagNlButton" onAction="#switchLocale" userData="nl" text="NL" />
-                                    <Button fx:id="flagPlButton" onAction="#switchLocale" userData="pl" text="PL" />
-                                </items>
-                            </ToolBar>
-                        </buttons>
-                    </ButtonBar>
-                </children>
-            </GridPane>
-
-            <Pane HBox.hgrow="ALWAYS" />
-
-            <HBox spacing="5" />
-            <GridPane prefHeight="90.0" prefWidth="114.0">
-                <columnConstraints>
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="315.0" minWidth="10.0" prefWidth="32.1666259765625" />
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="315.0" minWidth="10.0" prefWidth="24.8333740234375" />
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="173.0" minWidth="10.0" prefWidth="28.6666259765625" />
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="95.0" minWidth="10.0" prefWidth="34.0" />
-                </columnConstraints>
-                <rowConstraints>
-                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                </rowConstraints>
-                <children>
-
-                    <Button fx:id="refreshButton" onAction="#refresh" prefHeight="25.0" prefWidth="34.0" text="⟳" GridPane.columnIndex="3" GridPane.rowIndex="2" />
-                </children>
-            </GridPane>
-        </HBox>
+            <Label prefHeight="56.0" prefWidth="158.0" text="FoodPal">
+                <font>
+                    <Font name="System Bold" size="29.0" />
+                </font>
+            </Label>
+            </HBox>
     </top>
 
     <!-- LEFT: RECIPE LIST -->
@@ -83,7 +38,9 @@
             <padding>
                 <Insets bottom="10" left="10" right="10" top="10" />
             </padding>
-
+            <ComboBox fx:id="langSelectMenu" onAction="#switchLocale">
+            </ComboBox>
+            <Button fx:id="refreshButton" onAction="#refresh" prefHeight="25.0" prefWidth="34.0" text="⟳" GridPane.columnIndex="3" GridPane.rowIndex="2" />
             <Label fx:id="recipesLabel" text="Recipes">
                 <font>
                     <Font name="System Bold" size="15.0" />