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

Timestamp:

Mar 20, 2025 4:15:22 PM (4 weeks ago)

Author:

vboxsync

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

168076

Message:

FE/Qt: bugref:10814: Reverting r168069 and r168068; It was too early for this stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• UIGlobalToolsWidget.cpp (modified) (3 diffs)
• UIGlobalToolsWidget.h (modified) (2 diffs)
• UIMachineToolsWidget.cpp (modified) (3 diffs)
• UIMachineToolsWidget.h (modified) (2 diffs)
• UIVirtualBoxWidget.cpp (modified) (4 diffs)

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

@@ -205 +205 @@
 }
 
-void UIGlobalToolsWidget::sltHandleCloudMachineStateChange(const QUuid &uId)
-{
-    /* Acquire current item: */
-    UIVirtualMachineItem *pItem = machineToolsWidget()->currentItem();
-    const bool fCurrentItemIsOk = machineToolsWidget()->isItemAccessible(pItem);
-
-    /* If current item is Ok: */
-    if (fCurrentItemIsOk)
-    {
-        /* If Error-pane is chosen currently => switch to tool currently chosen in tools-menu: */
-        if (toolPaneMachine()->currentTool() == UIToolType_Error)
-            machineToolsWidget()->switchToolTo(toolMenu()->toolsType(UIToolClass_Machine));
-
-        /* If we still have same item selected: */
-        if (pItem && pItem->id() == uId)
-        {
-            /* Propagate current items to update the Details-pane: */
-            toolPaneMachine()->setItems(machineToolsWidget()->currentItems());
-        }
-    }
-    else
-    {
-        /* Make sure Error pane raised: */
-        if (toolPaneMachine()->currentTool() != UIToolType_Error)
-            toolPaneMachine()->openTool(UIToolType_Error);
-
-        /* If we still have same item selected: */
-        if (pItem && pItem->id() == uId)
-        {
-            /* Propagate current items to update the Details-pane (in any case): */
-            toolPaneMachine()->setItems(machineToolsWidget()->currentItems());
-            /* Propagate last access error to update the Error-pane (if machine selected but inaccessible): */
-            toolPaneMachine()->setErrorDetails(pItem->accessError());
-        }
-    }
-
-    /* Pass the signal further: */
-    emit sigCloudMachineStateChange(uId);
-}
-
 void UIGlobalToolsWidget::sltHandleGlobalToolMenuUpdate()
 {
@@ -410 +370 @@
     connect(chooser(), &UIChooser::sigCloudProfileStateChange,
             this, &UIGlobalToolsWidget::sltHandleCloudProfileStateChange);
-    connect(chooser(), &UIChooser::sigCloudMachineStateChange,
-            this, &UIGlobalToolsWidget::sltHandleCloudMachineStateChange);
 
     /* Tools-menu connections: */
@@ -458 +416 @@
     disconnect(chooser(), &UIChooser::sigCloudProfileStateChange,
                this, &UIGlobalToolsWidget::sltHandleCloudProfileStateChange);
-    disconnect(chooser(), &UIChooser::sigCloudMachineStateChange,
-               this, &UIGlobalToolsWidget::sltHandleCloudMachineStateChange);
 
     /* Tools-menu connections: */

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

@@ -65 +65 @@
     /** @} */
 
-    /** @name Chooser pane stuff.
-      * @{ */
-        /** Notifies about state change for cloud machine with certain @a uId. */
-        void sigCloudMachineStateChange(const QUuid &uId);
-    /** @} */
-
 public:
 
@@ -140 +134 @@
         void sltHandleCloudProfileStateChange(const QString &strProviderShortName,
                                               const QString &strProfileName);
-
-        /** Handles state change for cloud machine with certain @a uId. */
-        void sltHandleCloudMachineStateChange(const QUuid &uId);
     /** @} */
 

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

@@ -298 +298 @@
 }
 
+void UIMachineToolsWidget::sltHandleCloudMachineStateChange(const QUuid &uId)
+{
+    /* Acquire current item: */
+    UIVirtualMachineItem *pItem = currentItem();
+    const bool fCurrentItemIsOk = isItemAccessible(pItem);
+
+    /* If current item is Ok: */
+    if (fCurrentItemIsOk)
+    {
+        /* If Error-pane is chosen currently => switch to tool currently chosen in tools-menu: */
+        if (toolPane()->currentTool() == UIToolType_Error)
+            switchToolTo(toolMenu()->toolsType(UIToolClass_Machine));
+
+        /* If we still have same item selected: */
+        if (pItem && pItem->id() == uId)
+        {
+            /* Propagate current items to update the Details-pane: */
+            toolPane()->setItems(currentItems());
+        }
+    }
+    else
+    {
+        /* Make sure Error pane raised: */
+        if (toolPane()->currentTool() != UIToolType_Error)
+            toolPane()->openTool(UIToolType_Error);
+
+        /* If we still have same item selected: */
+        if (pItem && pItem->id() == uId)
+        {
+            /* Propagate current items to update the Details-pane (in any case): */
+            toolPane()->setItems(currentItems());
+            /* Propagate last access error to update the Error-pane (if machine selected but inaccessible): */
+            toolPane()->setErrorDetails(pItem->accessError());
+        }
+    }
+
+    /* Pass the signal further: */
+    emit sigCloudMachineStateChange(uId);
+}
+
 void UIMachineToolsWidget::sltHandleToolMenuUpdate(UIVirtualMachineItem *pItem)
 {
@@ -457 +497 @@
     connect(chooser(), &UIChooser::sigToolMenuRequested,
             this, &UIMachineToolsWidget::sltHandleToolMenuRequested);
+    connect(chooser(), &UIChooser::sigCloudMachineStateChange,
+            this, &UIMachineToolsWidget::sltHandleCloudMachineStateChange);
     connect(chooser(), &UIChooser::sigToggleStarted,
             toolPane(), &UIToolPane::sigToggleStarted);
@@ -510 +552 @@
     disconnect(chooser(), &UIChooser::sigToolMenuRequested,
                this, &UIMachineToolsWidget::sltHandleToolMenuRequested);
+    disconnect(chooser(), &UIChooser::sigCloudMachineStateChange,
+               this, &UIMachineToolsWidget::sltHandleCloudMachineStateChange);
     disconnect(chooser(), &UIChooser::sigToggleStarted,
                toolPane(), &UIToolPane::sigToggleStarted);

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

@@ -71 +71 @@
         /** Notifies about Chooser-pane selection change. */
         void sigChooserPaneSelectionChange();
+
+        /** Notifies about state change for cloud machine with certain @a uId. */
+        void sigCloudMachineStateChange(const QUuid &uId);
     /** @} */
 
@@ -185 +188 @@
         /** Handles signal about Chooser-pane selection invalidated. */
         void sltHandleChooserPaneSelectionInvalidated();
+
+        /** Handles state change for cloud machine with certain @a uId. */
+        void sltHandleCloudMachineStateChange(const QUuid &uId);
     /** @} */
 

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

@@ -461 +461 @@
     connect(globalToolsWidget(), &UIGlobalToolsWidget::sigToolTypeChange,
             this, &UIVirtualBoxWidget::sigToolTypeChangeGlobal);
-    connect(globalToolsWidget(), &UIGlobalToolsWidget::sigCloudMachineStateChange,
-            this, &UIVirtualBoxWidget::sigCloudMachineStateChange);
     /* Global Tool Pane connections: */
     connect(globalToolPane(), &UIToolPane::sigCreateMedium,
@@ -478 +476 @@
     connect(machineToolsWidget(), &UIMachineToolsWidget::sigChooserPaneSelectionChange,
             this, &UIVirtualBoxWidget::sltUpdateToolbar);
+    connect(machineToolsWidget(), &UIMachineToolsWidget::sigCloudMachineStateChange,
+            this, &UIVirtualBoxWidget::sigCloudMachineStateChange);
     /* Machine Tool Pane connections: */
     connect(machineToolPane(), &UIToolPane::sigLinkClicked,
@@ -718 +718 @@
     disconnect(globalToolsWidget(), &UIGlobalToolsWidget::sigToolTypeChange,
                this, &UIVirtualBoxWidget::sigToolTypeChangeGlobal);
-    disconnect(globalToolsWidget(), &UIGlobalToolsWidget::sigCloudMachineStateChange,
-               this, &UIVirtualBoxWidget::sigCloudMachineStateChange);
     /* Global Tool Pane connections: */
     disconnect(globalToolPane(), &UIToolPane::sigCreateMedium,
@@ -735 +733 @@
     disconnect(machineToolsWidget(), &UIMachineToolsWidget::sigChooserPaneSelectionChange,
                this, &UIVirtualBoxWidget::sltUpdateToolbar);
+    disconnect(machineToolsWidget(), &UIMachineToolsWidget::sigCloudMachineStateChange,
+               this, &UIVirtualBoxWidget::sigCloudMachineStateChange);
     /* Machine Tool Pane connections: */
     disconnect(machineToolPane(), &UIToolPane::sigLinkClicked,