Anton, Is this better?
Nikhil Bharadwaj On Thu, Dec 18, 2014 at 4:29 PM, Nikhil Bharadwaj <[email protected]> wrote: > > Anton, > > >(71dbcdc0d625e5dc2a2bc2de5b8be1962fb92f9e) > Sorry for my ignorance, but where did you get this ID from? > > Nikhil Bharadwaj > > On Thu, Dec 18, 2014 at 4:18 PM, Anton Lundin <[email protected]> wrote: >> >> On 18 December, 2014 - Nikhil Bharadwaj wrote: >> >> > Anton, >> > Hope this is what you meant. >> > >> >> As another reviewer said to me, just a day ago, "We are getting there" =) >> >> The code looks nice now, but the only thing left is the commit message. >> >> If you read that message, it doesn't really add up with whats already >> merged into master. >> >> Write the commit message based on the context its going to end up in. >> Eg, the "Added the option of opening User Survey form explicitly" >> (71dbcdc0d625e5dc2a2bc2de5b8be1962fb92f9e) is already in master, and >> this code cleans it up a bit. >> >> There are some notes on what to think about when writing a good commit >> message in README, especially the Contributing: section. >> >> >> //Anton >> >> >> -- >> Anton Lundin +46702-161604 >> > > > -- > Nikhil Bharadwaj > -- Nikhil Bharadwaj
From d2a9f1320c09d6c2e9d4daa263de34c926150b94 Mon Sep 17 00:00:00 2001 From: nikhil <[email protected]> Date: Thu, 18 Dec 2014 15:43:21 +0530 Subject: [PATCH] (71dbcdc0d625e5dc2a2bc2de5b8be1962fb92f9e) patch code cleanup (71dbcdc0d625e5dc2a2bc2de5b8be1962fb92f9e) is already in master, and this code cleans it up a bit. All the suggestions and mistakes pointed out by Anton Lundin have been incorporated. This includes removing extra lines of code, stray newlines etc. Signed-off-by: Nikhil Bharadwaj Gosala <[email protected]> --- qt-ui/mainwindow.cpp | 12 ------------ qt-ui/mainwindow.ui | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 4e1f8f2..4c96750 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -55,9 +55,6 @@ #ifndef NO_USERMANUAL #include "usermanual.h" #endif -#ifndef NO_USERSURVEY -#include "usersurvey.h" -#endif #include <QNetworkProxy> MainWindow *MainWindow::m_Instance = NULL; @@ -121,10 +118,7 @@ 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 @@ -754,12 +748,10 @@ void MainWindow::on_actionUserManual_triggered() void MainWindow::on_actionUserSurvey_triggered() { -#ifndef NO_USERSURVEY if(!survey) { survey = new UserSurvey(); } survey->show(); -#endif } QString MainWindow::filter() @@ -962,14 +954,10 @@ 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(); diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui index dc38a0d..08c8d34 100644 --- a/qt-ui/mainwindow.ui +++ b/qt-ui/mainwindow.ui @@ -864,7 +864,7 @@ p, li { white-space: pre-wrap; } </action> <action name="actionUserSurvey"> <property name="text"> - <string>User &Survey</string> + <string>User &survey</string> </property> </action> </widget> -- 2.1.0
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
