From f180e13bfe3b9fba013675e25330489282b7a2e5 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 8 Oct 2017 15:07:49 +0200
Subject: [PATCH] Fixed #217 - custom alert and color picker are not useable
---
.../deadlocker8/budgetmasterclient/ui/colorPick/ColorView.java | 2 +-
.../de/deadlocker8/budgetmaster}/ui/colorPick/ColorPickGUI.fxml | 2 +-
.../deadlocker8/budgetmaster}/ui/customAlert/CustomAlert.fxml | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename BudgetMasterClient/src/main/{java/de/deadlocker8/budgetmasterclient => resources/de/deadlocker8/budgetmaster}/ui/colorPick/ColorPickGUI.fxml (98%)
rename BudgetMasterClient/src/main/{java/de/deadlocker8/budgetmasterclient => resources/de/deadlocker8/budgetmaster}/ui/customAlert/CustomAlert.fxml (100%)
diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/colorPick/ColorView.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/colorPick/ColorView.java
index 7547dcc02..457d866f0 100644
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/colorPick/ColorView.java
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/colorPick/ColorView.java
@@ -97,7 +97,7 @@ public class ColorView extends GridPane
stage.setResizable(false);
stage.initModality(Modality.APPLICATION_MODAL);
stage.setScene(scene);
- stage.getIcons().add(new Image("/de/deadlocker8/budgetmaster/resources/icon.png"));
+ stage.getIcons().add(new Image("/de/deadlocker8/budgetmaster/icon.png"));
stage.show();
}
catch(Exception e)
diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/colorPick/ColorPickGUI.fxml b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/ui/colorPick/ColorPickGUI.fxml
similarity index 98%
rename from BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/colorPick/ColorPickGUI.fxml
rename to BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/ui/colorPick/ColorPickGUI.fxml
index 7b0f53954..8acf7b57b 100644
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/colorPick/ColorPickGUI.fxml
+++ b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/ui/colorPick/ColorPickGUI.fxml
@@ -10,7 +10,7 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
-<AnchorPane prefHeight="300.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.deadlocker8.budgetmaster.ui.colorPick.ColorPickController">
+<AnchorPane prefHeight="300.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.deadlocker8.budgetmasterclient.ui.colorPick.ColorPickController">
<children>
<HBox layoutX="273.0" layoutY="81.0" spacing="30.0" AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0">
<children>
diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/customAlert/CustomAlert.fxml b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/ui/customAlert/CustomAlert.fxml
similarity index 100%
rename from BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/customAlert/CustomAlert.fxml
rename to BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/ui/customAlert/CustomAlert.fxml
--
GitLab