Changeset 11532 in vbox for trunk/src

Timestamp:

Aug 21, 2008 11:08:54 AM (17 years ago)

Author:

vboxsync

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

35099

Message:

Fe/Qt4: Right (values) column alignment changed to right-aligned.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxVMInformationDlg.h (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (1 diff)
• src/VBoxVMInformationDlg.cpp (modified) (8 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxVMInformationDlg.h

@@ -70 +70 @@
     void refreshStatistics();
 
+    QString formatValue (const QString &aValueName, const QString &aValue, int aMaxSize);
     QString formatHardDisk (KStorageBus aBus, LONG aChannel, LONG aDevice, const QString &aBelongsTo);
     QString formatAdapter (ULONG aSlot, const QString &aBelongsTo);

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

@@ -1483 +1483 @@
 {
     static const char *sTableTpl =
-        "<table border=0 cellspacing=4 cellpadding=0>%1</table>";
+        "<table border=0 cellspacing=1 cellpadding=0>%1</table>";
     static const char *sSectionHrefTpl =
         "<tr><td width=22 rowspan=%1 align=left><img src='%2'></td>"

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

@@ -392 +392 @@
         return;
 
-    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 table = "<table width=100% cellspacing=1 cellpadding=0>%1</table>";
+    QString hdrRow = "<tr><td width=22><img src='%1'></td>"
+                     "<td colspan=2><nobr><b>%2</b></nobr></td></tr>";
+    QString paragraph = "<tr><td colspan=3></td></tr>";
     QString result;
 
@@ -409 +409 @@
         if (bpp)
             resolution += QString ("x%1").arg (bpp);
-        QString virt = console.GetDebugger().GetHWVirtExEnabled() ?
+        QString virtualization = console.GetDebugger().GetHWVirtExEnabled() ?
             VBoxGlobal::tr ("Enabled", "details report (VT-x/AMD-V)") :
             VBoxGlobal::tr ("Disabled", "details report (VT-x/AMD-V)");
@@ -427 +427 @@
             osType = vboxGlobal().vmGuestOSTypeDescription (osType);
 
+        /* Searching for longest string */
+        QStringList valuesList;
+        valuesList << resolution << virtualization << nested << addVerisonStr << osType;
+        int maxLength = 0;
+        foreach (QString value, valuesList)
+            maxLength = maxLength < fontMetrics().width (value) ?
+                        fontMetrics().width (value) : maxLength;
+
         result += hdrRow.arg (":/state_running_16px.png").arg (tr ("Runtime Attributes"));
-        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);
+        result += formatValue (tr ("Screen Resolution"), resolution, maxLength);
+        result += formatValue (VBoxGlobal::tr ("VT-x/AMD-V", "details report"), virtualization, maxLength);
+        result += formatValue (VBoxGlobal::tr ("Nested Paging", "details report"), nested, maxLength);
+        result += formatValue (tr ("Guest Additions"), addVerisonStr, maxLength);
+        result += formatValue (tr ("Guest OS Type"), osType, maxLength);
         result += paragraph;
     }
@@ -517 +525 @@
         result += naStat;
     }
+
     /* Show full composed page & save/restore scroll-bar position */
     int vv = mStatisticText->verticalScrollBar()->value();
@@ -523 +532 @@
 }
 
+/**
+ *  Allows left-aligned values formatting in right column.
+ *
+ *  aValueName - the name of value in the left column.
+ *  aValue - left-aligned value itself in the right column.
+ *  aMaxSize - maximum width (in pixels) of value in right column.
+ */
+QString VBoxVMInformationDlg::formatValue (const QString &aValueName,
+                                           const QString &aValue, int aMaxSize)
+{
+    QString bdyRow = "<tr><td></td><td width=50%><nobr>%1</nobr></td>"
+                     "<td align=right><nobr>%2"
+                     "<img src=:/tpixel.png width=%3 height=1></nobr></td></tr>";
+
+    int size = aMaxSize - fontMetrics().width (aValue);
+    return bdyRow.arg (aValueName).arg (aValue).arg (size);
+}
+
 QString VBoxVMInformationDlg::formatHardDisk (KStorageBus aBus,
                                               LONG aChannel,
@@ -532 +559 @@
 
     CHardDisk hd = mSession.GetMachine().GetHardDisk (aBus, aChannel, aDevice);
-    QString header = "<tr><td></td><td colspan=3><nobr><u>%1</u></nobr></td></tr>";
+    QString header = "<tr><td></td><td colspan=2><nobr><u>%1</u></nobr></td></tr>";
     QString name = vboxGlobal().toFullString (aBus, aChannel, aDevice);
     QString result = hd.isNull() ? QString::null : header.arg (name);
@@ -545 +572 @@
         return QString::null;
 
-    QString header = "<tr><td></td><td colspan=3><nobr><u>%1</u></nobr></td></tr>";
+    QString header = "<tr><td></td><td colspan=2><nobr><u>%1</u></nobr></td></tr>";
     QString name = VBoxGlobal::tr ("Adapter %1", "details report (network)").arg (aSlot);
     QString result = header.arg (name);
@@ -554 +581 @@
 QString VBoxVMInformationDlg::composeArticle (const QString &aBelongsTo)
 {
-    QString body = "<tr><td></td><td width=50%><nobr>%1</nobr></td><td colspan=2 align=right>"
-                   "<nobr>%2%3</nobr></td></tr>";
+    QString body = "<tr><td></td><td width=50%><nobr>%1</nobr></td>"
+                   "<td align=right><nobr>%2%3</nobr></td></tr>";
     QString result;