From a62a941fdbc32e69676592482c3fd2c0ecbcbd65 Mon Sep 17 00:00:00 2001 From: pstenkamp <philipp.stenkamp@hs-bochum.de> Date: Fri, 13 Jan 2017 15:44:02 +0100 Subject: [PATCH] =?UTF-8?q?minor=20changes,=20fixed=20"=C3=A4"=20and=20"?= =?UTF-8?q?=C3=BC"=20again.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bin/gui/view/EngineController.class | Bin 5432 -> 5416 bytes .../src/gui/view/ControlTabs.fxml | 34 ------------------ .../src/gui/view/EngineController.java | 6 ++-- 3 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 Praktikum/VINF_MaerklinControl/src/gui/view/ControlTabs.fxml diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/view/EngineController.class b/Praktikum/VINF_MaerklinControl/bin/gui/view/EngineController.class index ac6c3bc2ed9cfeeccd962c48cd2f8f6d876a5212..45f236aaad3c91ed9a6ce7b8df5c80565051e719 100644 GIT binary patch delta 51 zcmdm?wL)t{I=2L8S$<LZ;Uz^S#T*Qm85y{X4)00ME<e0vayNH67mq?>X>odL`Qas- Hcq}*p27VL5 delta 68 zcmZ3XwL@z|I=2dMS$<LZ;q{01AKF_~Qp~|{nUO)b2*OX!hDuDX=T7GnP)IB-PEUmj KZT`S*!3h9R*dW>f diff --git a/Praktikum/VINF_MaerklinControl/src/gui/view/ControlTabs.fxml b/Praktikum/VINF_MaerklinControl/src/gui/view/ControlTabs.fxml deleted file mode 100644 index 8ef2406..0000000 --- a/Praktikum/VINF_MaerklinControl/src/gui/view/ControlTabs.fxml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<?import javafx.scene.control.Tab?> -<?import javafx.scene.control.TabPane?> -<?import javafx.scene.layout.AnchorPane?> - -<AnchorPane prefHeight="600.0" prefWidth="340.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1"> - <children> - <TabPane layoutX="10.0" layoutY="10.0" prefHeight="200.0" prefWidth="200.0" tabClosingPolicy="UNAVAILABLE" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> - <tabs> - <Tab text="Loks"> - <content> - <fx:include source="Engine.fxml" /> - </content> - </Tab> - <Tab text="Weichen"> - <content> - <fx:include source="SwitchList.fxml" /> - </content> - </Tab> - <Tab text="Drehscheibe"> - <content> - <fx:include source="Turntable.fxml" /> - </content> - </Tab> - <Tab text="Verbindung"> - <content> - <fx:include source="Settings.fxml" /> - </content> - </Tab> - </tabs> - </TabPane> - </children> -</AnchorPane> diff --git a/Praktikum/VINF_MaerklinControl/src/gui/view/EngineController.java b/Praktikum/VINF_MaerklinControl/src/gui/view/EngineController.java index 7f33a25..b3ce21f 100644 --- a/Praktikum/VINF_MaerklinControl/src/gui/view/EngineController.java +++ b/Praktikum/VINF_MaerklinControl/src/gui/view/EngineController.java @@ -81,15 +81,15 @@ public class EngineController { engineFwdButton.setSelected(eng.getDirection().get()); engineRevButton.setSelected(!eng.getDirection().get()); if (eng.getDirection().get()) - status.append("vorw�rts"); + status.append("vorw�rts"); else - status.append("r�ckw�rts"); + status.append("r�ckw�rts"); mainApp.setStatus(status.toString()); } public void setSelectedEngine(Engine eng){ this.eng = eng; - mainApp.setStatus(eng.toString() + " ausgew�hlt"); + mainApp.setStatus(eng.toString() + " ausgew�hlt"); updateEngineStatus(); } -- GitLab