Skip to content
Snippets Groups Projects
Commit 785863e4 authored by askerazu's avatar askerazu
Browse files

vaihe 2 korjauksia

parent cc9a00ac
Branches tyo3
Tags vaihe2
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 181 additions and 321 deletions
kuvat/LisaaTehtava.png 0 → 100644
+ 0
− 0
View file @ 785863e4
kuvat/LisaaTehtava.png

7.02 KiB

kuvat/MuokkaaTehtavaa.png 0 → 100644
+ 0
− 0
View file @ 785863e4
kuvat/MuokkaaTehtavaa.png

5.72 KiB

kuvat/PoistaTehtava.png 0 → 100644
+ 0
− 0
View file @ 785863e4
kuvat/PoistaTehtava.png

6.07 KiB

kuvat/Tehtavadialogi.png
+ 0
− 0
View replaced file @ cc9a00ac View file @ 785863e4
kuvat/Tehtavadialogi.png

20.8 KiB | W: | H:

kuvat/Tehtavadialogi.png

20.4 KiB | W: | H:

kuvat/Tehtavadialogi.png
kuvat/Tehtavadialogi.png
kuvat/Tehtavadialogi.png
kuvat/Tehtavadialogi.png
  • 2-up
  • Swipe
  • Onion skin
src/fxHt/JasendialogiMain.java deleted 100644 → 0
+ 0
− 38
View file @ cc9a00ac
package fxHt;
import javafx.application.Application;
import javafx.stage.Stage;
import javafx.scene.Scene;
import javafx.scene.layout.Pane;
import javafx.fxml.FXMLLoader;
/**
* @author OMISTAJA
* @version 3.2.2021
*
*/
public class JasendialogiMain extends Application {
@Override
public void start(Stage primaryStage) {
try {
FXMLLoader ldr = new FXMLLoader(getClass().getResource("JasendialogiGUIView.fxml"));
final Pane root = ldr.load();
//final JasendialogiGUIController jasendialogiCtrl = (JasendialogiGUIController) ldr.getController();
Scene scene = new Scene(root);
scene.getStylesheets().add(getClass().getResource("jasendialogi.css").toExternalForm());
primaryStage.setScene(scene);
primaryStage.setTitle("Jasendialogi");
primaryStage.show();
} catch(Exception e) {
e.printStackTrace();
}
}
/**
* @param args Ei kytss
*/
public static void main(String[] args) {
launch(args);
}
}
\ No newline at end of file
src/kaynnistys/KaynnistysGUIController.java → src/fxHt/KaynnistysGUIController.java
+ 2
− 2
View file @ 785863e4
package kaynnistys;
package fxHt;
/**
* @author OMISTAJA
* @version 22.1.2021
* @version 8.2.2021
*
*/
public class KaynnistysGUIController {
......
src/fxHt/LisaaTehtavaGUIController.java 0 → 100644
+ 10
− 0
View file @ 785863e4
package fxHt;
/**
* @author OMISTAJA
* @version 8.2.2021
*
*/
public class LisaaTehtavaGUIController {
// TODO
}
\ No newline at end of file
src/fxHt/LisaaTehtavaGUIView.fxml 0 → 100644
+ 48
− 0
View file @ 785863e4
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.ButtonBar?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.RowConstraints?>
<BorderPane xmlns="http://javafx.com/javafx/15.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fxHt.MuokkaaTehtavaaGUIController">
<bottom>
<ButtonBar prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<buttons>
<Button mnemonicParsing="false" text="Tallenna" />
<Button mnemonicParsing="false" text="Peruuta" />
</buttons>
<BorderPane.margin>
<Insets left="10.0" right="10.0" />
</BorderPane.margin>
</ButtonBar>
</bottom>
<center>
<GridPane BorderPane.alignment="CENTER">
<columnConstraints>
<ColumnConstraints hgrow="NEVER" minWidth="10.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label text="Uusi tehtävä">
<GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin>
</Label>
<TextField promptText="Syötä tehtävän nimi" GridPane.rowIndex="1">
<GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin>
</TextField>
</children>
</GridPane>
</center>
</BorderPane>
src/fxHt/MuokkaaTehtavaaGUIController.java 0 → 100644
+ 10
− 0
View file @ 785863e4
package fxHt;
/**
* @author OMISTAJA
* @version 8.2.2021
*
*/
public class MuokkaaTehtavaaGUIController {
// TODO
}
\ No newline at end of file
src/fxHt/MuokkaaTehtavaaGUIView.fxml 0 → 100644
+ 60
− 0
View file @ 785863e4
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.ButtonBar?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.RowConstraints?>
<BorderPane xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/15.0.1" fx:controller="fxHt.MuokkaaTehtavaaGUIController">
<bottom>
<ButtonBar prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<buttons>
<Button mnemonicParsing="false" text="Tallenna" />
<Button mnemonicParsing="false" text="Peruuta" />
</buttons>
<BorderPane.margin>
<Insets left="10.0" right="10.0" />
</BorderPane.margin>
</ButtonBar>
</bottom>
<center>
<GridPane BorderPane.alignment="CENTER">
<columnConstraints>
<ColumnConstraints hgrow="NEVER" minWidth="10.0" />
<ColumnConstraints hgrow="NEVER" minWidth="10.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label text="ID">
<GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin>
</Label>
<Label text="Tehtävä" GridPane.columnIndex="1">
<GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin>
</Label>
<Label text="1" GridPane.rowIndex="1">
<GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin>
</Label>
<TextField text="Titu" GridPane.columnIndex="1" GridPane.rowIndex="1">
<GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin>
</TextField>
</children>
</GridPane>
</center>
</BorderPane>
src/fxHt/PoistaMain.java deleted 100644 → 0
+ 0
− 38
View file @ cc9a00ac
package fxHt;
import javafx.application.Application;
import javafx.stage.Stage;
import javafx.scene.Scene;
import javafx.scene.layout.Pane;
import javafx.fxml.FXMLLoader;
/**
* @author OMISTAJA
* @version 4.2.2021
*
*/
public class PoistaMain extends Application {
@Override
public void start(Stage primaryStage) {
try {
FXMLLoader ldr = new FXMLLoader(getClass().getResource("PoistaGUIView.fxml"));
final Pane root = ldr.load();
//final PoistaGUIController poistaCtrl = (PoistaGUIController) ldr.getController();
Scene scene = new Scene(root);
scene.getStylesheets().add(getClass().getResource("poista.css").toExternalForm());
primaryStage.setScene(scene);
primaryStage.setTitle("Poista");
primaryStage.show();
} catch(Exception e) {
e.printStackTrace();
}
}
/**
* @param args Ei kytss
*/
public static void main(String[] args) {
launch(args);
}
}
\ No newline at end of file
src/fxHt/PoistaTehtavaGUIController.java 0 → 100644
+ 10
− 0
View file @ 785863e4
package fxHt;
/**
* @author OMISTAJA
* @version 8.2.2021
*
*/
public class PoistaTehtavaGUIController {
// TODO
}
\ No newline at end of file
src/fxHt/PoistaTehtavaGUIView.fxml 0 → 100644
+ 32
− 0
View file @ 785863e4
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.ButtonBar?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.text.Font?>
<BorderPane xmlns="http://javafx.com/javafx/15.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fxHt.PoistaGUIController">
<bottom>
<ButtonBar prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<buttons>
<Button mnemonicParsing="false" text="Kyllä" />
<Button mnemonicParsing="false" text="Ei" />
</buttons>
<BorderPane.margin>
<Insets left="10.0" right="10.0" top="10.0" />
</BorderPane.margin>
</ButtonBar>
</bottom>
<center>
<Label text="Poistetaanko tehtävä: Titu" BorderPane.alignment="CENTER">
<BorderPane.margin>
<Insets left="10.0" right="10.0" top="10.0" />
</BorderPane.margin>
<font>
<Font size="14.0" />
</font>
</Label>
</center>
</BorderPane>
src/fxHt/TehtavadialogiGUIView.fxml
+ 9
− 127
View file @ 785863e4
<?xml version="1.0" encoding="UTF-8"?>
<?import fi.jyu.mit.fxgui.ListChooser?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.ButtonBar?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.ScrollPane?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.RowConstraints?>
<BorderPane xmlns="http://javafx.com/javafx/15.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fxHt.TehtavadialogiGUIController">
<center>
<ScrollPane BorderPane.alignment="CENTER">
<content>
<GridPane hgap="10.0">
<columnConstraints>
<ColumnConstraints halignment="RIGHT" hgrow="NEVER" minWidth="10.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<TextField text="Titu" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS">
<GridPane.margin>
<Insets left="5.0" right="5.0" top="5.0" />
</GridPane.margin></TextField>
<TextField text="RAH" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1">
<GridPane.margin>
<Insets left="5.0" right="5.0" top="5.0" />
</GridPane.margin></TextField>
<TextField text="KLO" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2">
<GridPane.margin>
<Insets left="5.0" right="5.0" top="5.0" />
</GridPane.margin></TextField>
<TextField text="KLO2" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3">
<GridPane.margin>
<Insets left="5.0" right="5.0" top="5.0" />
</GridPane.margin></TextField>
<TextField text="PA" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="4">
<GridPane.margin>
<Insets left="5.0" right="5.0" top="5.0" />
</GridPane.margin></TextField>
<TextField text="LK" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="5">
<GridPane.margin>
<Insets left="5.0" right="5.0" top="5.0" />
</GridPane.margin></TextField>
<TextField text="LL" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="6">
<GridPane.margin>
<Insets left="5.0" right="5.0" top="5.0" />
</GridPane.margin></TextField>
<TextField text="SN" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="7">
<GridPane.margin>
<Insets left="5.0" right="5.0" top="5.0" />
</GridPane.margin></TextField>
<TextField text="ET" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="8">
<GridPane.margin>
<Insets left="5.0" right="5.0" top="5.0" />
</GridPane.margin></TextField>
<TextField text="LT" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="9">
<GridPane.margin>
<Insets left="5.0" right="5.0" top="5.0" />
</GridPane.margin></TextField>
<Label text="1">
<GridPane.margin>
<Insets left="5.0" top="5.0" />
</GridPane.margin>
</Label>
<Label text="2" GridPane.rowIndex="1">
<GridPane.margin>
<Insets left="5.0" top="5.0" />
</GridPane.margin>
</Label>
<Label text="3" GridPane.rowIndex="2">
<GridPane.margin>
<Insets left="5.0" top="5.0" />
</GridPane.margin>
</Label>
<Label text="4" GridPane.rowIndex="3">
<GridPane.margin>
<Insets left="5.0" top="5.0" />
</GridPane.margin>
</Label>
<Label text="5" GridPane.rowIndex="4">
<GridPane.margin>
<Insets left="5.0" top="5.0" />
</GridPane.margin>
</Label>
<Label text="6" GridPane.rowIndex="5">
<GridPane.margin>
<Insets left="5.0" top="5.0" />
</GridPane.margin>
</Label>
<Label text="7" GridPane.rowIndex="6">
<GridPane.margin>
<Insets left="5.0" top="5.0" />
</GridPane.margin>
</Label>
<Label text="8" GridPane.rowIndex="7">
<GridPane.margin>
<Insets left="5.0" top="5.0" />
</GridPane.margin>
</Label>
<Label text="9" GridPane.rowIndex="8">
<GridPane.margin>
<Insets left="5.0" top="5.0" />
</GridPane.margin>
</Label>
<Label text="10" GridPane.rowIndex="9">
<GridPane.margin>
<Insets left="5.0" top="5.0" />
</GridPane.margin>
</Label>
</children>
<padding>
<Insets bottom="10.0" left="10.0" right="10.0" />
</padding>
</GridPane>
<ListChooser rivit="1&#9;Titu&#10;2&#9;RAH&#10;3&#9;KLO&#10;4&#9;KLO2&#10;5&#9;PA&#10;6&#9;LK&#10;7&#9;LL&#10;8&#9;SN&#10;9&#9;ET&#10;10&#9;LT" />
</content></ScrollPane>
</center>
<bottom>
<ButtonBar prefHeight="40.0" prefWidth="200.0">
<ButtonBar>
<buttons>
<Button mnemonicParsing="false" text="Tallenna" />
<Button mnemonicParsing="false" text="Peruuta" />
<Button mnemonicParsing="false" text="Lisää tehtävä" />
<Button mnemonicParsing="false" text="Muokkaa" />
<Button mnemonicParsing="false" text="Poista" />
<Button mnemonicParsing="false" text="Peruuta" />
</buttons>
<BorderPane.margin>
<Insets left="10.0" right="10.0" />
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</BorderPane.margin>
</ButtonBar>
</bottom>
<top>
<HBox BorderPane.alignment="CENTER">
<children>
<Label text="ID">
<Label text="ID Tehtävä">
<HBox.margin>
<Insets right="10.0" />
</HBox.margin>
</Label>
<Label text="Tehtävä">
<HBox.margin>
<Insets left="10.0" right="10.0" />
</HBox.margin>
</Label>
</children>
<BorderPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
......
src/fxHt/TehtavadialogiMain.java deleted 100644 → 0
+ 0
− 38
View file @ cc9a00ac
package fxHt;
import javafx.application.Application;
import javafx.stage.Stage;
import javafx.scene.Scene;
import javafx.scene.layout.Pane;
import javafx.fxml.FXMLLoader;
/**
* @author OMISTAJA
* @version 3.2.2021
*
*/
public class TehtavadialogiMain extends Application {
@Override
public void start(Stage primaryStage) {
try {
FXMLLoader ldr = new FXMLLoader(getClass().getResource("TehtavadialogiGUIView.fxml"));
final Pane root = ldr.load();
//final TehtavadialogiGUIController tehtavadialogiCtrl = (TehtavadialogiGUIController) ldr.getController();
Scene scene = new Scene(root);
scene.getStylesheets().add(getClass().getResource("tehtavadialogi.css").toExternalForm());
primaryStage.setScene(scene);
primaryStage.setTitle("Tehtavadialogi");
primaryStage.show();
} catch(Exception e) {
e.printStackTrace();
}
}
/**
* @param args Ei kytss
*/
public static void main(String[] args) {
launch(args);
}
}
\ No newline at end of file
src/fxHt/TiedotMain.java deleted 100644 → 0
+ 0
− 38
View file @ cc9a00ac
package fxHt;
import javafx.application.Application;
import javafx.stage.Stage;
import javafx.scene.Scene;
import javafx.scene.layout.Pane;
import javafx.fxml.FXMLLoader;
/**
* @author OMISTAJA
* @version 4.2.2021
*
*/
public class TiedotMain extends Application {
@Override
public void start(Stage primaryStage) {
try {
FXMLLoader ldr = new FXMLLoader(getClass().getResource("TiedotGUIView.fxml"));
final Pane root = ldr.load();
//final TiedotGUIController tiedotCtrl = (TiedotGUIController) ldr.getController();
Scene scene = new Scene(root);
scene.getStylesheets().add(getClass().getResource("tiedot.css").toExternalForm());
primaryStage.setScene(scene);
primaryStage.setTitle("Tiedot");
primaryStage.show();
} catch(Exception e) {
e.printStackTrace();
}
}
/**
* @param args Ei kytss
*/
public static void main(String[] args) {
launch(args);
}
}
\ No newline at end of file
src/fxHt/VirheMain.java deleted 100644 → 0
+ 0
− 38
View file @ cc9a00ac
package fxHt;
import javafx.application.Application;
import javafx.stage.Stage;
import javafx.scene.Scene;
import javafx.scene.layout.Pane;
import javafx.fxml.FXMLLoader;
/**
* @author OMISTAJA
* @version 4.2.2021
*
*/
public class VirheMain extends Application {
@Override
public void start(Stage primaryStage) {
try {
FXMLLoader ldr = new FXMLLoader(getClass().getResource("VirheGUIView.fxml"));
final Pane root = ldr.load();
//final VirheGUIController virheCtrl = (VirheGUIController) ldr.getController();
Scene scene = new Scene(root);
scene.getStylesheets().add(getClass().getResource("virhe.css").toExternalForm());
primaryStage.setScene(scene);
primaryStage.setTitle("Virhe");
primaryStage.show();
} catch(Exception e) {
e.printStackTrace();
}
}
/**
* @param args Ei kytss
*/
public static void main(String[] args) {
launch(args);
}
}
\ No newline at end of file
src/fxHt/jasendialogi.css deleted 100644 → 0
+ 0
− 1
View file @ cc9a00ac
/* JavaFX CSS - Leave this comment until you have at least create one rule which uses -fx-Property */
\ No newline at end of file
src/fxHt/poista.css deleted 100644 → 0
+ 0
− 1
View file @ cc9a00ac
/* JavaFX CSS - Leave this comment until you have at least create one rule which uses -fx-Property */
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment