From b7d8c887eca7a5b394aeefa134036f63747f087a Mon Sep 17 00:00:00 2001 From: Vladimir ELazar Tokarev Date: Sat, 4 Jun 2016 16:48:47 +0300 Subject: [PATCH] Ended the settings panel for now we have all the main flow vor the voter voting process (without all the logic for example the logic of fetching from server who else is voting right now is not existing, etc'...) --- .../StatusLog/java/StatusLogLoader.java | 4 +- .../fxml/polling_station_dashboard.fxml | 4 +- .../PollingStationDashboardController.java | 77 ++++++++--- .../java/PollingStationDashboardLoader.java | 9 ++ .../settings/fxml/settings.fxml | 4 +- .../settings/java/settingsController.java | 7 + .../settings/java/settingsLoader.java | 4 +- .../settings/settings.fxml | 124 ++++++++++++++++++ 8 files changed, 209 insertions(+), 24 deletions(-) create mode 100644 voting-station-gui/src/polling_station_dashboard/settings/settings.fxml diff --git a/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogLoader.java b/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogLoader.java index 1ceabb0..5753f6e 100644 --- a/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogLoader.java +++ b/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogLoader.java @@ -12,7 +12,7 @@ import java.io.IOException; */ public class StatusLogLoader { - private static final String POLLING_STATION_DASHBOARD_FXML_PATH = "../fxml/settings.fxml"; + private static final String STATUS_LOG_FXML_PATH = "../fxml/status_log.fxml"; private Stage currentStage; private FXMLLoader fxmlLoader; @@ -22,7 +22,7 @@ public class StatusLogLoader { { currentStage = primaryStage; statusLogUpdater = updater; - fxmlLoader = new FXMLLoader(getClass().getResource(POLLING_STATION_DASHBOARD_FXML_PATH)); + fxmlLoader = new FXMLLoader(getClass().getResource(STATUS_LOG_FXML_PATH)); } public GridPane GetStatusLogInstance() throws IOException { diff --git a/voting-station-gui/src/polling_station_dashboard/fxml/polling_station_dashboard.fxml b/voting-station-gui/src/polling_station_dashboard/fxml/polling_station_dashboard.fxml index f755ce7..b3af86e 100644 --- a/voting-station-gui/src/polling_station_dashboard/fxml/polling_station_dashboard.fxml +++ b/voting-station-gui/src/polling_station_dashboard/fxml/polling_station_dashboard.fxml @@ -72,9 +72,9 @@