From 6d6cae4c6255ed236ce2bdb24e5f98d1b9987577 Mon Sep 17 00:00:00 2001
From: bmbbk <bmbbk@147.171.174.101>
Date: Sat, 5 Apr 2025 17:35:02 +0200
Subject: [PATCH] mise en forme commune bandeau sup pages radiologue
---
src/ui/fxml/PageExamen.fxml | 28 +++++++++++++++++++---------
src/ui/fxml/Radio_Manip.fxml | 16 +++++++++++-----
src/ui/fxml/RadiologuePage.fxml | 15 +++++++++++----
3 files changed, 41 insertions(+), 18 deletions(-)
diff --git a/src/ui/fxml/PageExamen.fxml b/src/ui/fxml/PageExamen.fxml
index 75992f7..50fbb0e 100644
--- a/src/ui/fxml/PageExamen.fxml
+++ b/src/ui/fxml/PageExamen.fxml
@@ -4,6 +4,7 @@
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.ScrollPane?>
<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.ColumnConstraints?>
@@ -12,32 +13,41 @@
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.VBox?>
-<BorderPane style="-fx-background-color: #f5f9ff;" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.Controller.PageExamenController">
+<BorderPane prefHeight="680.0" prefWidth="1601.0" style="-fx-background-color: #f5f9ff;" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.Controller.PageExamenController">
<!-- En-tête -->
<top>
<VBox style="-fx-background-color: #3498db; -fx-padding: 15;">
- <HBox alignment="CENTER_LEFT" spacing="20">
- <Label fx:id="welcomeLabel" style="-fx-font-size: 18px; -fx-font-weight: bold;" />
- <Button onAction="#actionDeconnexion" style="-fx-background-color: #e74c3c; -fx-text-fill: white;" text="Déconnexion" />
+ <HBox alignment="CENTER_LEFT" prefHeight="27.0" prefWidth="1515.0" spacing="20">
+ <ImageView fitHeight="59.0" fitWidth="68.0" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../jpg/logo/icone.png" />
+ </image>
+ </ImageView>
+ <Label fx:id="welcomeLabel" prefHeight="27.0" prefWidth="262.0" style="-fx-font-size: 18px; -fx-font-weight: bold; -fx-text-fill: white;" />
+ <Label alignment="CENTER" contentDisplay="CENTER" prefHeight="35.0" prefWidth="854.0" style="-fx-text-fill: white; -fx-font-size: 24; -fx-font-weight: bold;" text="Fiche d'examen radiologique" />
+ <HBox alignment="TOP_RIGHT" prefHeight="59.0" prefWidth="319.0">
+ <children>
+ <Button alignment="TOP_LEFT" contentDisplay="TOP" onAction="#actionDeconnexion" style="-fx-background-color: #e74c3c; -fx-text-fill: white;" text="Déconnexion" />
+ </children>
+ </HBox>
</HBox>
- <Label style="-fx-text-fill: white; -fx-font-size: 24; -fx-font-weight: bold;" text="Fiche d'examen radiologique" />
</VBox>
</top>
<!-- Contenu principal - Maintenant avec ScrollPane pour le plein écran -->
<center>
<ScrollPane fitToHeight="true" fitToWidth="true">
- <HBox alignment="TOP_CENTER" spacing="30" style="-fx-padding: 20;">
+ <HBox alignment="TOP_CENTER" prefHeight="539.0" prefWidth="778.0" spacing="30" style="-fx-padding: 20;">
<!-- Colonne gauche - Image de l'examen -->
- <VBox alignment="CENTER" spacing="15" style="-fx-padding: 15; -fx-background-color: white; -fx-background-radius: 10; -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.1), 10, 0, 0, 5);">
+ <VBox alignment="CENTER" prefHeight="499.0" prefWidth="490.0" spacing="15" style="-fx-padding: 15; -fx-background-color: white; -fx-background-radius: 10; -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.1), 10, 0, 0, 5);">
<Label style="-fx-font-size: 16; -fx-font-weight: bold; -fx-text-fill: #2c3e50;" text="Image de l'examen" />
- <ImageView fx:id="image" fitHeight="350" fitWidth="350" preserveRatio="true" style="-fx-effect: dropshadow(gaussian, rgba(0,0,0,0.2), 10, 0, 0, 5);" />
+ <ImageView fx:id="image" fitHeight="382.0" fitWidth="404.0" preserveRatio="true" style="-fx-effect: dropshadow(gaussian, rgba(0,0,0,0.2), 10, 0, 0, 5);" />
<Label fx:id="noImageLabel" style="-fx-text-fill: #7f8c8d; -fx-font-style: italic;" text="Pas d'image disponible" visible="false" />
</VBox>
<!-- Colonne droite - Détails et compte rendu -->
- <VBox spacing="15" style="-fx-padding: 15; -fx-background-color: white; -fx-background-radius: 10; -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.1), 10, 0, 0, 5); -fx-min-width: 400;">
+ <VBox prefHeight="499.0" prefWidth="482.0" spacing="15" style="-fx-padding: 15; -fx-background-color: white; -fx-background-radius: 10; -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.1), 10, 0, 0, 5); -fx-min-width: 400;">
<Label style="-fx-font-size: 16; -fx-font-weight: bold; -fx-text-fill: #2c3e50;" text="Détails de l'examen" />
<GridPane hgap="10" vgap="10">
diff --git a/src/ui/fxml/Radio_Manip.fxml b/src/ui/fxml/Radio_Manip.fxml
index ce3f74a..817dd3f 100644
--- a/src/ui/fxml/Radio_Manip.fxml
+++ b/src/ui/fxml/Radio_Manip.fxml
@@ -10,6 +10,7 @@
<?import javafx.scene.control.TableColumn?>
<?import javafx.scene.control.TableView?>
<?import javafx.scene.control.TextField?>
+<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.ColumnConstraints?>
@@ -18,16 +19,21 @@
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.VBox?>
-<BorderPane style="-fx-background-color: #f5f9ff;" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.Controller.Radio_ManipController">
+<BorderPane prefHeight="1130.0" prefWidth="1618.0" style="-fx-background-color: #f5f9ff;" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.Controller.Radio_ManipController">
<top>
<VBox style="-fx-background-color: #3498db; -fx-padding: 15;">
<HBox alignment="CENTER_LEFT" spacing="20">
- <HBox spacing="10">
- <Button onAction="#actionDeconnexion" style="-fx-background-color: #e74c3c; -fx-text-fill: white;" text="Déconnexion" />
- <Button fx:id="PageRadio" onAction="#retourPageRadiologue" style="-fx-background-color: #2980b9; -fx-text-fill: white;" text="Revenir à la page Radiologue" />
+ <ImageView fitHeight="72.0" fitWidth="94.0" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../jpg/logo/icone.png" />
+ </image>
+ </ImageView>
+ <Label fx:id="welcomeLabel" prefHeight="27.0" prefWidth="1121.0" style="-fx-text-fill: white; -fx-font-size: 18; -fx-font-weight: bold;" />
+ <HBox alignment="TOP_RIGHT" prefHeight="72.0" prefWidth="307.0" spacing="10">
+ <Button fx:id="PageRadio" alignment="TOP_LEFT" onAction="#retourPageRadiologue" style="-fx-background-color: #2980b9; -fx-text-fill: white;" text="Revenir à la page Radiologue" />
+ <Button alignment="TOP_LEFT" onAction="#actionDeconnexion" style="-fx-background-color: #e74c3c; -fx-text-fill: white;" text="Déconnexion" />
</HBox>
- <Label fx:id="welcomeLabel" style="-fx-text-fill: white; -fx-font-size: 18; -fx-font-weight: bold;" />
</HBox>
</VBox>
</top>
diff --git a/src/ui/fxml/RadiologuePage.fxml b/src/ui/fxml/RadiologuePage.fxml
index 5d2102b..8a0a317 100644
--- a/src/ui/fxml/RadiologuePage.fxml
+++ b/src/ui/fxml/RadiologuePage.fxml
@@ -6,20 +6,27 @@
<?import javafx.scene.control.TableColumn?>
<?import javafx.scene.control.TableView?>
<?import javafx.scene.control.TextField?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
-<BorderPane style="-fx-background-color: #f5f9ff;" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.Controller.RadiologuePageController">
+<BorderPane prefHeight="1130.0" prefWidth="1620.0" style="-fx-background-color: #f5f9ff;" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.Controller.RadiologuePageController">
<!-- En-tête -->
<top>
<VBox style="-fx-background-color: #3498db; -fx-padding: 15;">
<HBox alignment="CENTER_LEFT" spacing="20">
- <Label fx:id="welcomeLabel" style="-fx-text-fill: white; -fx-font-size: 18; -fx-font-weight: bold;" />
- <HBox spacing="10">
+ <ImageView fitHeight="76.0" fitWidth="98.0" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../jpg/logo/icone.png" />
+ </image>
+ </ImageView>
+ <Label fx:id="welcomeLabel" prefHeight="27.0" prefWidth="1106.0" style="-fx-text-fill: white; -fx-font-size: 18; -fx-font-weight: bold;" />
+ <HBox alignment="TOP_RIGHT" prefHeight="76.0" prefWidth="346.0" spacing="10">
+ <Button fx:id="PageManip" onAction="#ouvertureManip" style="-fx-background-color: #2980b9; -fx-text-fill: white;" text="Aller à la page Manipulateur" />
<Button onAction="#actionDeconnexion" style="-fx-background-color: #e74c3c; -fx-text-fill: white;" text="Déconnexion" />
- <Button fx:id="PageManip" onAction="#ouvertureManip" style="-fx-background-color: #2980b9; -fx-text-fill: white;" text="Page Manipulateur" />
</HBox>
</HBox>
</VBox>
--
GitLab