mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 18:23:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added the option of opening User Survey form explicitly

Browse source 
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>
This commit is contained in:
nikhil 2014-12-17 09:29:41 +05:30 • committed by Dirk Hohndel
parent b72c32da7d
commit 71dbcdc0d6
3 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
qt-ui/mainwindow.cpp
View file

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

1
qt-ui/mainwindow.h
View file

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

8
qt-ui/mainwindow.ui
View file

@ -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 &amp;Survey</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>