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

Timestamp:

Dec 11, 2024 4:36:52 PM (5 weeks ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10814: Cleanup for UIToolPaneGlobal.

Location:

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

Files:

• UIToolPaneGlobal.cpp (modified) (13 diffs)
• UIToolPaneGlobal.h (modified) (2 diffs)

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

@@ -29 +29 @@
 #include <QApplication>
 #include <QStackedLayout>
+#include <QUuid>
 #ifndef VBOX_WS_MAC
 # include <QStyle>
 #endif
-#include <QUuid>
 
 /* GUI includes */
-#include "UIActionPoolManager.h"
 #include "UICommon.h"
 #include "UICloudProfileManager.h"
@@ -61 +60 @@
     , m_fActive(false)
 {
-    /* Prepare: */
     prepare();
 }
@@ -67 +65 @@
 UIToolPaneGlobal::~UIToolPaneGlobal()
 {
-    /* Cleanup: */
     cleanup();
 }
@@ -92 +89 @@
 bool UIToolPaneGlobal::isToolOpened(UIToolType enmType) const
 {
-    /* Search through the stacked widgets: */
     for (int iIndex = 0; iIndex < m_pLayout->count(); ++iIndex)
         if (m_pLayout->widget(iIndex)->property("ToolType").value<UIToolType>() == enmType)
@@ -123 +119 @@
                 /* Create Desktop pane: */
                 m_pPaneWelcome = new UIWelcomePane;
-                if (m_pPaneWelcome)
+                AssertPtrReturnVoid(m_pPaneWelcome);
                 {
                     /* Configure pane: */
@@ -140 +136 @@
                 AssertPtrReturnVoid(m_pPaneExtensions);
                 {
+                    /* Configure pane: */
+                    m_pPaneExtensions->setProperty("ToolType", QVariant::fromValue(UIToolType_Extensions));
 #ifndef VBOX_WS_MAC
                     const int iMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 4;
                     m_pPaneExtensions->setContentsMargins(iMargin, 0, iMargin, 0);
 #endif
-
-                    /* Configure pane: */
-                    m_pPaneExtensions->setProperty("ToolType", QVariant::fromValue(UIToolType_Extensions));
 
                     /* Add into layout: */
@@ -160 +155 @@
                 AssertPtrReturnVoid(m_pPaneMedia);
                 {
-#ifndef VBOX_WS_MAC
-                    const int iMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 4;
-                    m_pPaneMedia->setContentsMargins(iMargin, 0, iMargin, 0);
-#endif
-
                     /* Configure pane: */
                     m_pPaneMedia->setProperty("ToolType", QVariant::fromValue(UIToolType_Media));
@@ -171 +161 @@
                     connect(m_pPaneMedia, &UIMediumManagerWidget::sigCopyMedium,
                             this, &UIToolPaneGlobal::sigCopyMedium);
+#ifndef VBOX_WS_MAC
+                    const int iMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 4;
+                    m_pPaneMedia->setContentsMargins(iMargin, 0, iMargin, 0);
+#endif
 
                     /* Add into layout: */
@@ -184 +178 @@
                 AssertPtrReturnVoid(m_pPaneNetwork);
                 {
+                    /* Configure pane: */
+                    m_pPaneNetwork->setProperty("ToolType", QVariant::fromValue(UIToolType_Network));
 #ifndef VBOX_WS_MAC
                     const int iMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 4;
                     m_pPaneNetwork->setContentsMargins(iMargin, 0, iMargin, 0);
 #endif
-
-                    /* Configure pane: */
-                    m_pPaneNetwork->setProperty("ToolType", QVariant::fromValue(UIToolType_Network));
 
                     /* Add into layout: */
@@ -204 +197 @@
                 AssertPtrReturnVoid(m_pPaneCloud);
                 {
+                    /* Configure pane: */
+                    m_pPaneCloud->setProperty("ToolType", QVariant::fromValue(UIToolType_Cloud));
 #ifndef VBOX_WS_MAC
                     const int iMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 4;
                     m_pPaneCloud->setContentsMargins(iMargin, 0, iMargin, 0);
 #endif
-
-                    /* Configure pane: */
-                    m_pPaneCloud->setProperty("ToolType", QVariant::fromValue(UIToolType_Cloud));
 
                     /* Add into layout: */
@@ -224 +216 @@
                 AssertPtrReturnVoid(m_pPaneActivities);
                 {
-#ifndef VBOX_WS_MAC
-                    const int iMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 4;
-                    m_pPaneActivities->setContentsMargins(iMargin, 0, iMargin, 0);
-#endif
-
                     /* Configure pane: */
                     m_pPaneActivities->setProperty("ToolType", QVariant::fromValue(UIToolType_Activities));
@@ -234 +221 @@
                             this, &UIToolPaneGlobal::sigSwitchToMachineActivityPane);
                     m_pPaneActivities->setCloudMachineItems(m_cloudItems);
+#ifndef VBOX_WS_MAC
+                    const int iMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 4;
+                    m_pPaneActivities->setContentsMargins(iMargin, 0, iMargin, 0);
+#endif
 
                     /* Add into layout: */
@@ -239 +230 @@
                     m_pLayout->setCurrentWidget(m_pPaneActivities);
                 }
-
                 break;
             }

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

@@ -39 +39 @@
 
 /* Forward declarations: */
-class QHBoxLayout;
 class QStackedLayout;
 class QUuid;
-class QVBoxLayout;
 class UIActionPool;
 class UICloudProfileManagerWidget;
@@ -51 +49 @@
 class UIVirtualMachineItemCloud;
 class UIWelcomePane;
-class CMachine;