From a8e75cb558f2a75dd92d2711d989f3fe8add8bac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Koivisto=20Ida=20Maria=20Hannuntyt=C3=A4r?=
 <ida.m.koivisto@student.jyu.fi>
Date: Thu, 16 Feb 2023 19:31:09 +0200
Subject: [PATCH] muokkauksia

---
 src/rekisteri/tarkastele.fxml | 87 +++++++++++++++++++++++------------
 1 file changed, 58 insertions(+), 29 deletions(-)

diff --git a/src/rekisteri/tarkastele.fxml b/src/rekisteri/tarkastele.fxml
index 02afda0..78aa84c 100644
--- a/src/rekisteri/tarkastele.fxml
+++ b/src/rekisteri/tarkastele.fxml
@@ -1,53 +1,82 @@
 <?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.ChoiceBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Menu?>
 <?import javafx.scene.control.MenuBar?>
 <?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.control.TextArea?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.control.ScrollPane?>
+<?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?>
 
 
-<Pane 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">
-   <children>
-      <MenuBar layoutY="2.0" prefHeight="26.0" prefWidth="600.0">
+<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>
+      <MenuBar BorderPane.alignment="CENTER">
         <menus>
-          <Menu mnemonicParsing="false" text="File">
+          <Menu mnemonicParsing="false" text="Tiedosto">
             <items>
               <MenuItem mnemonicParsing="false" text="Close" />
             </items>
           </Menu>
-          <Menu mnemonicParsing="false" text="Edit">
+          <Menu mnemonicParsing="false" text="Muokkaa">
             <items>
               <MenuItem mnemonicParsing="false" text="Delete" />
             </items>
           </Menu>
-          <Menu mnemonicParsing="false" text="Help">
+          <Menu mnemonicParsing="false" text="Apua">
             <items>
               <MenuItem mnemonicParsing="false" text="About" />
             </items>
           </Menu>
         </menus>
       </MenuBar>
-      <ChoiceBox layoutX="14.0" layoutY="59.0" prefWidth="150.0" />
-      <Button layoutX="14.0" layoutY="355.0" mnemonicParsing="false" text="Lisää uusi" />
-      <Button layoutX="97.0" layoutY="355.0" mnemonicParsing="false" text="Muokkaa tietoja" />
-      <Button layoutX="537.0" layoutY="355.0" mnemonicParsing="false" text="Poistu" />
-      <TextArea layoutX="15.0" layoutY="84.0" prefHeight="116.0" prefWidth="150.0" text="Auto&#10;Henkilö&#10;Paikkakunta&#10;Ralli&#10;Seura&#10;Vuosi" />
-      <Label layoutX="23.0" layoutY="63.0" text="Hakuehto" />
-      <TableView layoutX="172.0" layoutY="59.0" prefHeight="290.0" prefWidth="414.0">
-        <columns>
-          <TableColumn prefWidth="126.4000244140625" text="Tulokset aakkosjärjestyksessä" />
-          <TableColumn minWidth="0.0" prefWidth="124.0" text="Esim. Henkilön tiedot" />
-            <TableColumn prefWidth="162.4000244140625" text="Esim. Henkilön rallimenestys" />
-        </columns>
-      </TableView>
-      <TextField layoutX="16.0" layoutY="235.0" />
-      <Label layoutX="16.0" layoutY="218.0" text="Hakusana" />
-   </children>
-</Pane>
+   </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" text="Lisää uusi" />
+            <Button mnemonicParsing="false" text="Muokkaa tietoja" />
+            <Button mnemonicParsing="false" text="Poistu" />
+         </children>
+      </HBox>
+   </bottom>
+   <left>
+      <BorderPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+         <top>
+            <Label text="Rallit" BorderPane.alignment="CENTER" />
+         </top>
+         <center>
+            <ListChooser rivit="SM-Ralli Pohjanmaa&#10;TGS-Ralli Korpilahti&#10;Takomoralli" BorderPane.alignment="CENTER" />
+         </center>
+      </BorderPane>
+   </left>
+   <center>
+      <ScrollPane fitToWidth="true" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+         <content>
+            <GridPane hgap="10.0">
+              <columnConstraints>
+                <ColumnConstraints fillWidth="false" halignment="RIGHT" hgrow="SOMETIMES" minWidth="10.0" />
+                <ColumnConstraints fillWidth="false" 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>
+               <padding>
+                  <Insets left="10.0" right="10.0" top="10.0" />
+               </padding>
+            </GridPane>
+         </content>
+      </ScrollPane>
+   </center>
+</BorderPane>
-- 
GitLab