Changeset 74957 in vbox

Timestamp:

Oct 21, 2018 11:53:53 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9230: Cloud Profile Manager: Actions reordering.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• cloud/UICloudProfileManager.cpp (modified) (6 diffs)
• cloud/UICloudProfileManager.h (modified) (1 diff)
• globals/UIActionPoolSelector.cpp (modified) (5 diffs)
• globals/UIActionPoolSelector.h (modified) (1 diff)
• manager/UIVirtualBoxManager.cpp (modified) (1 diff)
• manager/UIVirtualBoxManagerWidget.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/cloud/UICloudProfileManager.cpp

@@ -401 +401 @@
 }
 
+void UICloudProfileManagerWidget::sltImportCloudProfiles()
+{
+    /* Get provider item: */
+    UIItemCloudProvider *pProviderItem = static_cast<UIItemCloudProvider*>(m_pTreeWidget->currentItem());
+    AssertMsgReturnVoid(pProviderItem, ("Current item must not be null!\n"));
+
+    /* Confirm cloud profile removal: */
+    if (!msgCenter().confirmCloudProfilesImport(this))
+        return;
+
+    /* Get VirtualBox for further activities: */
+    const CVirtualBox comVBox = vboxGlobal().virtualBox();
+
+    /* Get CloudProviderManager for further activities: */
+    CCloudProviderManager comCloudProviderManager = comVBox.GetCloudProviderManager();
+    /* Show error message if necessary: */
+    if (!comVBox.isOk())
+        msgCenter().cannotAcquireCloudProviderManager(comVBox, this);
+    else
+    {
+        /* Acquire provider ID: */
+        const QUuid uId = pProviderItem->data(Column_Name, Data_ProviderID).toUuid();
+
+        /* Look for corresponding provider: */
+        CCloudProvider comCloudProvider = comCloudProviderManager.GetProviderById(uId);
+        /* Show error message if necessary: */
+        if (!comCloudProviderManager.isOk())
+            msgCenter().cannotFindCloudProvider(comCloudProviderManager, uId, this);
+        else
+        {
+            /* Import profiles: */
+            comCloudProvider.ImportProfiles();
+
+            /* Show error message if necessary: */
+            if (!comCloudProvider.isOk())
+                msgCenter().cannotImportCloudProfiles(comCloudProvider, this);
+            else
+                loadCloudStuff();
+        }
+    }
+}
+
 void UICloudProfileManagerWidget::sltRemoveCloudProfile()
 {
@@ -470 +512 @@
 }
 
-void UICloudProfileManagerWidget::sltImportCloudProfiles()
-{
-    /* Get provider item: */
-    UIItemCloudProvider *pProviderItem = static_cast<UIItemCloudProvider*>(m_pTreeWidget->currentItem());
-    AssertMsgReturnVoid(pProviderItem, ("Current item must not be null!\n"));
-
-    /* Confirm cloud profile removal: */
-    if (!msgCenter().confirmCloudProfilesImport(this))
-        return;
-
-    /* Get VirtualBox for further activities: */
-    const CVirtualBox comVBox = vboxGlobal().virtualBox();
-
-    /* Get CloudProviderManager for further activities: */
-    CCloudProviderManager comCloudProviderManager = comVBox.GetCloudProviderManager();
-    /* Show error message if necessary: */
-    if (!comVBox.isOk())
-        msgCenter().cannotAcquireCloudProviderManager(comVBox, this);
-    else
-    {
-        /* Acquire provider ID: */
-        const QUuid uId = pProviderItem->data(Column_Name, Data_ProviderID).toUuid();
-
-        /* Look for corresponding provider: */
-        CCloudProvider comCloudProvider = comCloudProviderManager.GetProviderById(uId);
-        /* Show error message if necessary: */
-        if (!comCloudProviderManager.isOk())
-            msgCenter().cannotFindCloudProvider(comCloudProviderManager, uId, this);
-        else
-        {
-            /* Import profiles: */
-            comCloudProvider.ImportProfiles();
-
-            /* Show error message if necessary: */
-            if (!comCloudProvider.isOk())
-                msgCenter().cannotImportCloudProfiles(comCloudProvider, this);
-            else
-                loadCloudStuff();
-        }
-    }
-}
-
 void UICloudProfileManagerWidget::sltHandleCurrentItemChange()
 {
@@ -525 +525 @@
     /* Update actions availability: */
     m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add)->setEnabled(!pItem || pItemProvider);
+    m_pActionPool->action(UIActionIndexST_M_Cloud_S_Import)->setEnabled(!pItem || pItemProvider);
     m_pActionPool->action(UIActionIndexST_M_Cloud_S_Remove)->setEnabled(pItemProfile);
     m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details)->setEnabled(pItemProfile || pItemProvider);
-    m_pActionPool->action(UIActionIndexST_M_Cloud_S_Import)->setEnabled(!pItem || pItemProvider);
 
     /* If there is an item => update details data: */
@@ -561 +561 @@
     {
         menu.addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add));
+        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Import));
         menu.addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details));
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Import));
     }
 
@@ -591 +591 @@
     connect(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add), &QAction::triggered,
             this, &UICloudProfileManagerWidget::sltAddCloudProfile);
+    connect(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Import), &QAction::triggered,
+            this, &UICloudProfileManagerWidget::sltImportCloudProfiles);
     connect(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Remove), &QAction::triggered,
             this, &UICloudProfileManagerWidget::sltRemoveCloudProfile);
     connect(m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details), &QAction::toggled,
             this, &UICloudProfileManagerWidget::sltToggleCloudProfileDetailsVisibility);
-    connect(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Import), &QAction::triggered,
-            this, &UICloudProfileManagerWidget::sltImportCloudProfiles);
 }
 
@@ -636 +636 @@
         /* Add toolbar actions: */
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Import));
         m_pToolBar->addSeparator();
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Remove));
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details));
-        m_pToolBar->addSeparator();
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Import));
 
 #ifdef VBOX_WS_MAC

trunk/src/VBox/Frontends/VirtualBox/src/cloud/UICloudProfileManager.h

@@ -91 +91 @@
         /** Handles command to create cloud profile. */
         void sltAddCloudProfile();
+        /** Handles command to import cloud profiles. */
+        void sltImportCloudProfiles();
         /** Handles command to remove cloud profile. */
         void sltRemoveCloudProfile();
         /** Handles command to make cloud profile details @a fVisible. */
         void sltToggleCloudProfileDetailsVisibility(bool fVisible);
-        /** Handles command to import cloud profiles. */
-        void sltImportCloudProfiles();
     /** @} */
 

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

@@ -2422 +2422 @@
 };
 
+/** Simple action extension, used as 'Perform Import' action class. */
+class UIActionMenuSelectorCloudPerformImport : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuSelectorCloudPerformImport(UIActionPool *pParent)
+        : UIActionSimple(pParent,
+                         ":/cloud_profile_restore_32px.png",          ":/cloud_profile_restore_16px.png",
+                         ":/cloud_profile_restore_disabled_32px.png", ":/cloud_profile_restore_disabled_16px.png")
+    {}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("ImportCloudProfiles");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
+    {
+        return QKeySequence("Ctrl+Shift+I");
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setIconText(QApplication::translate("UIActionPool", "Import"));
+        setName(QApplication::translate("UIActionPool", "&Import Profiles..."));
+        setShortcutScope(QApplication::translate("UIActionPool", "Cloud Profile Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Import the list of cloud profiles from external files"));
+        setToolTip(tr("Import Cloud Profiles (%1)").arg(shortcut().toString()));
+    }
+};
+
 /** Simple action extension, used as 'Perform Remove' action class. */
 class UIActionMenuSelectorCloudPerformRemove : public UIActionSimple
@@ -2498 +2537 @@
         setStatusTip(QApplication::translate("UIActionPool", "Open pane with selected cloud profile properties"));
         setToolTip(tr("Open Cloud Profile Properties (%1)").arg(shortcut().toString()));
-    }
-};
-
-/** Simple action extension, used as 'Perform Refresh' action class. */
-class UIActionMenuSelectorCloudPerformImport : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs action passing @a pParent to the base-class. */
-    UIActionMenuSelectorCloudPerformImport(UIActionPool *pParent)
-        : UIActionSimple(pParent,
-                         ":/cloud_profile_restore_32px.png",          ":/cloud_profile_restore_16px.png",
-                         ":/cloud_profile_restore_disabled_32px.png", ":/cloud_profile_restore_disabled_16px.png")
-    {}
-
-protected:
-
-    /** Returns shortcut extra-data ID. */
-    virtual QString shortcutExtraDataID() const /* override */
-    {
-        return QString("ImportCloudProfiles");
-    }
-
-    /** Returns default shortcut. */
-    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
-    {
-        return QKeySequence("Ctrl+Shift+I");
-    }
-
-    /** Handles translation event. */
-    virtual void retranslateUi() /* override */
-    {
-        setIconText(QApplication::translate("UIActionPool", "Import"));
-        setName(QApplication::translate("UIActionPool", "&Import Profiles..."));
-        setShortcutScope(QApplication::translate("UIActionPool", "Cloud Profile Manager"));
-        setStatusTip(QApplication::translate("UIActionPool", "Import the list of cloud profiles from external files"));
-        setToolTip(tr("Import Cloud Profiles (%1)").arg(shortcut().toString()));
     }
 };
@@ -2665 +2665 @@
     m_pool[UIActionIndexST_M_Cloud] = new UIActionMenuSelectorCloud(this);
     m_pool[UIActionIndexST_M_Cloud_S_Add] = new UIActionMenuSelectorCloudPerformAdd(this);
+    m_pool[UIActionIndexST_M_Cloud_S_Import] = new UIActionMenuSelectorCloudPerformImport(this);
     m_pool[UIActionIndexST_M_Cloud_S_Remove] = new UIActionMenuSelectorCloudPerformRemove(this);
     m_pool[UIActionIndexST_M_Cloud_T_Details] = new UIActionMenuSelectorCloudToggleProperties(this);
-    m_pool[UIActionIndexST_M_Cloud_S_Import] = new UIActionMenuSelectorCloudPerformImport(this);
 
     /* Prepare update-handlers for known menus: */
@@ -2846 +2846 @@
     /* 'Add' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexST_M_Cloud_S_Add)) || fSeparator;
+    /* 'Import' action: */
+    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Cloud_S_Import)) || fSeparator;
 
     /* Separator? */
@@ -2858 +2860 @@
     /* 'Properties' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexST_M_Cloud_T_Details)) || fSeparator;
-
-    /* Separator? */
-    if (fSeparator)
-    {
-        pMenu->addSeparator();
-        fSeparator = false;
-    }
-
-    /* 'Import' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Cloud_S_Import)) || fSeparator;
 }
 

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

@@ -146 +146 @@
     UIActionIndexST_M_Cloud,
     UIActionIndexST_M_Cloud_S_Add,
+    UIActionIndexST_M_Cloud_S_Import,
     UIActionIndexST_M_Cloud_S_Remove,
     UIActionIndexST_M_Cloud_T_Details,
-    UIActionIndexST_M_Cloud_S_Import,
 
     /* Maximum index: */

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

@@ -1794 +1794 @@
     /* Remember action list: */
     m_cloudProfileManagerActions << actionPool()->action(UIActionIndexST_M_Cloud_S_Add)
+                                 << actionPool()->action(UIActionIndexST_M_Cloud_S_Import)
                                  << actionPool()->action(UIActionIndexST_M_Cloud_S_Remove)
-                                 << actionPool()->action(UIActionIndexST_M_Cloud_T_Details)
-                                 << actionPool()->action(UIActionIndexST_M_Cloud_S_Import);
+                                 << actionPool()->action(UIActionIndexST_M_Cloud_T_Details);
 }
 

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

@@ -644 +644 @@
                 {
                     m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_S_Add));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_S_Import));
                     m_pToolBar->addSeparator();
                     m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_S_Remove));
                     m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_T_Details));
-                    m_pToolBar->addSeparator();
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_S_Import));
                     break;
                 }