From b4b64ac9633fbff179f1f3e6913ecf2f974cb683 Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Thu, 23 Nov 2017 20:54:34 -0800
Subject: [PATCH] Make UI adjustments.

---
 .../nwapw/abacus/fx/AbacusApplication.java    |  2 +-
 fx/src/main/resources/abacus.fxml             | 32 ++++++++++++-------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/fx/src/main/java/org/nwapw/abacus/fx/AbacusApplication.java b/fx/src/main/java/org/nwapw/abacus/fx/AbacusApplication.java
index 92a4b3f..5445898 100644
--- a/fx/src/main/java/org/nwapw/abacus/fx/AbacusApplication.java
+++ b/fx/src/main/java/org/nwapw/abacus/fx/AbacusApplication.java
@@ -26,7 +26,7 @@ public class AbacusApplication extends Application {
         FXMLLoader loader = new FXMLLoader(getClass().getResource("/abacus.fxml"));
         Parent parent = loader.load();
         controller = loader.getController();
-        Scene mainScene = new Scene(parent, 320, 480);
+        Scene mainScene = new Scene(parent, 420, 520);
         primaryStage.setScene(mainScene);
         primaryStage.setTitle("Abacus");
         primaryStage.show();
diff --git a/fx/src/main/resources/abacus.fxml b/fx/src/main/resources/abacus.fxml
index a70394f..6125735 100644
--- a/fx/src/main/resources/abacus.fxml
+++ b/fx/src/main/resources/abacus.fxml
@@ -47,26 +47,34 @@
                     </padding>
                     <Label text="Number Implementation" GridPane.columnIndex="0" GridPane.rowIndex="0"/>
                     <ComboBox fx:id="numberImplementationBox" GridPane.columnIndex="1" GridPane.rowIndex="0"/>
+
+                    <Label text="Plugins:" GridPane.columnIndex="0" GridPane.rowIndex="1"/>
                     <ListView fx:id="enabledPluginView"
-                              GridPane.rowIndex="1" GridPane.columnIndex="0"
+                              GridPane.rowIndex="2" GridPane.columnIndex="0"
                               GridPane.columnSpan="2" maxHeight="100"/>
-                    <Text GridPane.columnIndex="0" GridPane.rowIndex="2" text="Computation Limit"/>
-                    <TextField fx:id="computationLimitField" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
-                    <FlowPane GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="3" hgap="10"
-                              vgap="10">
-                        <Button text="Save" onAction="#performSave"/>
-                        <Button text="Reload Plugins" onAction="#performReload"/>
-                        <Button text="Apply and Reload" onAction="#performSaveAndReload"/>
-                        <Button text="Scan Plugins" onAction="#performScan"/>
-                    </FlowPane>
+
+                    <Label GridPane.columnIndex="0" GridPane.rowIndex="3" text="Computation Limit"/>
+                    <TextField fx:id="computationLimitField" GridPane.columnIndex="1" GridPane.rowIndex="3"/>
+
+                    <Label text="Definition Files:" GridPane.columnIndex="0" GridPane.rowIndex="4"/>
                     <ListView fx:id="definitionFilesView"
                               GridPane.columnIndex="0" GridPane.columnSpan="2"
-                              GridPane.rowIndex="4" maxHeight="100"/>
-                    <FlowPane GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="5" hgap="10"
+                              GridPane.rowIndex="5" maxHeight="100"/>
+                    <FlowPane GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="6" hgap="10"
                               vgap="10">
                         <Button text="Add" onAction="#performAddDefinitionFile"/>
                         <Button text="Remove" onAction="#performRemoveDefinitionFile"/>
                     </FlowPane>
+
+                    <Separator GridPane.rowIndex="7"/>
+
+                    <FlowPane GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="8" hgap="10"
+                              vgap="10">
+                        <Button text="Save Settings" onAction="#performSave"/>
+                        <Button text="Reload Plugins And Definitions" onAction="#performReload"/>
+                        <Button text="Save and Reload" onAction="#performSaveAndReload"/>
+                        <Button text="Reload Plugins From Disk" onAction="#performScan"/>
+                    </FlowPane>
                 </GridPane>
             </Tab>
             <Tab fx:id="functionListTab" text="Functions" closable="false">