diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2013-05-24 12:30:29 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2013-05-24 12:30:29 -0700 |
commit | 884e1c337981ba98a3a29c398cf1ab847009e954 (patch) | |
tree | ea929479280a3c712ca61acab1389272263c1130 /qt-ui/mainwindow.cpp | |
parent | 5926f9d4dfefba022dd2e436d9b8f4b0e38da345 (diff) | |
parent | efb7f109e89c3d8c093c238fb7671c7ab2475f25 (diff) | |
download | subsurface-884e1c337981ba98a3a29c398cf1ab847009e954.tar.gz |
Merge branch 'prefsDialog' of https://github.com/tcanabrava/subsurface
Diffstat (limited to 'qt-ui/mainwindow.cpp')
-rw-r--r-- | qt-ui/mainwindow.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 53138f5a1..b343140b0 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -26,6 +26,7 @@ #include "modeldelegates.h" #include "models.h" #include "downloadfromdivecomputer.h" +#include "preferences.h" static MainWindow* instance = 0; @@ -148,7 +149,7 @@ void MainWindow::on_actionPrint_triggered() void MainWindow::on_actionPreferences_triggered() { - qDebug("actionPreferences"); + PreferencesDialog::instance()->show(); } void MainWindow::on_actionQuit_triggered() |