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

Timestamp:

Oct 22, 2020 3:25:35 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Cloud Profile Manager: Handle profile events like [un]registering and change; Solving todo regarding profile removal.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• cloud/profilemanager/UICloudProfileManager.cpp (modified) (5 diffs)
• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)

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

@@ -309 +309 @@
                 if (comCloudProfile.isOk())
                 {
-                    /* Acquire cloud profile manager restrictions: */
-                    const QStringList restrictions = gEDataManager->cloudProfileManagerRestrictions();
-
-                    /* Update profile in the tree: */
-                    UIDataCloudProfile data;
-                    loadCloudProfile(comCloudProfile, restrictions, *pProviderItem, data);
-                    updateItemForCloudProfile(data, true, pProfileItem);
-
-                    /* Make sure current-item fetched: */
-                    sltHandleCurrentItemChange();
-
                     /* Save profile changes: */
                     comCloudProvider.SaveProfiles();
@@ -386 +375 @@
             const QVector<QString> values(keys.size());
             comCloudProvider.CreateProfile(strProfileName, keys, values);
-
             /* Show error message if necessary: */
             if (!comCloudProvider.isOk())
-                msgCenter().cannotCreateCloudProfle(comCloudProvider, this);
+                msgCenter().cannotCreateCloudProfile(comCloudProvider, this);
             else
             {
-                /* Look for corresponding profile: */
-                CCloudProfile comCloudProfile = comCloudProvider.GetProfileByName(strProfileName);
+                /* Save profile changes: */
+                comCloudProvider.SaveProfiles();
                 /* Show error message if necessary: */
                 if (!comCloudProvider.isOk())
-                    msgCenter().cannotFindCloudProfile(comCloudProvider, strProfileName, this);
-                else
-                {
-                    /* Acquire cloud profile manager restrictions: */
-                    const QStringList restrictions = gEDataManager->cloudProfileManagerRestrictions();
-
-                    /* Add profile to the tree: */
-                    UIDataCloudProfile data;
-                    loadCloudProfile(comCloudProfile, restrictions, *pProviderItem, data);
-                    createItemForCloudProfile(pProviderItem, data, true);
-
-                    /* Save profile changes: */
-                    comCloudProvider.SaveProfiles();
-                    /* Show error message if necessary: */
-                    if (!comCloudProvider.isOk())
-                        msgCenter().cannotSaveCloudProfiles(comCloudProvider, this);
-                }
+                    msgCenter().cannotSaveCloudProfiles(comCloudProvider, this);
             }
         }
@@ -459 +431 @@
             if (!comCloudProvider.isOk())
                 msgCenter().cannotImportCloudProfiles(comCloudProvider, this);
-            else
-                loadCloudStuff();
         }
     }
@@ -513 +483 @@
                 /* Remove current profile: */
                 comCloudProfile.Remove();
-                /// @todo how do we check that?
-
-                /* Remove interface from the tree: */
-                delete pProfileItem;
+                /* Show error message if necessary: */
+                if (!comCloudProfile.isOk())
+                    msgCenter().cannotRemoveCloudProfile(comCloudProfile, this);
 
                 /* Save profile changes: */
@@ -802 +771 @@
 
     /* Extra-data connections: */
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigCloudProviderListChanged,
+            this, &UICloudProfileManagerWidget::sltLoadCloudStuff);
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigCloudProfileRegistered,
+            this, &UICloudProfileManagerWidget::sltLoadCloudStuff);
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigCloudProfileChanged,
+            this, &UICloudProfileManagerWidget::sltLoadCloudStuff);
     connect(gEDataManager, &UIExtraDataManager::sigCloudProfileManagerRestrictionChange,
             this, &UICloudProfileManagerWidget::sltLoadCloudStuff);

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

@@ -1875 +1875 @@
 }
 
-void UIMessageCenter::cannotCreateCloudProfle(const CCloudProvider &comProvider, QWidget *pParent /* = 0 */) const
+void UIMessageCenter::cannotCreateCloudProfile(const CCloudProvider &comProvider, QWidget *pParent /* = 0 */) const
 {
     error(pParent, MessageType_Error,
           tr("Failed to create cloud profile."),
           UIErrorString::formatErrorInfo(comProvider));
+}
+
+void UIMessageCenter::cannotRemoveCloudProfile(const CCloudProfile &comProfile, QWidget *pParent /* = 0 */) const
+{
+    error(pParent, MessageType_Error,
+          tr("Failed to remove cloud profile."),
+          UIErrorString::formatErrorInfo(comProfile));
 }
 

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

@@ -396 +396 @@
     void cannotAcquireCloudProviderParameter(const CCloudProvider &comProvider, QWidget *pParent = 0) const;
     void cannotFindCloudProfile(const CCloudProvider &comProvider, const QString &strName, QWidget *pParent = 0) const;
-    void cannotCreateCloudProfle(const CCloudProvider &comProvider, QWidget *pParent = 0) const;
+    void cannotCreateCloudProfile(const CCloudProvider &comProvider, QWidget *pParent = 0) const;
+    void cannotRemoveCloudProfile(const CCloudProfile &comProfile, QWidget *pParent = 0) const;
     void cannotSaveCloudProfiles(const CCloudProvider &comProvider, QWidget *pParent = 0) const;
     void cannotImportCloudProfiles(const CCloudProvider &comProvider, QWidget *pParent = 0) const;