From ae180a54cc51b89495373a5b00b666c27f5079de Mon Sep 17 00:00:00 2001 From: ctrebeau <ctrebeau@pasteur.fr> Date: Sat, 5 Apr 2025 14:59:33 +0200 Subject: [PATCH] style: improved GUI look and feel --- .../ChannelProjection.fxml | 11 ++++------- .../ConstructionDisplay.fxml | 4 ++-- .../fr.pasteur.ida.zellige.gui.view/Projection.fxml | 4 ++-- .../ReferenceSurfacePanel.fxml | 4 ++-- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/main/resources/fr.pasteur.ida.zellige.gui.view/ChannelProjection.fxml b/src/main/resources/fr.pasteur.ida.zellige.gui.view/ChannelProjection.fxml index 6a05694..2b41d18 100644 --- a/src/main/resources/fr.pasteur.ida.zellige.gui.view/ChannelProjection.fxml +++ b/src/main/resources/fr.pasteur.ida.zellige.gui.view/ChannelProjection.fxml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <?import javafx.scene.control.Button?> -<?import javafx.scene.control.CheckBox?> <?import javafx.scene.control.ChoiceBox?> <?import javafx.scene.control.Label?> <?import javafx.scene.control.Spinner?> @@ -10,13 +9,12 @@ <?import javafx.scene.layout.Pane?> <?import javafx.scene.layout.RowConstraints?> - -<fx:root maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="143.0" prefWidth="312.0" style="-fx-background-color: green;" type="Pane" xmlns="http://javafx.com/javafx/18.0.2" xmlns:fx="http://javafx.com/fxml/1"> +<fx:root maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="156.0" prefWidth="312.0" type="Pane" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1"> <children> - <GridPane alignment="CENTER" layoutX="10.0" layoutY="10.0"> + <GridPane alignment="CENTER" layoutX="10.0" layoutY="10.0" prefHeight="123.0" prefWidth="283.0"> <columnConstraints> - <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" maxWidth="200.0" minWidth="10.0" prefWidth="72.6" /> - <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" maxWidth="210.20000000000002" minWidth="0.0" prefWidth="210.20000000000002" /> + <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" maxWidth="200.0" minWidth="10.0" prefWidth="106.20001220703125" /> + <ColumnConstraints halignment="LEFT" hgrow="SOMETIMES" maxWidth="226.39999999999998" minWidth="0.0" prefWidth="176.79998779296878" /> </columnConstraints> <rowConstraints> <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> @@ -33,6 +31,5 @@ </children> </GridPane> <Button fx:id="view" layoutX="246.0" layoutY="97.0" mnemonicParsing="false" text="View" /> - <CheckBox layoutX="237.0" layoutY="22.0" mnemonicParsing="false" selected="true" text="project" /> </children> </fx:root> diff --git a/src/main/resources/fr.pasteur.ida.zellige.gui.view/ConstructionDisplay.fxml b/src/main/resources/fr.pasteur.ida.zellige.gui.view/ConstructionDisplay.fxml index e1107ea..dd78c74 100644 --- a/src/main/resources/fr.pasteur.ida.zellige.gui.view/ConstructionDisplay.fxml +++ b/src/main/resources/fr.pasteur.ida.zellige.gui.view/ConstructionDisplay.fxml @@ -9,10 +9,10 @@ <!--No controller specified : need of fx:root--> -<fx:root alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="355.0" prefWidth="351.0" type="VBox" xmlns="http://javafx.com/javafx/18.0.2" xmlns:fx="http://javafx.com/fxml/1"> +<fx:root alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="355.0" prefWidth="351.0" type="VBox" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1"> <children> <Label fx:id="surfaceNb" /> - <FlowPane fx:id="display" alignment="CENTER" columnHalignment="CENTER" prefHeight="303.0" prefWidth="341.0" /> + <FlowPane fx:id="display" alignment="CENTER" columnHalignment="CENTER" prefHeight="303.0" prefWidth="341.0" style="-fx-border-color: grey;" /> <VBox alignment="CENTER" prefHeight="63.0" prefWidth="351.0"> <children> <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="20.0"> diff --git a/src/main/resources/fr.pasteur.ida.zellige.gui.view/Projection.fxml b/src/main/resources/fr.pasteur.ida.zellige.gui.view/Projection.fxml index d465314..2626661 100644 --- a/src/main/resources/fr.pasteur.ida.zellige.gui.view/Projection.fxml +++ b/src/main/resources/fr.pasteur.ida.zellige.gui.view/Projection.fxml @@ -11,11 +11,11 @@ <?import javafx.scene.layout.StackPane?> <?import javafx.scene.layout.VBox?> -<HBox prefHeight="388.0" prefWidth="748.0" xmlns="http://javafx.com/javafx/18.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.pasteur.ida.zellige.gui.controller.ProjectionController"> +<HBox prefHeight="388.0" prefWidth="748.0" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.pasteur.ida.zellige.gui.controller.ProjectionController"> <children> <VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="387.0" prefWidth="381.0"> <children> - <FlowPane fx:id="display" alignment="CENTER" columnHalignment="CENTER" prefHeight="348.0" prefWidth="371.0" /> + <FlowPane fx:id="display" alignment="CENTER" columnHalignment="CENTER" prefHeight="348.0" prefWidth="371.0" style="-fx-border-color: grey;" /> <VBox alignment="CENTER" prefHeight="63.0" prefWidth="351.0"> <children> <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="20.0"> diff --git a/src/main/resources/fr.pasteur.ida.zellige.gui.view/ReferenceSurfacePanel.fxml b/src/main/resources/fr.pasteur.ida.zellige.gui.view/ReferenceSurfacePanel.fxml index 9fe9d4a..8d1025a 100644 --- a/src/main/resources/fr.pasteur.ida.zellige.gui.view/ReferenceSurfacePanel.fxml +++ b/src/main/resources/fr.pasteur.ida.zellige.gui.view/ReferenceSurfacePanel.fxml @@ -4,9 +4,9 @@ <?import javafx.scene.control.TabPane?> <?import javafx.scene.layout.Pane?> -<fx:root maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="370.0" prefWidth="350.0" type="Pane" xmlns="http://javafx.com/javafx/18.0.2" xmlns:fx="http://javafx.com/fxml/1"> +<fx:root maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="355.0" prefWidth="350.0" style="-fx-border-color: grey;" type="Pane" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1"> <children> - <TabPane fx:id="channelTools" prefHeight="239.0" prefWidth="350.0" style="-fx-background-color: pink;" tabClosingPolicy="UNAVAILABLE" /> + <TabPane fx:id="channelTools" prefHeight="207.0" prefWidth="350.0" tabClosingPolicy="UNAVAILABLE" /> <Button fx:id="run" layoutX="259.0" layoutY="307.0" mnemonicParsing="false" text="Run!" /> </children> </fx:root> -- GitLab