Changeset 98761 in vbox

Timestamp:

Feb 27, 2023 4:31:12 PM (21 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322. In vm information dialog, use UISession wrapper for machine general info table.

Location:

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

Files:

• UISession.cpp (modified) (2 diffs)
• UISession.h (modified) (2 diffs)
• information/UIInformationConfiguration.cpp (modified) (3 diffs)

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

@@ -52 +52 @@
 #include "UISession.h"
 #include "UISettingsDialogSpecific.h"
+#include "UITextTable.h"
 #ifdef VBOX_GUI_WITH_KEYS_RESET_HANDLER
 # include "UIKeyboardHandler.h"
@@ -1403 +1404 @@
 }
 
+void UISession::generateMachineInformationGeneral(const UIExtraDataMetaDefs::DetailsElementOptionTypeGeneral &fOptions,
+                                                         UITextTable &returnTable)
+{
+    CMachine comMachine = machine();
+    returnTable = UIDetailsGenerator::generateMachineInformationGeneral(comMachine, fOptions);
+}
+
 bool UISession::setLogEnabled(bool fEnabled)
 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -43 +43 @@
 #include "UIMediumDefs.h"
 #include "UIMousePointerShapeData.h"
+#include "UITextTable.h"
 
 /* COM includes: */
@@ -528 +529 @@
     /** @} */
 
+    /** @name VM information stuff.
+     ** @{ */
+        /** Return general info. for the machine(). */
+        void generateMachineInformationGeneral(const UIExtraDataMetaDefs::DetailsElementOptionTypeGeneral &fOptions,
+                                               UITextTable &returnTable);
+    /** @} */
+
 public slots:
 

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

@@ -44 +44 @@
 #include "UIIconPool.h"
 #include "UIInformationConfiguration.h"
+#include "UIMachine.h"
+#include "UISession.h"
 #include "UIVirtualBoxEventHandler.h"
 
@@ -110 +112 @@
     if (!m_pTableWidget)
         return;
+    if (!gpMachine || !gpMachine->uisession())
+        return;
+    UISession *pSession = gpMachine->uisession();
     resetTable();
     QFontMetrics fontMetrics(m_pTableWidget->font());
@@ -115 +120 @@
     /* General section: */
     insertTitleRow(m_strGeneralTitle, UIIconPool::iconSet(":/machine_16px.png"), fontMetrics);
-    insertInfoRows(UIDetailsGenerator::generateMachineInformationGeneral(m_machine,
-                                                                         UIExtraDataMetaDefs::DetailsElementOptionTypeGeneral_Default),
-                   fontMetrics, iMaxColumn1Length);
+    UITextTable infoRows;
+    pSession->generateMachineInformationGeneral(UIExtraDataMetaDefs::DetailsElementOptionTypeGeneral_Default, infoRows);
+    insertInfoRows(infoRows, fontMetrics, iMaxColumn1Length);
 
     /* System section: */