Skip to content
Snippets Groups Projects
Commit aa2e2fe9 authored by Koivisto Ida Maria Hannuntytär's avatar Koivisto Ida Maria Hannuntytär
Browse files

päivitys alusta asti tehtyyn toimivaan koodiin

parent ab1edfb1
No related branches found
No related tags found
No related merge requests found
Showing
with 379 additions and 106 deletions
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<attribute name="module" value="true"/> <attribute name="module" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
<classpathentry kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ohj2"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ohj2"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>
##############################
## Java
##############################
.mtj.tmp/
*.class
*.jar
*.war
*.ear
*.nar
hs_err_pid*
##############################
## Maven
##############################
target/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties
.mvn/wrapper/maven-wrapper.jar
##############################
## Gradle
##############################
bin/
build/
.gradle
.gradletasknamecache
gradle-app.setting
!gradle-wrapper.jar
##############################
## IntelliJ
##############################
out/
.idea/
.idea_modules/
*.iml
*.ipr
*.iws
##############################
## Eclipse
##############################
.settings/
bin/
tmp/
.metadata
*.tmp
*.bak
*.swp
*~.nib
local.properties
.loadpath
##############################
## NetBeans
##############################
nbproject/private/
build/
nbbuild/
dist/
nbdist/
nbactions.xml
nb-configuration.xml
##############################
## OS X
##############################
.DS_Store
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>ht</name> <name>kerho</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>
......
eclipse.preferences.version=1
encoding/<project>=UTF-8
# pohja
Pohja kevään 2023 harjoitustöiden GIT-repoille
Lue käyttöohjeet TIMistä: <https://tim.jyu.fi/view/kurssit/tie/ohj2/tyokalut/git/ohj2git#fork>
File added
File added
File added
File added
File added
File added
File added
File added
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import fi.jyu.mit.fxgui.ComboBoxChooser?>
<?import fi.jyu.mit.fxgui.ListChooser?>
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?> <?import javafx.scene.control.Button?>
<?import javafx.scene.control.ComboBox?>
<?import javafx.scene.control.Label?> <?import javafx.scene.control.Label?>
<?import javafx.scene.control.Menu?> <?import javafx.scene.control.Menu?>
<?import javafx.scene.control.MenuBar?> <?import javafx.scene.control.MenuBar?>
<?import javafx.scene.control.MenuItem?> <?import javafx.scene.control.MenuItem?>
<?import javafx.scene.control.ScrollPane?> <?import javafx.scene.control.ScrollPane?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.BorderPane?> <?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.ColumnConstraints?> <?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?> <?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.HBox?> <?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.RowConstraints?> <?import javafx.scene.layout.RowConstraints?>
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="rekisteri.RalliGUIController"> <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="394.0" prefWidth="788.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.RalliController">
<top> <top>
<MenuBar BorderPane.alignment="CENTER"> <MenuBar BorderPane.alignment="CENTER">
<menus> <menus>
...@@ -50,33 +52,114 @@ ...@@ -50,33 +52,114 @@
</HBox> </HBox>
</bottom> </bottom>
<left> <left>
<BorderPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER"> <BorderPane prefHeight="328.0" prefWidth="170.0" BorderPane.alignment="CENTER">
<top> <bottom>
<Label text="Hakuehto" BorderPane.alignment="CENTER" /> <ListChooser fx:id="chooserHenkilot" prefHeight="277.0" prefWidth="170.0" rivit="Kalle Rovanperä&#10;Tommi Mäkinen&#10;Harri Rovanperä&#10;Oskari Sokka" BorderPane.alignment="CENTER" />
</top> </bottom>
<center> <center>
<ComboBox fx:id="rajaus" onAction="#handleRajaus" prefWidth="150.0" BorderPane.alignment="CENTER" /> <ComboBoxChooser prefHeight="26.0" prefWidth="101.0" rivit="...&#10;Kuskit&#10;Kartturit&#10;Rallit&#10;Paikkakunta&#10;" BorderPane.alignment="CENTER">
<BorderPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" />
</BorderPane.margin>
</ComboBoxChooser>
</center> </center>
<top>
<Label text="Hakuehto" BorderPane.alignment="CENTER">
<BorderPane.margin>
<Insets left="10.0" right="10.0" top="10.0" />
</BorderPane.margin>
</Label>
</top>
</BorderPane> </BorderPane>
</left> </left>
<center> <center>
<ScrollPane fitToWidth="true" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER"> <ScrollPane fx:id="panelHenkilo" fitToWidth="true" prefHeight="317.0" prefWidth="336.0" BorderPane.alignment="CENTER">
<content> <content>
<GridPane hgap="10.0"> <GridPane hgap="10.0" prefHeight="253.0" prefWidth="331.0">
<columnConstraints> <columnConstraints>
<ColumnConstraints fillWidth="false" halignment="RIGHT" hgrow="SOMETIMES" minWidth="10.0" /> <ColumnConstraints fillWidth="false" halignment="RIGHT" hgrow="SOMETIMES" />
<ColumnConstraints fillWidth="false" hgrow="ALWAYS" /> <ColumnConstraints hgrow="ALWAYS" />
</columnConstraints> </columnConstraints>
<rowConstraints> <rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints> </rowConstraints>
<padding> <padding>
<Insets left="10.0" right="10.0" top="10.0" /> <Insets left="10.0" right="10.0" top="10.0" />
</padding> </padding>
<children>
<Label text="Rallin nimi" />
<Label text="Paikkakunta" GridPane.rowIndex="1" />
<Label text="Ajankohta" GridPane.rowIndex="2" />
<Label text="Järjestäjä" GridPane.rowIndex="3" />
<Label text="Nettisivut" GridPane.rowIndex="4" />
<Label text="Osallistujalista" GridPane.rowIndex="5" />
<Label text="Tuloslista" GridPane.rowIndex="6" />
<Label fx:id="rallinNimi" text="SM-ralli Pohjanmaa" GridPane.columnIndex="1" />
<Label fx:id="rallinTuloslista" text="www.Facobook.com" GridPane.columnIndex="1" GridPane.rowIndex="6" />
<Label fx:id="rallinOsallistujalista" text="www.Youtube.com" GridPane.columnIndex="1" GridPane.rowIndex="5" />
<Label fx:id="rallinNettisivut" text="www.Google.com" GridPane.columnIndex="1" GridPane.rowIndex="4" />
<Label fx:id="rallinJarjestaja" text="Seinäjoen rämäpäät" GridPane.columnIndex="1" GridPane.rowIndex="3" />
<Label fx:id="rallinPvm" text="27.6.-28.6.2023" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<Label fx:id="rallinSijainti" text="Seinäjoki" GridPane.columnIndex="1" GridPane.rowIndex="1" />
</children>
</GridPane> </GridPane>
</content> </content>
</ScrollPane> </ScrollPane>
</center> </center>
<right>
<ScrollPane prefHeight="318.0" prefWidth="314.0" BorderPane.alignment="CENTER">
<content>
<GridPane hgap="10.0" prefHeight="183.0" prefWidth="314.0">
<columnConstraints>
<ColumnConstraints fillWidth="false" halignment="RIGHT" hgrow="SOMETIMES" minWidth="10.0" />
<ColumnConstraints hgrow="ALWAYS" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<padding>
<Insets left="10.0" right="10.0" top="10.0" />
</padding>
<children>
<Label text="Yleiskilpailun voittaja" GridPane.rowIndex="1" />
<TextField GridPane.columnIndex="1" GridPane.rowIndex="1">
<GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin>
</TextField>
<Label text="Osallistujien määrä" GridPane.rowIndex="2" />
<TextField prefHeight="26.0" prefWidth="93.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
<GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin>
</TextField>
<TextField GridPane.columnIndex="1" GridPane.rowIndex="3">
<GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin>
</TextField>
<Label text="Osallistumismaksu" GridPane.rowIndex="4" />
<TextField GridPane.columnIndex="1" GridPane.rowIndex="4">
<GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin>
</TextField>
<Label text="Luokkien määrä" GridPane.rowIndex="3" />
</children>
</GridPane>
</content>
</ScrollPane>
</right>
</BorderPane> </BorderPane>
File added
File moved
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.ChoiceBox?>
<?import javafx.scene.control.DatePicker?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.Menu?>
<?import javafx.scene.control.MenuBar?>
<?import javafx.scene.control.MenuItem?>
<?import javafx.scene.control.Tab?>
<?import javafx.scene.control.TabPane?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.AnchorPane?>
<?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 maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="367.0" prefWidth="472.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fi.jyu.mit.fxgui.ModalController">
<center>
<TabPane prefHeight="200.0" prefWidth="200.0" tabClosingPolicy="UNAVAILABLE" BorderPane.alignment="CENTER">
<tabs>
<Tab text="Muokkaa rallia">
<content>
<AnchorPane minHeight="0.0" minWidth="0.0">
<children>
<GridPane layoutX="72.0" layoutY="36.0">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="123.199951171875" minWidth="10.0" prefWidth="84.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="172.0" minWidth="10.0" prefWidth="151.20001220703125" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="134.79998779296875" minWidth="10.0" prefWidth="134.79998779296875" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="28.79999389648438" minHeight="0.0" prefHeight="28.00000610351563" vgrow="SOMETIMES" />
<RowConstraints maxHeight="60.80000000000001" minHeight="10.0" prefHeight="30.399993896484375" vgrow="SOMETIMES" />
<RowConstraints maxHeight="34.400006103515636" minHeight="10.0" prefHeight="34.400006103515636" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label text="Rallin nimi" GridPane.columnIndex="1" />
<Label text="Paikkakunta" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<Label text="Ajankohta" GridPane.rowIndex="2" />
<TextField GridPane.columnIndex="2" />
<ChoiceBox prefWidth="150.0" GridPane.columnIndex="2" GridPane.rowIndex="1" />
<DatePicker GridPane.columnIndex="1" GridPane.rowIndex="2">
<GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin>
</DatePicker>
<DatePicker prefHeight="26.0" prefWidth="128.0" GridPane.columnIndex="2" GridPane.rowIndex="2">
<GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin>
</DatePicker>
<TextField GridPane.columnIndex="2" GridPane.rowIndex="3" />
<TextField GridPane.columnIndex="2" GridPane.rowIndex="4" />
<Label prefHeight="18.0" prefWidth="157.0" text="Linkki tapahtuman sivuille" GridPane.columnIndex="1" GridPane.rowIndex="4" />
<Label text="Järjestäjä" GridPane.columnIndex="1" GridPane.rowIndex="3" />
<Button mnemonicParsing="false" onAction="#handleDefaultOK" prefHeight="25.0" prefWidth="131.0" text="Osallistujalista" GridPane.columnIndex="2" GridPane.rowIndex="5" />
<Button mnemonicParsing="false" onAction="#handleDefaultOK" prefHeight="25.0" prefWidth="132.0" text="Tuloslista" GridPane.columnIndex="2" GridPane.rowIndex="6" />
</children>
</GridPane>
</children></AnchorPane>
</content>
</Tab>
</tabs>
</TabPane>
</center>
<top>
<MenuBar BorderPane.alignment="CENTER">
<menus>
<Menu mnemonicParsing="false" text="Tiedosto">
<items>
<MenuItem mnemonicParsing="false" text="Close" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Muokkaa">
<items>
<MenuItem mnemonicParsing="false" text="Delete" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Apua">
<items>
<MenuItem mnemonicParsing="false" text="About" />
</items>
</Menu>
</menus>
</MenuBar>
</top>
<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 mnemonicParsing="false" onAction="#handleDefaultCancel" text="Peruuta" />
<Button mnemonicParsing="false" onAction="#handleDefaultOK" text="Tallenna" />
</children>
</HBox>
</bottom>
</BorderPane>
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?> <?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.Menu?> <?import javafx.scene.control.Menu?>
<?import javafx.scene.control.MenuBar?> <?import javafx.scene.control.MenuBar?>
<?import javafx.scene.control.MenuItem?> <?import javafx.scene.control.MenuItem?>
<?import javafx.scene.control.TextField?> <?import javafx.scene.control.ScrollPane?>
<?import javafx.scene.control.Tab?>
<?import javafx.scene.control.TabPane?>
<?import javafx.scene.control.ToolBar?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.BorderPane?> <?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.text.Font?>
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="rekisteri.RalliGUIController">
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
<top> <top>
<MenuBar BorderPane.alignment="CENTER"> <MenuBar BorderPane.alignment="CENTER">
<menus> <menus>
<Menu mnemonicParsing="false" text="Tiedosto"> <Menu mnemonicParsing="false" text="File">
<items> <items>
<MenuItem mnemonicParsing="false" text="Close" /> <MenuItem mnemonicParsing="false" text="Close" />
</items> </items>
</Menu> </Menu>
<Menu mnemonicParsing="false" text="Muokkaa"> <Menu mnemonicParsing="false" text="Edit">
<items> <items>
<MenuItem mnemonicParsing="false" text="Delete" /> <MenuItem mnemonicParsing="false" text="Delete" />
</items> </items>
</Menu> </Menu>
<Menu mnemonicParsing="false" text="Apua"> <Menu mnemonicParsing="false" text="Help">
<items> <items>
<MenuItem mnemonicParsing="false" text="About" /> <MenuItem mnemonicParsing="false" text="About" />
</items> </items>
...@@ -33,39 +34,43 @@ ...@@ -33,39 +34,43 @@
</menus> </menus>
</MenuBar> </MenuBar>
</top> </top>
<center>
<Label text="Rallirekisteri" BorderPane.alignment="CENTER_LEFT">
<font>
<Font size="55.0" />
</font>
</Label>
</center>
<bottom> <bottom>
<HBox spacing="10.0" BorderPane.alignment="CENTER"> <ToolBar prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<BorderPane.margin> <items>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" /> <Button mnemonicParsing="false" onAction="#handlePoistu" text="Poistu" />
</BorderPane.margin> </items>
</ToolBar>
</bottom>
<center>
<TabPane prefHeight="200.0" prefWidth="200.0" tabClosingPolicy="UNAVAILABLE" BorderPane.alignment="CENTER">
<tabs>
<Tab text="Osallistujalista">
<content>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="300.0" prefWidth="590.0">
<children> <children>
<Button mnemonicParsing="false" onAction="#handleUusi" text="Lisää Uusi" /> <ScrollPane layoutX="12.0" prefHeight="299.0" prefWidth="578.0">
<TextField fx:id="hakukentta" /> <content>
<Button alignment="CENTER" mnemonicParsing="false" onAction="#handleHae" text="Hae"> <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="297.0" prefWidth="577.0" />
<HBox.margin> </content>
<Insets /> </ScrollPane>
</HBox.margin>
</Button>
<Button mnemonicParsing="false" onAction="#handleLopeta" text="Lopeta" />
</children> </children>
</HBox> </AnchorPane>
</bottom> </content>
<left> </Tab>
<BorderPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER"> <Tab text="Tulokset">
<top> <content>
<Button mnemonicParsing="false" onAction="#handleTarkasteluun" text="Tarkasteluun" BorderPane.alignment="TOP_LEFT"> <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
<BorderPane.margin> <children>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" /> <ScrollPane layoutX="11.0" layoutY="9.0" prefHeight="290.0" prefWidth="582.0">
</BorderPane.margin> <content>
</Button> <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="291.0" prefWidth="582.0" />
</top> </content>
</BorderPane> </ScrollPane>
</left> </children>
</AnchorPane>
</content>
</Tab>
</tabs>
</TabPane>
</center>
</BorderPane> </BorderPane>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<?import javafx.scene.layout.HBox?> <?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.RowConstraints?> <?import javafx.scene.layout.RowConstraints?>
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fi.jyu.mit.fxgui.ModalController"> <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="402.0" prefWidth="483.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fi.jyu.mit.fxgui.ModalController">
<center> <center>
<TabPane prefHeight="200.0" prefWidth="200.0" tabClosingPolicy="UNAVAILABLE" BorderPane.alignment="CENTER"> <TabPane prefHeight="200.0" prefWidth="200.0" tabClosingPolicy="UNAVAILABLE" BorderPane.alignment="CENTER">
<tabs> <tabs>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<content> <content>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0"> <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
<children> <children>
<GridPane layoutX="360.0" layoutY="28.0"> <GridPane layoutX="206.0" layoutY="29.0">
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
...@@ -49,11 +49,11 @@ ...@@ -49,11 +49,11 @@
<CheckBox fx:id="onKuljettaja" mnemonicParsing="false" text="Kuljettaja" GridPane.rowIndex="2" /> <CheckBox fx:id="onKuljettaja" mnemonicParsing="false" text="Kuljettaja" GridPane.rowIndex="2" />
</children> </children>
</GridPane> </GridPane>
<GridPane layoutX="40.0" layoutY="183.0" prefHeight="91.0" prefWidth="529.0"> <GridPane layoutX="135.0" layoutY="164.0">
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> <ColumnConstraints hgrow="SOMETIMES" maxWidth="124.79998779296875" minWidth="10.0" prefWidth="124.79998779296875" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> <ColumnConstraints hgrow="SOMETIMES" maxWidth="124.00000000000001" minWidth="10.0" prefWidth="103.19995117187501" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> <ColumnConstraints hgrow="SOMETIMES" maxWidth="95.20001220703125" minWidth="10.0" prefWidth="72.800048828125" />
</columnConstraints> </columnConstraints>
<rowConstraints> <rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
...@@ -76,39 +76,40 @@ ...@@ -76,39 +76,40 @@
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" /> <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin> </GridPane.margin>
</Label> </Label>
<TextField GridPane.rowIndex="1"> <TextField GridPane.columnIndex="1" GridPane.rowIndex="1">
<GridPane.margin> <GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" /> <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin> </GridPane.margin>
</TextField> </TextField>
<TextField GridPane.columnIndex="1" GridPane.rowIndex="1"> <TextField GridPane.columnIndex="2" GridPane.rowIndex="1">
<GridPane.margin> <GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" /> <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin> </GridPane.margin>
</TextField> </TextField>
<TextField GridPane.columnIndex="2" GridPane.rowIndex="1"> <TextField GridPane.columnIndex="1" GridPane.rowIndex="2">
<GridPane.margin> <GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" /> <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin> </GridPane.margin>
</TextField> </TextField>
<TextField GridPane.rowIndex="2"> <TextField GridPane.columnIndex="2" GridPane.rowIndex="2">
<GridPane.margin> <GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" /> <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin> </GridPane.margin>
</TextField> </TextField>
<TextField GridPane.columnIndex="1" GridPane.rowIndex="2"> <ChoiceBox prefWidth="150.0" GridPane.rowIndex="1">
<GridPane.margin> <GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" /> <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin> </GridPane.margin>
</TextField> </ChoiceBox>
<TextField GridPane.columnIndex="2" GridPane.rowIndex="2"> <ChoiceBox prefWidth="150.0" GridPane.rowIndex="2">
<GridPane.margin> <GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" /> <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin> </GridPane.margin>
</TextField> </ChoiceBox>
</children> </children>
</GridPane> </GridPane>
<Label layoutX="346.0" layoutY="276.0" text="Ideointi rallien lisäämiseen vielä kesken..." /> <Label layoutX="150.0" layoutY="276.0" text="Ideointi rallien lisäämiseen vielä kesken..." />
<Button layoutX="407.0" layoutY="272.0" mnemonicParsing="false" onAction="#handleDefaultOK" text="Tallenna" />
</children> </children>
</AnchorPane> </AnchorPane>
</content> </content>
...@@ -117,7 +118,7 @@ ...@@ -117,7 +118,7 @@
<content> <content>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0"> <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
<children> <children>
<GridPane layoutX="194.0" layoutY="21.0" prefHeight="238.0" prefWidth="384.0"> <GridPane layoutX="46.0" layoutY="33.0">
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="123.199951171875" minWidth="10.0" prefWidth="84.0" /> <ColumnConstraints hgrow="SOMETIMES" maxWidth="123.199951171875" minWidth="10.0" prefWidth="84.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="172.0" minWidth="10.0" prefWidth="151.20001220703125" /> <ColumnConstraints hgrow="SOMETIMES" maxWidth="172.0" minWidth="10.0" prefWidth="151.20001220703125" />
...@@ -154,10 +155,14 @@ ...@@ -154,10 +155,14 @@
<TextField GridPane.columnIndex="2" GridPane.rowIndex="6" /> <TextField GridPane.columnIndex="2" GridPane.rowIndex="6" />
<Label text="Tuloslista" GridPane.columnIndex="1" GridPane.rowIndex="6" /> <Label text="Tuloslista" GridPane.columnIndex="1" GridPane.rowIndex="6" />
<Label text="Osallistujalista" GridPane.columnIndex="1" GridPane.rowIndex="5" /> <Label text="Osallistujalista" GridPane.columnIndex="1" GridPane.rowIndex="5" />
<Label prefHeight="18.0" prefWidth="157.0" text="Linkki tapahtuman sivuille" GridPane.columnIndex="1" GridPane.rowIndex="4" /> <Label text="Linkki tapahtuman sivuille" GridPane.columnIndex="1" GridPane.rowIndex="4" />
<Label text="Järjestäjä" GridPane.columnIndex="1" GridPane.rowIndex="3" /> <Label text="Järjestäjä" GridPane.columnIndex="1" GridPane.rowIndex="3" />
</children> </children>
<padding>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</padding>
</GridPane> </GridPane>
<Button layoutX="408.0" layoutY="267.0" mnemonicParsing="false" onAction="#handleDefaultOK" text="Tallenna" />
</children></AnchorPane> </children></AnchorPane>
</content> </content>
</Tab> </Tab>
...@@ -192,7 +197,6 @@ ...@@ -192,7 +197,6 @@
</BorderPane.margin> </BorderPane.margin>
<children> <children>
<Button mnemonicParsing="false" onAction="#handleDefaultCancel" text="Peruuta" /> <Button mnemonicParsing="false" onAction="#handleDefaultCancel" text="Peruuta" />
<Button mnemonicParsing="false" onAction="#handleDefaultOK" text="Tallenna" />
</children> </children>
</HBox> </HBox>
</bottom> </bottom>
......
<?xml version="1.0" encoding="ASCII"?> <?xml version="1.0" encoding="ASCII"?>
<anttasks:AntTask xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:anttasks="http://org.eclipse.fx.ide.jdt/1.0" buildDirectory="${project}/build"> <anttasks:AntTask xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:anttasks="http://org.eclipse.fx.ide.jdt/1.0" buildDirectory="${project}/build">
<deploy> <deploy>
<application name="ht"/> <application name="kerho"/>
<info/> <info/>
</deploy> </deploy>
<signjar/> <signjar/>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment