Merge branch 'develop' into bug/Hide_Projects_not_Supported_on_linux_disable_option

Author: ddamke

…n/java/de/doubleslash/keeptime/Main.java …in/java/de/doubleslash/keeptime/App.javasrc/main/java/de/doubleslash/keeptime/Main.java renamed to src/main/java/de/doubleslash/keeptime/App.java src/main/java/de/doubleslash/keeptime/Main.java renamed to src/main/java/de/doubleslash/keeptime/App.java

@@ -61,9 +61,9 @@
 import javafx.stage.StageStyle;
 
 @SpringBootApplication
-public class Main extends Application {
+public class App extends Application {
 
-   private static final Logger LOG = LoggerFactory.getLogger(Main.class);
+   private static final Logger LOG = LoggerFactory.getLogger(App.class);
 
    private ConfigurableApplicationContext springContext;
 
@@ -83,7 +83,7 @@ public void init() throws Exception {
       final DefaultExceptionHandler defaultExceptionHandler = new DefaultExceptionHandler();
       defaultExceptionHandler.register();
 
-      springContext = SpringApplication.run(Main.class);
+      springContext = SpringApplication.run(App.class);
       ApplicationProperties applicationProperties = springContext.getBean(ApplicationProperties.class);
       LOG.info("KeepTime Version: '{}'.", applicationProperties.getBuildVersion());
       LOG.info("KeepTime Build Timestamp: '{}'.", applicationProperties.getBuildTimestamp());
@@ -299,7 +299,4 @@ public void stop() throws Exception {
       springContext.stop();
    }
 
-   public static void main(final String[] args) {
-      launch(Main.class, args);
-   }
 }

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

@@ -1,7 +1,9 @@
 package de.doubleslash.keeptime;
 
+import static javafx.application.Application.launch;
+
 public class KeepTime {
     public static void main(final String[] args) {
-        Main.main(args);
+        launch(App.class, args);
     }
 }

src/main/java/de/doubleslash/keeptime/view/ManageWorkController.java

@@ -25,8 +25,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
-
 import de.doubleslash.keeptime.common.ColorHelper;
 import de.doubleslash.keeptime.common.StyleUtils;
 import de.doubleslash.keeptime.model.Model;
@@ -230,21 +228,22 @@ public Project fromString(final String string) {
       // needs to set again because editable is ignored from fxml because of custom preselection of current Project
       projectComboBox.setEditable(true);
 
-      projectComboBox.valueProperty().addListener(
-            (final ObservableValue<? extends Project> observable, final Project oldValue, final Project newValue) -> {
-               if (newValue == null) {
-                  return;
-               }
+      projectComboBox.valueProperty()
+                     .addListener((final ObservableValue<? extends Project> observable, final Project oldValue,
+                           final Project newValue) -> {
+                        if (newValue == null) {
+                           return;
+                        }
 
-               selectedProject = newValue;
-               comboChange = true;
-               // needed to avoid exception on empty textfield https://bugs.openjdk.java.net/browse/JDK-8081700
-               Platform.runLater(() -> {
-                  setTextColor(projectComboBox.getEditor(), newValue.getColor());
-               });
-            }
+                        selectedProject = newValue;
+                        comboChange = true;
+                        // needed to avoid exception on empty textfield https://bugs.openjdk.java.net/browse/JDK-8081700
+                        Platform.runLater(() -> {
+                           setTextColor(projectComboBox.getEditor(), newValue.getColor());
+                        });
+                     }
 
-      );
+                     );
 
       enableStrgA_combo();
 
@@ -291,17 +290,21 @@ public void changed(final ObservableValue<? extends String> observable, final St
       });
 
       // manages Focusbehaviour
-      projectComboBox.getEditor().focusedProperty().addListener((final ObservableValue<? extends Boolean> observable,
-            final Boolean oldIsFocused, final Boolean newIsFocused) -> {
-         if (newIsFocused) {
-            // needed to avoid exception on empty textfield https://bugs.openjdk.java.net/browse/JDK-8081700
-            Platform.runLater(() -> projectComboBox.getEditor().selectAll());
-         } else {
-            // needed to avoid exception on empty textfield https://bugs.openjdk.java.net/browse/JDK-8081700
-            Platform.runLater(() -> projectComboBox.hide());
-         }
-
-      });
+      projectComboBox.getEditor()
+                     .focusedProperty()
+                     .addListener((final ObservableValue<? extends Boolean> observable, final Boolean oldIsFocused,
+                           final Boolean newIsFocused) -> {
+                        if (newIsFocused) {
+                           // needed to avoid exception on empty textfield
+                           // https://bugs.openjdk.java.net/browse/JDK-8081700
+                           Platform.runLater(() -> projectComboBox.getEditor().selectAll());
+                        } else {
+                           // needed to avoid exception on empty textfield
+                           // https://bugs.openjdk.java.net/browse/JDK-8081700
+                           Platform.runLater(() -> projectComboBox.hide());
+                        }
+
+                     });
 
       // on
       projectComboBox.setOnKeyReleased(ke -> {

src/main/java/de/doubleslash/keeptime/view/SettingsController.java

@@ -18,17 +18,9 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.net.URL;
-import java.nio.charset.Charset;
 import java.nio.file.Paths;
 import java.sql.SQLException;
-import java.time.LocalDate;
-import java.util.List;
-import java.util.stream.Collectors;
 
-import de.doubleslash.keeptime.Main;
-import de.doubleslash.keeptime.model.Project;
-import de.doubleslash.keeptime.model.Work;
 import javafx.application.Platform;
 import javafx.scene.control.*;
 import org.h2.tools.RunScript;

src/main/java/de/doubleslash/keeptime/view/ViewController.java

@@ -150,6 +150,7 @@ private class Delta {
    private final BooleanProperty mouseHoveringProperty = new SimpleBooleanProperty(false);
    public static final LongProperty activeWorkSecondsProperty = new SimpleLongProperty(0);
    public static final ObjectProperty<Color> fontColorProperty = new SimpleObjectProperty<>();
+   private boolean contextMenuOpenBoolean = false;
 
    private Stage reportStage;
    private ReportController reportController;
@@ -268,8 +269,19 @@ private void initialize() {
 
       pane.setOnMouseEntered(a -> mouseHoveringProperty.set(true));
 
-      pane.setOnMouseExited(a -> mouseHoveringProperty.set(false));
+      projectsVBox.setOnContextMenuRequested(c -> { // Is needed because the Context menu loses Focus otherwise
+         mouseHoveringProperty.set(true);
+         LOG.trace("Options selected");
+         contextMenuOpenBoolean = true;
+      });
+
+      pane.setOnMouseExited(a -> {
+         if (!contextMenuOpenBoolean) {
+            mouseHoveringProperty.set(false);
+         }
+         contextMenuOpenBoolean = false;
 
+      });
       // Drag stage
       pane.setOnMousePressed(mouseEvent -> {
 
@@ -577,7 +589,7 @@ public void savePosition() {
          return;
       }
 
-      LOG.debug("Stage position changed '{}'/'{}'.", mainStage.xProperty().doubleValue(),
+      LOG.trace("Stage position changed '{}'/'{}'.", mainStage.xProperty().doubleValue(),
             mainStage.yProperty().doubleValue());
 
       final ScreenPosHelper positionHelper = new ScreenPosHelper(mainStage.xProperty().doubleValue(),

src/main/resources/logback.xml

@@ -14,8 +14,6 @@
       <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
     </encoder>
   </appender>
-
-  <logger name="de.doubleslash" level="debug" />
 
   <root level="info">
     <appender-ref ref="STDOUT" />