Skip to content
Snippets Groups Projects
Commit d468381b authored by Philipp Stenkamp's avatar Philipp Stenkamp
Browse files

Switched the Switch Icons, they're the right way around now

parent ee57b8a4
No related branches found
No related tags found
No related merge requests found
Showing
with 17 additions and 19 deletions
......@@ -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>
/server/
/gui/
/common/
No preview for this file type
No preview for this file type
......@@ -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" />
......
No preview for this file type
File added
Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_a.png

533 B | W: | H:

Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_a.png

532 B | W: | H:

Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_a.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_a.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_a.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_a.png
  • 2-up
  • Swipe
  • Onion skin
Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_i.png

299 B | W: | H:

Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_i.png

300 B | W: | H:

Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_i.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_i.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_i.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_00_i.png
  • 2-up
  • Swipe
  • Onion skin
Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_a.png

534 B | W: | H:

Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_a.png

537 B | W: | H:

Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_a.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_a.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_a.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_a.png
  • 2-up
  • Swipe
  • Onion skin
Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_i.png

298 B | W: | H:

Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_i.png

298 B | W: | H:

Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_i.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_i.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_i.png
Praktikum/VINF_MaerklinControl/res/MagIcon_00_01_i.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -102,7 +102,7 @@ public class MainApp extends Application {
@Override
public void start(Stage primaryStage) {
this.primaryStage = primaryStage;
this.primaryStage.setTitle("Mrklin Control Client");
this.primaryStage.setTitle("Mrklin Control Client");
this.primaryStage.getIcons().add(new Image("file:res/BO.png"));
initRootLayout();
initTabs();
......
......@@ -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" />
......
......@@ -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");
/**
......
pstenkamp/Doku/scenebuilder_switch.PNG

27.1 KiB

pstenkamp/Doku/tab_switches.PNG

22.2 KiB | W: | H:

pstenkamp/Doku/tab_switches.PNG

20.3 KiB | W: | H:

pstenkamp/Doku/tab_switches.PNG
pstenkamp/Doku/tab_switches.PNG
pstenkamp/Doku/tab_switches.PNG
pstenkamp/Doku/tab_switches.PNG
  • 2-up
  • Swipe
  • Onion skin
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment