From b871ced944049b83c9a9f0845ee7ff57ba5c67e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 16 Oct 2012 10:45:28 +0000 Subject: [PATCH] Set pick toolbars to default in scene again. refs #480 git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@15665 383ad7c9-94d9-4d36-a494-682f7c89f535 --- OpenFlipper/widgets/coreWidget/picking.cc | 2 +- OpenFlipper/widgets/optionsWidget/optionsWidget.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenFlipper/widgets/coreWidget/picking.cc b/OpenFlipper/widgets/coreWidget/picking.cc index 9616a732e..9a733265b 100644 --- a/OpenFlipper/widgets/coreWidget/picking.cc +++ b/OpenFlipper/widgets/coreWidget/picking.cc @@ -189,7 +189,7 @@ void CoreWidget::setActivePickToolBar(QToolBar* _tool) { // Hide all picking toolbars hidePickToolBar(); - if ( OpenFlipperSettings().value("Core/Gui/ToolBars/PickToolbarInScene",false).toBool() ) { + if ( OpenFlipperSettings().value("Core/Gui/ToolBars/PickToolbarInScene",true).toBool() ) { // Try to find toolbar in local map ( if it is in the gl scene PickToolBarMap::iterator ret = curPickingToolbarItems_.find(_tool); diff --git a/OpenFlipper/widgets/optionsWidget/optionsWidget.cc b/OpenFlipper/widgets/optionsWidget/optionsWidget.cc index 5532efcd6..a6c7ab594 100644 --- a/OpenFlipper/widgets/optionsWidget/optionsWidget.cc +++ b/OpenFlipper/widgets/optionsWidget/optionsWidget.cc @@ -274,7 +274,7 @@ void OptionsWidget::showEvent ( QShowEvent * /*event*/ ) { // UI settings toolBoxOrientation->setCurrentIndex((OpenFlipperSettings().value("Core/Gui/ToolBoxes/ToolBoxOnTheRight",true).toBool() ? 0 : 1)); - pickToolbarInScene->setChecked(OpenFlipperSettings().value("Core/Gui/ToolBars/PickToolbarInScene",false).toBool()); + pickToolbarInScene->setChecked(OpenFlipperSettings().value("Core/Gui/ToolBars/PickToolbarInScene",true).toBool()); //stereo @@ -581,7 +581,7 @@ void OptionsWidget::slotApply() { OpenFlipperSettings().setValue("Core/Gui/ToolBoxes/ToolBoxOnTheRight", (toolBoxOrientation->currentIndex() == 0)); // Render picking toolbar into scene - if ( OpenFlipperSettings().value("Core/Gui/ToolBars/PickToolbarInScene",false).toBool() != pickToolbarInScene->isChecked() ) { + if ( OpenFlipperSettings().value("Core/Gui/ToolBars/PickToolbarInScene",true).toBool() != pickToolbarInScene->isChecked() ) { OpenFlipperSettings().setValue("Core/Gui/ToolBars/PickToolbarInScene", pickToolbarInScene->isChecked()); restartRequired_ = true; } -- 2.26.2