Changeset 84104 in vbox

Timestamp:

Apr 30, 2020 1:43:36 PM (5 years ago)

Author:

vboxsync

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

137693

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Prepare/cleanup cascade fixes for contents widget.

Location:

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

Files:

• UIVirtualBoxManagerWidget.cpp (modified) (3 diffs)
• UIVirtualBoxManagerWidget.h (modified) (2 diffs)

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

@@ -398 +398 @@
 void UIVirtualBoxManagerWidget::prepare()
 {
-    /* Configure palette: */
+    /* Prepare everything: */
+    preparePalette();
+    prepareWidgets();
+    prepareConnections();
+
+    /* Load settings: */
+    loadSettings();
+
+    /* Translate UI: */
+    retranslateUi();
+
+    /* Make sure current Chooser-pane index fetched: */
+    sltHandleChooserPaneIndexChange();
+}
+
+void UIVirtualBoxManagerWidget::preparePalette()
+{
     setAutoFillBackground(true);
     QPalette pal = palette();
@@ -408 +424 @@
     pal.setColor(QPalette::Window, color);
     setPalette(pal);
-
-    /* Prepare: */
-    prepareWidgets();
-    prepareConnections();
-
-    /* Load settings: */
-    loadSettings();
-
-    /* Translate UI: */
-    retranslateUi();
-
-    /* Make sure current Chooser-pane index fetched: */
-    sltHandleChooserPaneIndexChange();
 }
 
@@ -818 +821 @@
 }
 
+void UIVirtualBoxManagerWidget::cleanupConnections()
+{
+    /* Tool-bar connections: */
+    disconnect(m_pToolBar, &UIToolBar::sigResized,
+               m_pPaneChooser, &UIChooser::sltHandleToolbarResize);
+    disconnect(m_pToolBar, &UIToolBar::customContextMenuRequested,
+               this, &UIVirtualBoxManagerWidget::sltHandleContextMenuRequest);
+
+    /* Chooser-pane connections: */
+    disconnect(m_pPaneChooser, &UIChooser::sigSelectionChanged,
+               this, &UIVirtualBoxManagerWidget::sltHandleChooserPaneIndexChange);
+    disconnect(m_pPaneChooser, &UIChooser::sigSelectionInvalidated,
+               this, &UIVirtualBoxManagerWidget::sltHandleChooserPaneSelectionInvalidated);
+    disconnect(m_pPaneChooser, &UIChooser::sigToggleStarted,
+               m_pPaneToolsMachine, &UIToolPaneMachine::sigToggleStarted);
+    disconnect(m_pPaneChooser, &UIChooser::sigToggleFinished,
+               m_pPaneToolsMachine, &UIToolPaneMachine::sigToggleFinished);
+    disconnect(m_pPaneChooser, &UIChooser::sigGroupSavingStateChanged,
+               this, &UIVirtualBoxManagerWidget::sigGroupSavingStateChanged);
+    disconnect(m_pPaneChooser, &UIChooser::sigToolMenuRequested,
+               this, &UIVirtualBoxManagerWidget::sltHandleToolMenuRequested);
+
+    /* Details-pane connections: */
+    disconnect(m_pPaneToolsMachine, &UIToolPaneMachine::sigLinkClicked,
+               this, &UIVirtualBoxManagerWidget::sigMachineSettingsLinkClicked);
+
+    /* Tools-pane connections: */
+    disconnect(m_pPaneTools, &UITools::sigSelectionChanged,
+               this, &UIVirtualBoxManagerWidget::sltHandleToolsPaneIndexChange);
+}
+
 void UIVirtualBoxManagerWidget::cleanup()
 {
     /* Save settings: */
     saveSettings();
+
+    /* Cleanup everything: */
+    cleanupConnections();
 }
 

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

@@ -188 +188 @@
     /** @name Prepare/Cleanup cascade.
       * @{ */
-        /** Prepares window. */
+        /** Prepares all. */
         void prepare();
+        /** Prepares palette. */
+        void preparePalette();
         /** Prepares widgets. */
         void prepareWidgets();
@@ -197 +199 @@
         void loadSettings();
 
-        /** Update toolbar. */
+        /** Updates toolbar. */
         void updateToolbar();
 
         /** Saves settings. */
         void saveSettings();
-        /** Cleanups window. */
+        /** Cleanups connections. */
+        void cleanupConnections();
+        /** Cleanups all. */
         void cleanup();
     /** @} */