diff options
| author |  nikhil <nikhil.gosala@gmail.com> | 2014-12-17 09:29:41 +0530 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-12-17 21:38:04 -0800 |
| commit | 71dbcdc0d625e5dc2a2bc2de5b8be1962fb92f9e (patch) | |
| tree | 7e01caf3025f65ffaad7764d9cd562610817bf0b | |
| parent | b72c32da7defdbc0ff3100f13d1688f06770674a (diff) | |
| download | subsurface-71dbcdc0d625e5dc2a2bc2de5b8be1962fb92f9e.tar.gz | |
Added the option of opening User Survey form explicitly
Earlier, there was no option for the user to explicitly open the User
Survey form. This has been corrected by placing an option in the "Help"
menu by which the user can explicity open the User Survey form.
Signed-off-by: Nikhil Bharadwaj Gosala <nikhil.gosala@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | qt-ui/mainwindow.cpp | 26 | ||||
| -rw-r--r-- | qt-ui/mainwindow.h | 1 | ||||
| -rw-r--r-- | qt-ui/mainwindow.ui | 8 |
3 files changed, 34 insertions, 1 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index acf520dd6..4e1f8f2f9 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -55,6 +55,9 @@ #ifndef NO_USERMANUAL #include "usermanual.h" #endif +#ifndef NO_USERSURVEY +#include "usersurvey.h" +#endif #include <QNetworkProxy> MainWindow *MainWindow::m_Instance = NULL; @@ -118,6 +121,10 @@ MainWindow::MainWindow() : QMainWindow(), #ifdef NO_USERMANUAL ui.menuHelp->removeAction(ui.actionUserManual); #endif +#ifdef NO_USERSURVEY + ui.menuHelp->removeAction(ui.actionUserSurvey); +#endif + #ifdef NO_PRINTING ui.menuFile->removeAction(ui.actionPrint); #endif @@ -745,6 +752,16 @@ void MainWindow::on_actionUserManual_triggered() #endif } +void MainWindow::on_actionUserSurvey_triggered() +{ +#ifndef NO_USERSURVEY + if(!survey) { + survey = new UserSurvey(); + } + survey->show(); +#endif +} + QString MainWindow::filter() { QString f; @@ -945,6 +962,15 @@ void MainWindow::closeEvent(QCloseEvent *event) } #endif + +#ifndef NO_USERSURVEY + if (survey && survey->isVisible()) { + survey->close(); + survey->deleteLater(); + } +#endif + + if (unsaved_changes() && (askSaveChanges() == false)) { event->ignore(); return; diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h index 26f4176ac..8a9d6f38b 100644 --- a/qt-ui/mainwindow.h +++ b/qt-ui/mainwindow.h @@ -118,6 +118,7 @@ slots: /* other menu actions */ void on_actionAboutSubsurface_triggered(); void on_actionUserManual_triggered(); + void on_actionUserSurvey_triggered(); void on_actionDivePlanner_triggered(); void on_actionReplanDive_triggered(); void on_action_Check_for_Updates_triggered(); diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui index ecbd4d787..dc38a0d9d 100644 --- a/qt-ui/mainwindow.ui +++ b/qt-ui/mainwindow.ui @@ -249,7 +249,7 @@ p, li { white-space: pre-wrap; } <x>0</x> <y>0</y> <width>1682</width> - <height>36</height> + <height>27</height> </rect> </property> <widget class="QMenu" name="menuFile"> @@ -314,6 +314,7 @@ p, li { white-space: pre-wrap; } <addaction name="actionAboutSubsurface"/> <addaction name="action_Check_for_Updates"/> <addaction name="actionUserManual"/> + <addaction name="actionUserSurvey"/> </widget> <widget class="QMenu" name="menuImport"> <property name="title"> @@ -861,6 +862,11 @@ p, li { white-space: pre-wrap; } <string>Toggle tissue graph</string> </property> </action> + <action name="actionUserSurvey"> + <property name="text"> + <string>User &Survey</string> + </property> + </action> </widget> <customwidgets> <customwidget> |