Skip to content

Commit 9c33ee5

Browse files
ddamkeddamke
authored andcommitted
add new button to copy Project name change some variables names
1 parent 420eb18 commit 9c33ee5

File tree

3 files changed

+35
-9
lines changed

3 files changed

+35
-9
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ public enum RESOURCE {
6767

6868
SVG_LICENSES_ICON("/svgs/closed-captioning.svg"),
6969

70-
ICON_MAIN("/icons/icon.png")
70+
ICON_MAIN("/icons/icon.png"),
71+
COPY_PROJECT_NAME("/svgs/copy.svg")
7172

7273
;
7374

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

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,8 @@ private void updateReport(final LocalDate dateToShow) {
263263
}
264264

265265
final HBox projectButtonBox = new HBox();
266-
projectButtonBox.getChildren().add(createCopyProjectButton(onlyCurrentProjectWork));
266+
projectButtonBox.getChildren().add(createCopyProjectNotesButton(onlyCurrentProjectWork));
267+
projectButtonBox.getChildren().add(createCopyProjectNameButton(onlyCurrentProjectWork));
267268

268269
final TreeItem<TableRow> projectRow = new TreeItem<>(
269270
new ProjectTableRow(project, projectWorkSeconds, projectButtonBox));
@@ -416,11 +417,13 @@ private GridPane setUpEditWorkGridPane(final Work work, final Dialog<Work> dialo
416417
return grid;
417418
}
418419

419-
private Button createCopyProjectButton(final List<Work> projectWork) {
420-
final Button copyButton = new Button("", SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_CLIPBOARD, 0.03, 0.03));
421-
copyButton.setMaxSize(20, 18);
422-
copyButton.setMinSize(20, 18);
423-
copyButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
420+
private Button createCopyProjectNotesButton(final List<Work> projectWork) {
421+
final Button copyNotesButton = new Button("", SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_CLIPBOARD, 0.03, 0.03));
422+
copyNotesButton.setMaxSize(20, 18);
423+
copyNotesButton.setMinSize(20, 18);
424+
copyNotesButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
425+
copyNotesButton.setTooltip(new Tooltip("Copy Project Notes"));
426+
424427

425428
final EventHandler<ActionEvent> eventListener = actionEvent -> {
426429
LOG.debug("Copy to Clipboard clicked.");
@@ -436,8 +439,29 @@ private Button createCopyProjectButton(final List<Work> projectWork) {
436439
clipboard.setContent(content);
437440
};
438441

439-
copyButton.setOnAction(eventListener);
440-
return copyButton;
442+
copyNotesButton.setOnAction(eventListener);
443+
return copyNotesButton;
444+
}
445+
private Button createCopyProjectNameButton(final List<Work> projectWork) {
446+
final Button copyProjectNameButton = new Button("", SvgNodeProvider.getSvgNodeWithScale(RESOURCE.COPY_PROJECT_NAME, 0.03, 0.03));
447+
copyProjectNameButton.setMaxSize(20, 18);
448+
copyProjectNameButton.setMinSize(20, 18);
449+
copyProjectNameButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
450+
copyProjectNameButton.setTooltip(new Tooltip("Copy Project Name"));
451+
452+
final EventHandler<ActionEvent> eventListener = actionEvent -> {
453+
LOG.debug("Copy to Clipboard clicked.");
454+
final ProjectReport pr = new ProjectReport();
455+
pr.appendToWorkNotes(projectWork.get(0).getProject().getName());
456+
457+
final Clipboard clipboard = Clipboard.getSystemClipboard();
458+
final ClipboardContent content = new ClipboardContent();
459+
content.putString(pr.getNotes());
460+
clipboard.setContent(content);
461+
};
462+
463+
copyProjectNameButton.setOnAction(eventListener);
464+
return copyProjectNameButton;
441465
}
442466

443467
private Node createCopyWorkButton(final Work w) {

src/main/resources/svgs/copy.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)