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.

Sign up for GitHub

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

Jump to bottom

Fix wrong button order (Apply and Cancel) in ManageProtectedTermsDialog. #6358

Merged
merged 2 commits into from
Apr 27, 2020
Merged

Fix wrong button order (Apply and Cancel) in ManageProtectedTermsDialog. #6358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
466772b
Fix wrong button order (Apply and Cancel) in ManageProtectedTermsDialog.
dextep Apr 26, 2020
51e2bda
Fix code style.
dextep Apr 26, 2020
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve

### Fixed

- We fixed wrong button order (Apply and Cancel) in ManageProtectedTermsDialog.
- We greatly improved the performance of the overall application and many operations. [#5071](https://github.com/JabRef/jabref/issues/5071)
- We fixed an issue where sort by priority was broken. [#6222](https://github.com/JabRef/jabref/issues/6222)
- We fixed an issue where opening a library from the recent libraries menu was not possible. [#5939](https://github.com/JabRef/jabref/issues/5939)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jabref/gui/protectedterms/ManageProtectedTermsDialog.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
</HBox>
</VBox>
</content>
<ButtonType buttonData="OK_DONE" text="%Save" />
<ButtonType fx:constant="CANCEL"/>
<ButtonType fx:constant="APPLY"/>
</DialogPane>
4 changes: 2 additions & 2 deletions src/main/java/org/jabref/gui/protectedterms/ManageProtectedTermsDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import javax.inject.Inject;

import javafx.fxml.FXML;
import javafx.scene.control.ButtonType;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please check your IDE setup. It seems that you did not import the JabRef code style. --> https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's true. Thanks @koppor!

import javafx.scene.control.ButtonBar;
import javafx.scene.control.ContextMenu;
import javafx.scene.control.MenuItem;
import javafx.scene.control.TableColumn;
Expand Down Expand Up @@ -48,7 +48,7 @@ public ManageProtectedTermsDialog() {
.setAsDialogPane(this);

setResultConverter(button -> {
if (button == ButtonType.APPLY) {
if (button.getButtonData() == ButtonBar.ButtonData.OK_DONE) {
viewModel.save();
}
return null;
Expand Down