Anton, I was not sure if UserSurvey worked on Android. Thats the reason I added it. And yeah, I overlooked the #include <usersurvey.h> on line 54.
Sorry for that. Nikhil Bharadwaj On Thu, Dec 18, 2014 at 12:07 PM, Anton Lundin <[email protected]> wrote: > > On 18 December, 2014 - Nikhil Bharadwaj wrote: > > > Resending the patch. > > > > On Wed, Dec 17, 2014 at 10:27 AM, Dirk Hohndel <[email protected]> wrote: > > > > > > On Wed, Dec 17, 2014 at 10:19:21AM +0530, Nikhil Bharadwaj wrote: > > > > > > > > Okay, I'm sorry. I didnt know that. Okay Ill change it and send it > to you > > > > once you finish releasing 4.3 > > > > > > Why would you be sorry? I'm thrilled that you are contributing and > working > > > on making the Subsurface user experience better. That is wonderful! > > > > > > I apologize that the timing is just unfortunate, otherwise I would of > > > course have accepted your patches already... > > > > > > /D > > > > > > > > > -- > > Nikhil Bharadwaj > > > From be92f5c121520434e6919ec4e8382e4038a75205 Mon Sep 17 00:00:00 2001 > > From: nikhil <[email protected]> > > Date: Wed, 17 Dec 2014 09:29:41 +0530 > > Subject: [PATCH 3/3] 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 <[email protected]> > > --- > > qt-ui/mainwindow.cpp | 26 ++++++++++++++++++++++++++ > > qt-ui/mainwindow.h | 1 + > > qt-ui/mainwindow.ui | 8 +++++++- > > 3 files changed, 34 insertions(+), 1 deletion(-) > > > > diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp > > index acf520d..1765d4c 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 > > Why a NO_USERSURVEY? > > NO_PRINTING and NO_USERMANUAL exists due to none of those components > work on Android, but the usersurvey works and i can't see a reson why > disabling bits of the usersurvey? > > > +#include "usersurvey.h" > > Its already included, right out of context for this patch, line 54 in > qt-ui/mainwindow.cpp > > > +#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(); > > Missing a connection to the parent here. > > > //Anton > > > -- > Anton Lundin +46702-161604 > -- Nikhil Bharadwaj
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
