diff --git a/src/fxHarakka/HarakkaController.java b/src/fxHarakka/HarakkaController.java index dc3fa92c174c29e9adc555aa9394a9ad3216fb9f..5e0c73e2bfea240d1e5d553fc52987b998d5f6bc 100644 --- a/src/fxHarakka/HarakkaController.java +++ b/src/fxHarakka/HarakkaController.java @@ -1,11 +1,15 @@ package fxHarakka; import fi.jyu.mit.fxgui.Dialogs; +import fi.jyu.mit.fxgui.ModalController; import javafx.event.ActionEvent; import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; import javafx.scene.control.Button; import javafx.scene.control.CheckBox; import javafx.scene.control.MenuItem; +import javafx.scene.layout.Pane; public class HarakkaController { @@ -168,7 +172,7 @@ public class HarakkaController { @FXML void handleTehtava(ActionEvent event) { - Dialogs.showMessageDialog("Myöhemmin: Tästä saat muokattua tehtävää"); + ModalController.showModal(HarakkaController.class.getResource("Oksa.fxml"), "Muokkaa", null, ""); } @FXML diff --git a/src/fxHarakka/HarakkaMain.java b/src/fxHarakka/HarakkaMain.java index 03cfe0cd2e8fafa9fab4f18063ea2b1879d9dbc7..2409d94fc76fc9a684ad1b9764567e01c42c628c 100644 --- a/src/fxHarakka/HarakkaMain.java +++ b/src/fxHarakka/HarakkaMain.java @@ -27,6 +27,7 @@ public class HarakkaMain extends Application { } } + /** * @param args Ei käytössä */ diff --git a/src/fxHarakka/Oksa.fxml b/src/fxHarakka/Oksa.fxml index 930630c9ea54f918705ca2492fd32e44f2e7e0b0..6ea0f6b50bd73aad8f3993f1d45be98bfb262a52 100644 --- a/src/fxHarakka/Oksa.fxml +++ b/src/fxHarakka/Oksa.fxml @@ -6,7 +6,7 @@ <?import javafx.scene.control.ToolBar?> <?import javafx.scene.layout.AnchorPane?> -<SplitPane dividerPositions="0.3704013377926421, 0.7065217391304348" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/23.0.1"> +<SplitPane dividerPositions="0.3704013377926421, 0.7065217391304348" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1"> <items> <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0"> <children> @@ -18,7 +18,7 @@ </children></AnchorPane> <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0"> <children> - <TitledPane animated="false" prefHeight="398.0" prefWidth="218.0" text="Demot"> + <TitledPane animated="false" prefHeight="398.0" prefWidth="218.0" text="Lisätiedot"> <content> <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0"> <children> diff --git a/src/fxHarakka/muokkaa.css b/src/fxHarakka/muokkaa.css new file mode 100644 index 0000000000000000000000000000000000000000..83d6f3343843c65d5dfaf3fedb97b6494c19113d --- /dev/null +++ b/src/fxHarakka/muokkaa.css @@ -0,0 +1 @@ +/* JavaFX CSS - Leave this comment until you have at least create one rule which uses -fx-Property */ \ No newline at end of file