From 4182ebb065080003c043a24bd20aeefdfb0bcca8 Mon Sep 17 00:00:00 2001 From: ddunig2 <36016544+ddunig2@users.noreply.github.com> Date: Sun, 26 Jul 2020 20:53:22 -0400 Subject: [PATCH 1/4] changed part of LibreOffice side panel to flow layout --- .../gui/openoffice/OpenOfficePanel.java | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java index 2f912d2d09a..0754d8bf70b 100644 --- a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java +++ b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java @@ -12,6 +12,7 @@ import javafx.concurrent.Task; import javafx.geometry.Side; +import javafx.geometry.Insets; import javafx.scene.Node; import javafx.scene.control.Button; import javafx.scene.control.CheckMenuItem; @@ -25,6 +26,7 @@ import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; import javafx.scene.layout.VBox; +import javafx.scene.layout.FlowPane; import org.jabref.Globals; import org.jabref.gui.BasePanel; @@ -264,19 +266,19 @@ private void initPanel() { HBox hbox = new HBox(); hbox.getChildren().addAll(connect, manualConnect, selectDocument, update, help); hbox.getChildren().forEach(btn -> HBox.setHgrow(btn, Priority.ALWAYS)); - - VBox row1 = new VBox(); - VBox row2 = new VBox(); - VBox row3 = new VBox(); - row1.getChildren().addAll(setStyleFile, pushEntries, pushEntriesInt); - row2.getChildren().addAll(pushEntriesAdvanced, pushEntriesEmpty, merge); - row3.getChildren().addAll(manageCitations, exportCitations, settingsB); - HBox hbox1 = new HBox(); - hbox1.getChildren().addAll(row1, row2, row3); - hbox1.getChildren().forEach(btn -> HBox.setHgrow(btn, Priority.ALWAYS)); + + FlowPane flow = new FlowPane(); + flow.setPadding(new Insets(5, 5, 5, 5)); + flow.setVgap(4); + flow.setHgap(4); + flow.setPrefWrapLength(200); + + flow.getChildren().addAll(setStyleFile, pushEntries, pushEntriesInt); + flow.getChildren().addAll(pushEntriesAdvanced, pushEntriesEmpty, merge); + flow.getChildren().addAll(manageCitations, exportCitations, settingsB); vbox.setFillWidth(true); - vbox.getChildren().addAll(hbox, hbox1); + vbox.getChildren().addAll(hbox, flow); } private void exportEntries() { From 8e8973d544d7bc21c7236170d34f4240724ca31f Mon Sep 17 00:00:00 2001 From: ddunig2 <36016544+ddunig2@users.noreply.github.com> Date: Mon, 27 Jul 2020 15:15:04 -0400 Subject: [PATCH 2/4] fixed the ordering of imports added for this issue --- src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java index 0754d8bf70b..1e7e55fc646 100644 --- a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java +++ b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java @@ -11,8 +11,8 @@ import java.util.stream.Collectors; import javafx.concurrent.Task; -import javafx.geometry.Side; import javafx.geometry.Insets; +import javafx.geometry.Side; import javafx.scene.Node; import javafx.scene.control.Button; import javafx.scene.control.CheckMenuItem; @@ -23,10 +23,10 @@ import javafx.scene.control.SeparatorMenuItem; import javafx.scene.control.ToggleGroup; import javafx.scene.control.Tooltip; +import javafx.scene.layout.FlowPane; import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; import javafx.scene.layout.VBox; -import javafx.scene.layout.FlowPane; import org.jabref.Globals; import org.jabref.gui.BasePanel; From fa85644077560913e260c4b561c495f9b425e61a Mon Sep 17 00:00:00 2001 From: ddunig2 <36016544+ddunig2@users.noreply.github.com> Date: Mon, 27 Jul 2020 18:44:50 -0400 Subject: [PATCH 3/4] updated change log for issue #6639 --- CHANGELOG.md | 1 + src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccccef747af..093ce5453d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,6 +50,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve - We changed the command line option 'generateBibtexKeys' to the more generic term 'generateCitationKeys' while the short option remains 'g'.[#6545](https://github.com/JabRef/jabref/pull/6545) - We improved the "Possible duplicate entries" window to remember its size and position throughout a session. [#6582](https://github.com/JabRef/jabref/issues/6582) - We divided the toolbar into small parts, so if the application window is to small, only a part of the toolbar is moved into the chevron popup. [#6682](https://github.com/JabRef/jabref/pull/6682) +- we change the layout for some of the buttons on the side panel to a flow layout to ensure button text are always visible, specially on resizing. [#6639](https://github.com/JabRef/jabref/issues/6639) ### Fixed diff --git a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java index 1e7e55fc646..bff1e366d35 100644 --- a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java +++ b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java @@ -272,7 +272,6 @@ private void initPanel() { flow.setVgap(4); flow.setHgap(4); flow.setPrefWrapLength(200); - flow.getChildren().addAll(setStyleFile, pushEntries, pushEntriesInt); flow.getChildren().addAll(pushEntriesAdvanced, pushEntriesEmpty, merge); flow.getChildren().addAll(manageCitations, exportCitations, settingsB); From 10a80d92cb4d80abff5563500e024e47771ed72d Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Tue, 28 Jul 2020 09:46:37 +0200 Subject: [PATCH 4/4] Improved change log entry a bit --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 093ce5453d6..e913361bb93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,7 +50,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve - We changed the command line option 'generateBibtexKeys' to the more generic term 'generateCitationKeys' while the short option remains 'g'.[#6545](https://github.com/JabRef/jabref/pull/6545) - We improved the "Possible duplicate entries" window to remember its size and position throughout a session. [#6582](https://github.com/JabRef/jabref/issues/6582) - We divided the toolbar into small parts, so if the application window is to small, only a part of the toolbar is moved into the chevron popup. [#6682](https://github.com/JabRef/jabref/pull/6682) -- we change the layout for some of the buttons on the side panel to a flow layout to ensure button text are always visible, specially on resizing. [#6639](https://github.com/JabRef/jabref/issues/6639) +- We changed the layout for of the buttons in the Open Office side panel to ensure that the button text is always visible, specially when resizing. [#6639](https://github.com/JabRef/jabref/issues/6639) ### Fixed