diff --git a/src/officerbreaker/Controller.java b/src/officerbreaker/Controller.java index ecbf727..5a1f28e 100644 --- a/src/officerbreaker/Controller.java +++ b/src/officerbreaker/Controller.java @@ -41,25 +41,39 @@ public class Controller { private Image wordImage; private Image excelImage; private Image powerpointImage; - + private Image progressOnGoing; + private Image progressFinished; + @FXML private Text fileText; @FXML private Text invalidFileText; + + @FXML + private ImageView progressBarBrowse; + + @FXML + private ImageView progressBarRemove; @FXML public void initialize() { anchorPane.setBackground(new Background(new BackgroundFill(Color.WHITE, CornerRadii.EMPTY, Insets.EMPTY))); - invalidFileText.setVisible(false); // hides the invalid file text - + invalidFileText.setVisible(false); + progressBarBrowse.setVisible(false); + progressBarRemove.setVisible(false); + try { wordImage = new Image(getClass().getResourceAsStream("img/word.png")); powerpointImage = new Image(getClass().getResourceAsStream("img/powerpoint.png")); excelImage = new Image(getClass().getResourceAsStream("img/excel.png")); + + progressOnGoing = new Image(getClass().getResourceAsStream("img/prog-bar-ongoing.gif")); + + progressFinished = new Image(getClass().getResourceAsStream("img/prog-bar-complete.png")); } catch (Exception e) { e.printStackTrace(); @@ -70,7 +84,8 @@ public class Controller { void browsePressed(ActionEvent event) { invalidFileText.setVisible(false); - + progressBarBrowse.setVisible(true); + progressBarBrowse.setImage(progressOnGoing); try { fileChooser = new FileChooser(); fileChooser.setTitle("Please Select a File"); @@ -100,6 +115,9 @@ public class Controller { } try { + progressBarRemove.setVisible(true); + progressBarRemove.setImage(progressOnGoing); + FileManipulator manipulator = new FileManipulator(filePath, "./"); // create new object to manipulate the file manipulator.extractFile(); // extract XML from file @@ -115,8 +133,10 @@ public class Controller { manipulator.insertFile(); // write back to file manipulator.removeXMLFile(); // cleans the xml extracted from origin file - + fileText.setText(fileFinishedMessage()); + + progressBarRemove.setImage(progressFinished); } } catch (Exception e) { @@ -153,6 +173,7 @@ public class Controller { private void setScreenByFileType() { titleImageView.setVisible(false); + progressBarBrowse.setVisible(false); switch (fileType) { case EXCEL: diff --git a/src/officerbreaker/View.fxml b/src/officerbreaker/View.fxml index 561deb2..03afba5 100644 --- a/src/officerbreaker/View.fxml +++ b/src/officerbreaker/View.fxml @@ -35,12 +35,14 @@ - + - + + + diff --git a/src/officerbreaker/img/prog-bar-complete.png b/src/officerbreaker/img/prog-bar-complete.png new file mode 100644 index 0000000..4ca7513 Binary files /dev/null and b/src/officerbreaker/img/prog-bar-complete.png differ diff --git a/src/officerbreaker/img/prog-bar-ongoing.gif b/src/officerbreaker/img/prog-bar-ongoing.gif new file mode 100644 index 0000000..c4d90fd Binary files /dev/null and b/src/officerbreaker/img/prog-bar-ongoing.gif differ diff --git a/workbook.xml b/workbook.xml deleted file mode 100644 index 0899af8..0000000 --- a/workbook.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file