From 31c45b8c4ceca669b36706814ec7379cacd685f0 Mon Sep 17 00:00:00 2001 From: Danilo Cesar Lemes de Paula Date: Fri, 7 Feb 2014 00:14:47 -0200 Subject: 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 Signed-off-by: Dirk Hohndel --- qt-ui/mainwindow.cpp | 4 ++++ qt-ui/mainwindow.ui | 1 + subsurface.pro | 5 +++++ 3 files changed, 10 insertions(+) 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 @@ &Log + 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) -- cgit v1.2.3-70-g09d2