diff options
| author |  Danilo Cesar Lemes de Paula <danilo.eu@gmail.com> | 2014-02-07 00:14:47 -0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-02-10 08:08:20 -0800 |
| commit | 31c45b8c4ceca669b36706814ec7379cacd685f0 (patch) | |
| tree | dc9657228cac0e08c03a018e69f8a3a70a12818e | |
| parent | 772c9fb0b14240ac6959f99052a7f78cb56c6944 (diff) | |
| download | subsurface-31c45b8c4ceca669b36706814ec7379cacd685f0.tar.gz | |
Enable the dive planning under a compile flag
Allow subsurface to show the dive planner in case a compile flag is given.
qmake CONFIG+=planner
Signed-off-by: Danilo Cesar Lemes de Paula <danilo.eu@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | qt-ui/mainwindow.cpp | 4 | ||||
| -rw-r--r-- | qt-ui/mainwindow.ui | 1 | ||||
| -rw-r--r-- | subsurface.pro | 5 |
3 files changed, 10 insertions, 0 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index d93de4d05..df6e13163 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -73,6 +73,10 @@ MainWindow::MainWindow() : QMainWindow(), ui.ListWidget->scrollTo(ui.ListWidget->model()->index(0,0), QAbstractItemView::PositionAtCenter); ui.divePlanner->settingsChanged(); ui.divePlannerWidget->settingsChanged(); + +#ifndef ENABLE_PLANNER + ui.menuLog->removeAction(ui.actionDivePlanner); +#endif } // this gets called after we download dives from a divecomputer diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui index 5b1280c65..c04fc2044 100644 --- a/qt-ui/mainwindow.ui +++ b/qt-ui/mainwindow.ui @@ -614,6 +614,7 @@ <string>&Log</string> </property> <addaction name="actionAddDive"/> + <addaction name="actionDivePlanner"/> <addaction name="separator"/> <addaction name="actionRenumber"/> <addaction name="actionAutoGroup"/> diff --git a/subsurface.pro b/subsurface.pro index 148b40047..2c7875110 100644 --- a/subsurface.pro +++ b/subsurface.pro @@ -233,5 +233,10 @@ QMAKE_INFO_PLIST = packaging/macosx/Info.plist.in OTHER_FILES += $$DESKTOPFILE $$ICON $$MANPAGE $$XSLT_FILES $$DOC_FILES $$MARBLEDIR \ $$QMAKE_INFO_PLIST +# enable or disable the dive planner +planner { + DEFINES += ENABLE_PLANNER +} + include(subsurface-gen-version.pri) include(subsurface-install.pri) |