Changeset 100654 in vbox

Timestamp:

Jul 19, 2023 2:50:18 PM (17 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10489: VBox Manager: Adding Reset action for cloud VMs same place as for local.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/UIVirtualBoxManager.cpp (modified) (4 diffs)
• manager/chooser/UIChooserModel.cpp (modified) (2 diffs)
• notificationcenter/UINotificationObjects.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)

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

@@ -1788 +1788 @@
     foreach (UIVirtualMachineItem *pItem, itemsToReset)
     {
-        /* Open a session to modify VM state: */
-        CSession comSession = uiCommon().openExistingSession(pItem->id());
-        if (comSession.isNull())
-            return;
-
-        /* Get session console: */
-        CConsole comConsole = comSession.GetConsole();
-        /* Reset VM: */
-        comConsole.Reset();
-
-        /* Unlock machine finally: */
-        comSession.UnlockMachine();
+        switch (pItem->itemType())
+        {
+            case UIVirtualMachineItemType_Local:
+            {
+                /* Open a session to modify VM state: */
+                CSession comSession = uiCommon().openExistingSession(pItem->id());
+                if (comSession.isNull())
+                    return;
+
+                /* Get session console: */
+                CConsole comConsole = comSession.GetConsole();
+                /* Reset VM: */
+                comConsole.Reset();
+
+                /* Unlock machine finally: */
+                comSession.UnlockMachine();
+                break;
+            }
+            case UIVirtualMachineItemType_CloudReal:
+            {
+                /* Reset VM: */
+                UINotificationProgressCloudMachineReset *pNotification =
+                    new UINotificationProgressCloudMachineReset(pItem->toCloud()->machine());
+                gpNotificationCenter->append(pNotification);
+                break;
+            }
+            default:
+                break;
+        }
     }
 }
@@ -2926 +2943 @@
         pMenu->addSeparator();
         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Reset));
         pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Console)->menu());
         pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Stop)->menu());
@@ -2983 +3001 @@
         pMenu->addSeparator();
         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Reset));
         pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Console)->menu());
         pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Stop)->menu());
@@ -3593 +3612 @@
         case UIActionIndexMN_M_Machine_S_Reset:
         {
-            return isItemsLocal(items) &&
-                   isAtLeastOneItemRunning(items);
+            return isAtLeastOneItemRunning(items);
         }
         case UIActionIndexMN_M_Group_S_Detach:

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

@@ -1549 +1549 @@
         pMenuGroup->addSeparator();
         pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow));
+        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Reset));
         pMenuGroup->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Console)->menu());
         pMenuGroup->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Stop)->menu());
@@ -1566 +1567 @@
         pMenuMachine->addSeparator();
         pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow));
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Reset));
         pMenuMachine->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Console)->menu());
         pMenuMachine->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Stop)->menu());

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

@@ -3184 +3184 @@
     if (error().isEmpty())
         emit sigCloudMachineRemoved(m_strProviderShortName, m_strProfileName, m_strName);
+}
+
+
+/*********************************************************************************************************************************
+*   Class UINotificationProgressCloudMachineReset implementation.                                                                *
+*********************************************************************************************************************************/
+
+UINotificationProgressCloudMachineReset::UINotificationProgressCloudMachineReset(const CCloudMachine &comMachine)
+    : m_comMachine(comMachine)
+{
+}
+
+QString UINotificationProgressCloudMachineReset::name() const
+{
+    return UINotificationProgress::tr("Resetting cloud VM ...");
+}
+
+QString UINotificationProgressCloudMachineReset::details() const
+{
+    return UINotificationProgress::tr("<b>VM Name:</b> %1").arg(m_strName);
+}
+
+CProgress UINotificationProgressCloudMachineReset::createProgress(COMResult &comResult)
+{
+    /* Acquire cloud VM name: */
+    m_strName = m_comMachine.GetName();
+    if (!m_comMachine.isOk())
+    {
+        /* Store COM result: */
+        comResult = m_comMachine;
+        /* Return progress-wrapper: */
+        return CProgress();
+    }
+
+    /* Initialize progress-wrapper: */
+    CProgress comProgress = m_comMachine.Reset();
+    /* Store COM result: */
+    comResult = m_comMachine;
+    /* Return progress-wrapper: */
+    return comProgress;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

@@ -1822 +1822 @@
 };
 
+/** UINotificationProgress extension for cloud machine reset functionality. */
+class SHARED_LIBRARY_STUFF UINotificationProgressCloudMachineReset : public UINotificationProgress
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs cloud machine reset notification-progress.
+      * @param  comMachine  Brings the machine being reset. */
+    UINotificationProgressCloudMachineReset(const CCloudMachine &comMachine);
+
+protected:
+
+    /** Returns object name. */
+    virtual QString name() const /* override final */;
+    /** Returns object details. */
+    virtual QString details() const /* override final */;
+    /** Creates and returns started progress-wrapper. */
+    virtual CProgress createProgress(COMResult &comResult) /* override final */;
+
+private:
+
+    /** Holds the machine being reset. */
+    CCloudMachine  m_comMachine;
+    /** Holds the machine name. */
+    QString        m_strName;
+};
+
 /** UINotificationProgress extension for cloud machine power-off functionality. */
 class SHARED_LIBRARY_STUFF UINotificationProgressCloudMachinePowerOff : public UINotificationProgress