diff --git a/.clang-format b/.clang-format index 2c120cc..3fa41ba 100644 --- a/.clang-format +++ b/.clang-format @@ -1,3 +1,4 @@ +--- Language: Cpp # BasedOnStyle: LLVM AccessModifierOffset: -2 @@ -89,6 +90,10 @@ PenaltyBreakString: 1000 PenaltyExcessCharacter: 1000000 PenaltyReturnTypeOnItsOwnLine: 60 PointerAlignment: Left +RawStringFormats: + - Delimiter: pb + Language: TextProto + BasedOnStyle: google ReflowComments: true SortIncludes: true SortUsingDeclarations: true @@ -103,7 +108,8 @@ SpacesInContainerLiterals: true SpacesInCStyleCastParentheses: false SpacesInParentheses: false SpacesInSquareBrackets: false -Standard: Auto +Standard: Cpp11 TabWidth: 8 UseTab: Never +... diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 3460e10..929ee2c 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -163,6 +163,7 @@ void MainWindow::onActionEditSellerTriggered() setSaleModel(); updateStatLabel(); + } void MainWindow::setSaleModel() @@ -194,6 +195,7 @@ void MainWindow::onPaidButtonTriggered() ui_.sellerNoEdit->setFocus(); statusBar()->showMessage("Verkaufsvorgang erfolgreich durchgeführt.", STATUSBAR_TIMEOUT); updateStatLabel(); + } } @@ -443,6 +445,7 @@ void MainWindow::onImportSellerExcelActionTriggered() ExcelReader::readSellersFromFile(filePath, marketplace_.get()); updateStatLabel(); + } void MainWindow::onImportSellerJsonActionTriggered() @@ -465,6 +468,7 @@ void MainWindow::onImportSellerJsonActionTriggered() JsonUtil::importSellers(filePath, marketplace_.get()); updateStatLabel(); + } void MainWindow::onExportSellerJsonActionTriggered() @@ -484,10 +488,8 @@ void MainWindow::onExportSalesJsonActionTriggered() { QSettings settings; - auto filename = QFileDialog::getSaveFileName( - this, "Umsätze/Transaktionen exportieren", - QString("kima2_umsaetze_kasse") + settings.value("global/cashPointNo").toString() + ".json", - "JSON Dateien (*.json)"); + auto filename = QFileDialog::getSaveFileName(this, "Umsätze/Transaktionen exportieren", + QString(), "JSON Dateien (*.json)"); if (filename.isEmpty()) return; @@ -521,6 +523,7 @@ void MainWindow::onImportSalesJsonActionTriggered() } setSaleModel(); updateStatLabel(); + } void MainWindow::writeGeometry()