From 85542ad3a622c300e996c0128b97f16f5e78a714 Mon Sep 17 00:00:00 2001
From: juhu1705 <Fabius1705@live.de>
Date: Mon, 6 Jan 2020 12:24:51 +0100
Subject: [PATCH] Changes

---
 .../resources/assets/layouts/GUIClient.fxml   |  74 ++++++-------
 .../resources/assets/layouts/GUIServer.fxml   | 100 +++++-------------
 2 files changed, 61 insertions(+), 113 deletions(-)

diff --git a/ModellTrainController/resources/assets/layouts/GUIClient.fxml b/ModellTrainController/resources/assets/layouts/GUIClient.fxml
index f110003..8412109 100644
--- a/ModellTrainController/resources/assets/layouts/GUIClient.fxml
+++ b/ModellTrainController/resources/assets/layouts/GUIClient.fxml
@@ -1,48 +1,48 @@
 <?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.Menu?>
-<?import javafx.scene.control.MenuBar?>
-<?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.RadioButton?>
-<?import javafx.scene.control.Spinner?>
+<?import javafx.scene.control.SplitPane?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.StackPane?>
-<?import javafx.scene.layout.VBox?>
 
-
-<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.noisruker.client.gui.GUIClient">
-   <top>
-       <MenuBar BorderPane.alignment="CENTER">
-           <Menu mnemonicParsing="false" text="File">
-               <MenuItem mnemonicParsing="false" text="Close"/>
-           </Menu>
-           <Menu mnemonicParsing="false" text="Edit">
-               <MenuItem mnemonicParsing="false" text="Delete"/>
-           </Menu>
-           <Menu mnemonicParsing="false" text="Help">
-               <MenuItem mnemonicParsing="false" text="About"/>
-           </Menu>
-       </MenuBar>
-   </top>
-   <center>
-       <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0" BorderPane.alignment="CENTER">
-           <padding>
-               <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
-           </padding>
-           <Label text="Address"/>
-           <Spinner fx:id="address"/>
-           <Label text="Speed"/>
-           <Spinner fx:id="speed"/>
-           <Label text="Foreward"/>
-           <RadioButton fx:id="foreward" mnemonicParsing="false" text="Foreward"/>
-       </VBox>
-   </center>
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="677.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.noisruker.client.gui.GUIClient">
    <bottom>
        <StackPane prefHeight="76.0" prefWidth="600.0" BorderPane.alignment="CENTER">
-           <Button mnemonicParsing="false" onAction="#onSend" text="Send"/>
+           <Button mnemonicParsing="false" onAction="#onSend" text="Send" />
        </StackPane>
    </bottom>
+   <top>
+      <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="361.0" prefWidth="600.0" BorderPane.alignment="CENTER">
+         <center>
+            <BorderPane prefHeight="200.0" prefWidth="200.0">
+               <right>
+                  <TableView fx:id="players" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+                    <columns>
+                      <TableColumn fx:id="name" prefWidth="75.0" text="%name" />
+                      <TableColumn fx:id="permissionlevel" prefWidth="75.0" text="%permissionlevel" />
+                    </columns>
+                     <columnResizePolicy>
+                        <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+                     </columnResizePolicy>
+                  </TableView>
+               </right>
+               <bottom>
+                  <SplitPane dividerPositions="0.5" prefHeight="33.0" prefWidth="600.0" BorderPane.alignment="CENTER">
+                     <items>
+                        <TextField fx:id="send" />
+                        <Button mnemonicParsing="false" onAction="#onSend" text="%send.text" />
+                     </items>
+                  </SplitPane>
+               </bottom>
+               <center>
+                  <TextArea fx:id="messages" prefHeight="313.0" prefWidth="364.0" BorderPane.alignment="CENTER" />
+               </center>
+            </BorderPane>
+         </center>
+      </BorderPane>
+   </top>
 </BorderPane>
diff --git a/ModellTrainController/resources/assets/layouts/GUIServer.fxml b/ModellTrainController/resources/assets/layouts/GUIServer.fxml
index 06b310d..30d9361 100644
--- a/ModellTrainController/resources/assets/layouts/GUIServer.fxml
+++ b/ModellTrainController/resources/assets/layouts/GUIServer.fxml
@@ -1,90 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ContextMenu?>
-<?import javafx.scene.control.Menu?>
-<?import javafx.scene.control.MenuBar?>
-<?import javafx.scene.control.MenuItem?>
 <?import javafx.scene.control.SplitPane?>
-<?import javafx.scene.control.Tab?>
-<?import javafx.scene.control.TabPane?>
 <?import javafx.scene.control.TableColumn?>
 <?import javafx.scene.control.TableView?>
 <?import javafx.scene.control.TextArea?>
 <?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.BorderPane?>
 
 <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.noisruker.server.gui.GUIServer">
-   <top>
-       <MenuBar BorderPane.alignment="CENTER">
-           <Menu mnemonicParsing="false" text="File">
-            <MenuItem mnemonicParsing="false" text="AddTrain" />
-               <MenuItem mnemonicParsing="false" text="Close" />
-            <MenuItem mnemonicParsing="false" text="On Drive 2" />
-            <MenuItem mnemonicParsing="false" text="Test" />
-           </Menu>
-           <Menu mnemonicParsing="false" text="Help">
-               <MenuItem mnemonicParsing="false" text="About" />
-           </Menu>
-       </MenuBar>
-   </top>
    <center>
-      <TabPane prefHeight="311.0" prefWidth="600.0" tabClosingPolicy="UNAVAILABLE" BorderPane.alignment="CENTER">
-        <tabs>
-          <Tab text="%tab.trains">
-               <content>
-                  <TableView fx:id="trains" prefHeight="200.0" prefWidth="200.0">
-                    <columns>
-                      <TableColumn fx:id="slot" editable="false" prefWidth="75.0" text="Zug" />
-                      <TableColumn fx:id="speed" prefWidth="75.0" text="Geschwindigkeit" />
-                    </columns>
-                     <contextMenu>
-                        <ContextMenu>
-                          <items>
-                            <MenuItem mnemonicParsing="false" onAction="#addTrain" text="Füge Hinzu" />
-                          </items>
-                        </ContextMenu>
-                     </contextMenu>
-                     <columnResizePolicy>
-                        <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-                     </columnResizePolicy>
-                  </TableView>
-               </content></Tab>
-            <Tab text="%tab.locoNet">
-              <content>
-                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
-              </content>
-            </Tab>
-            <Tab text="%tab.chat">
-               <content>
-                  <BorderPane prefHeight="200.0" prefWidth="200.0">
-                     <right>
-                        <TableView fx:id="players" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
-                          <columns>
-                            <TableColumn fx:id="name" prefWidth="75.0" text="%name" />
-                            <TableColumn fx:id="permissionlevel" prefWidth="75.0" text="%permissionlevel" />
-                          </columns>
-                           <columnResizePolicy>
-                              <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-                           </columnResizePolicy>
-                        </TableView>
-                     </right>
-                     <bottom>
-                        <SplitPane dividerPositions="0.5" prefHeight="33.0" prefWidth="600.0" BorderPane.alignment="CENTER">
-                           <items>
-                              <TextField />
-                              <Button mnemonicParsing="false" text="%send.text" />
-                           </items>
-                        </SplitPane>
-                     </bottom>
-                     <center>
-                        <TextArea prefHeight="313.0" prefWidth="364.0" BorderPane.alignment="CENTER" />
-                     </center>
-                  </BorderPane>
-               </content>
-            </Tab>
-        </tabs>
-      </TabPane>
+      <BorderPane prefHeight="200.0" prefWidth="200.0">
+         <right>
+            <TableView fx:id="players" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+              <columns>
+                <TableColumn fx:id="name" prefWidth="75.0" text="%name" />
+                <TableColumn fx:id="permissionlevel" prefWidth="75.0" text="%permissionlevel" />
+              </columns>
+               <columnResizePolicy>
+                  <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+               </columnResizePolicy>
+            </TableView>
+         </right>
+         <bottom>
+            <SplitPane dividerPositions="0.5" prefHeight="33.0" prefWidth="600.0" BorderPane.alignment="CENTER">
+               <items>
+                  <TextField fx:id="send" />
+                  <Button mnemonicParsing="false" onAction="#onSend" text="%send.text" />
+               </items>
+            </SplitPane>
+         </bottom>
+         <center>
+            <TextArea fx:id="messages" prefHeight="313.0" prefWidth="364.0" BorderPane.alignment="CENTER" />
+         </center>
+      </BorderPane>
    </center>
 </BorderPane>