Changeset 9cdab3 for src/UIElements/Menu/Qt4/QtMenu.hpp

Timestamp:

Aug 11, 2025, 5:45:54 PM (3 months ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

5718cc

Parents:

ae9ad6

git-author:

Frederik Heber <frederik.heber@…> (07/20/25 20:19:22)

git-committer:

Frederik Heber <frederik.heber@…> (08/11/25 17:45:54)

Message:

Adds context menu "atom" to GLWorldView.

File:

• src/UIElements/Menu/Qt4/QtMenu.hpp (modified) (5 diffs)

src/UIElements/Menu/Qt4/QtMenu.hpp

@@ -10 +10 @@
 
 // include config.h
+#include <cstddef>
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -16 +17 @@
 
 #include <Qt/qaction.h>
+#include <Qt/qpoint.h>
 
 #include "Menu/Qt4/QMenu_tooltip.hpp"
@@ -52 +54 @@
   virtual ~QtMenu()
   {
+    // delete all plumbed actions
     for(std::list<QtMenuPipe*>::iterator it=plumbing.begin(); it != plumbing.end(); it++)
       delete (*it);
 
+    // delete all submenus
+    for(SubMenus_t::iterator iter = submenus.begin(); iter != submenus.end(); ++iter)
+      delete(*iter);
+
+    // delete the wrapped instance if we took over ownership
     if (deleteMenu)
       delete MenuInstance;
@@ -103 +111 @@
   MenuShortcutMap ShortcutMap;
 
+  typedef std::list< QtMenu<QMenu_tooltip>* > SubMenus_t;
+  SubMenus_t submenus;
+
   virtual void addActionItem(const std::string &token, const std::string &description)
   {
@@ -123 +134 @@
     MenuInstance->addMenu(Menu);
     QtMenu<QMenu_tooltip> *NewMenu = new QtMenu<QMenu_tooltip>(Menu, token);
+    submenus.push_back(NewMenu);
     NewMenu->init();
   }
 
+public:
+  QtMenu<QMenu_tooltip>* findSubmenu(const std::string &token) {
+    for (SubMenus_t::iterator iter = submenus.begin(); iter != submenus.end(); ++iter) {
+      QtMenu<QMenu_tooltip>* submenu = *(iter);
+      if (submenu->getName() == token)
+        return submenu;
+      else {
+        QtMenu<QMenu_tooltip>* found_submenu = submenu->findSubmenu(token);
+        if (found_submenu != NULL)
+        return found_submenu;
+      }
+    }
+    return NULL;
+  }
+
+  void popup(const QPoint &pos) {
+    MenuInstance->popup(pos);
+  }
 };