Changeset 42616 in vbox for trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

Timestamp:

Aug 6, 2012 12:12:48 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: 6234: Support for VM groups: Creating new VM in currently selected group (or parent of currently selected machine).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp (modified) (10 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -37 +37 @@
 #include "UIGChooserHandlerMouse.h"
 #include "UIGChooserHandlerKeyboard.h"
+#include "UIWizardNewVM.h"
+#include "UISelectorWindow.h"
 
 /* COM includes: */
@@ -51 +53 @@
     , m_pMouseHandler(0)
     , m_pKeyboardHandler(0)
-    , m_pContextMenuRoot(0)
     , m_pContextMenuGroup(0)
     , m_pContextMenuMachine(0)
@@ -716 +717 @@
 }
 
+void UIGChooserModel::sltCreateNewMachine()
+{
+    UIGChooserItem *pGroup = 0;
+    if (singleGroupSelected())
+        pGroup = selectionList().first();
+    else if (!selectionList().isEmpty())
+        pGroup = selectionList().first()->parentItem();
+    if (pGroup)
+    {
+        UIWizardNewVM wizard(&vboxGlobal().selectorWnd(), fullName(pGroup));
+        wizard.exec();
+    }
+    else
+    {
+        UIWizardNewVM wizard(&vboxGlobal().selectorWnd());
+        wizard.exec();
+    }
+}
+
 void UIGChooserModel::sltActionHovered(QAction *pAction)
 {
@@ -804 +824 @@
 void UIGChooserModel::prepareContextMenu()
 {
-    /* Context menu for empty group: */
-    m_pContextMenuRoot = new QMenu;
-    m_pContextMenuRoot->addAction(gActionPool->action(UIActionIndexSelector_Simple_Group_NewWizard));
-    m_pContextMenuRoot->addAction(gActionPool->action(UIActionIndexSelector_Simple_Group_AddDialog));
-
     /* Context menu for group: */
     m_pContextMenuGroup = new QMenu;
@@ -851 +866 @@
     m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_Simple_Common_SortParent));
 
-    connect(m_pContextMenuRoot, SIGNAL(hovered(QAction*)), this, SLOT(sltActionHovered(QAction*)));
     connect(m_pContextMenuGroup, SIGNAL(hovered(QAction*)), this, SLOT(sltActionHovered(QAction*)));
     connect(m_pContextMenuMachine, SIGNAL(hovered(QAction*)), this, SLOT(sltActionHovered(QAction*)));
 
+    connect(gActionPool->action(UIActionIndexSelector_Simple_Group_NewWizard), SIGNAL(triggered()),
+            this, SLOT(sltCreateNewMachine()));
+    connect(gActionPool->action(UIActionIndexSelector_Simple_Machine_NewWizard), SIGNAL(triggered()),
+            this, SLOT(sltCreateNewMachine()));
     connect(gActionPool->action(UIActionIndexSelector_Simple_Group_RenameDialog), SIGNAL(triggered()),
             this, SLOT(sltStartEditingSelectedGroup()));
@@ -907 +925 @@
 void UIGChooserModel::cleanupContextMenu()
 {
-    delete m_pContextMenuRoot;
-    m_pContextMenuRoot = 0;
     delete m_pContextMenuGroup;
     m_pContextMenuGroup = 0;
@@ -1413 +1429 @@
                             return true;
                         }
-                        /* Is this root-group item? */
-                        else if (!pGroupItem->parentItem())
-                        {
-                            /* Root context menu in that cases: */
-                            popupContextMenu(UIGraphicsSelectorContextMenuType_Root, pEvent->screenPos());
-                            return true;
-                        }
+                        return false;
                     }
                     case UIGChooserItemType_Machine:
@@ -1431 +1441 @@
                 }
             }
-            /* Root context menu for all the other cases: */
-            popupContextMenu(UIGraphicsSelectorContextMenuType_Root, pEvent->screenPos());
             return true;
         }
@@ -1463 +1471 @@
                 }
             }
-            /* Root context menu for all the other cases: */
-            popupContextMenu(UIGraphicsSelectorContextMenuType_Root, pEvent->screenPos());
             return true;
         }
@@ -1479 +1485 @@
     switch (type)
     {
-        /* For empty group? */
-        case UIGraphicsSelectorContextMenuType_Root:
-        {
-            m_pContextMenuRoot->exec(point);
-            break;
-        }
         /* For group? */
         case UIGraphicsSelectorContextMenuType_Group: