Merge branch 'develop' into feature/logo

# Conflicts:
#	src/main/java/de/doubleslash/keeptime/view/ViewController.java

Author: Death111

CONTRIBUTING.md

@@ -0,0 +1,8 @@
+# Contributing
+
+If you want to contribute please follow this guideline.
+
+## FXML files
+
+For editing fxml files, use the "JavaFX Scene Builder" in version 8.5.0.  
+Layouting is generally done with fxml files.

src/main/java/de/doubleslash/keeptime/Main.java

@@ -228,6 +228,8 @@ private void initialisePopupUI(final Stage primaryStage) throws IOException {
       final ViewControllerPopup viewControllerPopupController = loader.getController();
       viewControllerPopupController.setStage(popupViewStage);
       viewControllerPopupController.setControllerAndModel(controller, model);
+      viewControllerPopupController.secondInitialize();
+
       globalScreenListener.setViewController(viewControllerPopupController);
    }
 
@@ -265,6 +267,7 @@ public void handle(final WindowEvent event) {
       // Give the controller access to the main app.
       viewController.setStage(primaryStage);
       viewController.setController(controller, model);
+      viewController.secondInitialize();
 
    }
 

src/main/java/de/doubleslash/keeptime/common/StyleUtils.java

@@ -0,0 +1,28 @@
+package de.doubleslash.keeptime.common;
+
+public class StyleUtils {
+
+   private StyleUtils() {
+
+   }
+
+   /**
+    * Returns a new String representing a JavaFX style with a new given value for a given attribute.
+    * 
+    * @param style
+    *           A String representing a JavaFX style.
+    * @param attribute
+    *           A String representing a JavaFX style attribute.
+    * @param newValue
+    *           A String representing the value that should be assigned to the given JavaFX style attribute.
+    * @return A String representing the new JavaFX style.
+    */
+   public static String changeStyleAttribute(final String style, final String attribute, final String newValue) {
+      final String newStyleAttribute = "-" + attribute + ": " + newValue + "; ";
+      if (style.contains(attribute)) {
+         return style.replaceAll("-" + attribute + ": " + "[^;]+;", newStyleAttribute);
+      }
+      return style + newStyleAttribute;
+   }
+
+}

src/main/java/de/doubleslash/keeptime/controller/Controller.java

@@ -142,6 +142,11 @@ public void deleteProject(final Project p) {
          LOG.error("You cannot delete the default project. Tried to delete project '{}'", p);
          return;
       }
+
+      if (isProjectActive(p)) {
+         changeProject(model.getIdleProject());
+      }
+
       LOG.info("Disabeling project '{}'.", p);
 
       final int indexToRemove = p.getIndex();
@@ -158,6 +163,10 @@ public void deleteProject(final Project p) {
       model.getProjectRepository().saveAll(changedProjects);
    }
 
+   private boolean isProjectActive(final Project p) {
+      return p == model.activeWorkItem.get().getProject();
+   }
+
    public void editProject(final Project p, final String newName, final Color newColor, final boolean isWork,
          final int newIndex) {
       LOG.info("Changing project '{}' to '{}' '{}' '{}'", p, newName, newColor, isWork);