1
0
mirror of https://github.com/DanilaFe/abacus synced 2024-12-22 15:30:09 -08:00

Make UI adjustments.

This commit is contained in:
Danila Fedorin 2017-11-23 20:54:34 -08:00
parent 50cc51d089
commit b4b64ac963
2 changed files with 21 additions and 13 deletions

View File

@ -26,7 +26,7 @@ public class AbacusApplication extends Application {
FXMLLoader loader = new FXMLLoader(getClass().getResource("/abacus.fxml")); FXMLLoader loader = new FXMLLoader(getClass().getResource("/abacus.fxml"));
Parent parent = loader.load(); Parent parent = loader.load();
controller = loader.getController(); controller = loader.getController();
Scene mainScene = new Scene(parent, 320, 480); Scene mainScene = new Scene(parent, 420, 520);
primaryStage.setScene(mainScene); primaryStage.setScene(mainScene);
primaryStage.setTitle("Abacus"); primaryStage.setTitle("Abacus");
primaryStage.show(); primaryStage.show();

View File

@ -47,26 +47,34 @@
</padding> </padding>
<Label text="Number Implementation" GridPane.columnIndex="0" GridPane.rowIndex="0"/> <Label text="Number Implementation" GridPane.columnIndex="0" GridPane.rowIndex="0"/>
<ComboBox fx:id="numberImplementationBox" GridPane.columnIndex="1" 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" <ListView fx:id="enabledPluginView"
GridPane.rowIndex="1" GridPane.columnIndex="0" GridPane.rowIndex="2" GridPane.columnIndex="0"
GridPane.columnSpan="2" maxHeight="100"/> 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"/> <Label GridPane.columnIndex="0" GridPane.rowIndex="3" text="Computation Limit"/>
<FlowPane GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="3" hgap="10" <TextField fx:id="computationLimitField" GridPane.columnIndex="1" GridPane.rowIndex="3"/>
vgap="10">
<Button text="Save" onAction="#performSave"/> <Label text="Definition Files:" GridPane.columnIndex="0" GridPane.rowIndex="4"/>
<Button text="Reload Plugins" onAction="#performReload"/>
<Button text="Apply and Reload" onAction="#performSaveAndReload"/>
<Button text="Scan Plugins" onAction="#performScan"/>
</FlowPane>
<ListView fx:id="definitionFilesView" <ListView fx:id="definitionFilesView"
GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.columnIndex="0" GridPane.columnSpan="2"
GridPane.rowIndex="4" maxHeight="100"/> GridPane.rowIndex="5" maxHeight="100"/>
<FlowPane GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="5" hgap="10" <FlowPane GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="6" hgap="10"
vgap="10"> vgap="10">
<Button text="Add" onAction="#performAddDefinitionFile"/> <Button text="Add" onAction="#performAddDefinitionFile"/>
<Button text="Remove" onAction="#performRemoveDefinitionFile"/> <Button text="Remove" onAction="#performRemoveDefinitionFile"/>
</FlowPane> </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> </GridPane>
</Tab> </Tab>
<Tab fx:id="functionListTab" text="Functions" closable="false"> <Tab fx:id="functionListTab" text="Functions" closable="false">