mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

desktop UI: no longer attempt to manually show error notifications

Browse source 
report_error() now does this automatically. So all these odd places in which we tried
to make sure that we show errors are no longer needed.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-10-26 15:55:49 +02:00
parent 752d9b60c4
commit e64dcd12bd
6 changed files with 8 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
desktop-widgets/mainwindow.cpp
View file

@ -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);

1
desktop-widgets/mainwindow.h
View file

@ -87,7 +87,6 @@ public:
QUndoStack *undoStack;
NotificationWidget *getNotificationWidget();
void enableDisableCloudActions();
void showError();
private
slots:

1
desktop-widgets/subsurfacewebservices.cpp
View file

@ -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)

3
profile-widget/profilewidget2.cpp
View file

@ -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()

1
profile-widget/profilewidget2.h
View file

@ -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);

2
subsurface-desktop-main.cpp
View file

@ -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();