Changeset 102787 in vbox for trunk

Timestamp:

Jan 8, 2024 3:59:38 PM (13 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10576. Parametrize tool pane detach slot in UIVirtualBoxManager.

Location:

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

Files:

• UIToolPaneMachine.cpp (modified) (2 diffs)
• UIToolPaneMachine.h (modified) (2 diffs)
• UIVirtualBoxManager.cpp (modified) (2 diffs)
• UIVirtualBoxManager.h (modified) (1 diff)
• UIVirtualBoxManagerWidget.cpp (modified) (1 diff)
• UIVirtualBoxManagerWidget.h (modified) (1 diff)

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

@@ -196 +196 @@
                     m_pPaneLogViewer->setProperty("ToolType", QVariant::fromValue(UIToolType_Logs));
                     connect(m_pPaneLogViewer, &UIVMLogViewerWidget::sigDetach,
-                            this, &UIToolPaneMachine::sigDetachLogViewer);
+                            this, &UIToolPaneMachine::sltDetachToolPane);
                     m_pPaneLogViewer->setSelectedVMListItems(m_items);
 
@@ -392 +392 @@
     // printf("UIToolPaneMachine::handleTokenChange: Active = %d, current tool = %d\n", m_fActive, currentTool());
 }
+
+void UIToolPaneMachine::sltDetachToolPane()
+{
+    AssertPtrReturnVoid(sender());
+    UIToolType enmToolType = UIToolType_Invalid;
+    if (sender() == m_pPaneLogViewer)
+        enmToolType = UIToolType_Logs;
+
+    if (enmToolType != UIToolType_Invalid)
+        emit sigDetachToolPane(enmToolType);
+}

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

@@ -76 +76 @@
     void sigSwitchToActivityOverviewPane();
 
-    /** Notifies listeners about request to detach Log Viewer pane. */
-    void sigDetachLogViewer();
+    /** Notifies listeners about request to detach pane with tool type @enmToolType. */
+    void sigDetachToolPane(UIToolType enmToolType);
 
 public:
@@ -114 +114 @@
     /** Returns the help keyword of the current tool's widget. */
     QString currentHelpKeyword() const;
+
+private slots:
+
+    /** Handles the detach signals received from panes.*/
+    void sltDetachToolPane();
 
 private:

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

@@ -963 +963 @@
 }
 
-void UIVirtualBoxManager::sltDetachLogViewer()
-{
+void UIVirtualBoxManager::sltDetachToolPane(UIToolType enmToolType)
+{
+    AssertReturnVoid(enmToolType != UIToolType_Invalid);
     /* Add tool to detached: */
     QList<UIToolType> tools = gEDataManager->detachedTools();
-    if (!tools.contains(UIToolType_Logs))
-    {
-        tools << UIToolType_Logs;
+    if (!tools.contains(enmToolType))
+    {
+        tools << enmToolType;
         gEDataManager->setDetachedTools(tools);
     }
 
     /* Detach Log Viewer: */
-    sltOpenManagerWindow(UIToolType_Logs);
+    sltOpenManagerWindow(enmToolType);
 }
 
@@ -2528 +2529 @@
     connect(m_pWidget, &UIVirtualBoxManagerWidget::sigCurrentSnapshotItemChange,
             this, &UIVirtualBoxManager::sltCurrentSnapshotItemChange);
-    connect(m_pWidget, &UIVirtualBoxManagerWidget::sigDetachLogViewer,
-            this, &UIVirtualBoxManager::sltDetachLogViewer);
+    connect(m_pWidget, &UIVirtualBoxManagerWidget::sigDetachToolPane,
+            this, &UIVirtualBoxManager::sltDetachToolPane);
 
     connect(menuBar(), &QMenuBar::customContextMenuRequested,

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

@@ -169 +169 @@
 
         /** Handles request to detach Log Viewer pane. */
-        void sltDetachLogViewer();
+        void sltDetachToolPane(UIToolType enmToolType);
 
         /** Handles state change for cloud machine with certain @a uId. */

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

@@ -705 +705 @@
                             connect(m_pPaneToolsMachine, &UIToolPaneMachine::sigSwitchToActivityOverviewPane,
                                     this, &UIVirtualBoxManagerWidget::sltSwitchToActivityOverviewPane);
-                            connect(m_pPaneToolsMachine, &UIToolPaneMachine::sigDetachLogViewer,
-                                    this, &UIVirtualBoxManagerWidget::sigDetachLogViewer);
+                            connect(m_pPaneToolsMachine, &UIToolPaneMachine::sigDetachToolPane,
+                                    this, &UIVirtualBoxManagerWidget::sigDetachToolPane);
 
                             /* Add into stack: */

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

@@ -124 +124 @@
     /** @} */
 
-    /** @name Tools / Log Viewer pane stuff.
-      * @{ */
-        /** Notifies listeners about request to detach Log Viewer pane. */
-        void sigDetachLogViewer();
+    /** @name Tools / Generic pane stuff.
+      * @{ */
+        /** Notifies listeners about request to detach pane with tool type @p enmToolType. */
+        void sigDetachToolPane(UIToolType enmToolType);
     /** @} */