Changeset 52980 in vbox

Timestamp:

Oct 8, 2014 7:34:42 AM (11 years ago)

Author:

vboxsync

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

96432

Message:

FE/Qt: UIVMInfoDialog.cpp show info for all guest monitors

File:

• trunk/src/VBox/Frontends/VirtualBox/src/UIVMInfoDialog.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/UIVMInfoDialog.cpp

@@ -569 +569 @@
         CConsole console = m_session.GetConsole();
 
-        /* Determine resolution: */
-        ULONG uWidth = 0;
-        ULONG uHeight = 0;
-        ULONG uBpp = 0;
-        LONG xOrigin = 0;
-        LONG yOrigin = 0;
-        KGuestMonitorStatus monitorStatus = KGuestMonitorStatus_Enabled;
-        console.GetDisplay().GetScreenResolution(0, uWidth, uHeight, uBpp, xOrigin, yOrigin, monitorStatus);
-        QString strResolution = QString("%1x%2").arg(uWidth).arg(uHeight);
-        if (uBpp)
-            strResolution += QString("x%1").arg(uBpp);
-        strResolution += QString(" @%1,%2").arg(xOrigin).arg(yOrigin);
+        ULONG cGuestScreens = m.GetMonitorCount();
+        QVector<QString> aResolutions(cGuestScreens);
+        for (ULONG iScreen = 0; iScreen < cGuestScreens; ++iScreen)
+        {
+            /* Determine resolution: */
+            ULONG uWidth = 0;
+            ULONG uHeight = 0;
+            ULONG uBpp = 0;
+            LONG xOrigin = 0;
+            LONG yOrigin = 0;
+            KGuestMonitorStatus monitorStatus = KGuestMonitorStatus_Enabled;
+            console.GetDisplay().GetScreenResolution(iScreen, uWidth, uHeight, uBpp, xOrigin, yOrigin, monitorStatus);
+            QString strResolution = QString("%1x%2").arg(uWidth).arg(uHeight);
+            if (uBpp)
+                strResolution += QString("x%1").arg(uBpp);
+            strResolution += QString(" @%1,%2").arg(xOrigin).arg(yOrigin);
+            if (monitorStatus == KGuestMonitorStatus_Disabled)
+            {
+                strResolution += QString(" ");
+                strResolution += QString(VBoxGlobal::tr("off", "guest monitor status"));
+            }
+            aResolutions[iScreen] = strResolution;
+        }
 
         /* Calculate uptime: */
@@ -638 +649 @@
         /* Searching for longest string: */
         QStringList values;
-        values << strResolution << strUptime
+        for (ULONG iScreen = 0; iScreen < cGuestScreens; ++iScreen)
+            values << aResolutions[iScreen];
+        values << strUptime
                << strVirtualization << strNestedPaging << strUnrestrictedExecution
                << strGAVersion << strOSType << strVRDEInfo;
@@ -648 +661 @@
         /* Summary: */
         strResult += strHeader.arg(":/state_running_16px.png").arg(tr("Runtime Attributes"));
-        strResult += formatValue(tr("Screen Resolution"), strResolution, iMaxLength);
+        for (ULONG iScreen = 0; iScreen < cGuestScreens; ++iScreen)
+        {
+            QString strLabel(tr("Screen Resolution"));
+            strLabel += QString(" %1").arg(iScreen + 1);
+            strResult += formatValue(strLabel, aResolutions[iScreen], iMaxLength);
+        }
         strResult += formatValue(tr("VM Uptime"), strUptime, iMaxLength);
         strResult += formatValue(tr("Clipboard Mode"), strClipboardMode, iMaxLength);