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

Show error messages during start up as soon as the main window is shown

Browse source 
When the user has setup cloud storage as their default file but didn't
store the cloud storage password an error is created but not shown until
another error happens - that's very confusing for the user.

This patch fixes that.

Fixes #938

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-10-05 23:52:39 +01:00
parent 05f4f9b533
commit d567859e87
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main.cpp
View file

@ -69,11 +69,13 @@ int main(int argc, char **argv)
files.push_back(cloudURL);
}
}
MainWindow *m = MainWindow::instance();
m->setLoadedWithFiles(!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();
if (!quit)

5
qt-ui/mainwindow.cpp
View file

@ -1511,6 +1511,11 @@ NotificationWidget *MainWindow::getNotificationWidget()
return ui.mainErrorMessage;
}
void MainWindow::showError()
{
getNotificationWidget()->showNotification(get_error_string(), KMessageWidget::Error);
}
QString MainWindow::displayedFilename(QString fullFilename)
{
QFile f(fullFilename);

1
qt-ui/mainwindow.h
View file

@ -98,6 +98,7 @@ public:
QUndoStack *undoStack;
NotificationWidget *getNotificationWidget();
void enableDisableCloudActions();
void showError();
private
slots:
/* file menu action */