Changeset 107299 in vbox

Timestamp:

Dec 12, 2024 2:02:39 PM (5 weeks ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10814: VBox Manager: Make sure Chooser and Tool panes have no dependency from VBox Manager widget as it should be possible to create them from other widgets.

Location:

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

Files:

• UIVirtualBoxManagerAdvancedWidget.cpp (modified) (1 diff)
• UIVirtualBoxManagerWidget.cpp (modified) (3 diffs)
• chooser/UIChooser.cpp (modified) (3 diffs)
• chooser/UIChooser.h (modified) (4 diffs)
• tools/UITools.cpp (modified) (3 diffs)
• tools/UITools.h (modified) (4 diffs)

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

@@ -763 +763 @@
 
         /* Create Global Tools-menu: */
-        m_pMenuToolsGlobal = new UITools(UIToolClass_Global, this);
+        m_pMenuToolsGlobal = new UITools(this, UIToolClass_Global, actionPool());
         /* Create Machine Tools-menu: */
-        m_pMenuToolsMachine = new UITools(UIToolClass_Machine, this);
+        m_pMenuToolsMachine = new UITools(this, UIToolClass_Machine, actionPool());
     }
 

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

@@ -804 +804 @@
 
         /* Create Global Tools-menu: */
-        m_pMenuToolsGlobal = new UITools(UIToolClass_Global, this);
+        m_pMenuToolsGlobal = new UITools(this, UIToolClass_Global, actionPool());
         /* Create Machine Tools-menu: */
-        m_pMenuToolsMachine = new UITools(UIToolClass_Machine, this);
+        m_pMenuToolsMachine = new UITools(this, UIToolClass_Machine, actionPool());
     }
 
@@ -866 +866 @@
     connect(m_pPaneChooser, &UIChooser::sigMachineSearchWidgetVisibilityChanged,
             this, &UIVirtualBoxManagerWidget::sigMachineSearchWidgetVisibilityChanged);
+    connect(this, &UIVirtualBoxManagerWidget::sigToolBarHeightChange,
+            m_pPaneChooser, &UIChooser::setGlobalItemHeightHint);
 
     /* Details-pane connections: */
@@ -1121 +1123 @@
     disconnect(m_pPaneChooser, &UIChooser::sigMachineSearchWidgetVisibilityChanged,
                this, &UIVirtualBoxManagerWidget::sigMachineSearchWidgetVisibilityChanged);
+    disconnect(this, &UIVirtualBoxManagerWidget::sigToolBarHeightChange,
+               m_pPaneChooser, &UIChooser::setGlobalItemHeightHint);
 
     /* Details-pane connections: */

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

@@ -33 +33 @@
 #include "UIChooserModel.h"
 #include "UIChooserView.h"
-#ifndef VBOX_GUI_WITH_ADVANCED_WIDGETS
-# include "UIVirtualBoxManagerWidget.h"
-#else
-# include "UIVirtualBoxManagerAdvancedWidget.h"
-#endif
 #include "UIVirtualMachineItem.h"
 
 
-UIChooser::UIChooser(UIVirtualBoxManagerWidget *pParent, UIActionPool *pActionPool)
+UIChooser::UIChooser(QWidget *pParent, UIActionPool *pActionPool)
     : QWidget(pParent)
-    , m_pParent(pParent)
     , m_pActionPool(pActionPool)
     , m_pChooserModel(0)
@@ -283 +277 @@
     AssertPtrReturnVoid(model());
     AssertPtrReturnVoid(view());
-
-    /* Parent connections: */
-    connect(m_pParent, &UIVirtualBoxManagerWidget::sigToolBarHeightChange,
-            this, &UIChooser::setGlobalItemHeightHint);
 
     /* Abstract Chooser-model connections: */
@@ -369 +359 @@
     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

@@ -37 +37 @@
 /* GUI includes: */
 #include "UIExtraDataDefs.h"
-#include "UIManagerDefs.h"
 
 /* Forward declarations: */
@@ -44 +43 @@
 class UIChooserView;
 class UIVirtualMachineItem;
-class UIVirtualBoxManagerWidget;
 class UIVirtualMachineItemCloud;
 
@@ -106 +104 @@
     /** Constructs Chooser-pane passing @a pParent to the base-class.
       * @param  pActionPool  Brings the action-pool reference.  */
-    UIChooser(UIVirtualBoxManagerWidget *pParent, UIActionPool *pActionPool);
+    UIChooser(QWidget *pParent, UIActionPool *pActionPool);
     /** Destructs Chooser-pane. */
     virtual ~UIChooser() RT_OVERRIDE;
@@ -239 +237 @@
     /** @name General stuff.
       * @{ */
-        /** Holds the parent reference. */
-        UIVirtualBoxManagerWidget *m_pParent;
-
         /** Holds the action-pool reference. */
         UIActionPool *m_pActionPool;

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp

@@ -33 +33 @@
 #include "UIToolsModel.h"
 #include "UIToolsView.h"
-#ifndef VBOX_GUI_WITH_ADVANCED_WIDGETS
-# include "UIVirtualBoxManagerWidget.h"
-#else
-# include "UIVirtualBoxManagerAdvancedWidget.h"
-#endif
 
 /* Other VBox includes: */
@@ -43 +38 @@
 
 
-UITools::UITools(UIToolClass enmClass, UIVirtualBoxManagerWidget *pParent /* = 0 */)
+UITools::UITools(QWidget *pParent, UIToolClass enmClass, UIActionPool *pActionPool)
     : QWidget(pParent, Qt::Popup)
     , m_enmClass(enmClass)
-    , m_pManagerWidget(pParent)
+    , m_pActionPool(pActionPool)
     , m_pMainLayout(0)
     , m_pToolsModel(0)
@@ -56 +51 @@
 UIActionPool *UITools::actionPool() const
 {
-    return managerWidget()->actionPool();
+    return m_pActionPool;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.h

@@ -37 +37 @@
 /* GUI icludes: */
 #include "UIExtraDataDefs.h"
-#include "UIManagerDefs.h"
 
 /* Forward declarations: */
@@ -45 +44 @@
 class UIToolsModel;
 class UIToolsView;
-class UIVirtualBoxManagerWidget;
 
 /** QWidget extension used as VM Tools-pane. */
@@ -69 +67 @@
 
     /** Constructs Tools-pane passing @a pParent to the base-class.
-      * @param  Brings the tools class, it will be fixed one. */
-    UITools(UIToolClass enmClass, UIVirtualBoxManagerWidget *pParent = 0);
+      * @param  enmClass     Brings the tools class, it will be fixed one.
+      * @param  pActionPool  Brings the action-pool reference. */
+    UITools(QWidget *pParent, UIToolClass enmClass, UIActionPool *pActionPool);
 
     /** @name General stuff.
       * @{ */
-        /** Returns the manager-widget reference. */
-        UIVirtualBoxManagerWidget *managerWidget() const { return m_pManagerWidget; }
-
         /** Returns the action-pool reference. */
         UIActionPool *actionPool() const;
@@ -130 +126 @@
         const UIToolClass  m_enmClass;
 
-        /** Holds the manager-widget reference. */
-        UIVirtualBoxManagerWidget *m_pManagerWidget;
+        /** Holds the action-pool reference. */
+        UIActionPool *m_pActionPool;
 
-        /** Holds the main layout instane. */
+        /** Holds the main layout instance. */
         QVBoxLayout  *m_pMainLayout;
-        /** Holds the Tools-model instane. */
+        /** Holds the Tools-model instance. */
         UIToolsModel *m_pToolsModel;
-        /** Holds the Tools-view instane. */
+        /** Holds the Tools-view instance. */
         UIToolsView  *m_pToolsView;
     /** @} */