Compare commits

..

No commits in common. "a156c5331aff147d7c3805eb05b3f00c8264ed92" and "8b299bacc38f0c966577a801debc51a2c84aa7e8" have entirely different histories.

3 changed files with 29 additions and 42 deletions

View file

@ -126,9 +126,7 @@ MainWindow::MainWindow()
"SOFTWARE ODER SONSTIGER VERWENDUNG DER SOFTWARE ENTSTANDEN."); "SOFTWARE ODER SONSTIGER VERWENDUNG DER SOFTWARE ENTSTANDEN.");
QMessageBox::information(this, "Lizenzinformation", licenseText); QMessageBox::information(this, "Lizenzinformation", licenseText);
}); });
connect(ui_.reportAction, &QAction::triggered, this, [=]() { connect(ui_.reportAction, &QAction::triggered, this, [=]() { ReportDialog(this).exec(); });
ReportDialog(this).exec();
});
connect(ui_.configAction, &QAction::triggered, this, [=]() { connect(ui_.configAction, &QAction::triggered, this, [=]() {
int result = SettingsDialog(this).exec(); int result = SettingsDialog(this).exec();
if (result == QDialog::Accepted) { if (result == QDialog::Accepted) {
@ -434,9 +432,7 @@ void MainWindow::onCancelAllArticlesButtonClicked([[maybe_unused]] bool checked)
ui_.sellerNoEdit->setFocus(); ui_.sellerNoEdit->setFocus();
} }
void MainWindow::onAboutQt() { void MainWindow::onAboutQt() { QMessageBox::aboutQt(this); }
QMessageBox::aboutQt(this);
}
void MainWindow::onAbout() void MainWindow::onAbout()
{ {
@ -474,16 +470,7 @@ void MainWindow::onImportSellerExcelActionTriggered()
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"))) {
try {
numImported = ExcelReader::readSellersFromFile(filePath, marketplace_.get()); numImported = ExcelReader::readSellersFromFile(filePath, marketplace_.get());
} catch (const std::exception& e) {
QMessageBox(QMessageBox::Icon::Critical, "Fehler beim Importieren",
"Beim Import aus der Excel-Datei ist ein Fehler aufgetreten. "
"Sie könnten ggf. versuchen, die Daten aus einer .csv Datei zu imporieren.",
QMessageBox::StandardButton::Ok, this).exec();
std::cerr << e.what() << std::endl;
return;
}
} else { } else {
numImported = CsvReader::readSellersFromFile(filePath, marketplace_.get()); numImported = CsvReader::readSellersFromFile(filePath, marketplace_.get());
} }

@ -1 +1 @@
Subproject commit 6c91e845320e907658fa5192f6884d1fcbbf3ad9 Subproject commit e4a899dcafcfa14e448348e9b3c8c06d7697dbf8

@ -1 +1 @@
Subproject commit e93c12ab69a25fcaa963416f0e348d3269263190 Subproject commit e18babe5598d53a9e51ac9263d5b62ea2c3276e6