diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2014-06-17 20:01:14 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-06-18 04:56:08 -0700 |
| commit | d8ec3988b139020ff8e8202568832120b362d422 (patch) | |
| tree | 112072fd5be6497a319f14f76b15df779c02c412 | |
| parent | aad393aa4f39935eb0183daed02dc0e408758742 (diff) | |
| download | subsurface-d8ec3988b139020ff8e8202568832120b362d422.tar.gz | |
Fix building with NO_MARBLE again
Back in 708f19830e2a ("Planner: New plannerSettingsWidget") the Globe
widget handling changed, and this updates the NO_MARBLE build option to
work after that.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | qt-ui/mainwindow.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 488b5f69f..9f741e84f 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -94,7 +94,7 @@ MainWindow::MainWindow() : QMainWindow(), ui.ListWidget->scrollTo(ui.ListWidget->model()->index(0, 0), QAbstractItemView::PositionAtCenter); ui.divePlannerWidget->settingsChanged(); #ifdef NO_MARBLE - ui.layoutWidget->hide(); + ui.globePane->hide(); ui.menuView->removeAction(ui.actionViewGlobe); #endif #ifdef NO_USERMANUAL @@ -135,6 +135,9 @@ void MainWindow::refreshDisplay(bool doRecreateDiveList) if (doRecreateDiveList) recreateDiveList(); ui.diveListPane->setCurrentIndex(0); // switch to the dive list +#ifdef NO_MARBLE + ui.globePane->hide(); +#endif ui.globePane->setCurrentIndex(0); ui.ListWidget->setEnabled(true); ui.ListWidget->setFocus(); @@ -476,6 +479,9 @@ void MainWindow::on_actionDivePlanner_triggered() ui.ListWidget->setEnabled(false); ui.diveListPane->setCurrentIndex(1); // switch to the plan output ui.globePane->setCurrentIndex(1); +#ifdef NO_MARBLE + ui.globePane->show(); +#endif } void MainWindow::on_actionAddDive_triggered() |