summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--desktop-widgets/mainwindow.cpp40
-rw-r--r--desktop-widgets/mainwindow.h1
-rw-r--r--desktop-widgets/subsurfacewebservices.cpp1
-rw-r--r--profile-widget/profilewidget2.cpp3
-rw-r--r--profile-widget/profilewidget2.h1
-rw-r--r--subsurface-desktop-main.cpp2
6 files changed, 8 insertions, 40 deletions
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index 7a99611bf..1afe8b262 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -297,7 +297,6 @@ MainWindow::MainWindow() : QMainWindow(),
// now let's set up some connections
connect(graphics(), &ProfileWidget2::enableToolbar ,this, &MainWindow::setEnabledToolbar);
- connect(graphics(), &ProfileWidget2::showError, this, &MainWindow::showError);
connect(graphics(), &ProfileWidget2::disableShortcuts, this, &MainWindow::disableShortcuts);
connect(graphics(), &ProfileWidget2::enableShortcuts, this, &MainWindow::enableShortcuts);
connect(graphics(), &ProfileWidget2::refreshDisplay, this, &MainWindow::refreshDisplay);
@@ -439,7 +438,6 @@ MainWindow *MainWindow::instance()
// this gets called after we download dives from a divecomputer
void MainWindow::refreshDisplay(bool doRecreateDiveList)
{
- getNotificationWidget()->showNotification(get_error_string(), KMessageWidget::Error);
information()->reload();
TankInfoModel::instance()->update();
MapWidget::instance()->reload();
@@ -572,10 +570,9 @@ void MainWindow::on_actionCloudstorageopen_triggered()
return;
QString filename;
- if (getCloudURL(filename)) {
- getNotificationWidget()->showNotification(get_error_string(), KMessageWidget::Error);
+ if (getCloudURL(filename))
return;
- }
+
if (verbose)
qDebug() << "Opening cloud storage from:" << filename;
@@ -601,13 +598,12 @@ void MainWindow::on_actionCloudstoragesave_triggered()
{
QString filename;
if (!dive_table.nr) {
- getNotificationWidget()->showNotification(tr("Don't save an empty log to the cloud"), KMessageWidget::Error);
+ report_error(qPrintable(tr("Don't save an empty log to the cloud")));
return;
}
- if (getCloudURL(filename)) {
- getNotificationWidget()->showNotification(get_error_string(), KMessageWidget::Error);
+ if (getCloudURL(filename))
return;
- }
+
if (verbose)
qDebug() << "Saving cloud storage to:" << filename;
if (information()->isEditing())
@@ -615,14 +611,11 @@ void MainWindow::on_actionCloudstoragesave_triggered()
showProgressBar();
- if (save_dives(filename.toUtf8().data())) {
- getNotificationWidget()->showNotification(get_error_string(), KMessageWidget::Error);
+ if (save_dives(filename.toUtf8().data()))
return;
- }
hideProgressBar();
- getNotificationWidget()->showNotification(get_error_string(), KMessageWidget::Error);
set_filename(filename.toUtf8().data(), true);
setTitle(MWTF_FILENAME);
mark_divelist_changed(false);
@@ -1656,12 +1649,9 @@ int MainWindow::file_save_as(void)
if (information()->isEditing())
information()->acceptChanges();
- if (save_dives(filename.toUtf8().data())) {
- getNotificationWidget()->showNotification(get_error_string(), KMessageWidget::Error);
+ if (save_dives(filename.toUtf8().data()))
return -1;
- }
- getNotificationWidget()->showNotification(get_error_string(), KMessageWidget::Error);
set_filename(filename.toUtf8().data(), true);
setTitle(MWTF_FILENAME);
mark_divelist_changed(false);
@@ -1693,14 +1683,12 @@ int MainWindow::file_save(void)
if (is_cloud)
showProgressBar();
if (save_dives(existing_filename)) {
- getNotificationWidget()->showNotification(get_error_string(), KMessageWidget::Error);
if (is_cloud)
hideProgressBar();
return -1;
}
if (is_cloud)
hideProgressBar();
- getNotificationWidget()->showNotification(get_error_string(), KMessageWidget::Error);
mark_divelist_changed(false);
addRecentFile(QStringList() << QString(existing_filename));
return 0;
@@ -1711,11 +1699,6 @@ NotificationWidget *MainWindow::getNotificationWidget()
return ui.mainErrorMessage;
}
-void MainWindow::showError()
-{
- getNotificationWidget()->showNotification(get_error_string(), KMessageWidget::Error);
-}
-
QString MainWindow::displayedFilename(QString fullFilename)
{
QFile f(fullFilename);
@@ -1805,7 +1788,6 @@ void MainWindow::importTxtFiles(const QStringList fileNames)
void MainWindow::loadFiles(const QStringList fileNames)
{
- bool showWarning = false;
if (fileNames.isEmpty()) {
refreshDisplay();
return;
@@ -1822,19 +1804,11 @@ void MainWindow::loadFiles(const QStringList fileNames)
if (!error) {
set_filename(fileNamePtr.data(), true);
setTitle(MWTF_FILENAME);
- // if there were any messages, show them
- QString warning = get_error_string();
- if (!warning.isEmpty()) {
- showWarning = true;
- getNotificationWidget()->showNotification(warning , KMessageWidget::Information);
- }
} else {
failedParses.append(fileNames.at(i));
}
}
hideProgressBar();
- if (!showWarning)
- getNotificationWidget()->hideNotification();
process_dives(false, false);
addRecentFile(fileNames);
removeRecentFile(failedParses);
diff --git a/desktop-widgets/mainwindow.h b/desktop-widgets/mainwindow.h
index 161a5b606..073d3cad8 100644
--- a/desktop-widgets/mainwindow.h
+++ b/desktop-widgets/mainwindow.h
@@ -87,7 +87,6 @@ public:
QUndoStack *undoStack;
NotificationWidget *getNotificationWidget();
void enableDisableCloudActions();
- void showError();
private
slots:
diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp
index 6c982d27f..86554cd8c 100644
--- a/desktop-widgets/subsurfacewebservices.cpp
+++ b/desktop-widgets/subsurfacewebservices.cpp
@@ -735,7 +735,6 @@ void DivelogsDeWebServices::prepareDivesForUpload(bool selected)
} else {
report_error("Failed to create upload file %s\n", qPrintable(filename));
}
- MainWindow::instance()->getNotificationWidget()->showNotification(get_error_string(), KMessageWidget::Error);
}
void DivelogsDeWebServices::uploadDives(QIODevice *dldContent)
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp
index a7ac87d77..cfe705f6f 100644
--- a/profile-widget/profilewidget2.cpp
+++ b/profile-widget/profilewidget2.cpp
@@ -709,7 +709,7 @@ void ProfileWidget2::plotDive(struct dive *d, bool force)
#ifdef SUBSURFACE_MOBILE
if (currentdc->divemode == CCR) {
- gasYAxis->setPos(itemPos.partialPressure.pos.on);
+ gasYAxis->setPos(itemPos.partialPressure.pos.on);
gasYAxis->setLine(itemPos.partialPressure.expanded);
tankItem->setVisible(false);
@@ -802,7 +802,6 @@ void ProfileWidget2::plotDive(struct dive *d, bool force)
report_error(qPrintable(tr("Show NDL / TTS was disabled because of excessive processing time")));
}
#endif
- emit showError();
}
void ProfileWidget2::recalcCeiling()
diff --git a/profile-widget/profilewidget2.h b/profile-widget/profilewidget2.h
index 9c4a82f5c..3d6bb7e2c 100644
--- a/profile-widget/profilewidget2.h
+++ b/profile-widget/profilewidget2.h
@@ -90,7 +90,6 @@ public:
signals:
void fontPrintScaleChanged(double scale);
void enableToolbar(bool enable);
- void showError();
void enableShortcuts();
void disableShortcuts(bool paste);
void refreshDisplay(bool recreateDivelist);
diff --git a/subsurface-desktop-main.cpp b/subsurface-desktop-main.cpp
index 193f8f8a5..49272e3ea 100644
--- a/subsurface-desktop-main.cpp
+++ b/subsurface-desktop-main.cpp
@@ -104,8 +104,6 @@ int main(int argc, char **argv)
filesOnCommandLine = !files.isEmpty() || !importedFiles.isEmpty();
m->loadFiles(files);
m->importFiles(importedFiles);
- // in case something has gone wrong make sure we show the error message
- m->showError();
if (verbose > 0) {
print_files();
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-27 06:04:06 +0000