Changeset 74586 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 2, 2018 4:03:51 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Chooser pane: Global item context menu.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser

Files:

• UIChooserModel.cpp (modified) (6 diffs)
• UIChooserModel.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -74 +74 @@
     , m_pMouseHandler(0)
     , m_pKeyboardHandler(0)
+    , m_pContextMenuGlobal(0)
     , m_pContextMenuGroup(0)
     , m_pContextMenuMachine(0)
@@ -1323 +1324 @@
 void UIChooserModel::prepareContextMenu()
 {
+    /* Context menu for global(s): */
+    m_pContextMenuGlobal = new QMenu;
+    if (m_pContextMenuGlobal)
+    {
+#ifdef VBOX_WS_MAC
+        m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_About));
+# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+        if (gEDataManager->applicationUpdateEnabled())
+            m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
+        m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
+# endif
+        m_pContextMenuGlobal->addSeparator();
+        m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_Preferences));
+        m_pContextMenuGlobal->addSeparator();
+        m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ImportAppliance));
+        m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ExportAppliance));
+# ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
+        m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowExtraDataManager));
+# endif
+        m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowVirtualMediumManager));
+        m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowHostNetworkManager));
+
+#else /* !VBOX_WS_MAC */
+
+        m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_Preferences));
+        m_pContextMenuGlobal->addSeparator();
+        m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ImportAppliance));
+        m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ExportAppliance));
+        m_pContextMenuGlobal->addSeparator();
+# ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
+        m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowExtraDataManager));
+# endif
+        m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowVirtualMediumManager));
+        m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowHostNetworkManager));
+# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+        m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
+        if (gEDataManager->applicationUpdateEnabled())
+            m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
+# endif
+#endif /* !VBOX_WS_MAC */
+    }
+
     /* Context menu for group(s): */
     m_pContextMenuGroup = new QMenu;
@@ -1462 +1505 @@
 void UIChooserModel::cleanupContextMenu()
 {
+    delete m_pContextMenuGlobal;
+    m_pContextMenuGlobal = 0;
     delete m_pContextMenuGroup;
     m_pContextMenuGroup = 0;
@@ -1527 +1572 @@
                 switch (pItem->type())
                 {
+                    case UIChooserItemType_Global:
+                    {
+                        /* Global context menu for global item cases: */
+                        popupContextMenu(UIGraphicsSelectorContextMenuType_Global, pEvent->screenPos());
+                        return true;
+                    }
                     case UIChooserItemType_Group:
                     {
@@ -1563 +1614 @@
                 switch (pItem->type())
                 {
+                    case UIChooserItemType_Global:
+                    {
+                        /* Global context menu for global item cases: */
+                        popupContextMenu(UIGraphicsSelectorContextMenuType_Machine, pEvent->screenPos());
+                        return true;
+                    }
                     case UIChooserItemType_Group:
                     {
@@ -1598 +1655 @@
     switch (enmType)
     {
+        /* For global item? */
+        case UIGraphicsSelectorContextMenuType_Global:
+        {
+            m_pContextMenuGlobal->exec(point);
+            break;
+        }
         /* For group? */
         case UIGraphicsSelectorContextMenuType_Group:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.h

@@ -52 +52 @@
 enum UIGraphicsSelectorContextMenuType
 {
+    UIGraphicsSelectorContextMenuType_Global,
     UIGraphicsSelectorContextMenuType_Group,
     UIGraphicsSelectorContextMenuType_Machine
@@ -469 +470 @@
         UIChooserHandlerKeyboard *m_pKeyboardHandler;
 
+        /** Holds the global item context menu instance. */
+        QMenu *m_pContextMenuGlobal;
         /** Holds the group item context menu instance. */
         QMenu *m_pContextMenuGroup;