From ac2fc3a83d792f6ee978317785b669f958de8e31 Mon Sep 17 00:00:00 2001 From: Vladimir ELazar Tokarev Date: Sat, 21 May 2016 09:54:21 +0300 Subject: [PATCH] Ended the fxml of uploading to bulletin board ended its fxml and addedexternal loadinig pane class --- .../src/ExternalClasses/LoadingIndicator.java | 68 ++++++++ .../src/fxmls/set_up_complete.fxml | 153 ++++++++++++++++++ .../fxmls/spalsh_screen_on_boot.fxml | 34 ++-- .../fxmls/uploading_to_bulletin_board.fxml | 152 +++++++++++++++++ .../src/gifs/VerticalLoading.gif | Bin 0 -> 14131 bytes .../src/splash_screen_on_boot/Main.java | 10 +- 6 files changed, 398 insertions(+), 19 deletions(-) create mode 100644 voting-station-gui/src/ExternalClasses/LoadingIndicator.java create mode 100644 voting-station-gui/src/fxmls/set_up_complete.fxml rename voting-station-gui/src/{splash_screen_on_boot => }/fxmls/spalsh_screen_on_boot.fxml (76%) create mode 100644 voting-station-gui/src/fxmls/uploading_to_bulletin_board.fxml create mode 100644 voting-station-gui/src/gifs/VerticalLoading.gif diff --git a/voting-station-gui/src/ExternalClasses/LoadingIndicator.java b/voting-station-gui/src/ExternalClasses/LoadingIndicator.java new file mode 100644 index 0000000..575c671 --- /dev/null +++ b/voting-station-gui/src/ExternalClasses/LoadingIndicator.java @@ -0,0 +1,68 @@ +package ExternalClasses; + +import javafx.animation.KeyFrame; +import javafx.animation.KeyValue; +import javafx.animation.Timeline; +import javafx.beans.property.DoubleProperty; +import javafx.beans.property.SimpleDoubleProperty; +import javafx.scene.Parent; +import javafx.scene.layout.StackPane; +import javafx.scene.layout.VBox; +import javafx.scene.paint.Color; +import javafx.scene.shape.Rectangle; +import javafx.scene.text.Text; +import javafx.util.Duration; + +public class LoadingIndicator extends Parent{ + + private Timeline timeline = new Timeline(); + + private DoubleProperty stroke = new SimpleDoubleProperty(100.0); + + public LoadingIndicator(){ + super(); + + timeline.setCycleCount(Timeline.INDEFINITE); + + final KeyValue kv = new KeyValue(stroke, 0); + final KeyFrame kf = new KeyFrame(Duration.millis(1500), kv); + + timeline.getKeyFrames().add(kf); + timeline.play(); + + VBox root = new VBox(3); + + StackPane progressIndicator = new StackPane(); + + Rectangle bar = new Rectangle(350,13); + bar.setFill(Color.TRANSPARENT); + bar.setStroke(Color.WHITE); + bar.setArcHeight(15); + bar.setArcWidth(15); + bar.setStrokeWidth(2); + + Rectangle progress = new Rectangle(342,6); + progress.setFill(Color.WHITE); + progress.setStroke(Color.WHITE); + progress.setArcHeight(8); + progress.setArcWidth(8); + progress.setStrokeWidth(1.5); + progress.getStrokeDashArray().addAll(3.0,7.0,3.0,7.0); + progress.strokeDashOffsetProperty().bind(stroke); + + + progressIndicator.getChildren().add(progress); + progressIndicator.getChildren().add(bar); + + root.getChildren().add(progressIndicator); + + Text label = new Text("Loading..."); + label.setFill(Color.WHITE); + + root.getChildren().add(label); + + getChildren().add(root); + + } + +} \ No newline at end of file diff --git a/voting-station-gui/src/fxmls/set_up_complete.fxml b/voting-station-gui/src/fxmls/set_up_complete.fxml new file mode 100644 index 0000000..44217a6 --- /dev/null +++ b/voting-station-gui/src/fxmls/set_up_complete.fxml @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+
+
+ + + + + + + + + + + + + + + + +
+
+ +
+ + + + + + + + + + + + + +
+ +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+ +
+
diff --git a/voting-station-gui/src/splash_screen_on_boot/fxmls/spalsh_screen_on_boot.fxml b/voting-station-gui/src/fxmls/spalsh_screen_on_boot.fxml similarity index 76% rename from voting-station-gui/src/splash_screen_on_boot/fxmls/spalsh_screen_on_boot.fxml rename to voting-station-gui/src/fxmls/spalsh_screen_on_boot.fxml index a0a5e58..1808651 100644 --- a/voting-station-gui/src/splash_screen_on_boot/fxmls/spalsh_screen_on_boot.fxml +++ b/voting-station-gui/src/fxmls/spalsh_screen_on_boot.fxml @@ -10,8 +10,7 @@ - - + @@ -42,11 +41,6 @@ - @@ -59,18 +53,28 @@ - - - - - - - - + +
+ + + + + +
+
+ +
+ +
+
diff --git a/voting-station-gui/src/fxmls/uploading_to_bulletin_board.fxml b/voting-station-gui/src/fxmls/uploading_to_bulletin_board.fxml new file mode 100644 index 0000000..f9cc007 --- /dev/null +++ b/voting-station-gui/src/fxmls/uploading_to_bulletin_board.fxml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+
+
+ + + + + + + + + + + + + + + + +
+
+ +
+ + + + + + + + + + + + + +
+ +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
diff --git a/voting-station-gui/src/gifs/VerticalLoading.gif b/voting-station-gui/src/gifs/VerticalLoading.gif new file mode 100644 index 0000000000000000000000000000000000000000..942255f6ea1fc4579c6d360ac86e086556c70b1b GIT binary patch literal 14131 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 literal 0 HcmV?d00001 diff --git a/voting-station-gui/src/splash_screen_on_boot/Main.java b/voting-station-gui/src/splash_screen_on_boot/Main.java index 08c7ba4..50a8388 100644 --- a/voting-station-gui/src/splash_screen_on_boot/Main.java +++ b/voting-station-gui/src/splash_screen_on_boot/Main.java @@ -15,7 +15,8 @@ import java.util.concurrent.ThreadFactory; public class Main extends Application { - private static final String SPALSH_SCREEN_ON_BOOT_FXML_PATH = "fxmls/spalsh_screen_on_boot.fxml"; + private static final String SPALSH_SCREEN_ON_BOOT_FXML_PATH = "../fxmls/spalsh_screen_on_boot.fxml"; + private static final String FXMLS_DIRECTORY_PATH = "../fxmls/"; private List listFilesForFolder(File folder) { List filesNames = new ArrayList<>(); @@ -28,7 +29,7 @@ public class Main extends Application { } private List getNamesOfAllFxmls() throws IOException { - String fxmlsFolderPath = getClass().getResource("fxmls/").getPath().replace("%20", " "); + String fxmlsFolderPath = getClass().getResource(FXMLS_DIRECTORY_PATH).getPath().replace("%20", " "); List filesNames = listFilesForFolder(new File(fxmlsFolderPath)); return filesNames; } @@ -38,7 +39,7 @@ public class Main extends Application { private void loadAllFxmls() throws IOException, InterruptedException { Boards = new ArrayList<>(); for (String filename : getNamesOfAllFxmls()) { - Boards.add(FXMLLoader.load(getClass().getResource("fxmls/" + filename))); + Boards.add(FXMLLoader.load(getClass().getResource(FXMLS_DIRECTORY_PATH + filename))); } } @@ -58,8 +59,9 @@ public class Main extends Application { @Override public void start(Stage primaryStage) throws Exception{ Parent root = loadStartingPanel(primaryStage); + System.out.println(0); loadAllFxmls(); - removeLoadingGif(root); + //removeLoadingGif(root); } public static void main(String[] args) throws InterruptedException {