mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix building with NO_MARBLE again

Browse source 
Back in 708f19830e ("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>
This commit is contained in:
Anton Lundin 2014-06-17 20:01:14 +02:00 • committed by Dirk Hohndel
parent aad393aa4f
commit d8ec3988b1
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
qt-ui/mainwindow.cpp
View file

@ -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()