From d00f2871d6e48ba305817f3aa7524a80ecef061b Mon Sep 17 00:00:00 2001
From: Mike Kremer <mkremer@cs.rwth-aachen.de>
Date: Tue, 9 Jun 2009 13:42:01 +0000
Subject: [PATCH] Moved coordsys context menu to submenu of background context
 menu (if coordsys node is invisible)

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@6349 383ad7c9-94d9-4d36-a494-682f7c89f535
---
 widgets/coreWidget/ContextMenu.cc | 7 ++++++-
 widgets/coreWidget/CoreWidget.cc  | 1 +
 widgets/coreWidget/CoreWidget.hh  | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/widgets/coreWidget/ContextMenu.cc b/widgets/coreWidget/ContextMenu.cc
index f0f220de..c77d88a3 100644
--- a/widgets/coreWidget/ContextMenu.cc
+++ b/widgets/coreWidget/ContextMenu.cc
@@ -263,7 +263,12 @@ void CoreWidget::updatePopupMenuBackground(QMenu* _menu , const QPoint& /*_point
   ACG::SceneGraph::BaseNode* coordSys = root->find("Core Coordsys Node");
 
   if(!coordSys->visible()) {
-	  updatePopupMenuCoordsysNode(_menu, 0);
+
+	  if(!coordSysMenu_) {
+		  coordSysMenu_ = new QMenu("Coordinate System Options", _menu);
+		  updatePopupMenuCoordsysNode(coordSysMenu_, 0);
+	  }
+	  _menu->addMenu(coordSysMenu_);
   }
 
   // Tell Plugins to update their context Menu
diff --git a/widgets/coreWidget/CoreWidget.cc b/widgets/coreWidget/CoreWidget.cc
index 67da7cf4..3bbe3d8b 100644
--- a/widgets/coreWidget/CoreWidget.cc
+++ b/widgets/coreWidget/CoreWidget.cc
@@ -96,6 +96,7 @@ CoreWidget( QVector<ViewMode*>& _viewModes,
   contextSelectionMenu_(0),
   drawGroupViewer_(0),
   viewerDrawMenu_(0),
+  coordSysMenu_(0),
   snapshotName_("snap.png"),
   snapshotCounter_(0),
   stackMenu_(0),
diff --git a/widgets/coreWidget/CoreWidget.hh b/widgets/coreWidget/CoreWidget.hh
index 48e7cf05..4fbc7412 100644
--- a/widgets/coreWidget/CoreWidget.hh
+++ b/widgets/coreWidget/CoreWidget.hh
@@ -640,6 +640,10 @@ public:
     /// Draw Menu for per Viewer Draw Modes
     QMenu* viewerDrawMenu_;
 
+    /// Menu which holds the context menu entries for
+    /// the coordsys node if invisible
+    QMenu* coordSysMenu_;
+
   /** @} */
 
   //===========================================================================
-- 
GitLab