Changeset 107263 in vbox

Timestamp:

Dec 9, 2024 4:05:53 PM (6 weeks ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10814: VBox Manager: Make sure Chooser related connections placed insisde Chooser code.

Location:

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

Files:

• UIVirtualBoxManagerWidget.cpp (modified) (2 diffs)
• chooser/UIChooser.cpp (modified) (3 diffs)
• chooser/UIChooser.h (modified) (3 diffs)

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

@@ -830 +830 @@
 
     /* Chooser-pane connections: */
-    connect(this, &UIVirtualBoxManagerWidget::sigToolBarHeightChange,
-            m_pPaneChooser, &UIChooser::setGlobalItemHeightHint);
     connect(m_pPaneChooser, &UIChooser::sigSelectionChanged,
             this, &UIVirtualBoxManagerWidget::sltHandleChooserPaneIndexChange);
@@ -1087 +1085 @@
 
     /* Chooser-pane connections: */
-    disconnect(this, &UIVirtualBoxManagerWidget::sigToolBarHeightChange,
-               m_pPaneChooser, &UIChooser::setGlobalItemHeightHint);
     disconnect(m_pPaneChooser, &UIChooser::sigSelectionChanged,
                this, &UIVirtualBoxManagerWidget::sltHandleChooserPaneIndexChange);

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

@@ -33 +33 @@
 #include "UIChooserModel.h"
 #include "UIChooserView.h"
+#include "UIVirtualBoxManagerWidget.h"
 #include "UIVirtualMachineItem.h"
 
 
-UIChooser::UIChooser(QWidget *pParent, UIActionPool *pActionPool)
+UIChooser::UIChooser(UIVirtualBoxManagerWidget *pParent, UIActionPool *pActionPool)
     : QWidget(pParent)
+    , m_pParent(pParent)
     , m_pActionPool(pActionPool)
     , m_pChooserModel(0)
@@ -277 +279 @@
     AssertPtrReturnVoid(model());
     AssertPtrReturnVoid(view());
+
+    /* Parent connections: */
+    connect(m_pParent, &UIVirtualBoxManagerWidget::sigToolBarHeightChange,
+            this, &UIChooser::setGlobalItemHeightHint);
 
     /* Abstract Chooser-model connections: */
@@ -359 +365 @@
     disconnect(view(), &UIChooserView::sigSearchWidgetVisibilityChanged,
                this, &UIChooser::sigMachineSearchWidgetVisibilityChanged);
+
+    /* Parent connections: */
+    disconnect(m_pParent, &UIVirtualBoxManagerWidget::sigToolBarHeightChange,
+               this, &UIChooser::setGlobalItemHeightHint);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.h

@@ -43 +43 @@
 class UIChooserView;
 class UIVirtualMachineItem;
+class UIVirtualBoxManagerWidget;
 class UIVirtualMachineItemCloud;
 
@@ -104 +105 @@
     /** Constructs Chooser-pane passing @a pParent to the base-class.
       * @param  pActionPool  Brings the action-pool reference.  */
-    UIChooser(QWidget *pParent, UIActionPool *pActionPool);
+    UIChooser(UIVirtualBoxManagerWidget *pParent, UIActionPool *pActionPool);
     /** Destructs Chooser-pane. */
     virtual ~UIChooser() RT_OVERRIDE;
@@ -237 +238 @@
     /** @name General stuff.
       * @{ */
+        /** Holds the parent reference. */
+        UIVirtualBoxManagerWidget *m_pParent;
+
         /** Holds the action-pool reference. */
         UIActionPool *m_pActionPool;