Changeset 26926 in vbox

Timestamp:

Mar 1, 2010 10:19:43 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: New running VM core: cumulative fix for mm-support.

Location:

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

Files:

• UIMachineLogic.cpp (modified) (15 diffs)
• UIMachineLogic.h (modified) (2 diffs)
• UIMachineWindow.cpp (modified) (1 diff)
• normal/UIMachineLogicNormal.cpp (modified) (4 diffs)

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

@@ -363 +363 @@
 }
 
+UIMachineWindow* UIMachineLogic::mainMachineWindow()
+{
+    /* Return null if windows are not created yet: */
+    if (!isMachineWindowsCreated())
+        return 0;
+
+    return machineWindows()[0];
+}
+
+UIMachineWindow* UIMachineLogic::defaultMachineWindow()
+{
+    /* Return null if windows are not created yet: */
+    if (!isMachineWindowsCreated())
+        return 0;
+
+    /* Select main machine window by default: */
+    UIMachineWindow *pWindowToPropose = mainMachineWindow();
+
+    /* Check if there is active window present: */
+    foreach (UIMachineWindow *pWindowToCheck, machineWindows())
+    {
+        if (pWindowToCheck->machineWindow()->isActiveWindow())
+        {
+            pWindowToPropose = pWindowToCheck;
+            break;
+        }
+    }
+
+    /* Return default machine window: */
+    return pWindowToPropose;
+}
+
 UIMachineLogic::UIMachineLogic(QObject *pParent,
                                UISession *pSession,
@@ -703 +735 @@
     /* Variable falgs: */
     bool fIsMouseSupportsAbsolute = uisession()->isMouseSupportsAbsolute();
-    /* bool fIsMouseSupportsRelative = uisession()->isMouseSupportsRelative(); */
+    bool fIsMouseSupportsRelative = uisession()->isMouseSupportsRelative();
     bool fIsMouseHostCursorNeeded = uisession()->isMouseHostCursorNeeded();
 
     /* Update action state: */
     QAction *pAction = actionsPool()->action(UIActionIndex_Toggle_MouseIntegration);
-    pAction->setEnabled(fIsMouseSupportsAbsolute /* && fIsMouseSupportsRelative */ && !fIsMouseHostCursorNeeded);
+    pAction->setEnabled(fIsMouseSupportsAbsolute && fIsMouseSupportsRelative && !fIsMouseHostCursorNeeded);
     pAction->setChecked(fIsMouseHostCursorNeeded || pAction->isChecked());
 }
@@ -733 +765 @@
 {
     /* Do not process if window(s) missed! */
-    if (!machineWindowsCreated())
+    if (!isMachineWindowsCreated())
         return;
 
@@ -744 +776 @@
 {
     /* Do not process if window(s) missed! */
-    if (!machineWindowsCreated())
+    if (!isMachineWindowsCreated())
         return;
 
@@ -762 +794 @@
 {
     /* Do not process if window(s) missed! */
-    if (!machineWindowsCreated())
+    if (!isMachineWindowsCreated())
         return;
 
@@ -798 +830 @@
 {
     /* Do not process if window(s) missed! */
-    if (!machineWindowsCreated())
+    if (!isMachineWindowsCreated())
         return;
 
@@ -813 +845 @@
     CMachine machine = session().GetMachine();
 
-    VBoxTakeSnapshotDlg dlg(mainMachineWindow()->machineWindow(), machine);
+    VBoxTakeSnapshotDlg dlg(defaultMachineWindow()->machineWindow(), machine);
 
     QString strTypeId = machine.GetOSTypeId();
@@ -848 +880 @@
 void UIMachineLogic::sltShowInformationDialog()
 {
-    /* Do not process if window(s) missed! */
-    if (!machineWindowsCreated())
-        return;
-
     // TODO: Call for singleton information dialog for this machine!
-    //VBoxVMInformationDlg::createInformationDlg(session(), mainMachineWindow()->machineWindow());
+    //VBoxVMInformationDlg::createInformationDlg(session());
 }
 
@@ -886 +914 @@
 {
     /* Do not process if window(s) missed! */
-    if (!machineWindowsCreated())
+    if (!isMachineWindowsCreated())
         return;
 
-    /* Close machine window: */
-    mainMachineWindow()->sltTryClose();
+    /* Propose to close default machine window: */
+    defaultMachineWindow()->sltTryClose();
 }
 
@@ -1110 +1138 @@
         }
         /* Open VMM Dialog: */
-        VBoxMediaManagerDlg dlg(mainMachineWindow()->machineWindow());
+        VBoxMediaManagerDlg dlg(defaultMachineWindow()->machineWindow());
         dlg.setup(target.type, true /* select? */, true /* refresh? */, machine, currentId, true, usedImages);
         if (dlg.exec() == QDialog::Accepted)
@@ -1231 +1259 @@
 {
     /* Do not process if window(s) missed! */
-    if (!machineWindowsCreated())
+    if (!isMachineWindowsCreated())
         return;
 
     /* Show network settings dialog: */
-    UINetworkAdaptersDialog dlg(mainMachineWindow()->machineWindow(), session());
+    UINetworkAdaptersDialog dlg(defaultMachineWindow()->machineWindow(), session());
     dlg.exec();
 }
@@ -1242 +1270 @@
 {
     /* Do not process if window(s) missed! */
-    if (!machineWindowsCreated())
+    if (!isMachineWindowsCreated())
         return;
 
     /* Show shared folders settings dialog: */
-    UISharedFoldersDialog dlg(mainMachineWindow()->machineWindow(), session());
+    UISharedFoldersDialog dlg(defaultMachineWindow()->machineWindow(), session());
     dlg.exec();
 }
@@ -1261 +1289 @@
 {
     /* Do not process if window(s) missed! */
-    if (!machineWindowsCreated())
+    if (!isMachineWindowsCreated())
         return;
 
@@ -1475 +1503 @@
                 m_dbgGuiVT->u32EndVersion == m_dbgGuiVT->u32Version)
             {
-                m_dbgGuiVT->pfnSetParent(m_dbgGui, (QWidget*)mainMachineWindow());
+                m_dbgGuiVT->pfnSetParent(m_dbgGui, (QWidget*)defaultMachineWindow());
                 m_dbgGuiVT->pfnSetMenu(m_dbgGui, (QMenu*)actionsPool()->action(UIActionIndex_Menu_Debug));
                 dbgAdjustRelativePos();
@@ -1509 +1537 @@
     if (m_dbgGui)
     {
-        QRect rct = mainMachineWindow()->machineWindow()->frameGeometry();
+        QRect rct = defaultMachineWindow()->machineWindow()->frameGeometry();
         m_dbgGuiVT->pfnAdjustRelativePos(m_dbgGui, rct.x(), rct.y(), rct.width(), rct.height());
     }

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

@@ -63 +63 @@
     UIVisualStateType visualStateType() const { return m_visualStateType; }
     QList<UIMachineWindow*>& machineWindows() { return m_machineWindowsList; }
-    UIMachineWindow* mainMachineWindow() { return machineWindows().size() > 0 ? machineWindows()[0] : 0; }
+    UIMachineWindow* mainMachineWindow();
+    UIMachineWindow* defaultMachineWindow();
 
     /* Maintenance getters/setters: */
@@ -81 +82 @@
 
     /* Protected getters/setters: */
-    bool machineWindowsCreated() const { return m_fIsWindowsCreated; }
+    bool isMachineWindowsCreated() const { return m_fIsWindowsCreated; }
     void setMachineWindowsCreated(bool fIsWindowsCreated) { m_fIsWindowsCreated = fIsWindowsCreated; }
 

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

@@ -402 +402 @@
             strMachineName += " [" + vboxGlobal().toString(state) + "] - ";
         strMachineName += m_strWindowTitlePrefix;
+        if (machine.GetMonitorCount() > 1)
+            strMachineName += QString(" : %1").arg(m_uScreenId);
         machineWindow()->setWindowTitle(strMachineName);
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

@@ -133 +133 @@
     for (ulong uScreenId = 0; uScreenId < uMonitorCount; ++ uScreenId)
         addMachineWindow(UIMachineWindow::create(this, visualStateType(), uScreenId));
+    /* Order machine window(s): */
+    for (ulong uScreenId = uMonitorCount; uScreenId > 0; -- uScreenId)
+        machineWindows()[uScreenId - 1]->machineWindow()->raise();
 
     /* Notify others about machine window(s) created: */
@@ -151 +154 @@
         if (uisession()->isFirstTimeStarted())
         {
-            UIFirstRunWzd wzd(mainMachineWindow()->machineWindow(), machine);
+            UIFirstRunWzd wzd(defaultMachineWindow()->machineWindow(), machine);
             wzd.exec();
         }
@@ -174 +177 @@
         /* Show "Starting/Restoring" progress dialog: */
         if (uisession()->isSaved())
-            vboxProblem().showModalProgressDialog(progress, machine.GetName(), mainMachineWindow()->machineWindow(), 0);
+            vboxProblem().showModalProgressDialog(progress, machine.GetName(), defaultMachineWindow()->machineWindow(), 0);
         else
-            vboxProblem().showModalProgressDialog(progress, machine.GetName(), mainMachineWindow()->machineWindow());
+            vboxProblem().showModalProgressDialog(progress, machine.GetName(), defaultMachineWindow()->machineWindow());
 
 #if 0 // TODO: Check immediate failure!
@@ -231 +234 @@
 {
     /* Do not cleanup machine window if it is not present: */
-    if (!machineWindowsCreated())
+    if (!isMachineWindowsCreated())
         return;