Changeset 98722 in vbox for trunk/src

Timestamp:

Feb 24, 2023 1:24:27 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156022

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking CMachine wrapper usage step-by-step; Log and OS type stuff.

Location:

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

Files:

• UIMachine.cpp (modified) (3 diffs)
• UIMachine.h (modified) (2 diffs)
• UIMachineLogic.cpp (modified) (6 diffs)
• UISession.cpp (modified) (3 diffs)
• UISession.h (modified) (3 diffs)

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

@@ -233 +233 @@
 }
 
+QString UIMachine::osTypeId() const
+{
+    return uisession()->osTypeId();
+}
+
 void UIMachine::updateStateAdditionsActions()
 {
@@ -718 +723 @@
 {
     return uisession()->acquireWhetherLogEnabled(fEnabled);
+}
+
+bool UIMachine::acquireLogFolder(QString &strFolder)
+{
+    return uisession()->acquireLogFolder(strFolder);
 }
 
@@ -1209 +1219 @@
     /* Use the OS type icon if user one was not set: */
     if (icon.isNull())
-        icon = generalIconPool().guestOSTypeIcon(uisession()->machine().GetOSTypeId());
+        icon = generalIconPool().guestOSTypeIcon(osTypeId());
     /* Use the default icon if nothing else works: */
     if (icon.isNull())

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

@@ -185 +185 @@
         /** Returns the machine name. */
         QString machineName() const;
+        /** Returns the OS type id. */
+        QString osTypeId() const;
     /** @} */
 
@@ -516 +518 @@
         bool acquireWhetherLogEnabled(bool &fEnabled);
 
+        /** Acquire log folder. */
+        bool acquireLogFolder(QString &strFolder);
+
         /** Acquires effective CPU @a uLoad. */
         bool acquireEffectiveCPULoad(ulong &uLoad);

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

@@ -415 +415 @@
             uimachine()->setGuestResizeIgnored(true);
             /* Get log-folder: */
-            QString strLogFolder = machine().GetLogFolder();
+            QString strLogFolder;
+            uimachine()->acquireLogFolder(strLogFolder);
             /* Take the screenshot for debugging purposes: */
             takeScreenshot(strLogFolder + "/VBox.png", "png");
@@ -1241 +1242 @@
     QPixmap pixmap = generalIconPool().userMachinePixmap(machine(), QSize(42, 42));
     if (pixmap.isNull())
-        pixmap = generalIconPool().guestOSTypePixmap(machine().GetOSTypeId(), QSize(42, 42));
+        pixmap = generalIconPool().guestOSTypePixmap(uimachine()->osTypeId(), QSize(42, 42));
     m_pDockIconPreview = new UIDockIconPreview(uimachine(), pixmap);
 
@@ -1658 +1659 @@
 void UIMachineLogic::sltShowFileManagerDialog()
 {
-    if (machine().isNull() || !activeMachineWindow())
+    if (!activeMachineWindow())
         return;
 
@@ -1700 +1701 @@
 void UIMachineLogic::sltShowLogDialog()
 {
-    if (machine().isNull() || !activeMachineWindow())
+    if (!activeMachineWindow())
         return;
 
@@ -2034 +2035 @@
 void UIMachineLogic::sltShowSoftKeyboard()
 {
-    if (machine().isNull() || !activeMachineWindow())
+    if (!activeMachineWindow())
         return;
 
@@ -2456 +2457 @@
 void UIMachineLogic::sltShowGuestControlConsoleDialog()
 {
-    if (machine().isNull() || !activeMachineWindow())
+    if (!activeMachineWindow())
         return;
 

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

@@ -645 +645 @@
 
     /* Auto GA update is currently for Windows and Linux guests only */
-    const CGuestOSType osType = uiCommon().vmGuestOSType(machine().GetOSTypeId());
+    const CGuestOSType osType = uiCommon().vmGuestOSType(uimachine()->osTypeId());
     if (!osType.isOk())
         return false;
@@ -1070 +1070 @@
     else
         fEnabled = fLogEnabled == TRUE;
+    return fSuccess;
+}
+
+bool UISession::acquireLogFolder(QString &strFolder)
+{
+    CMachine comMachine = machine();
+    const QString strLogFolder = comMachine.GetLogFolder();
+    const bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    else
+        strFolder = strLogFolder;
     return fSuccess;
 }
@@ -1469 +1481 @@
         return false;
 
-    /* Update machine-name: */
+    /* Update machine attributes: */
     m_strMachineName = machine().GetName();
+    m_strOSTypeId = machine().GetOSTypeId();
 
     /* Update machine-state: */

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

@@ -190 +190 @@
         /** Returns the machine name. */
         QString machineName() const { return m_strMachineName; }
+        /** Returns the OS type id. */
+        QString osTypeId() const { return m_strOSTypeId; }
 
         /** Returns main machine-widget id. */
@@ -424 +426 @@
         bool acquireWhetherLogEnabled(bool &fEnabled);
 
+        /** Acquire log folder. */
+        bool acquireLogFolder(QString &strFolder);
+
         /** Acquires VM's execution engine @a enmType. */
         bool acquireExecutionEngineType(KVMExecutionEngine &enmType);
@@ -575 +580 @@
         /** Holds the machine name. */
         QString  m_strMachineName;
+        /** Holds the OS type id. */
+        QString  m_strOSTypeId;
     /** @} */