diff --git a/src/.classpath b/src/.classpath
deleted file mode 100644
index 3f3893aff96296c1ce15c61728d13a5d97589bbe..0000000000000000000000000000000000000000
--- a/src/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="src" path=""/>
- <classpathentry kind="output" path=""/>
-</classpath>
diff --git a/src/.project b/src/.project
deleted file mode 100644
index 0f6f6a7651742888f8fab41052ab2787920558f1..0000000000000000000000000000000000000000
--- a/src/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>src</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/src/fxHiihtorekisteri/.classpath b/src/fxHiihtorekisteri/.classpath
deleted file mode 100644
index ac37fb2e4bca5ec7510383d7e55ea7b6b759e05a..0000000000000000000000000000000000000000
--- a/src/fxHiihtorekisteri/.classpath
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/src/fxHiihtorekisteri/.project b/src/fxHiihtorekisteri/.project
deleted file mode 100644
index 1e91de0784565baaf0d6e6667692bdc58e0ed303..0000000000000000000000000000000000000000
--- a/src/fxHiihtorekisteri/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>fxHiihtorekisteri</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/src/fxHiihtorekisteri/HiihtorekisteriGUIController.java b/src/fxHiihtorekisteri/HiihtorekisteriGUIController.java
index 9d08a9ba0076a08277fdbb10c1c4ac810d262ded..558c8623908f86fdaebc540ea0d1479c3c477d52 100644
--- a/src/fxHiihtorekisteri/HiihtorekisteriGUIController.java
+++ b/src/fxHiihtorekisteri/HiihtorekisteriGUIController.java
@@ -1,10 +1,39 @@
package fxHiihtorekisteri;
+import fi.jyu.mit.fxgui.ModalController;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+
+
/**
* @author pohjo
* @version 13.1.2020
*
*/
public class HiihtorekisteriGUIController {
- //
-}
+
+ @FXML
+ private Button nappiLisaaHiihto;
+
+ @FXML
+ private Button nappiMuokkaa;
+
+ @FXML
+ private Button nappiTulosta;
+
+ @FXML
+ void handleMuokkaa() {
+ ModalController.showModal(HiihtorekisteriGUIController.class.getResource("Muokkaa.fxml"), "Hiihtaja", null, "");
+ }
+
+ @FXML
+ void handleLisaaHiihto(ActionEvent event) {
+ //
+ }
+
+ @FXML
+ void handleTulosta(ActionEvent event) {
+ //
+ }
+}
\ No newline at end of file
diff --git a/src/fxHiihtorekisteri/HiihtorekisteriMain.java b/src/fxHiihtorekisteri/HiihtorekisteriMain.java
index 28ba0c9c6d4ab2a77bd73b421207554a52f6eb4f..c74245d93a745fe732597ac846108f7a128c6f73 100644
--- a/src/fxHiihtorekisteri/HiihtorekisteriMain.java
+++ b/src/fxHiihtorekisteri/HiihtorekisteriMain.java
@@ -1,14 +1,12 @@
-package fxHiihtorekisteri;
-
+package fxHiihtorekisteri;
import javafx.application.Application;
import javafx.stage.Stage;
import javafx.scene.Scene;
import javafx.scene.layout.BorderPane;
import javafx.fxml.FXMLLoader;
-
/**
- * @author pohjo
+ * @author JPo ja MHo
* @version 13.1.2020
*
*/
@@ -16,7 +14,7 @@ public class HiihtorekisteriMain extends Application {
@Override
public void start(Stage primaryStage) {
try {
- BorderPane root = (BorderPane)FXMLLoader.load(getClass().getResource("HiihtorekisteriGUIView.fxml"));
+ BorderPane root = (BorderPane)FXMLLoader.load(getClass().getResource("PaaikkunaGUIView.fxml"));
Scene scene = new Scene(root);
scene.getStylesheets().add(getClass().getResource("hiihtorekisteri.css").toExternalForm());
primaryStage.setScene(scene);
@@ -26,10 +24,11 @@ public class HiihtorekisteriMain extends Application {
}
}
+
/**
- * @param args ei käytössä
+ * @param args ei k�yt�ss�
*/
public static void main(String[] args) {
launch(args);
}
-}
+}
\ No newline at end of file
diff --git a/src/fxHiihtorekisteri/LisaaHiihtoGUIController.java b/src/fxHiihtorekisteri/LisaaHiihtoGUIController.java
new file mode 100644
index 0000000000000000000000000000000000000000..b60f78549f5c83d737ea43da19e1367b8a7c3f85
--- /dev/null
+++ b/src/fxHiihtorekisteri/LisaaHiihtoGUIController.java
@@ -0,0 +1,50 @@
+package fxHiihtorekisteri;
+
+import fi.jyu.mit.fxgui.Dialogs;
+import fi.jyu.mit.fxgui.ModalController;
+import fi.jyu.mit.fxgui.ModalControllerInterface;
+import javafx.application.Platform;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+
+
+/**
+ * @author pohjo
+ * @version 13.1.2020
+ *
+ */
+public class LisaaHiihtoGUIController implements ModalControllerInterface<String> {
+
+ @FXML
+ private Button nappiTallenna;
+
+ @FXML
+ void handleTallenna() {
+ Dialogs.showMessageDialog("Tallennus ei toimi vielä");
+ }
+
+ @FXML
+ void handlePeruuta() {
+ Platform.exit();
+ }
+
+ @Override
+ public String getResult() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public void handleShown() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setDefault(String oletus) {
+ // TODO Auto-generated method stub
+
+ }
+ //
+}
\ No newline at end of file
diff --git a/src/fxHiihtorekisteri/Muokkaa.fxml b/src/fxHiihtorekisteri/Muokkaa.fxml
index ef0883a8c8a7fab0357e0fd571552ab11aaf533d..298b148f18aaf223bc931697e33e805d52237f85 100644
--- a/src/fxHiihtorekisteri/Muokkaa.fxml
+++ b/src/fxHiihtorekisteri/Muokkaa.fxml
@@ -13,15 +13,15 @@
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.VBox?>
-<BorderPane prefHeight="408.0" prefWidth="684.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fxHiihtorekisteri.HiihtorekisteriGUIController">
+<BorderPane prefHeight="408.0" prefWidth="684.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fxHiihtorekisteri.MuokkaaGUIController">
<bottom>
<HBox spacing="10.0" BorderPane.alignment="CENTER">
<BorderPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</BorderPane.margin>
<children>
- <Button text="Tallenna" />
- <Button alignment="CENTER" mnemonicParsing="false" text="Peruuta" />
+ <Button fx:id="nappiTallenna" onAction="#handleTallenna" text="Tallenna" />
+ <Button fx:id="nappiPeruuta" alignment="CENTER" mnemonicParsing="false" onAction="#handlePeruuta" text="Peruuta" />
</children>
</HBox>
</bottom>
diff --git a/src/fxHiihtorekisteri/MuokkaaGUIController.java b/src/fxHiihtorekisteri/MuokkaaGUIController.java
new file mode 100644
index 0000000000000000000000000000000000000000..f50c3fb4d3822e797be3e0e45cfccb367ddd0ed0
--- /dev/null
+++ b/src/fxHiihtorekisteri/MuokkaaGUIController.java
@@ -0,0 +1,50 @@
+package fxHiihtorekisteri;
+
+import fi.jyu.mit.fxgui.Dialogs;
+import fi.jyu.mit.fxgui.ModalController;
+import fi.jyu.mit.fxgui.ModalControllerInterface;
+import javafx.application.Platform;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+
+
+/**
+ * @author pohjo
+ * @version 13.1.2020
+ *
+ */
+public class MuokkaaGUIController implements ModalControllerInterface<String> {
+
+ @FXML
+ private Button nappiTallenna;
+
+ @FXML
+ void handleTallenna() {
+ Dialogs.showMessageDialog("Tallennus ei toimi vielä");
+ }
+
+ @FXML
+ void handlePeruuta() {
+ Platform.exit();
+ }
+
+ @Override
+ public String getResult() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public void handleShown() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setDefault(String oletus) {
+ // TODO Auto-generated method stub
+
+ }
+ //
+}
\ No newline at end of file
diff --git a/src/fxHiihtorekisteri/PaaikkunaGUIView.fxml b/src/fxHiihtorekisteri/PaaikkunaGUIView.fxml
index 5537f32d7e0baeb2a12c4dd830255cbecd39aebe..1fbb0a58a6167b9b9ae2fd2fc1840d8448b30ee2 100644
--- a/src/fxHiihtorekisteri/PaaikkunaGUIView.fxml
+++ b/src/fxHiihtorekisteri/PaaikkunaGUIView.fxml
@@ -27,9 +27,9 @@
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</BorderPane.margin>
<children>
- <Button text="_Lisää hiihto" />
- <Button alignment="CENTER" mnemonicParsing="false" text="Katso hiihdot" />
- <Button mnemonicParsing="false" text="Tulosta" />
+ <Button fx:id="nappiLisaaHiihto" onAction="#handleLisaaHiihto" text="_Lisää hiihto" />
+ <Button fx:id="nappiMuokkaa" alignment="CENTER" mnemonicParsing="false" onAction="#handleMuokkaa" text="Muokkaa" />
+ <Button fx:id="nappiTulosta" mnemonicParsing="false" onAction="#handleTulosta" text="Tulosta" />
</children>
</HBox>
</bottom>