From baeb85756042bbb133c387372aad18f18bca9c38 Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Thu, 3 Aug 2017 19:00:13 -0700
Subject: [PATCH] Add a save and reload button.

---
 src/main/java/org/nwapw/abacus/fx/AbacusController.java | 8 ++++++++
 src/main/resources/abacus.fxml                          | 8 +++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/nwapw/abacus/fx/AbacusController.java b/src/main/java/org/nwapw/abacus/fx/AbacusController.java
index bbf5bc6..aae51df 100644
--- a/src/main/java/org/nwapw/abacus/fx/AbacusController.java
+++ b/src/main/java/org/nwapw/abacus/fx/AbacusController.java
@@ -188,6 +188,14 @@ public class AbacusController implements PluginListener {
         inputField.setText("");
     }
 
+    @FXML
+    private void performSaveAndReload(){
+        performSave();
+        performReload();
+        changesMade = false;
+        reloadAlertShown = false;
+    }
+
     @FXML
     private void performReload(){
         alertIfApplyNeeded(true);
diff --git a/src/main/resources/abacus.fxml b/src/main/resources/abacus.fxml
index 9cc8e70..b3125e8 100644
--- a/src/main/resources/abacus.fxml
+++ b/src/main/resources/abacus.fxml
@@ -7,6 +7,7 @@
 <?import javafx.scene.text.Text?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.FlowPane?>
 <BorderPane xmlns="http://javafx.com/javafx"
             xmlns:fx="http://javafx.com/fxml"
             fx:controller="org.nwapw.abacus.fx.AbacusController">
@@ -49,10 +50,11 @@
                     <ListView fx:id="enabledPluginView"
                               GridPane.rowIndex="1" GridPane.columnIndex="0"
                               GridPane.columnSpan="2" maxHeight="100"/>
-                    <HBox GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="2" spacing="10">
+                    <FlowPane GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="2" hgap="10" vgap="10">
                         <Button text="Apply" onAction="#performSave"/>
-                        <Button text="Reload" onAction="#performReload"/>
-                    </HBox>
+                        <Button text="Reload Plugins" onAction="#performReload"/>
+                        <Button text="Apply and Reload" onAction="#performSaveAndReload"/>
+                    </FlowPane>
                 </GridPane>
             </Tab>
         </TabPane>