Changeset 74950 in vbox

Timestamp:

Oct 19, 2018 4:41:15 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9261: VirtualBox Manager: Add/New actions for Machine menu in Global Tools case, we wanted to have them in toolbar anyway.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPoolSelector.cpp (modified) (1 diff)
• globals/UIActionPoolSelector.h (modified) (1 diff)
• manager/UIVirtualBoxManager.cpp (modified) (6 diffs)
• manager/UIVirtualBoxManager.h (modified) (2 diffs)
• manager/UIVirtualBoxManagerWidget.cpp (modified) (1 diff)
• manager/chooser/UIChooserModel.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolSelector.cpp

@@ -2557 +2557 @@
 #endif
     m_pool[UIActionIndexST_M_File_S_Close] = new UIActionSimpleSelectorFilePerformExit(this);
+
+    /* 'Welcome' actions: */
+    m_pool[UIActionIndexST_M_Welcome] = new UIActionMenuSelectorMachine(this);
+    m_pool[UIActionIndexST_M_Welcome_S_New] = new UIActionSimpleSelectorMachinePerformCreate(this);
+    m_pool[UIActionIndexST_M_Welcome_S_Add] = new UIActionSimpleSelectorMachinePerformAdd(this);
 
     /* 'Group' actions: */

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolSelector.h

@@ -44 +44 @@
 #endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
     UIActionIndexST_M_File_S_Close,
+
+    /* 'Welcome' menu actions: */
+    UIActionIndexST_M_Welcome,
+    UIActionIndexST_M_Welcome_S_New,
+    UIActionIndexST_M_Welcome_S_Add,
 
     /* 'Group' menu actions: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -112 +112 @@
     , m_fFirstMediumEnumerationHandled(false)
     , m_pActionPool(0)
+    , m_pWelcomeMenuAction(0)
     , m_pGroupMenuAction(0)
     , m_pMachineMenuAction(0)
@@ -1247 +1248 @@
     prepareMenuFile(actionPool()->action(UIActionIndexST_M_File)->menu());
     menuBar()->addMenu(actionPool()->action(UIActionIndexST_M_File)->menu());
+
+    /* Prepare 'Welcome' menu: */
+    prepareMenuWelcome(actionPool()->action(UIActionIndexST_M_Welcome)->menu());
+    m_pWelcomeMenuAction = menuBar()->addMenu(actionPool()->action(UIActionIndexST_M_Welcome)->menu());
 
     /* Prepare 'Group' / 'Start or Show' menu: */
@@ -1408 +1413 @@
 }
 
+void UIVirtualBoxManager::prepareMenuWelcome(QMenu *pMenu)
+{
+#ifdef VBOX_WS_X11
+    // WORKAROUND:
+    // There is an issue under Ubuntu which uses special kind of QPA
+    // plugin (appmenu-qt5) which redirects actions added to Qt menu-bar
+    // directly to Ubuntu Application menu-bar. In that case action
+    // shortcuts are not being handled by the Qt and that way ignored.
+    // As a workaround we can add those actions into QMainWindow as well.
+    addAction(actionPool()->action(UIActionIndexST_M_Welcome_S_New));
+    addAction(actionPool()->action(UIActionIndexST_M_Welcome_S_Add));
+#endif /* VBOX_WS_X11 */
+
+    /* Populate Machine-menu: */
+    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Welcome_S_New));
+    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Welcome_S_Add));
+
+    /* Remember action list: */
+    m_welcomeActions << actionPool()->action(UIActionIndexST_M_Welcome_S_New)
+                     << actionPool()->action(UIActionIndexST_M_Welcome_S_Add);
+}
+
 void UIVirtualBoxManager::prepareMenuGroup(QMenu *pMenu)
 {
@@ -1839 +1866 @@
             this, &UIVirtualBoxManager::sltPerformExit);
 
+    /* 'Welcome' menu connections: */
+    connect(actionPool()->action(UIActionIndexST_M_Welcome_S_Add), &UIAction::triggered,
+            this, &UIVirtualBoxManager::sltOpenAddMachineDialogDefault);
+
     /* 'Group' menu connections: */
     connect(actionPool()->action(UIActionIndexST_M_Group_S_Add), &UIAction::triggered,
@@ -2062 +2093 @@
     const bool fMachineMenuShown = m_pWidget->isMachineItemSelected() && !isSingleGroupSelected();
     const bool fGroupMenuShown   = m_pWidget->isGroupItemSelected()   &&  isSingleGroupSelected();
+    m_pWelcomeMenuAction->setVisible(fGlobalMenuShown);
     m_pMachineMenuAction->setVisible(fMachineMenuShown);
     m_pGroupMenuAction->setVisible(fGroupMenuShown);
@@ -2088 +2120 @@
 
     /* Hide action shortcuts: */
+    if (!fGlobalMenuShown)
+        foreach (UIAction *pAction, m_welcomeActions)
+            pAction->hideShortcut();
     if (!fMachineMenuShown)
         foreach (UIAction *pAction, m_machineActions)
             pAction->hideShortcut();
-    else
+    if (!fGroupMenuShown)
         foreach (UIAction *pAction, m_groupActions)
             pAction->hideShortcut();
 
     /* Show action shortcuts: */
+    if (fGlobalMenuShown)
+        foreach (UIAction *pAction, m_welcomeActions)
+            pAction->showShortcut();
     if (fMachineMenuShown)
         foreach (UIAction *pAction, m_machineActions)
             pAction->showShortcut();
-    else
+    if (fGroupMenuShown)
         foreach (UIAction *pAction, m_groupActions)
             pAction->showShortcut();

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h

@@ -241 +241 @@
         /** Prepares @a pMenu File. */
         void prepareMenuFile(QMenu *pMenu);
+        /** Prepares @a pMenu Welcome. */
+        void prepareMenuWelcome(QMenu *pMenu);
         /** Prepares @a pMenu Group. */
         void prepareMenuGroup(QMenu *pMenu);
@@ -353 +355 @@
     UIActionPool *m_pActionPool;
 
+    /** Holds the list of Welcome menu actions. */
+    QList<UIAction*>  m_welcomeActions;
+    /** Holds the Welcome menu parent action. */
+    QAction          *m_pWelcomeMenuAction;
+
     /** Holds the list of Group menu actions. */
     QList<UIAction*>  m_groupActions;

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -615 +615 @@
                     m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_File_S_ExportAppliance));
                     m_pToolBar->addSeparator();
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_New));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Add));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Welcome_S_New));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Welcome_S_Add));
                     break;
                 }

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

@@ -989 +989 @@
 
     /* Lock the action preventing cascade calls: */
+    actionPool()->action(UIActionIndexST_M_Welcome_S_New)->setEnabled(false);
     actionPool()->action(UIActionIndexST_M_Machine_S_New)->setEnabled(false);
     actionPool()->action(UIActionIndexST_M_Group_S_New)->setEnabled(false);
@@ -1007 +1008 @@
 
     /* Unlock the action allowing further calls: */
+    actionPool()->action(UIActionIndexST_M_Welcome_S_New)->setEnabled(true);
     actionPool()->action(UIActionIndexST_M_Machine_S_New)->setEnabled(true);
     actionPool()->action(UIActionIndexST_M_Group_S_New)->setEnabled(true);
@@ -1458 +1460 @@
 
     /* Setup action connections: */
+    connect(actionPool()->action(UIActionIndexST_M_Welcome_S_New), SIGNAL(triggered()),
+            this, SLOT(sltCreateNewMachine()));
     connect(actionPool()->action(UIActionIndexST_M_Group_S_New), SIGNAL(triggered()),
             this, SLOT(sltCreateNewMachine()));