Merge branch 'develop' into feature/#165_Rest-API-New

Author: mairKi

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

@@ -53,7 +53,7 @@ public enum RESOURCE {
 
       SVG_PENCIL_ICON("/svgs/pencil.svg"),
 
-      SVG_CLIPBOARD("/svgs/clipboard.svg"),
+      SVG_CLIPBOARD_ICON("/svgs/clipboard.svg"),
 
       SVG_BUG_ICON("/svgs/bug.svg"),
 
@@ -67,6 +67,8 @@ public enum RESOURCE {
 
       SVG_LICENSES_ICON("/svgs/closed-captioning.svg"),
 
+      SVG_MULTIPLE_CLIPBOARD_ICON("/svgs/copy.svg"),
+
       ICON_MAIN("/icons/icon.png")
 
       ;

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

@@ -261,7 +261,8 @@ private void updateReport(final LocalDate dateToShow) {
          }
 
          final HBox projectButtonBox = new HBox();
-         projectButtonBox.getChildren().add(createCopyProjectButton(onlyCurrentProjectWork));
+         projectButtonBox.getChildren().add(createCopyProjectNameButton(project.getName()));
+         projectButtonBox.getChildren().add(createCopyProjectNotesButton(onlyCurrentProjectWork));
 
          final TreeItem<TableRow> projectRow = new TreeItem<>(
                new ProjectTableRow(project, projectWorkSeconds, projectButtonBox));
@@ -414,11 +415,13 @@ private GridPane setUpEditWorkGridPane(final Work work, final Dialog<Work> dialo
       return grid;
    }
 
-   private Button createCopyProjectButton(final List<Work> projectWork) {
-      final Button copyButton = new Button("", SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_CLIPBOARD, 0.03, 0.03));
-      copyButton.setMaxSize(20, 18);
-      copyButton.setMinSize(20, 18);
-      copyButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+   private Button createCopyProjectNotesButton(final List<Work> projectWork) {
+      final Button copyNotesButton = new Button("", SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_MULTIPLE_CLIPBOARD_ICON, 0.03, 0.03));
+      copyNotesButton.setMaxSize(20, 18);
+      copyNotesButton.setMinSize(20, 18);
+      copyNotesButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+      copyNotesButton.setTooltip(new Tooltip("Copy Project Notes"));
+
 
       final EventHandler<ActionEvent> eventListener = actionEvent -> {
          LOG.debug("Copy to Clipboard clicked.");
@@ -434,12 +437,30 @@ private Button createCopyProjectButton(final List<Work> projectWork) {
          clipboard.setContent(content);
       };
 
-      copyButton.setOnAction(eventListener);
-      return copyButton;
+      copyNotesButton.setOnAction(eventListener);
+      return copyNotesButton;
+   }
+   private Button createCopyProjectNameButton(String projectName) {
+      final Button copyProjectNameButton = new Button("", SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_CLIPBOARD_ICON, 0.03, 0.03));
+      copyProjectNameButton.setMaxSize(20, 18);
+      copyProjectNameButton.setMinSize(20, 18);
+      copyProjectNameButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+      copyProjectNameButton.setTooltip(new Tooltip("Copy Project Name"));
+
+      final EventHandler<ActionEvent> eventListener = actionEvent -> {
+         LOG.debug("Copy to Clipboard clicked.");
+         final Clipboard clipboard = Clipboard.getSystemClipboard();
+         final ClipboardContent content = new ClipboardContent();
+         content.putString(projectName);
+         clipboard.setContent(content);
+      };
+
+      copyProjectNameButton.setOnAction(eventListener);
+      return copyProjectNameButton;
    }
 
    private Node createCopyWorkButton(final Work w) {
-      final Button copyButton = new Button("", SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_CLIPBOARD, 0.03, 0.03));
+      final Button copyButton = new Button("", SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_CLIPBOARD_ICON, 0.03, 0.03));
       copyButton.setMaxSize(20, 18);
       copyButton.setMinSize(20, 18);
       copyButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);

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

@@ -397,9 +397,7 @@ private void setUpTime() {
 
    private void setUpTextArea() {
       textArea.setWrapText(true);
-      textArea.setEditable(false);
-      textArea.editableProperty().bind(mouseHoveringProperty);
-
+      textArea.setEditable(true);
       textArea.textProperty().addListener((a, b, c) -> controller.setComment(textArea.getText()));
    }