localhorst/jFxKasse
2
0
Fork 0
Code Issues Pull Requests 1 Releases 4 Wiki Activity

Update dependencies and build system #2

Open
localhorst wants to merge 11 commits from feature/revival into master
pull from: feature/revival
merge into: localhorst:master
Conversation 1 Commits 11 Files Changed 27 +2771 -2796
27 changed files with 2771 additions and 2796 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6330d7fd51 - Show all commits

15
src/main/java/com/jFxKasse/controller/MainWindowController.java
View File

@ -513,7 +513,11 @@ public class MainWindowController {
xmlc.setHeader(tftheader.getText());
xmlc.setFooter(tftfooter.getText());
xmlc.setCategorySplitted(switchSeparate.isSelected());
xmlc.setAutoPrintBill(switchAutoPrint.isSelected());
// Only save if checkbox exists (might be null if FXML not updated)
if (switchAutoPrint != null) {
xmlc.setAutoPrintBill(switchAutoPrint.isSelected());
}
try {
xmlc.saveSettings();
@ -870,7 +874,10 @@ public class MainWindowController {
switchSeparate.setSelected(xmlc.getCategorySplitted());
switchAutoPrint.setSelected(xmlc.getAutoPrintBill());
// Only set if checkbox exists (might be null if FXML not updated)
if (switchAutoPrint != null) {
switchAutoPrint.setSelected(xmlc.getAutoPrintBill());
}
updatePrintButtonLabel();
@ -881,7 +888,7 @@ public class MainWindowController {
btnPrintBill.setText("Drucken");
}
else {
btnPrintBill.setText("Bestellen");
btnPrintBill.setText("Buchen");
}
}
@ -1399,4 +1406,4 @@ public class MainWindowController {
return 404;
}
}
}