Compare commits

...

5 commits

3 changed files with 42 additions and 29 deletions

View file

@ -126,7 +126,9 @@ MainWindow::MainWindow()
"SOFTWARE ODER SONSTIGER VERWENDUNG DER SOFTWARE ENTSTANDEN.");
QMessageBox::information(this, "Lizenzinformation", licenseText);
});
connect(ui_.reportAction, &QAction::triggered, this, [=]() { ReportDialog(this).exec(); });
connect(ui_.reportAction, &QAction::triggered, this, [=]() {
ReportDialog(this).exec();
});
connect(ui_.configAction, &QAction::triggered, this, [=]() {
int result = SettingsDialog(this).exec();
if (result == QDialog::Accepted) {
@ -432,7 +434,9 @@ void MainWindow::onCancelAllArticlesButtonClicked([[maybe_unused]] bool checked)
ui_.sellerNoEdit->setFocus();
}
void MainWindow::onAboutQt() { QMessageBox::aboutQt(this); }
void MainWindow::onAboutQt() {
QMessageBox::aboutQt(this);
}
void MainWindow::onAbout()
{
@ -470,7 +474,16 @@ void MainWindow::onImportSellerExcelActionTriggered()
std::size_t numImported{};
if (case_insensitive_match(filePath.extension().string(), std::string(".xlsx"))) {
try {
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 {
numImported = CsvReader::readSellersFromFile(filePath, marketplace_.get());
}

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

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