martin/kima2
1
1
Fork 0
Code Issues Pull requests Releases 23 Wiki Activity

Fix file system problem (umlauts) on Linux

Browse source
This commit is contained in:
Martin Brodbeck 2019-10-07 08:32:51 +02:00
parent 99104a932f
commit acc8408b0a
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gui/mainwindow.cpp
View file

@ -462,7 +462,11 @@ void MainWindow::onImportSellerExcelActionTriggered()
if (filename.isEmpty()) if (filename.isEmpty())
return; return;
#if defined(_WIN64) || defined(_WIN32)
fs::path filePath(filename.toStdWString()); fs::path filePath(filename.toStdWString());
#else
fs::path filePath(filename.toStdString());
#endif
std::size_t numImported{}; std::size_t numImported{};
if (case_insensitive_match(filePath.extension().string(), std::string(".xlsx"))) { if (case_insensitive_match(filePath.extension().string(), std::string(".xlsx"))) {
@ -498,7 +502,11 @@ void MainWindow::onImportSellerJsonActionTriggered()
if (filename.isEmpty()) if (filename.isEmpty())
return; return;
#if defined(_WIN64) || defined(_WIN32)
fs::path filePath(filename.toStdWString()); fs::path filePath(filename.toStdWString());
#else
fs::path filePath(filename.toStdString());
#endif
JsonUtil::importSellers(filePath, marketplace_.get()); JsonUtil::importSellers(filePath, marketplace_.get());
updateStatLabel(); updateStatLabel();
@ -529,7 +537,11 @@ void MainWindow::onExportSalesJsonActionTriggered()
if (filename.isEmpty()) if (filename.isEmpty())
return; return;
#if defined(_WIN64) || defined(_WIN32)
fs::path filePath(filename.toStdWString()); fs::path filePath(filename.toStdWString());
#else
fs::path filePath(filename.toStdString());
#endif
JsonUtil::exportSales(filePath, marketplace_.get(), JsonUtil::exportSales(filePath, marketplace_.get(),
settings.value("global/cashPointNo").toInt()); settings.value("global/cashPointNo").toInt());
@ -545,7 +557,11 @@ void MainWindow::onImportSalesJsonActionTriggered()
if (filename.isEmpty()) if (filename.isEmpty())
return; return;
#if defined(_WIN64) || defined(_WIN32)
fs::path filePath(filename.toStdWString()); fs::path filePath(filename.toStdWString());
#else
fs::path filePath(filename.toStdString());
#endif
delete ui_.salesView->model(); delete ui_.salesView->model();
try { try {