From 84301148496c38503a33624cc6eaf1889c9dd3f4 Mon Sep 17 00:00:00 2001 From: Janine Leona <s79028@beuth-hochschule.de> Date: Thu, 7 Nov 2019 16:28:37 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Klassen=20f=C3=BCr=20alle=20f=C3=BCnf=20Lay?= =?UTF-8?q?outelemente=20erstellt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BrowserBar.java | 12 ++++++++++++ src/FilterTab.java | 11 +++++++++++ src/InfoBar.java | 12 ++++++++++++ src/{MenuBar.java => MenuTab.java} | 7 ++----- src/Photoview.java | 9 +++++++++ 5 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 src/BrowserBar.java create mode 100644 src/FilterTab.java create mode 100644 src/InfoBar.java rename src/{MenuBar.java => MenuTab.java} (92%) diff --git a/src/BrowserBar.java b/src/BrowserBar.java new file mode 100644 index 0000000..40dac8b --- /dev/null +++ b/src/BrowserBar.java @@ -0,0 +1,12 @@ +import javafx.application.Application; +import javafx.scene.layout.VBox; +import javafx.stage.Stage; + +public class BrowserBar extends Application { + + @Override + public void start(Stage primaryStage) { + VBox root = new VBox(); + + } +} diff --git a/src/FilterTab.java b/src/FilterTab.java new file mode 100644 index 0000000..0b87910 --- /dev/null +++ b/src/FilterTab.java @@ -0,0 +1,11 @@ +import javafx.application.Application; +import javafx.scene.layout.HBox; +import javafx.stage.Stage; + +public class FilterTab extends Application { + + @Override + public void start(Stage primaryStage) { + HBox root = new HBox(); + } +} diff --git a/src/InfoBar.java b/src/InfoBar.java new file mode 100644 index 0000000..e3eeab1 --- /dev/null +++ b/src/InfoBar.java @@ -0,0 +1,12 @@ +import javafx.application.Application; +import javafx.scene.layout.VBox; +import javafx.stage.Stage; + +public class InfoBar extends Application { + + @Override + public void start(Stage primaryStage) { + VBox root = new VBox(); + + } +} diff --git a/src/MenuBar.java b/src/MenuTab.java similarity index 92% rename from src/MenuBar.java rename to src/MenuTab.java index a3a28d8..bb86df4 100644 --- a/src/MenuBar.java +++ b/src/MenuTab.java @@ -14,10 +14,11 @@ import javafx.stage.Stage; import javafx.scene.image.Image; import java.io.File; -public class MenuBar extends Application { +public class MenuTab extends Application { public void start(Stage stage) throws Exception { HBox root = new HBox(); + Photoview photoview = new Photoview(); root.setSpacing(5); root.setPadding(new Insets(5, 10 ,5, 10)); @@ -47,10 +48,6 @@ public class MenuBar extends Application { } }); - //directoryBtn.setOnAction(new EventHandler<ActionEvent>() { - // @Override - // public void handle(ActionEvent event) { - directoryBtn.setOnAction(event -> { DirectoryChooser directoryChooser = new DirectoryChooser(); directoryChooser.setTitle("load directory"); diff --git a/src/Photoview.java b/src/Photoview.java index 6659c69..b4c6a30 100644 --- a/src/Photoview.java +++ b/src/Photoview.java @@ -16,4 +16,13 @@ import java.io.File; public class Photoview extends Application { + public void start(Stage stage) { + GridPane photoview = new GridPane(); + + } + + public void add(ImageView imageView, int i, int i1) { + + } + } -- GitLab From e589936fd971d0367dd45cf8f139e68dc6e65921 Mon Sep 17 00:00:00 2001 From: Janine Leona <s79028@beuth-hochschule.de> Date: Thu, 7 Nov 2019 16:40:13 +0100 Subject: [PATCH 2/3] new class structure --- src/FxFrontend.java | 13 ++++++++++++- src/MenuTab.java | 4 ++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/FxFrontend.java b/src/FxFrontend.java index 10e31c5..d2a43aa 100644 --- a/src/FxFrontend.java +++ b/src/FxFrontend.java @@ -21,6 +21,17 @@ public class FxFrontend extends Application { @Override public void start(Stage stage) { + + BorderPane root = new BorderPane(); + MenuTab menutab = new MenuTab(); + root.setTop(menutab); + root.setCenter(photoview); + + + + + + /* stage.setTitle("Hello World!"); stage.setResizable(true); @@ -42,7 +53,7 @@ public class FxFrontend extends Application { menuTab.setAlignment(Pos.BASELINE_CENTER); filterTab.setAlignment(Pos.BASELINE_CENTER); - stage.show(); + stage.show(); */ } } \ No newline at end of file diff --git a/src/MenuTab.java b/src/MenuTab.java index bb86df4..9b7e102 100644 --- a/src/MenuTab.java +++ b/src/MenuTab.java @@ -14,9 +14,9 @@ import javafx.stage.Stage; import javafx.scene.image.Image; import java.io.File; -public class MenuTab extends Application { +public class MenuTab extends HBox { - public void start(Stage stage) throws Exception { + public void start(Stage stage) { HBox root = new HBox(); Photoview photoview = new Photoview(); -- GitLab From f8d001fc8c328e3e3079cd2c2aa1ebd59b7b9c19 Mon Sep 17 00:00:00 2001 From: kat-ho <s77518@beuth-hochschule.de> Date: Thu, 7 Nov 2019 22:17:44 +0100 Subject: [PATCH 3/3] update Readme --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 47147cc..63ac2e0 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # photobook -möp - ## how to git in a team **1. create a new feature branch** for developing (Make sure you're on the master) -- GitLab