Changed colors and v1.3.0

s0urc3d3v · Mar 12, 2017 · bf3f261 · bf3f261
1 parent ff06be9
commit bf3f261
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>WHS_planner</groupId>
     <artifactId>WHS_Planner</artifactId>
-    <version>1.2.3</version>
+    <version>1.3.0</version>
     <packaging>jar</packaging>
 
     <name>WHS Planner</name>

diff --git a/src/main/java/WHS_planner/Calendar/Task.java b/src/main/java/WHS_planner/Calendar/Task.java
@@ -71,27 +71,25 @@ public Pane getPane(CalendarBox box){
 
         isEditing = false;
 
-        JFXButton deleteButton = new JFXButton("Delete");
-        deleteButton.setStyle("-fx-background-color: rgb(56, 118, 237);");
-        deleteButton.setPrefWidth(50);
-        deleteButton.setMinWidth(50);
+        JFXButton deleteButton = new JFXButton();
+        setButtonToDelete(deleteButton);
+        deleteButton.setMinHeight(20);
 
         JFXButton cancelButton = new JFXButton("Cancel");
         cancelButton.setPrefWidth(50);
         cancelButton.setMinWidth(50);
-        cancelButton.setStyle("-fx-background-color: red");
+        cancelButton.setMinHeight(20);
+        cancelButton.setStyle("-fx-background-color: #F26650");
 
         deleteButton.setOnMouseClicked((event -> {
             if (event.getButton() == MouseButton.PRIMARY) {
                 if (doesExist) {
                     doesExist = false;
-                    deleteButton.setText("Undo");
-                    deleteButton.setStyle("-fx-background-color: red");
+                    setButtonToUndo(deleteButton);
                     label.setStrikethrough(true);
                 } else {
                     doesExist = true;
-                    deleteButton.setText("Delete");
-                    deleteButton.setStyle("-fx-background-color: rgb(56, 118, 237);");
+                    setButtonToDelete(deleteButton);
                     label.setStrikethrough(false);
                 }
                 box.update();
@@ -164,4 +162,18 @@ public String replaceBeginingSpace(String string){
     Boolean doesExist() {
         return doesExist;
     }
+
+    public void setButtonToDelete(JFXButton button){
+        button.setText("\uf00d");
+        button.setPrefWidth(20);
+        button.setMinWidth(20);
+        button.setStyle("-fx-background-color: rgb(56, 118, 237); -fx-font-family: 'FontAwesome Regular';");
+    }
+
+    public void setButtonToUndo(JFXButton button){
+        button.setText("Undo");
+        button.setPrefWidth(50);
+        button.setMinWidth(50);
+        button.setStyle("-fx-background-color: #F26650;-fx-font-family: 'Roboto';");
+    }
 }
diff --git a/src/main/java/WHS_planner/Main.java b/src/main/java/WHS_planner/Main.java
@@ -21,9 +21,9 @@ public class Main extends Application {
 
     public static final String SAVE_FOLDER = System.getenv("HOME" ) + File.separator + "Library" + File.separator + "Application Support" + File.separator + "WHS Planner";
 
-    public static final String VERSION_NUMBER = "1.2.4";
+    public static final String VERSION_NUMBER = "1.3.0";
 
-    public static final String UPDATE_NOTES = " - iPass login should be fixed!\n - Added Task Editing Support (Suggestion from Vincent Pak)";
+    public static final String UPDATE_NOTES = "- Added task editing support (Suggestion from Vincent Pak)\n - iPass login should be fixed";
 
     public static boolean isFirstStartup = false;
     public static boolean isFirstTimeOnVersion = false;

diff --git a/src/main/resources/UI/NewsUI.css b/src/main/resources/UI/NewsUI.css
@@ -19,7 +19,7 @@
 }
 
 .scroll-bar .increment-arrow,
-.scroll-bar .decrement-arrow,
+.scroll-bar .decrement-arrow
  {
 	-fx-padding:0;
 }