Changeset 83859 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 20, 2020 2:36:26 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

137388

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Put Add Cloud VM and New Cloud VM wizards onto proper places; Enable both simultaneously; Add corresponding toolbar buttons.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPoolManager.cpp (modified) (1 diff)
• manager/UIVirtualBoxManager.cpp (modified) (4 diffs)
• manager/UIVirtualBoxManagerWidget.cpp (modified) (2 diffs)
• manager/chooser/UIChooserModel.cpp (modified) (2 diffs)

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

@@ -435 +435 @@
     virtual void retranslateUi() /* override */
     {
+        /// @todo replace that one with separate "Add" before 6.2
+        setIconText(QApplication::translate("UIActionPool", "&Add...").remove('.'));
         setName(QApplication::translate("UIActionPool", "&Add Machine..."));
         setStatusTip(QApplication::translate("UIActionPool", "Add existing virtual machine"));
+        setToolTip(simplifyText(text()) + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
     }
 };

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

@@ -41 +41 @@
 #include "UIVMLogViewerDialog.h"
 #include "UIVirtualBoxEventHandler.h"
+#include "UIWizardAddCloudVM.h"
 #include "UIWizardCloneVM.h"
 #include "UIWizardExportApp.h"
@@ -568 +569 @@
     updateActionsAppearance();
 
-    /* Open add machine dialog: */
-    openAddMachineDialog();
+    /* Get selected items: */
+    QList<UIVirtualMachineItem*> items = currentItems();
+    AssertMsgReturnVoid(!items.isEmpty(), ("At least one item should be selected!\n"));
+    UIVirtualMachineItem *pItem = items.first();
+
+    /* For local machine: */
+    if (pItem->itemType() == UIVirtualMachineItem::ItemType_Local)
+    {
+        /* Open add machine dialog: */
+        openAddMachineDialog();
+    }
+    /* For real cloud machine: */
+    else if (pItem->itemType() == UIVirtualMachineItem::ItemType_CloudReal)
+    {
+        /* Use the "safe way" to open stack of Mac OS X Sheets: */
+        QWidget *pWizardParent = windowManager().realParentWindow(this);
+        UISafePointerWizardAddCloudVM pWizard = new UIWizardAddCloudVM(pWizardParent);
+        windowManager().registerNewParent(pWizard, pWizardParent);
+        pWizard->prepare();
+
+        /* Execute wizard: */
+        pWizard->exec();
+        delete pWizard;
+    }
 }
 
@@ -1929 +1952 @@
     {
         case UIActionIndexST_M_Group_S_New:
+        case UIActionIndexST_M_Group_S_Add:
         {
             return !isGroupSavingInProgress() &&
@@ -1934 +1958 @@
                     isSingleCloudProfileGroupSelected());
         }
-        case UIActionIndexST_M_Group_S_Add:
         case UIActionIndexST_M_Group_S_Sort:
         {

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

@@ -710 +710 @@
                     {
                         m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Group_S_New));
+                        m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Add));
+                        m_pToolBar->addSeparator();
                         m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Discard));
                         m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow));
@@ -716 +718 @@
                     {
                         m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_New));
+                        m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Add));
+                        m_pToolBar->addSeparator();
                         m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Settings));
                         m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Discard));

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

@@ -47 +47 @@
 #include "UIVirtualMachineItemCloud.h"
 #include "UIVirtualMachineItemLocal.h"
-#include "UIWizardAddCloudVM.h"
+#include "UIWizardNewCloudVM.h"
 #include "UIWizardNewVM.h"
 
@@ -972 +972 @@
         /* Use the "safe way" to open stack of Mac OS X Sheets: */
         QWidget *pWizardParent = windowManager().realParentWindow(chooser()->managerWidget());
-        UISafePointerWizardAddCloudVM pWizard = new UIWizardAddCloudVM(pWizardParent);
+        UISafePointerWizardNewCloudVM pWizard = new UIWizardNewCloudVM(pWizardParent);
         windowManager().registerNewParent(pWizard, pWizardParent);
         pWizard->prepare();