Skip to content
Snippets Groups Projects
Commit 23213b74 authored by Kiljala Renne Lauri Olavi's avatar Kiljala Renne Lauri Olavi
Browse files

controller muutoksia

parent a717d5ad
No related branches found
No related tags found
No related merge requests found
...@@ -9,6 +9,7 @@ import javafx.scene.Scene; ...@@ -9,6 +9,7 @@ import javafx.scene.Scene;
import javafx.scene.control.*; import javafx.scene.control.*;
import javafx.scene.layout.Pane; import javafx.scene.layout.Pane;
public class HarakkaController { public class HarakkaController {
@FXML @FXML
...@@ -158,6 +159,11 @@ public class HarakkaController { ...@@ -158,6 +159,11 @@ public class HarakkaController {
@FXML @FXML
void handleLisaaPro(ActionEvent event) { void handleLisaaPro(ActionEvent event) {
Tab uusiLehti = new Tab();
uusiLehti.setContent(new Label());
lehti.getTabs().add(uusiLehti);
ModalController.showModal(HarakkaController.class.getResource("LuoProjekti.fxml"), "Lisää Projekti", null, ""); ModalController.showModal(HarakkaController.class.getResource("LuoProjekti.fxml"), "Lisää Projekti", null, "");
} }
...@@ -198,10 +204,7 @@ public class HarakkaController { ...@@ -198,10 +204,7 @@ public class HarakkaController {
@FXML @FXML
public void lisaaLehti(String nimi){ public void lisaaLehti(String nimi){
Tab uusiLehti = new Tab(nimi);
uusiLehti.setContent(new Label(nimi));
lehti.getTabs().add(uusiLehti);
} }
......
...@@ -6,6 +6,7 @@ import fxHarakka.luokat.Harakka; ...@@ -6,6 +6,7 @@ import fxHarakka.luokat.Harakka;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.control.TabPane;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
import javafx.scene.input.KeyEvent; import javafx.scene.input.KeyEvent;
...@@ -28,6 +29,9 @@ public class LuoProjektiController implements ModalControllerInterface<String> { ...@@ -28,6 +29,9 @@ public class LuoProjektiController implements ModalControllerInterface<String> {
private TextField projektiNimi; private TextField projektiNimi;
private String nimi = null; private String nimi = null;
@FXML
private TabPane lehti;
@FXML @FXML
void HylkaaProjekti(ActionEvent event) { void HylkaaProjekti(ActionEvent event) {
...@@ -42,12 +46,8 @@ public class LuoProjektiController implements ModalControllerInterface<String> { ...@@ -42,12 +46,8 @@ public class LuoProjektiController implements ModalControllerInterface<String> {
Harakka harakka = new Harakka(); Harakka harakka = new Harakka();
harakka.luoProjekti(nimi, aihe, kesto); harakka.luoProjekti(nimi, aihe, kesto);
//lisätään uusi tabi kun luodaan projekti TODO
HarakkaController controller = new HarakkaController();
controller.lisaaLehti(nimi);
ModalController.closeStage(projektiKesto); ModalController.closeStage(projektiNimi);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment