Merge branch 'master' of https://gitlab.cvh-server.de/lf.ps/VInf

Praktikum/VINF_MaerklinControl/.classpath

@@ -3,6 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/>
-	<classpathentry kind="lib" path="/home/lukas/VInf/Praktikum/VINF_MaerklinGUI/controlsfx-8.40.12.jar"/>
+	<classpathentry kind="lib" path="D:/Users/Philipp/gitlab/VInf/Praktikum/VINF_MaerklinControl/controlsfx-8.40.12.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Praktikum/VINF_MaerklinControl/bin/.gitignore

-/server/
 /gui/
-/common/

Praktikum/VINF_MaerklinControl/bin/gui/view/Switch.fxml

@@ -15,7 +15,7 @@
       </Label>
       <ImageView fx:id="straightIcon" fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
          <image>
-            <Image url="@../../../res/MagIcon_00_00_i.png" />
+            <Image url="@../../../res/MagIcon_00_01_i.png" />
          </image>
          <HBox.margin>
             <Insets right="5.0" />
@@ -31,7 +31,7 @@
       </ToggleSwitch>
       <ImageView fx:id="bentIcon" fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
          <image>
-            <Image url="@../../../res/MagIcon_00_01_i.png" />
+            <Image url="@../../../res/MagIcon_00_00_i.png" />
          </image>
          <HBox.margin>
             <Insets right="5.0" />

Praktikum/VINF_MaerklinControl/src/gui/MainApp.java

@@ -102,7 +102,7 @@ public class MainApp extends Application {
     @Override
     public void start(Stage primaryStage) {
         this.primaryStage = primaryStage;
-        this.primaryStage.setTitle("M�rklin Control Client");
+        this.primaryStage.setTitle("Mrklin Control Client");
         this.primaryStage.getIcons().add(new Image("file:res/BO.png"));
         initRootLayout();
         initTabs();

Praktikum/VINF_MaerklinControl/src/gui/view/ControlTabs.fxml

-<?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>

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("vorwrts");
     	else
-    		status.append("r�ckw�rts");
+    		status.append("rckwrts");
     	mainApp.setStatus(status.toString());
     }
     
     public void setSelectedEngine(Engine eng){
     	this.eng = eng;
-    	mainApp.setStatus(eng.toString() + " ausgew�hlt");
+    	mainApp.setStatus(eng.toString() + " ausgewhlt");
     	updateEngineStatus();
     }
     

Praktikum/VINF_MaerklinControl/src/gui/view/Switch.fxml

@@ -15,7 +15,7 @@
       </Label>
       <ImageView fx:id="straightIcon" fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
          <image>
-            <Image url="@../../../res/MagIcon_00_00_i.png" />
+            <Image url="@../../../res/MagIcon_00_01_i.png" />
          </image>
          <HBox.margin>
             <Insets right="5.0" />
@@ -31,7 +31,7 @@
       </ToggleSwitch>
       <ImageView fx:id="bentIcon" fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
          <image>
-            <Image url="@../../../res/MagIcon_00_01_i.png" />
+            <Image url="@../../../res/MagIcon_00_00_i.png" />
          </image>
          <HBox.margin>
             <Insets right="5.0" />

Praktikum/VINF_MaerklinControl/src/gui/view/SwitchControl.java

@@ -28,10 +28,10 @@ public class SwitchControl extends HBox{
 	// Reference to the main application.
     private MainApp mainApp;
     private Switch sw;
-    private Image straightActive = new Image("file:res/MagIcon_00_00_a.png");
-    private Image straightInactive = new Image("file:res/MagIcon_00_00_i.png");
-    private Image bentActive = new Image("file:res/MagIcon_00_01_a.png");
-    private Image bentInactive = new Image("file:res/MagIcon_00_01_i.png");
+    private Image straightActive = new Image("file:res/MagIcon_00_01_a.png");
+    private Image straightInactive = new Image("file:res/MagIcon_00_01_i.png");
+    private Image bentActive = new Image("file:res/MagIcon_00_00_a.png");
+    private Image bentInactive = new Image("file:res/MagIcon_00_00_i.png");
     
 
     /**