From 8ef821dcc0cd115cef8e505ba646e05bed79cc5e Mon Sep 17 00:00:00 2001 From: Martin Brodbeck Date: Fri, 17 Sep 2021 21:13:21 +0200 Subject: [PATCH 1/6] singleapplication updated --- subprojects/singleapplication/singleapplication.git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/singleapplication/singleapplication.git b/subprojects/singleapplication/singleapplication.git index e93c12a..bdbb09b 160000 --- a/subprojects/singleapplication/singleapplication.git +++ b/subprojects/singleapplication/singleapplication.git @@ -1 +1 @@ -Subproject commit e93c12ab69a25fcaa963416f0e348d3269263190 +Subproject commit bdbb09b5f21ebea4cd7dfb43b29114a94e04a3a1 From e48fbe82e0f6c0e243ef7419b62953f362d762aa Mon Sep 17 00:00:00 2001 From: Martin Brodbeck Date: Fri, 17 Sep 2021 21:16:08 +0200 Subject: [PATCH 2/6] csv-parser updated --- subprojects/csv-parser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/csv-parser b/subprojects/csv-parser index 6c91e84..ea547fd 160000 --- a/subprojects/csv-parser +++ b/subprojects/csv-parser @@ -1 +1 @@ -Subproject commit 6c91e845320e907658fa5192f6884d1fcbbf3ad9 +Subproject commit ea547fdb16c7baf99bd9ced5febba52cc5da3ca3 From 92ecc92bf79a2e403fa972dd606795871987ee66 Mon Sep 17 00:00:00 2001 From: Martin Brodbeck Date: Sun, 19 Sep 2021 19:52:32 +0200 Subject: [PATCH 3/6] Fix umlaut-crash on linux machines --- src/gui/reportdialog.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gui/reportdialog.cpp b/src/gui/reportdialog.cpp index 84971ec..02717aa 100644 --- a/src/gui/reportdialog.cpp +++ b/src/gui/reportdialog.cpp @@ -48,7 +48,11 @@ void ReportDialog::onExportCsvButtonClicked() if (filename.isEmpty()) return; +#if defined(_WIN64) || defined(_WIN32) fs::path filePath(filename.toStdWString()); +#else + fs::path filePath(filename.toStdString()); +#endif market_->exportReportToCSV(filePath, feeInPercent, maxFeeInEuro); } From 072af76de197ac673c1c7fa0d584e4f1ca90a0aa Mon Sep 17 00:00:00 2001 From: Martin Brodbeck Date: Sun, 19 Sep 2021 19:53:20 +0200 Subject: [PATCH 4/6] ... --- subprojects/csv-parser | 2 +- subprojects/singleapplication/singleapplication.git | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/subprojects/csv-parser b/subprojects/csv-parser index ea547fd..6c91e84 160000 --- a/subprojects/csv-parser +++ b/subprojects/csv-parser @@ -1 +1 @@ -Subproject commit ea547fdb16c7baf99bd9ced5febba52cc5da3ca3 +Subproject commit 6c91e845320e907658fa5192f6884d1fcbbf3ad9 diff --git a/subprojects/singleapplication/singleapplication.git b/subprojects/singleapplication/singleapplication.git index bdbb09b..e93c12a 160000 --- a/subprojects/singleapplication/singleapplication.git +++ b/subprojects/singleapplication/singleapplication.git @@ -1 +1 @@ -Subproject commit bdbb09b5f21ebea4cd7dfb43b29114a94e04a3a1 +Subproject commit e93c12ab69a25fcaa963416f0e348d3269263190 From b8b5d8b1407e21aee717b2a5c9d9c7ea30e824ae Mon Sep 17 00:00:00 2001 From: Martin Brodbeck Date: Sun, 19 Sep 2021 19:58:49 +0200 Subject: [PATCH 5/6] =?UTF-8?q?2021=20=E2=86=92=202021?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gui/mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 1cf383c..0d727b8 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -107,7 +107,7 @@ MainWindow::MainWindow() }); connect(ui_.licenseAction, &QAction::triggered, this, [=]() { QString licenseText( - "Copyright © 2018-2020 Martin Brodbeck\n\n" + "Copyright © 2018-2021 Martin Brodbeck\n\n" "Hiermit wird unentgeltlich jeder Person, die eine Kopie der Software und der " "zugehörigen Dokumentationen (die \"Software\") erhält, die Erlaubnis erteilt, " "sie uneingeschränkt zu nutzen, inklusive und ohne Ausnahme mit dem Recht, " From edf9cb1a2c3f7614c443ba69a45e6fd8910258e7 Mon Sep 17 00:00:00 2001 From: Martin Brodbeck Date: Sun, 19 Sep 2021 19:59:51 +0200 Subject: [PATCH 6/6] =?UTF-8?q?Revert=20"2020=20=E2=86=92=202021"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b8b5d8b1407e21aee717b2a5c9d9c7ea30e824ae. --- src/gui/mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 0d727b8..1cf383c 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -107,7 +107,7 @@ MainWindow::MainWindow() }); connect(ui_.licenseAction, &QAction::triggered, this, [=]() { QString licenseText( - "Copyright © 2018-2021 Martin Brodbeck\n\n" + "Copyright © 2018-2020 Martin Brodbeck\n\n" "Hiermit wird unentgeltlich jeder Person, die eine Kopie der Software und der " "zugehörigen Dokumentationen (die \"Software\") erhält, die Erlaubnis erteilt, " "sie uneingeschränkt zu nutzen, inklusive und ohne Ausnahme mit dem Recht, "