From a5d8b7256a73c13bb94e64daad4fb5e8180af9e7 Mon Sep 17 00:00:00 2001
From: pohjjuan <jussi.a.pohjola@student.jyu.fi>
Date: Thu, 23 Jan 2020 13:49:39 +0200
Subject: [PATCH] uusi yritys
---
src/fxHiihtorekisteri/PaaikkunaGUIView.fxml | 63 ++++++++++++++-------
1 file changed, 43 insertions(+), 20 deletions(-)
diff --git a/src/fxHiihtorekisteri/PaaikkunaGUIView.fxml b/src/fxHiihtorekisteri/PaaikkunaGUIView.fxml
index e05d8ab..1500c08 100644
--- a/src/fxHiihtorekisteri/PaaikkunaGUIView.fxml
+++ b/src/fxHiihtorekisteri/PaaikkunaGUIView.fxml
@@ -1,8 +1,10 @@
<?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.scene.control.Button?>
+<?import javafx.scene.control.DatePicker?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.Menu?>
<?import javafx.scene.control.MenuBar?>
@@ -16,6 +18,7 @@
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
<BorderPane xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fxHiihtorekisteri.HiihtorekisteriGUIController">
<bottom>
@@ -24,11 +27,11 @@
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</BorderPane.margin>
<children>
- <Button text="_Uusi jäsen">
+ <Button text="_Lisää hiihto">
<tooltip>
<Tooltip text="Uuden jäsenen lisääminen" />
</tooltip></Button>
- <Button mnemonicParsing="false" text="Tallenna">
+ <Button mnemonicParsing="false" text="Hiihtäjän tiedot">
<tooltip>
<Tooltip text="Tallenna" />
</tooltip></Button>
@@ -38,23 +41,22 @@
<top>
<MenuBar BorderPane.alignment="CENTER">
<menus>
- <Menu mnemonicParsing="false" text="File">
+ <Menu mnemonicParsing="false" text="Tiedosto">
<items>
<MenuItem mnemonicParsing="false" text="Tallenna">
<accelerator>
<KeyCodeCombination alt="UP" code="S" control="DOWN" meta="UP" shift="UP" shortcut="UP" />
</accelerator></MenuItem>
+ <MenuItem mnemonicParsing="false" text="Tulosta" />
+ <MenuItem mnemonicParsing="false" text="Lisää hiihtäjä" />
+ <MenuItem mnemonicParsing="false" text="Poista hiihtäjä" />
<MenuItem mnemonicParsing="false" text="Lopeta" />
</items>
</Menu>
- <Menu mnemonicParsing="false" text="Edit">
+ <Menu mnemonicParsing="false" text="Ohje">
<items>
- <MenuItem mnemonicParsing="false" text="Delete" />
- </items>
- </Menu>
- <Menu mnemonicParsing="false" text="Help">
- <items>
- <MenuItem mnemonicParsing="false" text="About" />
+ <MenuItem mnemonicParsing="false" text="Käyttöohjeet" />
+ <MenuItem mnemonicParsing="false" text="Tietoja" />
</items>
</Menu>
</menus>
@@ -63,11 +65,19 @@
<left>
<BorderPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<top>
- <Label text="Jäsenet" BorderPane.alignment="CENTER" />
+ <VBox BorderPane.alignment="CENTER">
+ <children>
+ <ComboBoxChooser rivit="Nimi Paikkakunta " />
+ <TextField prefHeight="0.0" prefWidth="200.0" />
+ <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0">
+ <children>
+ <Label contentDisplay="CENTER" text="Hiihtäjät" textAlignment="CENTER" wrapText="true" />
+ <ListChooser rivit=" " />
+ </children>
+ </VBox>
+ </children>
+ </VBox>
</top>
- <center>
- <ListChooser BorderPane.alignment="CENTER" />
- </center>
</BorderPane>
</left>
<center>
@@ -75,23 +85,36 @@
<content>
<GridPane hgap="10.0">
<columnConstraints>
- <ColumnConstraints fillWidth="false" halignment="RIGHT" hgrow="SOMETIMES" minWidth="10.0" />
- <ColumnConstraints hgrow="ALWAYS" />
+ <ColumnConstraints fillWidth="false" halignment="RIGHT" hgrow="SOMETIMES" />
+ <ColumnConstraints hgrow="ALWAYS" maxWidth="140.00004069010416" minWidth="69.33333841959634" prefWidth="83.33335367838542" />
</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 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>
- <TextField GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" />
- <TextField GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1" />
- <TextField GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2" />
- <TextField GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3" />
+ <Label text="Suorituspvm." />
+ <DatePicker GridPane.columnIndex="1" />
+ <Label text="Matka" GridPane.rowIndex="1" />
+ <TextField text="50" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1" />
+ <Label text="Hiihtoaika" GridPane.rowIndex="2" />
+ <TextField text="01:30" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+ <Label text="Lämpötila" GridPane.rowIndex="3" />
+ <TextField text="-5" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3" />
+ <Label text="Keskisyke" GridPane.rowIndex="4" />
+ <TextField text="135" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+ <Label text="Maksimisyke" GridPane.rowIndex="5" />
+ <TextField text="180" GridPane.columnIndex="1" GridPane.rowIndex="5" />
+ <Label text="Kalorit" GridPane.rowIndex="6" />
+ <TextField text="550" GridPane.columnIndex="1" GridPane.rowIndex="6" />
</children>
</GridPane>
</content>
--
GitLab