From 5fdfb137c6aec8681215ad1ccbfb9b00c110845f Mon Sep 17 00:00:00 2001
From: Alnotz <alnotz@protonmail.com>
Date: Sun, 9 Jul 2023 00:37:14 +0200
Subject: [PATCH] Scene adjusted

---
 .idea/workspace.xml                           |  57 +++++++++---------
 .../java/fr/alnotz/control/MainControl.java   |   9 ++-
 src/main/java/fr/alnotz/gui/App.java          |  28 ++++++---
 src/main/resources/fr/alnotz/alnotz.png       | Bin 0 -> 3757 bytes
 .../resources/fr/alnotz/style/mainStyle.css   |  25 ++++++--
 .../resources/fr/alnotz/view/mainView.fxml    |  24 +++++---
 6 files changed, 90 insertions(+), 53 deletions(-)
 create mode 100644 src/main/resources/fr/alnotz/alnotz.png

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9a21084..07d1b89 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,22 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="368303c6-28f7-4db0-afac-e5679385c10c" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/fr/alnotz/SystemInfo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/fr/alnotz/control/MainControl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/fr/alnotz/control/package-info.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/fr/alnotz/gui/App.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/fr/alnotz/gui/package-info.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/module-info.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/fr/alnotz/style/mainStyle.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/fr/alnotz/view/mainView.fxml" afterDir="false" />
+    <list default="true" id="368303c6-28f7-4db0-afac-e5679385c10c" name="Changes" comment="New project">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/fr/alnotz/control/MainControl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/fr/alnotz/control/MainControl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/fr/alnotz/gui/App.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/fr/alnotz/gui/App.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/fr/alnotz/style/mainStyle.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/fr/alnotz/style/mainStyle.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/fr/alnotz/view/mainView.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/fr/alnotz/view/mainView.fxml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -44,18 +34,18 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "git-widget-placeholder": "master",
-    "last_opened_file_path": "/home/alnotz/Git/Alnotz/jfxui",
-    "project.structure.last.edited": "Modules",
-    "project.structure.proportion": "0.0",
-    "project.structure.side.proportion": "0.0"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;last_opened_file_path&quot;: &quot;/home/alnotz/Git/Alnotz/jfxui&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/src/main/resources/fr/alnotz/view" />
@@ -90,6 +80,19 @@
       <option name="presentableId" value="Default" />
       <updated>1688292143465</updated>
     </task>
+    <task id="LOCAL-00001" summary="New project">
+      <option name="closed" value="true" />
+      <created>1688836184660</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1688836184660</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="New project" />
+    <option name="LAST_COMMIT_MESSAGE" value="New project" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/fr/alnotz/control/MainControl.java b/src/main/java/fr/alnotz/control/MainControl.java
index 020f797..2441a57 100644
--- a/src/main/java/fr/alnotz/control/MainControl.java
+++ b/src/main/java/fr/alnotz/control/MainControl.java
@@ -8,6 +8,8 @@ import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.Pane;
 
 import java.net.URL;
 import java.util.ResourceBundle;
@@ -15,6 +17,10 @@ import java.util.ResourceBundle;
 public class MainControl implements Initializable {
     private boolean hasClicked = false;
     @FXML
+    private Pane pane;
+    @FXML
+    private ImageView image;
+    @FXML
     private Label mainLabel = null;
     @FXML
     private Button mainButton = null;
@@ -26,12 +32,11 @@ public class MainControl implements Initializable {
             mainButton.setText("_Bye.");
             hasClicked = true;
         }
-
     }
 
     @Override
     @FXML
-    public void initialize(URL url, ResourceBundle resourceBundle) {
+    public void initialize(URL url, ResourceBundle resourceBundle){
         final String txt = "Hello, JavaFX " +
                 SystemInfo.javaVersion() +
                 ", running on Java " +
diff --git a/src/main/java/fr/alnotz/gui/App.java b/src/main/java/fr/alnotz/gui/App.java
index 5cb7b68..a9bf4fd 100644
--- a/src/main/java/fr/alnotz/gui/App.java
+++ b/src/main/java/fr/alnotz/gui/App.java
@@ -3,8 +3,9 @@ package fr.alnotz.gui;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
+import javafx.scene.image.Image;
 import javafx.scene.input.KeyEvent;
-import javafx.scene.layout.VBox;
+import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
 
 import java.io.IOException;
@@ -16,9 +17,14 @@ import java.nio.file.FileSystems;
  * JavaFX App
  */
 public class App extends Application {
-
+    /**
+     * JavaFX starter
+     * @param stage Main stage
+     * @throws IOException In/Out exception
+     */
     @Override
     public void start(Stage stage) throws IOException {
+        ///// Scene and style added /////
         final String pathStr =
                 "src/main/resources/fr/alnotz/view/mainView.fxml";
         final URL url = FileSystems
@@ -27,20 +33,24 @@ public class App extends Application {
                 .toUri()
                 .toURL();
         final FXMLLoader fxmlLoader = new FXMLLoader(url);
-        final VBox vbox = fxmlLoader.load();
-        final Scene scene = new Scene(vbox,640,480);
+        final Pane pane = fxmlLoader.load();
+        final Scene scene = new Scene(pane,800,600);
         final String cssStr =
                 "file:src/main/resources/fr/alnotz/style/mainStyle.css";
         scene.getStylesheets().add(cssStr);
-        stage.setTitle("Main window");
         stage.setScene(scene);
+        ///// Stage loaded and events listened /////
+        stage.setTitle("Main window");
+        final String imgPath =
+                "file:src/main/resources/fr/alnotz/alnotz.png";
+        stage.getIcons().add(new Image(imgPath));
         stage.addEventHandler(KeyEvent.KEY_PRESSED, keyEvent ->
-            System.out.println("Key pressed: " +
-                    keyEvent.getCode().getChar())
+            System.out.println("Key pressed (code): " +
+                    keyEvent.getCode().getCode())
         );
         stage.addEventHandler(KeyEvent.KEY_RELEASED, keyEvent ->
-            System.out.println("Key released: " +
-                    keyEvent.getCode().getChar())
+            System.out.println("Key released (code): " +
+                    keyEvent.getCode().getCode())
         );
         stage.show();
     }
diff --git a/src/main/resources/fr/alnotz/alnotz.png b/src/main/resources/fr/alnotz/alnotz.png
new file mode 100644
index 0000000000000000000000000000000000000000..a594725c9d93e9822156b2c2740f3d49c7f37303
GIT binary patch
literal 3757
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

literal 0
HcmV?d00001

diff --git a/src/main/resources/fr/alnotz/style/mainStyle.css b/src/main/resources/fr/alnotz/style/mainStyle.css
index 53d4c39..beb4f90 100644
--- a/src/main/resources/fr/alnotz/style/mainStyle.css
+++ b/src/main/resources/fr/alnotz/style/mainStyle.css
@@ -1,8 +1,21 @@
 /** Main style Sheet */
-#mainButton {
-    -fx-background-color: #101010;
+#pane {
+    -fx-background-color: black;
+}
+#mainLabel {
     -fx-text-fill: #d0d0d0;
-    -fx-padding: 50;
-    -fx-pref-width: 300;
-    -fx-pref-height: 200;
-}
\ No newline at end of file
+    -fx-font-size: 2em;
+}
+
+#image{
+    -fx-image: url(../alnotz.png);
+
+}
+#mainButton {
+    -fx-background-color: #303030;
+    -fx-text-fill: #d0d0d0;
+    -fx-font-size: 2em;
+    -fx-padding: 10;
+    -fx-pref-width: 200;
+    -fx-pref-height: 100;
+}
diff --git a/src/main/resources/fr/alnotz/view/mainView.fxml b/src/main/resources/fr/alnotz/view/mainView.fxml
index 8208049..aa5f774 100644
--- a/src/main/resources/fr/alnotz/view/mainView.fxml
+++ b/src/main/resources/fr/alnotz/view/mainView.fxml
@@ -1,17 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.layout.VBox?>
 <?import javafx.scene.control.Label?>
-
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.layout.Pane?>
 
-<VBox xmlns="http://javafx.com/javafx"
+<?import javafx.scene.image.ImageView?>
+<Pane xmlns="http://javafx.com/javafx"
       xmlns:fx="http://javafx.com/fxml"
-      fx:controller="fr.alnotz.control.MainControl"
-      prefHeight="400.0" prefWidth="600.0">
-    <Label fx:id="mainLabel"/>
+      fx:id="pane"
+      fx:controller="fr.alnotz.control.MainControl">
+    <ImageView fx:id="image"
+               layoutX="100"
+               fitWidth="600"/>
+    <Label fx:id="mainLabel"
+           layoutX="100"
+           layoutY="10"/>
     <Button fx:id="mainButton"
             text="Click _here!"
-            onAction="#onClick">
-    </Button>
-</VBox>
+            layoutX="300"
+            layoutY="400"
+            onAction="#onClick"/>
+</Pane>