Fix wrong button order (Apply and Cancel) in ManageProtectedTermsDial…

…og. (#6358) * Fix wrong button order (Apply and Cancel) in ManageProtectedTermsDialog. * Fix code style. Change button text 'Apply' to 'Save'.
JabRef · Apr 27, 2020 · 5292a70 · 5292a70
1 parent c0e1a42
commit 5292a70
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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)

diff --git a/src/main/java/org/jabref/gui/protectedterms/ManageProtectedTermsDialog.fxml b/src/main/java/org/jabref/gui/protectedterms/ManageProtectedTermsDialog.fxml
@@ -31,6 +31,6 @@
             </HBox>
         </VBox>
     </content>
+    <ButtonType buttonData="OK_DONE" text="%Save" />
     <ButtonType fx:constant="CANCEL"/>
-    <ButtonType fx:constant="APPLY"/>
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/protectedterms/ManageProtectedTermsDialog.java b/src/main/java/org/jabref/gui/protectedterms/ManageProtectedTermsDialog.java
@@ -3,7 +3,7 @@
 import javax.inject.Inject;
 
 import javafx.fxml.FXML;
-import javafx.scene.control.ButtonType;
+import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.TableColumn;
@@ -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;