diff --git a/widgets/coreWidget/ContextMenu.cc b/widgets/coreWidget/ContextMenu.cc index 91f0be0a8adfdfcaf27b58902bfc61190540500b..ccab980b080e0e98cd25a8ab54625bbfa23d089d 100644 --- a/widgets/coreWidget/ContextMenu.cc +++ b/widgets/coreWidget/ContextMenu.cc @@ -479,10 +479,15 @@ bool CoreWidget::addContextMenus( QMenu* _menu , ContextMenuType _type , int _id } /// \todo Sort the menu entries by the order given in visibleContextMenus + //first add all menus QMapIterator it(menuMap); QStringList visible = viewModes_[id]->visibleContextMenus; + if (visible.contains("ALL_THAT_EXIST")) { + //this plugin adds all context menus, no special configuration so far. + visible = viewModes_[0]->visibleContextMenus; + } visible.replaceInStrings(QRegExp(".*>"), ""); while (it.hasNext()) { diff --git a/widgets/coreWidget/viewMode.cc b/widgets/coreWidget/viewMode.cc index ad1c761143632b450c641585d978eeddd01caecb..e2219492f8c64763346c6625951b879f2c96c058 100644 --- a/widgets/coreWidget/viewMode.cc +++ b/widgets/coreWidget/viewMode.cc @@ -110,7 +110,7 @@ void CoreWidget::slotAddViewModeToolboxes(QString _mode, bool _custom, QStringLi vm->icon = "Unknown.png"; vm->visibleToolbars = QString("Main Toolbar;Viewer Toolbar").split(";"); - vm->visibleContextMenus = viewModes_[0]->visibleContextMenus; + vm->visibleContextMenus = QString("ALL_THAT_EXIST").split(" "); if (_custom) { viewModes_.push_back(vm); @@ -156,7 +156,7 @@ void CoreWidget::slotAddViewModeToolbars(QString _mode, bool _custom, QStringLis vm->custom = _custom; vm->icon = "Unknown.png"; - vm->visibleContextMenus = viewModes_[0]->visibleContextMenus; + vm->visibleContextMenus = QString("ALL_THAT_EXIST").split(" "); if (_custom) { viewModes_.push_back(vm); diff --git a/widgets/viewModeWidget/viewModeWidget.cc b/widgets/viewModeWidget/viewModeWidget.cc index 7696e14aa9d8c9bd6e18e3c34af750392e7e601e..6b96e7b0eb5016c6b05bd84782f634e4c10b4d77 100644 --- a/widgets/viewModeWidget/viewModeWidget.cc +++ b/widgets/viewModeWidget/viewModeWidget.cc @@ -296,7 +296,7 @@ void viewModeWidget::slotSetIcon() { } // ======================================================================================================= -// ToolBox and ToolBar Lists update functions +// ToolBox, ToolBar and ContextMenu Lists update functions // ======================================================================================================= void viewModeWidget::slotSetAllWidgets(){ toolboxList->clear(); @@ -319,6 +319,8 @@ void viewModeWidget::slotSetAllWidgets(){ toolboxes = modes_[i]->visibleToolboxes; toolbars = modes_[i]->visibleToolbars; contextmenus = modes_[i]->visibleContextMenus; + if (contextmenus.contains("ALL_THAT_EXIST")) + contextmenus = modes_[0]->visibleContextMenus; toolboxList->addItems(toolboxes); //add corresponding widgets toolbarList->addItems(toolbars); contextMenuList->addItems(contextmenus);