DanilaFe/Abacus
1
0
Fork 0
mirror of https://github.com/DanilaFe/abacus synced 2026-01-12 01:55:19 +00:00
Code Issues Releases Wiki Activity

Merge branch 'stoppable-new'

Browse Source 
# Conflicts:
#	src/main/java/org/nwapw/abacus/fx/AbacusController.java
#	src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java
This commit is contained in:
Danila Fedorin
2017-08-04 14:28:22 -07:00
parent 385a0c960d f8bf60f383
commit 0058ec9c71
6 changed files with 246 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/abacus.fxml
View File

@@ -38,6 +38,8 @@
<TextField fx:id="inputField" onAction="#performCalculation"/>
<Button fx:id="inputButton" text="Calculate" maxWidth="Infinity"
onAction="#performCalculation"/>
<Button fx:id="stopButton" text="Stop" maxWidth="Infinity"
onAction="#stopCalculation"/>
</VBox>
</bottom>
</BorderPane>