diff --git a/kuvat/Lisaa.png b/kuvat/Lisaa.png new file mode 100644 index 0000000000000000000000000000000000000000..2dc89bb815f373e9ac62fbeb7a1414026f978883 Binary files /dev/null and b/kuvat/Lisaa.png differ diff --git a/kuvat/Paaikkuna.png b/kuvat/Paaikkuna.png index 15cb4bded29b58ad4bccde068a035b8a8acee99b..9efddeceeedbb28e5104c5ed2f6de1e8b08e44da 100644 Binary files a/kuvat/Paaikkuna.png and b/kuvat/Paaikkuna.png differ diff --git a/kuvat/muokkaa.png b/kuvat/muokkaa.png index 62f0f19f6a10f3d6d18886b51619c1b34de5294d..1ed60bc25ca4616a8c691ad39d77a3328082ba33 100644 Binary files a/kuvat/muokkaa.png and b/kuvat/muokkaa.png differ diff --git a/kuvat/virhe.png b/kuvat/virhe.png index b81b8b51f68ee43127ef56d6f354e66ef7038ede..04ce4a7236d6be10d5723a373922e2487c3fc33d 100644 Binary files a/kuvat/virhe.png and b/kuvat/virhe.png differ diff --git a/src/fxKirjalista/KirjalistaGUIView.fxml b/src/fxKirjalista/KirjalistaGUIView.fxml index 6ef3c1f4ca1e8cc2134765518cff53108faa9636..4f6cab45b6c2b4b7b2fa897d32b59f46f5866e4d 100644 --- a/src/fxKirjalista/KirjalistaGUIView.fxml +++ b/src/fxKirjalista/KirjalistaGUIView.fxml @@ -28,7 +28,7 @@ </Label> <ScrollPane prefHeight="383.0" prefWidth="274.0"> <content> - <AnchorPane prefHeight="384.0" prefWidth="224.0"> + <AnchorPane prefHeight="303.0" prefWidth="237.0"> <children> <GridPane layoutX="-1.0" layoutY="1.0" prefHeight="235.0" prefWidth="238.0"> <columnConstraints> @@ -113,13 +113,16 @@ <MenuItem mnemonicParsing="false" text="Kirjailija" /> <MenuItem mnemonicParsing="false" text="Genre" /> </items> + <HBox.margin> + <Insets left="7.0" /> + </HBox.margin> </SplitMenuButton> </children> <VBox.margin> <Insets bottom="7.0" left="7.0" right="7.0" top="7.0" /> </VBox.margin> </HBox> - <Label text="Kirjat:"> + <Label text="Kirjat:" textAlignment="CENTER"> <VBox.margin> <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" /> </VBox.margin> diff --git a/src/fxKirjalista/LisaaView.fxml b/src/fxKirjalista/LisaaView.fxml new file mode 100644 index 0000000000000000000000000000000000000000..16a65f9df1258eabecb23d5f9421a2b4944a32a3 --- /dev/null +++ b/src/fxKirjalista/LisaaView.fxml @@ -0,0 +1,105 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<?import javafx.geometry.Insets?> +<?import javafx.scene.control.Button?> +<?import javafx.scene.control.Label?> +<?import javafx.scene.control.TextField?> +<?import javafx.scene.layout.ColumnConstraints?> +<?import javafx.scene.layout.GridPane?> +<?import javafx.scene.layout.RowConstraints?> +<?import javafx.scene.layout.VBox?> + + +<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="338.0" prefWidth="243.0" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1"> + <children> + <Label text="Lisää"> + <VBox.margin> + <Insets bottom="7.0" left="7.0" right="7.0" top="7.0" /> + </VBox.margin> + </Label> + <GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="272.0" prefWidth="241.0"> + <columnConstraints> + <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> + <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> + </columnConstraints> + <rowConstraints> + <RowConstraints vgrow="SOMETIMES" /> + <RowConstraints vgrow="SOMETIMES" /> + <RowConstraints vgrow="SOMETIMES" /> + <RowConstraints vgrow="SOMETIMES" /> + <RowConstraints vgrow="SOMETIMES" /> + <RowConstraints vgrow="SOMETIMES" /> + </rowConstraints> + <children> + <Label text="Nimi:"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </Label> + <Label text="Kirjailija:" GridPane.rowIndex="1"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </Label> + <Label text="Kirjasarja:" GridPane.rowIndex="2"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </Label> + <Label text="Genre:" GridPane.rowIndex="3"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </Label> + <Label text="Julkaisuvuosi:" GridPane.rowIndex="4"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </Label> + <TextField GridPane.columnIndex="1"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </TextField> + <TextField GridPane.columnIndex="1" GridPane.rowIndex="1"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </TextField> + <TextField GridPane.columnIndex="1" GridPane.rowIndex="2"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </TextField> + <TextField GridPane.columnIndex="1" GridPane.rowIndex="3"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </TextField> + <TextField GridPane.columnIndex="1" GridPane.rowIndex="4"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </TextField> + <Label text="Sivumäärä:" GridPane.rowIndex="5"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </Label> + <TextField GridPane.columnIndex="1" GridPane.rowIndex="5"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </TextField> + </children> + </GridPane> + <Button contentDisplay="CENTER" mnemonicParsing="false" text="OK"> + <padding> + <Insets bottom="5.0" left="20.0" right="20.0" top="5.0" /> + </padding> + <VBox.margin> + <Insets left="7.0" right="7.0" /> + </VBox.margin> + </Button> + </children> +</VBox> diff --git a/src/fxKirjalista/MuokkaaView.fxml b/src/fxKirjalista/MuokkaaView.fxml new file mode 100644 index 0000000000000000000000000000000000000000..3466c3f4b89d8b9fa040fda8408c4db1bf574087 --- /dev/null +++ b/src/fxKirjalista/MuokkaaView.fxml @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<?import javafx.geometry.Insets?> +<?import javafx.scene.control.Button?> +<?import javafx.scene.control.Label?> +<?import javafx.scene.control.TextField?> +<?import javafx.scene.layout.ColumnConstraints?> +<?import javafx.scene.layout.GridPane?> +<?import javafx.scene.layout.RowConstraints?> +<?import javafx.scene.layout.VBox?> + + +<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="343.0" prefWidth="255.0" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1"> + <children> + <Label text="Muokkaa" /> + <GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="272.0" prefWidth="241.0"> + <columnConstraints> + <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> + <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> + </columnConstraints> + <rowConstraints> + <RowConstraints vgrow="SOMETIMES" /> + <RowConstraints vgrow="SOMETIMES" /> + <RowConstraints vgrow="SOMETIMES" /> + <RowConstraints vgrow="SOMETIMES" /> + <RowConstraints vgrow="SOMETIMES" /> + <RowConstraints vgrow="SOMETIMES" /> + </rowConstraints> + <children> + <Label text="Nimi:"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </Label> + <Label text="Kirjailija:" GridPane.rowIndex="1"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </Label> + <Label text="Kirjasarja:" GridPane.rowIndex="2"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </Label> + <Label text="Genre:" GridPane.rowIndex="3"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </Label> + <Label text="Julkaisuvuosi:" GridPane.rowIndex="4"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </Label> + <TextField GridPane.columnIndex="1"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </TextField> + <TextField GridPane.columnIndex="1" GridPane.rowIndex="1"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </TextField> + <TextField GridPane.columnIndex="1" GridPane.rowIndex="2"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </TextField> + <TextField GridPane.columnIndex="1" GridPane.rowIndex="3"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </TextField> + <TextField GridPane.columnIndex="1" GridPane.rowIndex="4"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </TextField> + <Label text="Sivumäärä:" GridPane.rowIndex="5"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </Label> + <TextField GridPane.columnIndex="1" GridPane.rowIndex="5"> + <GridPane.margin> + <Insets left="7.0" right="7.0" /> + </GridPane.margin> + </TextField> + </children> + </GridPane> + <Button contentDisplay="CENTER" mnemonicParsing="false" text="OK"> + <VBox.margin> + <Insets bottom="7.0" left="7.0" right="7.0" top="7.0" /> + </VBox.margin> + <padding> + <Insets bottom="5.0" left="20.0" right="20.0" top="5.0" /> + </padding> + </Button> + </children> + <padding> + <Insets bottom="7.0" left="7.0" right="7.0" top="7.0" /> + </padding> +</VBox>