From 9c5e037a612808a9ad1d2c9f8e6ec7213d5d468b Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 19 Nov 2013 23:08:20 -0800 Subject: Trigger redraw of the Dive Info pane on preferences change If we change the units we need to redraw the info on this pane. Signed-off-by: Dirk Hohndel --- qt-ui/maintab.h | 2 +- qt-ui/mainwindow.cpp | 2 ++ qt-ui/preferences.cpp | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/qt-ui/maintab.h b/qt-ui/maintab.h index 6aee9fbfe..233aa9439 100644 --- a/qt-ui/maintab.h +++ b/qt-ui/maintab.h @@ -63,7 +63,7 @@ public: public slots: void addCylinder_clicked(); void addWeight_clicked(); - void updateDiveInfo(int dive); + void updateDiveInfo(int dive = selected_dive); void acceptChanges(); void rejectChanges(); void on_location_textChanged(const QString& text); diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 1edd8be67..53198902c 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -53,6 +53,8 @@ MainWindow::MainWindow() : helpView(0) connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), ui.ListWidget, SLOT(update())); connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), ui.ListWidget, SLOT(reloadHeaderActions())); connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), ui.ProfileWidget, SLOT(refresh())); + connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), ui.InfoWidget, SLOT(updateDiveInfo())); + ui.mainErrorMessage->hide(); initialUiSetup(); readSettings(); diff --git a/qt-ui/preferences.cpp b/qt-ui/preferences.cpp index 8c3982eb5..b9fb26018 100644 --- a/qt-ui/preferences.cpp +++ b/qt-ui/preferences.cpp @@ -208,6 +208,6 @@ void PreferencesDialog::buttonClicked(QAbstractButton* button) void PreferencesDialog::on_chooseFile_clicked() { - QFileInfo fi(system_default_filename()); - ui.defaultfilename->setText(QFileDialog::getOpenFileName(this, tr("Open Default Log File"), fi.absolutePath(), tr("Subsurface XML files (*.ssrf *.xml *.XML)"))); + QFileInfo fi(system_default_filename()); + ui.defaultfilename->setText(QFileDialog::getOpenFileName(this, tr("Open Default Log File"), fi.absolutePath(), tr("Subsurface XML files (*.ssrf *.xml *.XML)"))); } -- cgit v1.2.3-70-g09d2