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

Timestamp:

Dec 17, 2024 10:11:13 AM (4 weeks ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10814: VBox Manager: Cleanup for Global and Machine tool managers.

Location:

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

Files:

• UIGlobalToolsManagerWidget.cpp (modified) (5 diffs)
• UIGlobalToolsManagerWidget.h (modified) (2 diffs)
• UIMachineManagerWidget.cpp (modified) (10 diffs)
• UIMachineManagerWidget.h (modified) (1 diff)

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

@@ -27 +27 @@
 
 /* Qt includes: */
-// #include <QApplication>
 #include <QHBoxLayout>
-// #include <QStyle>
-// #include <QToolButton>
-// #include <QVBoxLayout>
 
 /* GUI includes: */
-#include "UIActionPoolManager.h"
 #include "UIChooser.h"
 #include "UICommon.h"
 #include "UIExtraDataManager.h"
-// #include "UILoggingDefs.h"
+#include "UIGlobalToolsManagerWidget.h"
 #include "UIMachineManagerWidget.h"
-// #include "UIMessageCenter.h"
-#include "UINotificationCenter.h"
-// #include "UISlidingAnimation.h"
-// #include "UITabBar.h"
 #include "UIToolPaneGlobal.h"
 #include "UIToolPaneMachine.h"
 #include "UITools.h"
-// #include "UITranslationEventListener.h"
-// #include "UIVirtualBoxEventHandler.h"
 #include "UIVirtualBoxManagerAdvancedWidget.h"
-#include "UIGlobalToolsManagerWidget.h"
-// #include "UIVirtualMachineItemCloud.h"
-// #include "UIVirtualMachineItemLocal.h"
-#ifndef VBOX_WS_MAC
-// # include "UIMenuBar.h"
-#endif
+
+/* Other VBox includes: */
+#include "iprt/assert.h"
 
 
@@ -176 +162 @@
 {
     /* Update tools restrictions: */
-    updateToolsMenuGlobal();
+    updateToolsMenu();
 }
 
@@ -238 +224 @@
         }
     }
-
-    /* Create notification-center: */
-    UINotificationCenter::create(this);
 }
 
@@ -291 +274 @@
 }
 
-void UIGlobalToolsManagerWidget::cleanupWidgets()
-{
-    UINotificationCenter::destroy();
-}
-
 void UIGlobalToolsManagerWidget::cleanup()
 {
     /* Ask sub-dialogs to commit data: */
     sltHandleCommitData();
-
-    /* Cleanup everything: */
-    cleanupWidgets();
 }
 
@@ -330 +305 @@
 }
 
-void UIGlobalToolsManagerWidget::updateToolsMenuGlobal()
+void UIGlobalToolsManagerWidget::updateToolsMenu()
 {
     /* Update global tools restrictions: */

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

@@ -143 +143 @@
         /** Cleanups connections. */
         void cleanupConnections();
-        /** Cleanups widgets. */
-        void cleanupWidgets();
         /** Cleanups all. */
         void cleanup();
@@ -162 +160 @@
         UIToolPaneMachine *toolPaneMachine() const;
 
-        /** Updates Global tools menu. */
-        void updateToolsMenuGlobal();
+        /** Updates tools menu. */
+        void updateToolsMenu();
     /** @} */
 

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

@@ -29 +29 @@
 #include <QHBoxLayout>
 #include <QTimer>
-#include <QVBoxLayout>
 
 /* GUI includes: */
@@ -38 +37 @@
 #include "UIExtraDataManager.h"
 #include "UIGlobalSession.h"
-#include "UILoggingDefs.h"
-#include "UINotificationCenter.h"
+#include "UIMachineManagerWidget.h"
 #include "UIToolPaneGlobal.h"
 #include "UIToolPaneMachine.h"
@@ -45 +43 @@
 #include "UITranslationEventListener.h"
 #include "UIVirtualBoxEventHandler.h"
-#include "UIMachineManagerWidget.h"
 #include "UIVirtualMachineItemLocal.h"
 
@@ -362 +359 @@
 {
     const QList<int> splitterSizes = m_pSplitter->sizes();
-    LogRel2(("GUI: UIMachineManagerWidget: Saving splitter as: Size=%d,%d\n",
-             splitterSizes.at(0), splitterSizes.at(1)));
     gEDataManager->setSelectorWindowSplitterHints(splitterSizes);
 }
@@ -495 +490 @@
 void UIMachineManagerWidget::prepareWidgets()
 {
-    /* Create main-layout: */
-    QHBoxLayout *pLayoutMain = new QHBoxLayout(this);
-    if (pLayoutMain)
+    /* Create layout: */
+    QHBoxLayout *pLayout = new QHBoxLayout(this);
+    if (pLayout)
     {
         /* Configure layout: */
-        pLayoutMain->setSpacing(0);
-        pLayoutMain->setContentsMargins(0, 0, 0, 0);
+        pLayout->setSpacing(0);
+        pLayout->setContentsMargins(0, 0, 0, 0);
 
         /* Create splitter: */
@@ -515 +510 @@
             }
 
-            /* Create right widget: */
-            QWidget *pWidgetRight = new QWidget;
-            if (pWidgetRight)
+            /* Create Tools-pane: */
+            m_pPaneTools = new UIToolPaneMachine(actionPool());
+            if (m_pPaneTools)
             {
-                /* Create right-layout: */
-                QVBoxLayout *pLayoutRight = new QVBoxLayout(pWidgetRight);
-                if(pLayoutRight)
-                {
-                    /* Configure layout: */
-                    pLayoutRight->setSpacing(0);
-                    pLayoutRight->setContentsMargins(0, 0, 0, 0);
-
-                    /* Create Tools-pane: */
-                    m_pPaneTools = new UIToolPaneMachine(actionPool());
-                    if (m_pPaneTools)
-                    {
-                        /// @todo make sure it's used properly
-                        m_pPaneTools->setActive(true);
-
-                        /* Add into layout: */
-                        pLayoutRight->addWidget(m_pPaneTools, 1);
-                    }
-                }
+                /// @todo make sure it's used properly
+                m_pPaneTools->setActive(true);
 
                 /* Add into splitter: */
-                m_pSplitter->addWidget(pWidgetRight);
+                m_pSplitter->addWidget(m_pPaneTools);
             }
 
@@ -548 +526 @@
 
             /* Add into layout: */
-            pLayoutMain->addWidget(m_pSplitter);
+            pLayout->addWidget(m_pSplitter);
         }
 
@@ -554 +532 @@
         m_pMenuTools = new UITools(this, UIToolClass_Machine, actionPool());
     }
-
-    /* Create notification-center: */
-    UINotificationCenter::create(this);
 
     /* Bring the VM list to the focus: */
@@ -616 +591 @@
             sizes[1] = (int)(width() * .9 * (2.0 / 3));
         }
-        LogRel2(("GUI: UIMachineManagerWidget: Restoring splitter to: Size=%d,%d\n",
-                 sizes.at(0), sizes.at(1)));
         m_pSplitter->setSizes(sizes);
     }
@@ -650 +623 @@
 }
 
-void UIMachineManagerWidget::cleanupWidgets()
-{
-    UINotificationCenter::destroy();
-}
-
 void UIMachineManagerWidget::cleanup()
 {
     /* Ask sub-dialogs to commit data: */
     sltHandleCommitData();
-
-    /* Cleanup everything: */
-    cleanupWidgets();
 }
 

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

@@ -276 +276 @@
         /** Cleanups connections. */
         void cleanupConnections();
-        /** Cleanups widgets. */
-        void cleanupWidgets();
         /** Cleanups all. */
         void cleanup();