Compare commits

...

2 commits

Author SHA1 Message Date
0b4041c13a propose filename when exporting sales as json 2018-10-09 11:55:20 +02:00
9ef1ada6d9 Fix clang-format 2018-10-09 11:54:35 +02:00
2 changed files with 5 additions and 14 deletions

View file

@ -1,4 +1,3 @@
---
Language: Cpp Language: Cpp
# BasedOnStyle: LLVM # BasedOnStyle: LLVM
AccessModifierOffset: -2 AccessModifierOffset: -2
@ -90,10 +89,6 @@ PenaltyBreakString: 1000
PenaltyExcessCharacter: 1000000 PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60 PenaltyReturnTypeOnItsOwnLine: 60
PointerAlignment: Left PointerAlignment: Left
RawStringFormats:
- Delimiter: pb
Language: TextProto
BasedOnStyle: google
ReflowComments: true ReflowComments: true
SortIncludes: true SortIncludes: true
SortUsingDeclarations: true SortUsingDeclarations: true
@ -108,8 +103,7 @@ SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false SpacesInCStyleCastParentheses: false
SpacesInParentheses: false SpacesInParentheses: false
SpacesInSquareBrackets: false SpacesInSquareBrackets: false
Standard: Cpp11 Standard: Auto
TabWidth: 8 TabWidth: 8
UseTab: Never UseTab: Never
...

View file

@ -163,7 +163,6 @@ void MainWindow::onActionEditSellerTriggered()
setSaleModel(); setSaleModel();
updateStatLabel(); updateStatLabel();
} }
void MainWindow::setSaleModel() void MainWindow::setSaleModel()
@ -195,7 +194,6 @@ void MainWindow::onPaidButtonTriggered()
ui_.sellerNoEdit->setFocus(); ui_.sellerNoEdit->setFocus();
statusBar()->showMessage("Verkaufsvorgang erfolgreich durchgeführt.", STATUSBAR_TIMEOUT); statusBar()->showMessage("Verkaufsvorgang erfolgreich durchgeführt.", STATUSBAR_TIMEOUT);
updateStatLabel(); updateStatLabel();
} }
} }
@ -445,7 +443,6 @@ void MainWindow::onImportSellerExcelActionTriggered()
ExcelReader::readSellersFromFile(filePath, marketplace_.get()); ExcelReader::readSellersFromFile(filePath, marketplace_.get());
updateStatLabel(); updateStatLabel();
} }
void MainWindow::onImportSellerJsonActionTriggered() void MainWindow::onImportSellerJsonActionTriggered()
@ -468,7 +465,6 @@ void MainWindow::onImportSellerJsonActionTriggered()
JsonUtil::importSellers(filePath, marketplace_.get()); JsonUtil::importSellers(filePath, marketplace_.get());
updateStatLabel(); updateStatLabel();
} }
void MainWindow::onExportSellerJsonActionTriggered() void MainWindow::onExportSellerJsonActionTriggered()
@ -488,8 +484,10 @@ void MainWindow::onExportSalesJsonActionTriggered()
{ {
QSettings settings; QSettings settings;
auto filename = QFileDialog::getSaveFileName(this, "Umsätze/Transaktionen exportieren", auto filename = QFileDialog::getSaveFileName(
QString(), "JSON Dateien (*.json)"); this, "Umsätze/Transaktionen exportieren",
QString("kima2_umsaetze_kasse") + settings.value("global/cashPointNo").toString() + ".json",
"JSON Dateien (*.json)");
if (filename.isEmpty()) if (filename.isEmpty())
return; return;
@ -523,7 +521,6 @@ void MainWindow::onImportSalesJsonActionTriggered()
} }
setSaleModel(); setSaleModel();
updateStatLabel(); updateStatLabel();
} }
void MainWindow::writeGeometry() void MainWindow::writeGeometry()