diff --git a/.vscode/launch.json b/.vscode/launch.json index caa98d8..a459b7b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -14,7 +14,7 @@ "request": "launch", "mainClass": "lodge.TestMainFx", "projectName": "reservationsystem", - "vmArgs": " --module-path ./libs:. --add-modules ALL-MODULE-PATH --enable-native-access=javafx.graphics -Dcom.sun.management.jmxremote=false -Djava.awt.headless=true -XX:+DisableAttachMechanism", + "vmArgs": " --module-path ./libs:. --add-modules ALL-MODULE-PATH --enable-native-access=javafx.web,javafx.controls,javafx.graphics -Dcom.sun.management.jmxremote=false -Djava.awt.headless=true -XX:+DisableAttachMechanism", "cwd": "${workspaceFolder}", "console": "integratedTerminal" }, diff --git a/build.gradle b/build.gradle index c27b511..ef169e9 100644 --- a/build.gradle +++ b/build.gradle @@ -28,11 +28,14 @@ application { } sourceSets { - main { - java { - srcDirs = ['src/main/java'] - } - } + main { + java { + srcDirs = ['src/main/java'] + } + resources { + srcDirs = ['src/resources/media'] + } + } test { java { srcDirs = ['src/test/java'] diff --git a/libs/javafx-media-24.0.1-linux.jar b/libs/javafx-media-24.0.1-linux.jar new file mode 100644 index 0000000..96c5a4c Binary files /dev/null and b/libs/javafx-media-24.0.1-linux.jar differ diff --git a/libs/javafx-media-24.0.1-sources.jar b/libs/javafx-media-24.0.1-sources.jar deleted file mode 100644 index 579abf2..0000000 Binary files a/libs/javafx-media-24.0.1-sources.jar and /dev/null differ diff --git a/libs/javafx-media-24.0.1.jar b/libs/javafx-media-24.0.1.jar new file mode 100644 index 0000000..686f8f5 Binary files /dev/null and b/libs/javafx-media-24.0.1.jar differ diff --git a/src/main/java/lodge/TestMainFx.java b/src/main/java/lodge/TestMainFx.java index 68594a1..8b1c3b6 100644 --- a/src/main/java/lodge/TestMainFx.java +++ b/src/main/java/lodge/TestMainFx.java @@ -1,34 +1,27 @@ package lodge; import javafx.application.Application; +import javafx.fxml.FXMLLoader; +import javafx.scene.Parent; import javafx.scene.Scene; import javafx.stage.Stage; -import javafx.scene.layout.StackPane; -import javafx.scene.paint.Color; -import javafx.scene.shape.Ellipse; -import javafx.scene.text.Font; -import javafx.scene.text.Text; -public class TestMainFx extends Application{ +public class TestMainFx extends Application { @Override public void start(Stage primaryStage) { - primaryStage.setTitle("Lodge ReservationSystem"); - // Create an Ellipse and set fill color - Ellipse ellipse = new Ellipse(110, 70); - ellipse.setFill(Color.LIGHTBLUE); - // Create a Text shape with font and size - Text text = new Text("My Shapes"); - text.setFont(new Font("Arial Bold", 24)); - StackPane stackPane = new StackPane(); - stackPane.getChildren().addAll(ellipse, text); - Scene scene = new Scene(stackPane,800, 600, Color.LIGHTYELLOW); - primaryStage.setScene(scene); - primaryStage.show(); + try { + primaryStage.setTitle("Lodge ReservationSystem"); + Parent root = FXMLLoader.load(getClass().getClassLoader().getResource("main.fxml")); + Scene scene = new Scene(root, 800, 600); + primaryStage.setScene(scene); + primaryStage.show(); + } catch (Exception e) { + e.printStackTrace(); + } } public static void main(String[] args) { launch(args); } - } diff --git a/src/resources/media/main.fxml b/src/resources/media/main.fxml new file mode 100644 index 0000000..5d50466 --- /dev/null +++ b/src/resources/media/main.fxml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +