Changeset 98606 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 16, 2023 3:51:22 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: Rework Information Dialog a bit to use UIMachine directly instead of UIMachineWindow.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineLogic.cpp (modified) (1 diff)
• information/UIVMInformationDialog.cpp (modified) (10 diffs)
• information/UIVMInformationDialog.h (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -1612 +1612 @@
 
     if (!m_pVMInformationDialog)
-        m_pVMInformationDialog = new UIVMInformationDialog(activeMachineWindow());
+        m_pVMInformationDialog = new UIVMInformationDialog(uimachine());
 
     if (m_pVMInformationDialog)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp

@@ -44 +44 @@
 #include "UIMachine.h"
 #include "UIMachineView.h"
-#include "UIMachineWindow.h"
 #include "UIMessageCenter.h"
 #include "UIVMActivityMonitor.h"
@@ -68 +67 @@
 #include <iprt/time.h>
 
-UIVMInformationDialog::UIVMInformationDialog(UIMachineWindow *pMachineWindow)
+UIVMInformationDialog::UIVMInformationDialog(UIMachine *pMachine)
     : QMainWindowWithRestorableGeometryAndRetranslateUi(0)
+    , m_pMachine(pMachine)
     , m_pTabWidget(0)
-    , m_pMachineWindow(pMachineWindow)
     , m_fCloseEmitted(false)
     , m_iGeometrySaveTimerId(-1)
 {
-    if (m_pMachineWindow && !m_pMachineWindow->console().isNull())
-    {
-        CMachine comMachine = m_pMachineWindow->console().GetMachine();
-        m_uMachineId = comMachine.GetId();
-    }
-    /* Prepare: */
     prepare();
-    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineStateChange,
-            this, &UIVMInformationDialog::sltMachineStateChange);
-}
-
-UIVMInformationDialog::~UIVMInformationDialog()
-{
 }
 
@@ -98 +85 @@
 {
     /* Setup dialog title: */
-    setWindowTitle(tr("%1 - Session Information").arg(m_pMachineWindow->machine().GetName()));
+    setWindowTitle(tr("%1 - Session Information").arg(m_strMachineName));
 
     /* Translate tabs: */
@@ -185 +172 @@
 void UIVMInformationDialog::prepare()
 {
-    /* Prepare dialog: */
-    prepareThis();
-    /* Load settings: */
-    loadDialogGeometry();
-}
-
-void UIVMInformationDialog::prepareThis()
-{
+    /* Load and clear: */
+    AssertPtrReturnVoid(m_pMachine);
+
+    /// @todo to be encapsulated in UIMachine soon
+    CMachine comMachine = m_pMachine->uisession()->machine();
+    m_uMachineId = comMachine.GetId();
+    m_strMachineName = comMachine.GetName();
+
 #ifdef VBOX_WS_MAC
     /* No window-icon on Mac OS X, because it acts as proxy icon which isn't necessary here. */
@@ -201 +188 @@
 #endif
 
-    /* Prepare central-widget: */
+    /* Prepare stuff: */
     prepareCentralWidget();
-
-    /* Retranslate: */
+    prepareConnections();
+
+    /* Apply language settings: */
     retranslateUi();
+
+    /* Load settings: */
+    loadDialogGeometry();
 }
 
@@ -238 +229 @@
         /* Create Configuration Details tab: */
         UIInformationConfiguration *pInformationConfigurationWidget =
-            new UIInformationConfiguration(this, m_pMachineWindow->machine(), m_pMachineWindow->console());
+            new UIInformationConfiguration(this, m_pMachine->uisession()->machine(), m_pMachine->uisession()->console());
         if (pInformationConfigurationWidget)
         {
@@ -247 +238 @@
         /* Create Runtime Information tab: */
         UIInformationRuntime *pInformationRuntimeWidget =
-            new UIInformationRuntime(this, m_pMachineWindow->machine(), m_pMachineWindow->console(), m_pMachineWindow->uimachine());
+            new UIInformationRuntime(this, m_pMachine->uisession()->machine(), m_pMachine->uisession()->console(), m_pMachine);
         if (pInformationRuntimeWidget)
         {
@@ -256 +247 @@
         /* Create Performance Monitor tab: */
         UIVMActivityMonitor *pVMActivityMonitorWidget =
-            new UIVMActivityMonitor(EmbedTo_Dialog, this, m_pMachineWindow->machine());
+            new UIVMActivityMonitor(EmbedTo_Dialog, this, m_pMachine->uisession()->machine());
         if (pVMActivityMonitorWidget)
         {
-            connect(m_pMachineWindow->uimachine(), &UIMachine::sigAdditionsStateChange,
+            connect(m_pMachine, &UIMachine::sigAdditionsStateChange,
                     pVMActivityMonitorWidget, &UIVMActivityMonitor::sltGuestAdditionsStateChange);
             m_tabs.insert(Tabs_ActivityMonitor, pVMActivityMonitorWidget);
@@ -266 +257 @@
 
         /* Create Guest Process Control tab: */
-        QString strMachineName;
-        if (m_pMachineWindow && m_pMachineWindow->console().isOk())
-        {
-            CMachine comMachine = m_pMachineWindow->console().GetMachine();
-            if (comMachine.isOk())
-                strMachineName = comMachine.GetName();
-        }
         UIGuestProcessControlWidget *pGuestProcessControlWidget =
-            new UIGuestProcessControlWidget(EmbedTo_Dialog, m_pMachineWindow->console().GetGuest(),
-                                            this, strMachineName, false /* fShowToolbar */);
+            new UIGuestProcessControlWidget(EmbedTo_Dialog, m_pMachine->uisession()->guest(),
+                                            this, m_strMachineName, false /* fShowToolbar */);
         if (pGuestProcessControlWidget)
         {
@@ -311 +295 @@
 }
 
+void UIVMInformationDialog::prepareConnections()
+{
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineStateChange,
+            this, &UIVMInformationDialog::sltMachineStateChange);
+}
+
 void UIVMInformationDialog::loadDialogGeometry()
 {
-    const QRect geo = gEDataManager->sessionInformationDialogGeometry(this, m_pMachineWindow);
+    const QRect geo = gEDataManager->sessionInformationDialogGeometry(this, m_pMachine->activeWindow());
     LogRel2(("GUI: UIVMInformationDialog: Restoring geometry to: Origin=%dx%d, Size=%dx%d\n",
              geo.x(), geo.y(), geo.width(), geo.height()));

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.h

@@ -46 +46 @@
 class QITabWidget;
 class QIDialogButtonBox;
-class UIMachineWindow;
+class UIMachine;
 
 /* Type definitions: */
@@ -65 +65 @@
 public:
 
-    /** Constructs information dialog for passed @a pMachineWindow. */
-    UIVMInformationDialog(UIMachineWindow *pMachineWindow);
-    /** Destructs information dialog. */
-    ~UIVMInformationDialog();
+    /** Constructs information dialog for passed @a pMachine. */
+    UIVMInformationDialog(UIMachine *pMachine);
 
     /** Returns whether the dialog should be maximized when geometry being restored. */
@@ -96 +94 @@
     /** Prepares all. */
     void prepare();
-    /** Prepares this. */
-    void prepareThis();
     /** Prepares central-widget. */
     void prepareCentralWidget();
@@ -106 +102 @@
     /** Prepares button-box. */
     void prepareButtonBox();
+    /** Prepares connections: */
+    void prepareConnections();
     void loadDialogGeometry();
     void saveDialogGeometry();
+
+    /** Holds the machine UI reference. */
+    UIMachine *m_pMachine;
 
     /** @name Widget variables.
@@ -117 +118 @@
        /** Holds the dialog button-box instance. */
        QIDialogButtonBox            *m_pButtonBox;
-       /** Holds the machine-window reference. */
-       UIMachineWindow              *m_pMachineWindow;
     /** @} */
     bool m_fCloseEmitted;
     int m_iGeometrySaveTimerId;
     QUuid m_uMachineId;
+    QString m_strMachineName;
 };