Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for issue 6639 #6719

Merged
merged 7 commits into from
Jul 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 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

Expand Down
23 changes: 12 additions & 11 deletions src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.util.stream.Collectors;

import javafx.concurrent.Task;
import javafx.geometry.Insets;
import javafx.geometry.Side;
import javafx.scene.Node;
import javafx.scene.control.Button;
Expand All @@ -22,6 +23,7 @@
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;
Expand Down Expand Up @@ -264,19 +266,18 @@ 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() {
Expand Down