FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the references to ShowError to the new notification object.

Browse Source 
Showing an Error message is better called from the Notification Object,
So for consistency old references to showError is replaced by calling
the notification object.

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Gehad elrobey 2015-02-27 02:57:56 +02:00 committed by Dirk Hohndel
parent 59ab849854
commit f61b59d961
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qt-ui/mainwindow.cpp
View File

@ -246,7 +246,7 @@ MainWindow *MainWindow::instance()
// this gets called after we download dives from a divecomputer
void MainWindow::refreshDisplay(bool doRecreateDiveList)
{
showError(get_error_string());
getNotificationWidget()->showNotification(get_error_string(), KMessageWidget::Error);
information()->reload();
TankInfoModel::instance()->update();
globe()->reload();
@ -1266,11 +1266,11 @@ int MainWindow::file_save_as(void)
information()->acceptChanges();
if (save_dives(filename.toUtf8().data())) {
showError(get_error_string());
getNotificationWidget()->showNotification(get_error_string(), KMessageWidget::Error);
return -1;
}
showError(get_error_string());
getNotificationWidget()->showNotification(get_error_string(), KMessageWidget::Error);
set_filename(filename.toUtf8().data(), true);
setTitle(MWTF_FILENAME);
mark_divelist_changed(false);
@ -1297,20 +1297,15 @@ int MainWindow::file_save(void)
current_def_dir.mkpath(current_def_dir.absolutePath());
}
if (save_dives(existing_filename)) {
showError(get_error_string());
getNotificationWidget()->showNotification(get_error_string(), KMessageWidget::Error);
return -1;
}
showError(get_error_string());
getNotificationWidget()->showNotification(get_error_string(), KMessageWidget::Error);
mark_divelist_changed(false);
addRecentFile(QStringList() << QString(existing_filename));
return 0;
}
void MainWindow::showError(QString message)
{
ui.mainErrorMessage->showNotification(message, KMessageWidget::Error);
}
NotificationWidget *MainWindow::getNotificationWidget()
{
return ui.mainErrorMessage;

1
qt-ui/mainwindow.h
View File

@ -71,7 +71,6 @@ public:
DivePlannerWidget *divePlannerWidget();
PlannerSettingsWidget *divePlannerSettingsWidget();
LocationInformationWidget *locationInformationWidget();
void showError(QString message);
void setTitle(enum MainWindowTitleFormat format);
// Some shortcuts like "change DC" or "copy/paste dive components"

2
qt-ui/profile/profilewidget2.cpp
View File

@ -650,7 +650,7 @@ void ProfileWidget2::plotDive(struct dive *d, bool force)
// so if we are calculation TTS / NDL then let's force that off.
if (measureDuration.elapsed() > 1000 && prefs.calcndltts) {
MainWindow::instance()->turnOffNdlTts();
MainWindow::instance()->showError(tr("Show NDL / TTS was disabled because of excessive processing time"));
MainWindow::instance()->getNotificationWidget()->showNotification(tr("Show NDL / TTS was disabled because of excessive processing time"), KMessageWidget::Error);
}
}

2
qt-ui/subsurfacewebservices.cpp
View File

@ -649,7 +649,7 @@ void DivelogsDeWebServices::prepareDivesForUpload(bool selected)
return;
}
}
MainWindow::instance()->showError(get_error_string());
MainWindow::instance()->getNotificationWidget()->showNotification(get_error_string(), KMessageWidget::Error);
}
void DivelogsDeWebServices::uploadDives(QIODevice *dldContent)