Changeset 41108 in vbox

Timestamp:

May 2, 2012 12:43:07 AM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Machine logic refactoring/cleanup (part 2).

Location:

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

Files:

• UIMachineLogic.cpp (modified) (18 diffs)
• UIMachineLogic.h (modified) (3 diffs)

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

@@ -215 +215 @@
 }
 
-UIMachineWindow* UIMachineLogic::defaultMachineWindow() const
+UIMachineWindow* UIMachineLogic::activeMachineWindow() const
 {
     /* Return null if windows are not created yet: */
@@ -221 +221 @@
         return 0;
 
-    /* Select main machine window by default: */
-    UIMachineWindow *pWindowToPropose = mainMachineWindow();
-
-    /* Check if there is active window present: */
-    foreach (UIMachineWindow *pWindowToCheck, machineWindows())
-    {
-        if (pWindowToCheck->isActiveWindow())
-        {
-            pWindowToPropose = pWindowToCheck;
-            break;
-        }
-    }
-
-    /* Return default machine window: */
-    return pWindowToPropose;
+    /* Check if there is an active window present: */
+    for (int i = 0; i < machineWindows().size(); ++i)
+    {
+        UIMachineWindow *pIteratedWindow = machineWindows()[i];
+        if (pIteratedWindow->isActiveWindow())
+            return pIteratedWindow;
+    }
+
+    /* Return main machine window: */
+    return mainMachineWindow();
 }
 
@@ -409 +404 @@
 void UIMachineLogic::sltShowWindows()
 {
-    for (int i=0; i < m_machineWindowsList.size(); ++i)
-    {
-        UIMachineWindow *pMachineWindow = m_machineWindowsList.at(i);
+    for (int i=0; i < machineWindows().size(); ++i)
+    {
+        UIMachineWindow *pMachineWindow = machineWindows().at(i);
         /* Dunno what Qt thinks a window that has minimized to the dock
          * should be - it is not hidden, neither is it minimized. OTOH it is
@@ -721 +716 @@
     /* Now the dock icon preview */
     QString osTypeId = session().GetConsole().GetGuest().GetOSTypeId();
-    m_pDockIconPreview = new UIDockIconPreview(m_pSession, vboxGlobal().vmGuestOSTypeIcon(osTypeId));
+    m_pDockIconPreview = new UIDockIconPreview(uisession(), vboxGlobal().vmGuestOSTypeIcon(osTypeId));
 
     QString strTest = session().GetMachine().GetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateEnabled).toLower();
@@ -861 +856 @@
 
     /* Disable/Enable mouse-integration for all view(s): */
-    m_pMouseHandler->setMouseIntegrationEnabled(!fOff);
+    mouseHandler()->setMouseIntegrationEnabled(!fOff);
 }
 
@@ -907 +902 @@
     CMachine machine = session().GetMachine();
 
-    VBoxTakeSnapshotDlg dlg(defaultMachineWindow(), machine);
+    VBoxTakeSnapshotDlg dlg(activeMachineWindow(), machine);
 
     QString strTypeId = machine.GetOSTypeId();
@@ -978 +973 @@
     QString strFilename = QIFileDialog::getSaveFileName(strStart,
                                                         filters.join(";;"),
-                                                        defaultMachineWindow(),
+                                                        activeMachineWindow(),
                                                         tr("Select a filename for the screenshot ..."),
                                                         &strFilter,
@@ -1036 +1031 @@
         return;
 
-    /* Propose to close default machine window: */
-    defaultMachineWindow()->sltTryClose();
+    /* Propose to close active machine window: */
+    activeMachineWindow()->sltTryClose();
 }
 
@@ -1047 +1042 @@
 
     /* Create and execute current VM settings dialog: */
-    UISettingsDialogMachine dlg(defaultMachineWindow(),
-                                session().GetMachine().GetId(), strCategory, QString());
+    UISettingsDialogMachine dlg(activeMachineWindow(), session().GetMachine().GetId(), strCategory, QString());
     dlg.execute();
 }
@@ -1062 +1056 @@
     /* Do not process if additions are not loaded! */
     if (!uisession()->isGuestAdditionsActive())
-        msgCenter().remindAboutGuestAdditionsAreNotActive(defaultMachineWindow());
+        msgCenter().remindAboutGuestAdditionsAreNotActive(activeMachineWindow());
 
     /* Open VM settings : Shared folders page: */
@@ -1315 +1309 @@
         /* Call for file-open window: */
         QString strMachineFolder(QFileInfo(machine.GetSettingsFilePath()).absolutePath());
-        QString strMediumId = vboxGlobal().openMediumWithFileOpenDialog(target.type, defaultMachineWindow(),
+        QString strMediumId = vboxGlobal().openMediumWithFileOpenDialog(target.type, activeMachineWindow(),
                                                                         strMachineFolder);
-        defaultMachineWindow()->machineView()->setFocus();
+        activeMachineWindow()->machineView()->setFocus();
         if (!strMediumId.isNull())
             newId = strMediumId;
@@ -1611 +1605 @@
     if (dbgCreated())
     {
-        m_pKeyboardHandler->setDebuggerActive();
+        keyboardHandler()->setDebuggerActive();
         m_pDbgGuiVT->pfnShowStatistics(m_pDbgGui);
     }
@@ -1620 +1614 @@
     if (dbgCreated())
     {
-        m_pKeyboardHandler->setDebuggerActive();
+        keyboardHandler()->setDebuggerActive();
         m_pDbgGuiVT->pfnShowCommandLine(m_pDbgGui);
     }
@@ -1640 +1634 @@
 {
     /* Show VM Log Viewer: */
-    UIVMLogViewer::showLogViewerFor(mainMachineWindow(), session().GetMachine());
+    UIVMLogViewer::showLogViewerFor(activeMachineWindow(), session().GetMachine());
 }
 
@@ -1648 +1642 @@
 void UIMachineLogic::sltDockPreviewModeChanged(QAction *pAction)
 {
-    CMachine machine = m_pSession->session().GetMachine();
+    CMachine machine = session().GetMachine();
     if (!machine.isNull())
     {
@@ -1662 +1656 @@
 void UIMachineLogic::sltDockPreviewMonitorChanged(QAction *pAction)
 {
-    CMachine machine = m_pSession->session().GetMachine();
+    CMachine machine = session().GetMachine();
     if (!machine.isNull())
     {
@@ -1777 +1771 @@
                 || m_pDbgGuiVT->u32EndVersion == m_pDbgGuiVT->u32Version)
             {
-                m_pDbgGuiVT->pfnSetParent(m_pDbgGui, defaultMachineWindow());
+                m_pDbgGuiVT->pfnSetParent(m_pDbgGui, activeMachineWindow());
                 m_pDbgGuiVT->pfnSetMenu(m_pDbgGui, gActionPool->action(UIActionIndexRuntime_Menu_Debug));
                 dbgAdjustRelativePos();
@@ -1811 +1805 @@
     if (m_pDbgGui)
     {
-        QRect rct = defaultMachineWindow()->frameGeometry();
+        QRect rct = activeMachineWindow()->frameGeometry();
         m_pDbgGuiVT->pfnAdjustRelativePos(m_pDbgGui, rct.x(), rct.y(), rct.width(), rct.height());
     }

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

@@ -20 +20 @@
 #define __UIMachineLogic_h__
 
-/* Local includes */
+/* Local includes: */
 #include "UIMachineDefs.h"
 #include <QIWithRetranslateUI.h>
@@ -27 +27 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-/* Global forwards */
+/* Forward declarations: */
 class QAction;
 class QActionGroup;
-
-/* Local forwards */
 class CSession;
 class CMachine;
@@ -70 +68 @@
     UIMouseHandler* mouseHandler() const { return m_pMouseHandler; }
     UIMachineWindow* mainMachineWindow() const;
-    UIMachineWindow* defaultMachineWindow() const;
+    UIMachineWindow* activeMachineWindow() const;
 
     /* Maintenance getters/setters: */