Changeset 98682 in vbox

Timestamp:

Feb 22, 2023 9:18:00 AM (2 years ago)

Author:

vboxsync

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

155982

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking CMachine wrapper usage step-by-step; Machine id/name stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (2 diffs)
• globals/UICommon.h (modified) (2 diffs)
• runtime/UIMachineLogic.cpp (modified) (7 diffs)
• runtime/UIMachineWindow.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -614 +614 @@
                 return msgCenter().cannotFindMachineByName(m_comVBox, vmNameOrUuid);
         }
-        m_strManagedVMId = machine.GetId();
+        m_uManagedVMId = machine.GetId();
 
         if (m_fSeparateProcess)
@@ -667 +667 @@
         m_comVBox.SetSettingsSecret(m_astrSettingsPw);
 
-    if (visualStateType != UIVisualStateType_Invalid && !m_strManagedVMId.isNull())
-        gEDataManager->setRequestedVisualState(visualStateType, m_strManagedVMId);
+    if (visualStateType != UIVisualStateType_Invalid && !m_uManagedVMId.isNull())
+        gEDataManager->setRequestedVisualState(visualStateType, m_uManagedVMId);
 
 #ifdef VBOX_WITH_DEBUGGER_GUI

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.h

@@ -236 +236 @@
 
         /** Returns the --startvm option value (managed VM id). */
-        QUuid managedVMUuid() const { return m_strManagedVMId; }
+        QUuid managedVMUuid() const { return m_uManagedVMId; }
         /** Returns the --separate option value (whether GUI process is separate from VM process). */
         bool isSeparateProcess() const { return m_fSeparateProcess; }
@@ -665 +665 @@
 
         /** Holds the --startvm option value (managed VM id). */
-        QUuid  m_strManagedVMId;
+        QUuid  m_uManagedVMId;
         /** Holds the --separate option value (whether GUI process is separate from VM process). */
         bool   m_fSeparateProcess;

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

@@ -1554 +1554 @@
     {
         m_settings[UISettingsDialog::DialogType_Machine] = new UISettingsDialogMachine(activeMachineWindow(),
-                                                                                       machine().GetId(),
+                                                                                       uiCommon().managedVMUuid(),
                                                                                        actionPool(),
                                                                                        strCategory,
@@ -1670 +1670 @@
 
     QIManagerDialog *pFileManagerDialog;
-    UIFileManagerDialogFactory dialogFactory(actionPool(), machine().GetId(), machine().GetName());
+    UIFileManagerDialogFactory dialogFactory(actionPool(), uiCommon().managedVMUuid(), uimachine()->machineName());
     dialogFactory.prepare(pFileManagerDialog, activeMachineWindow());
     if (pFileManagerDialog)
@@ -1708 +1708 @@
 
     QIManagerDialog *pLogViewerDialog;
-    UIVMLogViewerDialogFactory dialogFactory(actionPool(), machine().GetId(), machine().GetName());
+    UIVMLogViewerDialogFactory dialogFactory(actionPool(), uiCommon().managedVMUuid(), uimachine()->machineName());
     dialogFactory.prepare(pLogViewerDialog, activeMachineWindow());
     if (pLogViewerDialog)
@@ -1864 +1864 @@
     const QFileInfo fi(machine().GetSettingsFilePath());
     const QString strCurrentTime = QDateTime::currentDateTime().toString("dd_MM_yyyy_hh_mm_ss");
-    const QString strFormatDefaultFileName = QString("VirtualBox").append("_").append(machine().GetName()).append("_").append(strCurrentTime);
+    const QString strFormatDefaultFileName = QString("VirtualBox").append("_").append(uimachine()->machineName()).append("_").append(strCurrentTime);
     const QString strDefaultFileName = QDir(fi.absolutePath()).absoluteFilePath(strFormatDefaultFileName);
 
@@ -1976 +1976 @@
         uimachine()->updateStateRecordingAction();
         /* Notify about the error: */
-        return UINotificationMessage::cannotToggleRecording(comRecordingSettings, machine().GetName(), fEnabled);
+        return UINotificationMessage::cannotToggleRecording(comRecordingSettings, uimachine()->machineName(), fEnabled);
     }
 
@@ -2040 +2040 @@
     {
         QWidget *pCenterWidget = windowManager().realParentWindow(activeMachineWindow());
-        m_pSoftKeyboardDialog = new UISoftKeyboard(0, uimachine(), pCenterWidget, machine().GetName());
+        m_pSoftKeyboardDialog = new UISoftKeyboard(0, uimachine(), pCenterWidget, uimachine()->machineName());
         connect(m_pSoftKeyboardDialog, &UISoftKeyboard::sigClose, this, &UIMachineLogic::sltCloseSoftKeyboardDefault);
     }
@@ -3114 +3114 @@
     for (int i = 0; i < machines.size(); ++i)
     {
-        if (machines[i].GetState() == KMachineState_Running && machines[i].GetId() != machine().GetId())
+        if (machines[i].GetState() == KMachineState_Running && machines[i].GetId() != uiCommon().managedVMUuid())
         {
             fAnother = true;

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

@@ -390 +390 @@
     {
         /* Execute asynchronously and leave: */
-        QProcess::startDetached(strScript, QStringList() << machine().GetId().toString());
+        QProcess::startDetached(strScript, QStringList() << uiCommon().managedVMUuid().toString());
         return;
     }