Changeset 6719 in vbox

Timestamp:

Feb 1, 2008 1:20:51 PM (17 years ago)

Author:

vboxsync

Message:

1761: “Create VM session information dialog”:

1. The margins around the HTML widget made as thick as on the Details page of the main (VM Selector) window.
2. "Basic" page renamed to "Details" (gear icon used for it).
3. "Runtime" page made the default visible.
4. "Green arrow" icon used for the "Runtime Attributes header".
5. To avoid large dialog width "one column mode" is used: extended margin and large attributes values leads to enlarging dialog to annoying width in case of two columns.
6. Disabled adapters are marked "Disabled" now and not attached Hard Disks are marked "Not attached".
7. HTML widget have the initial focus now. Moreover, switching between pages enables focus to switched page.
8. Session Info Dialog is now centered relative to it's VM window, not the desktop.

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxVMInformationDlg.ui (modified) (2 diffs)
• VBoxVMInformationDlg.ui.h (modified) (17 diffs)

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMInformationDlg.ui

@@ -141 +141 @@
     <slot access="protected">updateDetails()</slot>
     <slot access="protected">processStatistics()</slot>
+    <slot access="protected">onPageChanged( QWidget* )</slot>
 </slots>
 <functions>
@@ -156 +157 @@
     <function returnType="QString" access="pritave">parseStatistics( const QString &amp; )</function>
     <function access="pritave">refreshStatistics()</function>
-    <function returnType="QString" access="pritave">composeArticle( const QString &amp;, int, int, int, int )</function>
+    <function returnType="QString" access="pritave">formatHardDisk( const QString &amp;, CEnums::DiskControllerType, LONG, int, int )</function>
+    <function returnType="QString" access="pritave">formatAdapter( const QString &amp;, ULONG, int, int )</function>
+    <function returnType="QString" access="pritave">composeArticle( const QString &amp;, int, int )</function>
 </functions>
 <pixmapinproject/>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMInformationDlg.ui.h

@@ -36 +36 @@
     {
         /* creating new information dialog if there is no one existing */
-        mSelfArray [machine.GetName()] = new VBoxVMInformationDlg (0,
+        mSelfArray [machine.GetName()] = new VBoxVMInformationDlg (
+            aConsole->topLevelWidget(),
             "VBoxVMInformationDlg", WType_TopLevel | WDestructiveClose);
         /* read new machine data for this information dialog */
@@ -72 +73 @@
     /* logs list creation */
     mInfoStack = new QTabWidget (mInfoFrame, "mInfoStack");
+    mInfoStack->setMargin (10);
     QVBoxLayout *infoFrameLayout = new QVBoxLayout (mInfoFrame);
     infoFrameLayout->addWidget (mInfoStack);
@@ -77 +79 @@
     /* details view creation */
     mDetailsText = new QTextBrowser();
-        mDetailsText->setFrameShape (QFrame::NoFrame);
-    mDetailsText->setMargin (3);
+    mDetailsText->setFrameShape (QFrame::NoFrame);
     mDetailsText->setPaper (backgroundBrush());
     mInfoStack->addTab (mDetailsText,
-                        VBoxGlobal::iconSet ("help_16px.png"),
+                        VBoxGlobal::iconSet ("settings_16px.png"),
                         QString::null);
 
     /* statistic view creation */
     mStatisticText = new QTextBrowser();
-        mStatisticText->setFrameShape (QFrame::NoFrame);
-    mStatisticText->setMargin (3);
+    mStatisticText->setFrameShape (QFrame::NoFrame);
     mStatisticText->setPaper (backgroundBrush());
     mInfoStack->addTab (mStatisticText,
@@ -95 +95 @@
     /* full list of statistics counters to get total info */
     // mDefStatText = new QTextBrowser();
-        // mDefStatText->setFrameShape (QFrame::NoFrame);
-    // mDefStatText->setMargin (3);
+    // mDefStatText->setFrameShape (QFrame::NoFrame);
     // mDefStatText->setPaper (backgroundBrush());
     // mInfoStack->addTab (mDefStatText,
@@ -105 +104 @@
     languageChangeImp();
 
-    resize (800, 550);
+    /* make initial resize */
+    resize (600, 450);
+
+    /* show statistics page and make it focused */
+    connect (mInfoStack, SIGNAL (currentChanged (QWidget*)),
+             this, SLOT (onPageChanged (QWidget*)));
+    mInfoStack->showPage (mStatisticText);
 }
 
@@ -111 +116 @@
 void VBoxVMInformationDlg::destroy()
 {
-    mSelfArray.erase (mSession.GetMachine().GetName());
+    if (!mSession.isNull() && !mSession.GetMachine().isNull())
+        mSelfArray.erase (mSession.GetMachine().GetName());
 }
 
@@ -153 +159 @@
 
     /* Setup a tabwidget page names. */
-    mInfoStack->changeTab (mDetailsText, tr ("&Basic"));
+    mInfoStack->changeTab (mDetailsText, tr ("&Details"));
     mInfoStack->changeTab (mStatisticText, tr ("&Runtime"));
-    // mInfoStack->changeTab (mDefStatText, tr ("&Default Stat"));
+    // mInfoStack->changeTab (mDefStatText, tr ("De&fault Stat"));
 
     /* Clear counter names initially. */
@@ -183 +189 @@
     mNamesMap ["/Devices/PCNet0/TransmitBytes"] = tr ("Amount of bytes transmitted");
     mNamesMap ["/Devices/PCNet0/ReceiveBytes"] = tr ("Amount of bytes received");
+
     mNamesMap ["/Devices/PCNet1/TransmitBytes"] = tr ("Amount of bytes transmitted");
     mNamesMap ["/Devices/PCNet1/ReceiveBytes"] = tr ("Amount of bytes received");
+
+    mNamesMap ["/Devices/PCNet2/TransmitBytes"] = tr ("Amount of bytes transmitted");
+    mNamesMap ["/Devices/PCNet2/ReceiveBytes"] = tr ("Amount of bytes received");
+
+    mNamesMap ["/Devices/PCNet3/TransmitBytes"] = tr ("Amount of bytes transmitted");
+    mNamesMap ["/Devices/PCNet3/ReceiveBytes"] = tr ("Amount of bytes received");
 
     /* Statistics page update. */
@@ -324 +337 @@
 
 
+void VBoxVMInformationDlg::onPageChanged (QWidget *aPage)
+{
+    /* focusing the browser on shown page */
+    aPage->setFocus();
+}
+
+
 void VBoxVMInformationDlg::processStatistics()
 {
@@ -345 +365 @@
 }
 
+
 QString VBoxVMInformationDlg::parseStatistics (const QString &aText)
 {
@@ -350 +371 @@
     QRegExp query ("^.+<Statistics>\n(.+)\n</Statistics>.*$");
     if (query.search (aText) == -1)
-    {
-            AssertMsgFailed (("Statistics format doesn't match.\n"));
         return QString::null;
-    }
+
     QStringList wholeList = QStringList::split ("\n", query.cap (1));
 
@@ -386 +405 @@
 }
 
+
+void VBoxVMInformationDlg::refreshStatistics()
+{
+    if (mSession.isNull())
+        return;
+
+    QString table = "<p><table border=0 cellspacing=0 cellpadding=0 width=100%>%1</table></p>";
+    QString hdrRow = "<tr><td align=left><img src='%1'></td><td colspan=2><b>%2</b></td></tr>";
+    QString bdyRow = "<tr><td></td><td><nobr>%1</nobr></td><td width=100%><nobr>%2</nobr></td></tr>";
+    QString paragraph = "<tr><td colspan=3></td></tr>";
+    QString interline = "<tr><td colspan=3><font size=1>&nbsp;</font></td></tr>";
+    QString result;
+
+    /* Screen & VT-X Runtime Parameters */
+    {
+        CConsole console = mSession.GetConsole();
+        ULONG bpp = console.GetDisplay().GetBitsPerPixel();
+        QString resolution = QString ("%1x%2")
+            .arg (console.GetDisplay().GetWidth())
+            .arg (console.GetDisplay().GetHeight());
+        if (bpp)
+            resolution += QString ("x%1").arg (bpp);
+        QString virt = console.GetDebugger().GetHWVirtExEnabled() ?
+            tr ("Enabled") : tr ("Disabled");
+
+        result += hdrRow.arg ("state_running_16px.png").arg (tr ("Runtime Attributes"));
+        result += bdyRow.arg (tr ("Screen Resolution")).arg (resolution) +
+                  bdyRow.arg (tr ("Hardware Virtualization")).arg (virt);
+        result += paragraph;
+    }
+
+    /* Hard Disk Statistics. */
+    result += hdrRow.arg ("hd_16px.png").arg (tr ("Hard Disks Statistics"));
+    result += formatHardDisk (tr ("Primary Master"), CEnums::IDE0Controller, 0, 0, 1);
+    result += interline;
+    result += formatHardDisk (tr ("Primary Slave"), CEnums::IDE0Controller, 1, 4, 5);
+    result += interline;
+    result += formatHardDisk (tr ("Secondary Master"), CEnums::IDE1Controller, 0, 8, 9);
+    result += interline;
+    result += formatHardDisk (tr ("Secondary Slave"), CEnums::IDE1Controller, 1, 12, 13);
+    result += paragraph;
+
+    /* Network Adapters Statistics. */
+    result += hdrRow.arg ("nw_16px.png").arg (tr ("Network Adapters Statistics"));
+    result += formatAdapter (tr ("Adapter 1"), 0, 16, 17);
+    result += interline;
+    result += formatAdapter (tr ("Adapter 2"), 1, 18, 19);
+    result += interline;
+    result += formatAdapter (tr ("Adapter 3"), 2, 20, 21);
+    result += interline;
+    result += formatAdapter (tr ("Adapter 4"), 3, 22, 23);
+
+    /* Show full composed page. */
+    mStatisticText->setText (table.arg (result));
+}
+
+
+QString VBoxVMInformationDlg::formatHardDisk (const QString &aName,
+                                              CEnums::DiskControllerType aType,
+                                              LONG aSlot, int aStart, int aFinish)
+{
+    if (mSession.isNull())
+        return QString::null;
+
+    QString header = "<tr><td></td><td colspan=2><nobr><u>%1</u></nobr></td></tr>";
+    CMachine machine = mSession.GetMachine();
+
+    QString result = header.arg (aName);
+    CHardDisk hd = machine.GetHardDisk (aType, aSlot);
+    if (!hd.isNull() || (aType == CEnums::IDE1Controller && aSlot == 0))
+    {
+        result += composeArticle (QString::null, aStart, aFinish);
+        result += composeArticle ("B", aStart + 2, aFinish + 2);
+    }
+    else
+        result += composeArticle (tr ("Not attached"), -1, -1);
+    return result;
+}
+
+QString VBoxVMInformationDlg::formatAdapter (const QString &aName,
+                                             ULONG aSlot,
+                                             int aStart, int aFinish)
+
+{
+    if (mSession.isNull())
+        return QString::null;
+
+    QString header = "<tr><td></td><td colspan=2><nobr><u>%1</u></nobr></td></tr>";
+    CMachine machine = mSession.GetMachine();
+
+    QString result = header.arg (aName);
+    CNetworkAdapter na = machine.GetNetworkAdapter (aSlot);
+    result += na.GetEnabled() ?
+        composeArticle ("B", aStart, aFinish) :
+        composeArticle (tr ("Disabled"), -1, -1);
+    return result;
+}
+
+
+QString VBoxVMInformationDlg::composeArticle (const QString &aUnits,
+                                              int aStart, int aFinish)
+{
+    QString body = "<tr><td></td><td><nobr>%1</nobr></td><td width=100%><nobr>%2</nobr></td></tr>";
+
+    QString result;
+
+    if (aStart == -1 && aFinish == -1)
+        result += body.arg (aUnits).arg (QString::null);
+    else for (int id = aStart; id <= aFinish; ++ id)
+    {
+        QString line = body;
+        if (mValuesMap.contains (mNamesMap.keys() [id]))
+        {
+            line = line.arg (mNamesMap.values() [id]);
+            ULONG64 value = mValuesMap.values() [id].toULongLong();
+            line = aUnits.isNull() ?
+                line.arg (QString ("%L1").arg (value)) :
+                line.arg (QString ("%L1 %2").arg (value).arg (aUnits));
+        }
+        result += line;
+    }
+
+    return result;
+}
+
+
+/* Old code for two columns support */
+#if 0
 void VBoxVMInformationDlg::refreshStatistics()
 {
@@ -411 +558 @@
             tr ("Enabled") : tr ("Disabled");
 
-        result += hdrRow.arg ("settings_16px.png").arg (tr ("Runtime Attributes"));
+        result += hdrRow.arg ("state_running_16px.png").arg (tr ("Runtime Attributes"));
         result += bdyRow.arg (tr ("Screen Resolution")) .arg (resolution)
                         .arg (tr ("Hardware Virtualization")).arg (virt);
@@ -439 +586 @@
 }
 
+
 QString VBoxVMInformationDlg::composeArticle (const QString &aUnits,
                                               int aStart1, int aFinish1,
@@ -452 +600 @@
     {
         QString line = bdyRow;
+        /* Processing first column */
         if (id1 > aFinish1)
         {
-            line = line.arg (QString::null).arg (QString::null).arg (QString::null);
+            line = line.arg (QString::null).arg (QString::null)
+                       .arg (QString::null).arg (QString::null);
         }
         else if (mValuesMap.contains (mNamesMap.keys() [id1]))
@@ -464 +614 @@
                 line.arg (QString ("%L1 %2").arg (value).arg (aUnits));
         }
+        /* Processing second column */
         if (id2 > aFinish2)
         {
-            line = line.arg (QString::null).arg (QString::null).arg (QString::null);
+            line = line.arg (QString::null).arg (QString::null)
+                       .arg (QString::null).arg (QString::null);
         }
         else if (mValuesMap.contains (mNamesMap.keys() [id2]))
@@ -482 +634 @@
     return result;
 }
-
+#endif
+