diff --git a/build/BudgetMaster.exe b/build/BudgetMaster.exe index 5f7212cad765df8b57cf4902b6ba1093ae5e4f1f..9a71939b6080305901ead54e03601db2a98f7c8b 100644 Binary files a/build/BudgetMaster.exe and b/build/BudgetMaster.exe differ diff --git a/build/BudgetMasterClient.jar b/build/BudgetMasterClient.jar index b18685566ba91f3f658051275ee038bc28d41bec..844ca0c75e35537d1975ec1bee85b622fd498515 100644 Binary files a/build/BudgetMasterClient.jar and b/build/BudgetMasterClient.jar differ diff --git a/build/BudgetMasterServer.jar b/build/BudgetMasterServer.jar index 3133317cd7b41133781f30d616c65536745ff7fa..9dc64339715653f0fb059b3259223a7aaf46bb4a 100644 Binary files a/build/BudgetMasterServer.jar and b/build/BudgetMasterServer.jar differ diff --git a/src/de/deadlocker8/budgetmaster/logic/report/HeaderFooterPageEvent.java b/src/de/deadlocker8/budgetmaster/logic/report/HeaderFooterPageEvent.java index 6909497dfde3d30c06981bf4a88239f284e8ecc3..3ff99a548ff30a38227ab3cf7ed4ed917ce21022 100644 --- a/src/de/deadlocker8/budgetmaster/logic/report/HeaderFooterPageEvent.java +++ b/src/de/deadlocker8/budgetmaster/logic/report/HeaderFooterPageEvent.java @@ -27,7 +27,7 @@ public class HeaderFooterPageEvent extends PdfPageEventHelper Font font = new Font(FontFamily.HELVETICA, 8, Font.NORMAL, GrayColor.BLACK); ColumnText.showTextAligned(writer.getDirectContent(), Element.ALIGN_CENTER, new Phrase(Localization.getString(Strings.REPORT_FOOTER_LEFT), font), 100, 25, 0); - ColumnText.showTextAligned(writer.getDirectContent(), Element.ALIGN_CENTER, new Phrase(Localization.getString(Strings.REPORT_FOOTER_LEFT, document.getPageNumber()), font), 300, 25, 0); + ColumnText.showTextAligned(writer.getDirectContent(), Element.ALIGN_CENTER, new Phrase(Localization.getString(Strings.REPORT_FOOTER_CENTER, document.getPageNumber()), font), 300, 25, 0); ColumnText.showTextAligned(writer.getDirectContent(), Element.ALIGN_CENTER, new Phrase(DateTime.now().toString("dd.MM.YYYY"), font), 500, 25, 0); } } \ No newline at end of file diff --git a/src/de/deadlocker8/budgetmaster/resources/languages/_de.properties b/src/de/deadlocker8/budgetmaster/resources/languages/_de.properties index 38641effc52c8f8d5003decc64f553064b16851b..5617bd8b86aeb8d98d409eed7b868a608fea2329 100644 --- a/src/de/deadlocker8/budgetmaster/resources/languages/_de.properties +++ b/src/de/deadlocker8/budgetmaster/resources/languages/_de.properties @@ -1,7 +1,7 @@ # DEFAULT app.name=BudgetMaster -version.code=7 -version.name=1.4.0 +version.code=8 +version.name=1.4.1 version.date=23.08.17 author=Robert Goldmann credits=L�nderflaggen von Freepik auf https://www.flaticon.com @@ -15,7 +15,7 @@ title.income=Einnahme title.payments=Ausgaben title.payment=Ausgabe title.categories=Kategorien -title.categorie=Kategorie +title.category=Kategorie title.category.budgets=Verbrauch nach Kategorien title.amount=Betrag title.info=Hinweis @@ -77,7 +77,7 @@ report.repeating.no=Nein report.initial.filename=BudgetMaster Monatsbericht - {0}_{1}.pdf # MONTH -month.january=Januar +month.january=Januar month.february=Februar month.march=M�rz month.april=April diff --git a/src/de/deadlocker8/budgetmaster/resources/languages/_en.properties b/src/de/deadlocker8/budgetmaster/resources/languages/_en.properties index 1aabc4fca3f7c390c7587def7489111e9d4601fb..583d72fcee558039462aac213b003a1b2c735896 100644 --- a/src/de/deadlocker8/budgetmaster/resources/languages/_en.properties +++ b/src/de/deadlocker8/budgetmaster/resources/languages/_en.properties @@ -1,7 +1,7 @@ # DEFAULT app.name=BudgetMaster -version.code=7 -version.name=1.4.0 +version.code=8 +version.name=1.4.1 version.date=23.08.17 author=Robert Goldmann credits=Flags by Freepik on https://www.flaticon.com @@ -15,7 +15,7 @@ title.income=Income title.payments=Payments title.payment=Payment title.categories=Categories -title.categorie=Category +title.category=Category title.category.budgets=Consumption by categories title.amount=Amount title.info=Information @@ -77,7 +77,7 @@ report.repeating.no=No report.initial.filename=BudgetMaster Month Report - {0}_{1}.pdf # MONTH -month.january=January +month.january=January month.february=February month.march=March month.april=April @@ -166,7 +166,7 @@ error.401=Invalid Server Password. error.500=An internal server error occurred while processing the request. error.create.ui=An error occurred while creating the user interface. error.server.connection=An error occurred while connecting to the server. Please check your settings. -error.server.connection.with.details=BAn error occurred while connecting to the server. Please check your settings.\n\nError details:\n{0} +error.server.connection.with.details=An error occurred while connecting to the server. Please check your settings.\n\nError details:\n{0} error.open.folder=The folder couldn't be opened.\n\n{0} error.open.chart=The chart couldn't be opened.\n\n{0} error.open.report=The report couldn't be opened.\n\n{0} diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/ReportController.java b/src/de/deadlocker8/budgetmaster/ui/controller/ReportController.java index c216e026e687c80b45943dc376eb6739aa842764..af57c52c8509fa71620e8a8c737626c6979bb634 100644 --- a/src/de/deadlocker8/budgetmaster/ui/controller/ReportController.java +++ b/src/de/deadlocker8/budgetmaster/ui/controller/ReportController.java @@ -76,7 +76,6 @@ public class ReportController implements Refreshable private Controller controller; private ColumnFilter columnFilter; - private File reportPath; private String initialReportPath; public void init(Controller controller) @@ -523,21 +522,11 @@ public class ReportController implements Refreshable FileChooser fileChooser = new FileChooser(); fileChooser.setTitle(Localization.getString(Strings.TITLE_REPORT_SAVE)); FileChooser.ExtensionFilter extFilter = new FileChooser.ExtensionFilter("PDF (*.pdf)", "*.pdf"); - if(reportPath != null) - { - fileChooser.setInitialDirectory(reportPath.getParentFile()); - fileChooser.setInitialFileName(reportPath.getName()); - } - else - { - fileChooser.setInitialFileName(initialReportPath); - } + fileChooser.setInitialFileName(initialReportPath); fileChooser.getExtensionFilters().add(extFilter); File file = fileChooser.showSaveDialog(controller.getStage()); if(file != null) - { - reportPath = file; - + { Budget budget = new Budget(controller.getPaymentHandler().getPayments()); ReportGenerator reportGenerator = new ReportGenerator(new ArrayList<ReportItem>(tableView.getItems()), diff --git a/src/de/deadlocker8/budgetmasterserver/main/Main.java b/src/de/deadlocker8/budgetmasterserver/main/Main.java index 1b8d945bedb5d71b475bb28f5621397029c4eb62..61a8906296d81470e7983c1382f687048d0bfe9f 100644 --- a/src/de/deadlocker8/budgetmasterserver/main/Main.java +++ b/src/de/deadlocker8/budgetmasterserver/main/Main.java @@ -20,7 +20,7 @@ import tools.Localization; public class Main { //for server specific version information - private static ResourceBundle bundle = ResourceBundle.getBundle("de/deadlocker8/budgetmasterserver/main/", Locale.ENGLISH); + private static ResourceBundle bundle = ResourceBundle.getBundle("de/deadlocker8/budgetmasterserver/main/", Locale.GERMAN); public static void main(String[] args) { diff --git a/src/de/deadlocker8/budgetmasterserver/main/_de.properties b/src/de/deadlocker8/budgetmasterserver/main/_de.properties index fbb01a8c8e4d0c4a48a8996dd1c94ea615260447..9fb7282676790f968f37e305f8ee5397ed7b94da 100644 --- a/src/de/deadlocker8/budgetmasterserver/main/_de.properties +++ b/src/de/deadlocker8/budgetmasterserver/main/_de.properties @@ -1,5 +1,5 @@ app.name=BudgetMasterServer -version.code=7 -version.name=1.4.0 +version.code=8 +version.name=1.4.1 version.date=23.08.17 author=Robert Goldmann \ No newline at end of file