Changeset 11471 in vbox for trunk/src

Timestamp:

Aug 18, 2008 6:24:20 PM (17 years ago)

Author:

vboxsync

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

34930

Message:

Fe/Qt4: 'Nested Paging' VM attribute added to Details Page. Little relayouting of Session Information Dialog to make Details & Runtime pages more proportional and feat the containing data.

Location:

trunk/src/VBox/Frontends/VirtualBox4/src

Files:

• VBoxGlobal.cpp (modified) (5 diffs)
• VBoxVMInformationDlg.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp

@@ -1483 +1483 @@
 {
     static const char *sTableTpl =
-        "<table border=0 cellspacing=0 cellpadding=0>%1</table>";
+        "<table border=0 cellspacing=4 cellpadding=0>%1</table>";
     static const char *sSectionHrefTpl =
-        "<tr><td width=26 rowspan=%1 align=left><img src='%2'></td>"
+        "<tr><td width=22 rowspan=%1 align=left><img src='%2'></td>"
             "<td colspan=2><b><a href='%3'><nobr>%4</nobr></a></b></td></tr>"
             "%5"
         "<tr><td colspan=2><font size=1>&nbsp;</font></td></tr>";
     static const char *sSectionBoldTpl =
-        "<tr><td width=26 rowspan=%1 align=left><img src='%2'></td>"
+        "<tr><td width=22 rowspan=%1 align=left><img src='%2'></td>"
             "<td colspan=2><!-- %3 --><b><nobr>%4</nobr></b></td></tr>"
             "%5"
         "<tr><td colspan=2><font size=1>&nbsp;</font></td></tr>";
     static const char *sSectionItemTpl =
-        "<tr><td width=30%><nobr>%1</nobr></td><td>%2</td></tr>";
+        "<tr><td width=40%><nobr>%1</nobr></td><td>%2</td></tr>";
 
     static QString sGeneralBasicHrefTpl, sGeneralBasicBoldTpl;
@@ -1531 +1531 @@
             + QString (sSectionItemTpl).arg (tr ("IO APIC", "details report"), "%7")
             + QString (sSectionItemTpl).arg (tr ("VT-x/AMD-V", "details report"), "%8")
-            + QString (sSectionItemTpl).arg (tr ("PAE/NX", "details report"), "%9");
+            + QString (sSectionItemTpl).arg (tr ("Nested Paging", "details report"), "%9")
+            + QString (sSectionItemTpl).arg (tr ("PAE/NX", "details report"), "%10");
 
         sGeneralFullHrefTpl = QString (sSectionHrefTpl)
-            .arg (2 + 9) /* rows */
+            .arg (2 + 10) /* rows */
             .arg (":/machine_16px.png", /* icon */
                   "#general", /* link */
@@ -1540 +1541 @@
                   generalItems); /* items */
         sGeneralFullBoldTpl = QString (sSectionBoldTpl)
-            .arg (2 + 9) /* rows */
+            .arg (2 + 10) /* rows */
             .arg (":/machine_16px.png", /* icon */
                   "#general", /* link */
@@ -1648 +1649 @@
 
         /* VT-x/AMD-V */
-        CSystemProperties props = vboxGlobal().virtualBox().GetSystemProperties();
         QString virt = m.GetHWVirtExEnabled() == KTSBool_True ?
                        tr ("Enabled", "details report (VT-x/AMD-V)") :
                        tr ("Disabled", "details report (VT-x/AMD-V)");
+
+        /* Nested paging status */
+        QString nested = m.GetHWVirtExNestedPagingEnabled() ?
+                       tr ("Enabled", "details report (Nested Paging)") :
+                       tr ("Disabled", "details report (Nested Paging)");
 
         /* PAE/NX */
@@ -1669 +1674 @@
                 .arg (ioapic)
                 .arg (virt)
+                .arg (nested)
                 .arg (pae)
             + hardDisks;

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMInformationDlg.cpp

@@ -78 +78 @@
     mDetailsText->viewport()->setAutoFillBackground (false);
     mStatisticText->viewport()->setAutoFillBackground (false);
+
+    /* For further tuning can be used setViewportMargins method of
+     * QRichTextEdit extended class: */
+#if 0
     mDetailsText->setViewportMargins (5, 5, 5, 5);
     mStatisticText->setViewportMargins (5, 5, 5, 5);
+#endif
 
     /* Setup handlers */
@@ -144 +149 @@
 
     AssertReturnVoid (!mSession.isNull());
-        CMachine machine = mSession.GetMachine();
-        AssertReturnVoid (!machine.isNull());
+    CMachine machine = mSession.GetMachine();
+    AssertReturnVoid (!machine.isNull());
 
     /* Setup a dialog caption */
@@ -387 +392 @@
         return;
 
-    QString table = "<table border=0 cellspacing=0 cellpadding=0>%1</table>";
-    QString hdrRow = "<tr><td width=26 align=left><img src='%1'></td><td colspan=3><b>%2</b></td></tr>";
-    QString bdyRow = "<tr><td></td><td><nobr>%1</nobr></td><td colspan=2><nobr>%2</nobr></td></tr>";
+    QString table = "<table border=0 cellspacing=4 cellpadding=0>%1</table>";
+    QString hdrRow = "<tr><td width=22 align=left><img src='%1'></td><td colspan=3><nobr><b>%2</b></nobr></td></tr>";
+    QString bdyRow = "<tr><td></td><td width=50%><nobr>%1</nobr></td><td colspan=2><nobr>%2</nobr></td></tr>";
     QString paragraph = "<tr><td colspan=4></td></tr>";
     QString result;
@@ -407 +412 @@
             VBoxGlobal::tr ("Enabled", "details report (VT-x/AMD-V)") :
             VBoxGlobal::tr ("Disabled", "details report (VT-x/AMD-V)");
+        QString nested = console.GetDebugger().GetHWVirtExNestedPagingEnabled() ?
+            VBoxGlobal::tr ("Enabled", "details report (Nested Paging)") :
+            VBoxGlobal::tr ("Disabled", "details report (Nested Paging)");
         QString addInfo = console.GetGuest().GetAdditionsVersion();
         uint addVersion = addInfo.toUInt();
@@ -420 +428 @@
 
         result += hdrRow.arg (":/state_running_16px.png").arg (tr ("Runtime Attributes"));
-        result += bdyRow.arg (tr ("Screen Resolution")).arg (resolution) +
-                  bdyRow.arg (VBoxGlobal::tr ("VT-x/AMD-V", "details report")).arg (virt);
+        result += bdyRow.arg (tr ("Screen Resolution")).arg (resolution);
+        result += bdyRow.arg (VBoxGlobal::tr ("VT-x/AMD-V", "details report")).arg (virt);
+        result += bdyRow.arg (VBoxGlobal::tr ("Nested Paging", "details report")).arg (nested);
         result += bdyRow.arg (tr ("Guest Additions")).arg (addVerisonStr);
         result += bdyRow.arg (tr ("Guest OS Type")).arg (osType);
@@ -545 +554 @@
 QString VBoxVMInformationDlg::composeArticle (const QString &aBelongsTo)
 {
-    QString body = "<tr><td></td><td><nobr>%1</nobr></td><td align=right>"
-                   "<nobr>%2%3</nobr></td><td></td></tr>";
+    QString body = "<tr><td></td><td width=50%><nobr>%1</nobr></td><td colspan=2 align=right>"
+                   "<nobr>%2%3</nobr></td></tr>";
     QString result;