From 6c132e9f1691b1342ce4c54ca0162289955776b4 Mon Sep 17 00:00:00 2001
From: Kiljala Renne Lauri Olavi <renne.l.o.kiljala@student.jyu.fi>
Date: Thu, 20 Feb 2025 18:04:06 +0200
Subject: [PATCH] =?UTF-8?q?lis=C3=A4tty=20modaalinen=20menu=20kun=20painet?=
 =?UTF-8?q?aan=20teht=C3=A4v=C3=A4=C3=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/fxHarakka/HarakkaController.java | 6 +++++-
 src/fxHarakka/HarakkaMain.java       | 1 +
 src/fxHarakka/Oksa.fxml              | 4 ++--
 src/fxHarakka/muokkaa.css            | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 src/fxHarakka/muokkaa.css

diff --git a/src/fxHarakka/HarakkaController.java b/src/fxHarakka/HarakkaController.java
index dc3fa92..5e0c73e 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 03cfe0c..2409d94 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 930630c..6ea0f6b 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 0000000..83d6f33
--- /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
-- 
GitLab