From a1858cb9efbaa7a721be465d042aca5f225a3bab Mon Sep 17 00:00:00 2001 From: kaiquekk Date: Mon, 4 Mar 2019 13:05:42 -0300 Subject: [PATCH 1/3] Change toolbar icons and add separators Changed some toolbar icons and grouped them visually with vertical separators. Signed-off-by: kaiquekk --- src/main/java/org/jabref/gui/Base.css | 2 +- src/main/java/org/jabref/gui/JabRefFrame.java | 11 ++++++----- src/main/java/org/jabref/gui/icon/IconTheme.java | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css index e9c36458ba8..14c7861eb45 100644 --- a/src/main/java/org/jabref/gui/Base.css +++ b/src/main/java/org/jabref/gui/Base.css @@ -825,7 +825,7 @@ .separator:vertical .line { -fx-border-color: -jr-separator; -fx-border-width: 1; - -fx-border-insets: 0 0 0 1; + -fx-border-insets: 5 15 5 15; } .mainToolbar { diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java index 2e41bbc7e64..804903672cd 100644 --- a/src/main/java/org/jabref/gui/JabRefFrame.java +++ b/src/main/java/org/jabref/gui/JabRefFrame.java @@ -25,6 +25,7 @@ import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; import javafx.collections.ListChangeListener; +import javafx.geometry.Orientation; import javafx.scene.Node; import javafx.scene.control.Alert; import javafx.scene.control.Button; @@ -33,6 +34,7 @@ import javafx.scene.control.Menu; import javafx.scene.control.MenuBar; import javafx.scene.control.ProgressBar; +import javafx.scene.control.Separator; import javafx.scene.control.SeparatorMenuItem; import javafx.scene.control.SplitPane; import javafx.scene.control.Tab; @@ -617,21 +619,20 @@ private Node createToolbar() { leftSide.setMinWidth(100); leftSide.prefWidthProperty().bind(sidePane.widthProperty()); leftSide.maxWidthProperty().bind(sidePane.widthProperty()); - PushToApplicationButton pushToExternal = new PushToApplicationButton(this, pushApplications.getApplications()); HBox rightSide = new HBox( factory.createIconButton(StandardActions.NEW_ARTICLE, new NewEntryAction(this, BiblatexEntryTypes.ARTICLE, dialogService, Globals.prefs)), factory.createIconButton(StandardActions.DELETE_ENTRY, new OldDatabaseCommandWrapper(Actions.DELETE, this, Globals.stateManager)), - + new Separator(Orientation.VERTICAL), factory.createIconButton(StandardActions.UNDO, new OldDatabaseCommandWrapper(Actions.UNDO, this, Globals.stateManager)), factory.createIconButton(StandardActions.REDO, new OldDatabaseCommandWrapper(Actions.REDO, this, Globals.stateManager)), factory.createIconButton(StandardActions.CUT, new OldDatabaseCommandWrapper(Actions.CUT, this, Globals.stateManager)), factory.createIconButton(StandardActions.COPY, new OldDatabaseCommandWrapper(Actions.COPY, this, Globals.stateManager)), factory.createIconButton(StandardActions.PASTE, new OldDatabaseCommandWrapper(Actions.PASTE, this, Globals.stateManager)), - - factory.createIconButton(StandardActions.CLEANUP_ENTRIES, new OldDatabaseCommandWrapper(Actions.CLEANUP, this, Globals.stateManager)), + new Separator(Orientation.VERTICAL), factory.createIconButton(pushToExternal.getMenuAction(), pushToExternal), - + factory.createIconButton(StandardActions.CLEANUP_ENTRIES, new OldDatabaseCommandWrapper(Actions.CLEANUP, this, Globals.stateManager)), + new Separator(Orientation.VERTICAL), factory.createIconButton(StandardActions.FORK_ME, new OpenBrowserAction("https://github.com/JabRef/jabref")), factory.createIconButton(StandardActions.OPEN_FACEBOOK, new OpenBrowserAction("https://www.facebook.com/JabRef/")), factory.createIconButton(StandardActions.OPEN_TWITTER, new OpenBrowserAction("https://twitter.com/jabref_org")) diff --git a/src/main/java/org/jabref/gui/icon/IconTheme.java b/src/main/java/org/jabref/gui/icon/IconTheme.java index 49cfe8ba53a..55341a664d0 100644 --- a/src/main/java/org/jabref/gui/icon/IconTheme.java +++ b/src/main/java/org/jabref/gui/icon/IconTheme.java @@ -197,7 +197,7 @@ public enum JabRefIcons implements JabRefIcon { CLOSE(MaterialDesignIcon.CLOSE_CIRCLE), PASTE(JabRefMaterialDesignIcon.PASTE), CUT(MaterialDesignIcon.CONTENT_CUT), - COPY(JabRefMaterialDesignIcon.COPY), + COPY(MaterialDesignIcon.CONTENT_COPY), COMMENT(MaterialDesignIcon.COMMENT), REDO(MaterialDesignIcon.REDO), UNDO(MaterialDesignIcon.UNDO), @@ -239,7 +239,7 @@ public enum JabRefIcons implements JabRefIcon { AUTO_FILE_LINK(MaterialDesignIcon.FILE_FIND) /*css: file-find */, QUALITY_ASSURED(MaterialDesignIcon.CERTIFICATE), /*css: certificate */ QUALITY(MaterialDesignIcon.CERTIFICATE),/*css: certificate */ - OPEN(MaterialDesignIcon.FOLDER_OUTLINE) /*css: folder-outline */, + OPEN(MaterialDesignIcon.FOLDER_OUTLINE) /*css: folder */, ADD_ROW(MaterialDesignIcon.SERVER_PLUS) /* css: server-plus*/, REMOVE_ROW(MaterialDesignIcon.SERVER_MINUS) /*css: server-minus */, PICTURE(MaterialDesignIcon.FILE_IMAGE) /*css: file-image */, From d157b9d7e1cf7b14c91893976ddc6d79c7a1b706 Mon Sep 17 00:00:00 2001 From: yurickyh Date: Mon, 4 Mar 2019 13:48:21 -0300 Subject: [PATCH 2/3] Adding GENERATE_CITE_KEYS button to toolbar. Signed-off-by: yurickyh --- src/main/java/org/jabref/gui/JabRefFrame.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java index 804903672cd..ad3f0747106 100644 --- a/src/main/java/org/jabref/gui/JabRefFrame.java +++ b/src/main/java/org/jabref/gui/JabRefFrame.java @@ -631,6 +631,7 @@ private Node createToolbar() { factory.createIconButton(StandardActions.PASTE, new OldDatabaseCommandWrapper(Actions.PASTE, this, Globals.stateManager)), new Separator(Orientation.VERTICAL), factory.createIconButton(pushToExternal.getMenuAction(), pushToExternal), + factory.createIconButton(StandardActions.GENERATE_CITE_KEYS, new OldDatabaseCommandWrapper(Actions.MAKE_KEY, this, Globals.stateManager)), factory.createIconButton(StandardActions.CLEANUP_ENTRIES, new OldDatabaseCommandWrapper(Actions.CLEANUP, this, Globals.stateManager)), new Separator(Orientation.VERTICAL), factory.createIconButton(StandardActions.FORK_ME, new OpenBrowserAction("https://github.com/JabRef/jabref")), From 5025d0b38a3b76593fe46b5912cf4610c742e946 Mon Sep 17 00:00:00 2001 From: kaiquekk Date: Wed, 6 Mar 2019 16:41:50 -0300 Subject: [PATCH 3/3] Add changes to CHANGELOG and fix New Library icons Signed-off-by: kaiquekk --- CHANGELOG.md | 2 +- src/main/java/org/jabref/gui/actions/StandardActions.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index be3982fb06c..a262139b69b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,7 +54,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `# - We added the ability to execute default action in dialog by using with Ctrl + Enter combination [#4496](https://github.com/JabRef/jabref/issues/4496) - We grouped and reordered the Main Menu (File, Edit, Library, Quality, Tools, and View tabs & icons). [#4666](https://github.com/JabRef/jabref/issues/4666) [#4667](https://github.com/JabRef/jabref/issues/4667) [#4668](https://github.com/JabRef/jabref/issues/4668) [#4669](https://github.com/JabRef/jabref/issues/4669) [#4670](https://github.com/JabRef/jabref/issues/4670) [#4671](https://github.com/JabRef/jabref/issues/4671) [#4672](https://github.com/JabRef/jabref/issues/4672) [#4673](https://github.com/JabRef/jabref/issues/4673) - We added additional modifiers (capitalize, titlecase and sentencecase) to the Bibtex key generator. [#1506](https://github.com/JabRef/jabref/issues/1506) - +- We grouped the toolbar icons and changed the Open Library and Copy icons. [#4584](https://github.com/JabRef/jabref/issues/4584) ### Fixed diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java index b3b10e3aeaa..15e662dec5e 100644 --- a/src/main/java/org/jabref/gui/actions/StandardActions.java +++ b/src/main/java/org/jabref/gui/actions/StandardActions.java @@ -61,8 +61,8 @@ public enum StandardActions implements Action { RELEVANCE(Localization.lang("Relevance"), IconTheme.JabRefIcons.RELEVANCE), RELEVANT(Localization.lang("Toggle relevance"), IconTheme.JabRefIcons.RELEVANCE), NEW_LIBRARY(Localization.lang("New library"), IconTheme.JabRefIcons.NEW), - NEW_LIBRARY_BIBTEX(Localization.lang("New %0 library", BibDatabaseMode.BIBTEX.getFormattedName())), - NEW_LIBRARY_BIBLATEX(Localization.lang("New %0 library", BibDatabaseMode.BIBLATEX.getFormattedName())), + NEW_LIBRARY_BIBTEX(Localization.lang("New %0 library", BibDatabaseMode.BIBTEX.getFormattedName()), IconTheme.JabRefIcons.NEW), + NEW_LIBRARY_BIBLATEX(Localization.lang("New %0 library", BibDatabaseMode.BIBLATEX.getFormattedName()), IconTheme.JabRefIcons.NEW), OPEN_LIBRARY(Localization.lang("Open library"), IconTheme.JabRefIcons.OPEN, KeyBinding.OPEN_DATABASE), IMPORT(Localization.lang("Import"), IconTheme.JabRefIcons.IMPORT), EXPORT(Localization.lang("Export"), IconTheme.JabRefIcons.EXPORT),