Changeset 6603 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 30, 2008 1:56:19 PM (17 years ago)

Author:

vboxsync

Message:

1761: Create VM session information dialog:

First version of Session Information Dialog implemented.
Dialog Invoked from working VM console by Host+N key combination.
Dialog contains Basic & Runtime tabs with VM details, runtime parameters and HD statistics. Network & Other statistics will be added into GUI when the necessary counters appears.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VBoxUI.pro (modified) (1 diff)
• include/VBoxConsoleWnd.h (modified) (2 diffs)
• include/VBoxGlobal.h (modified) (2 diffs)
• src/VBoxConsoleWnd.cpp (modified) (6 diffs)
• src/VBoxGlobal.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro

@@ -38 +38 @@
         ui/VBoxVMFirstRunWzd.ui \
         ui/VBoxVMLogViewer.ui \
-        ui/VBoxRegistrationDlg.ui
+        ui/VBoxRegistrationDlg.ui \
+        ui/VBoxVMInformationDlg.ui
 
 IMAGES  = images/tpixel.png \

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h

@@ -141 +141 @@
     void vmClose();
     void vmTakeSnapshot();
+    void vmShowInfoDialog();
     void vmDisableMouseIntegr (bool);
 
@@ -211 +212 @@
     QAction *vmTakeSnapshotAction;
     QAction *vmDisableMouseIntegrAction;
+    QAction *vmShowInformationDlgAction;
 
     // Devices actions

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -384 +384 @@
     /* details generators */
 
-    QString details (const CHardDisk &aHD, bool aPredict = false);
+    QString details (const CHardDisk &aHD, bool aPredict = false,
+                     bool aDoRefresh = true);
 
     QString details (const CUSBDevice &aDevice) const;
@@ -391 +392 @@
     QString prepareFileNameForHTML (const QString &fn) const;
 
-    QString detailsReport (const CMachine &m, bool isNewVM, bool withLinks);
+    QString detailsReport (const CMachine &m, bool isNewVM, bool withLinks,
+                           bool aDoRefresh = true);
 
     /* VirtualBox helpers */

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

@@ -24 +24 @@
 #include "VBoxVMFirstRunWzd.h"
 #include "VBoxSharedFoldersSettings.h"
+#include "VBoxVMInformationDlg.h"
 #include "VBoxDownloaderWgt.h"
 #include "QIStateIndicator.h"
@@ -207 +208 @@
         "take_snapshot_16px.png", "take_snapshot_dis_16px.png"));
 
+    vmShowInformationDlgAction = new QAction (this, "vmShowInformationDlgAction");
+    vmShowInformationDlgAction->setIconSet (VBoxGlobal::iconSet (
+        "description_16px.png", "description_disabled_16px.png"));
+
     vmDisableMouseIntegrAction = new QAction (this, "vmDisableMouseIntegrAction");
     vmDisableMouseIntegrAction->setIconSet (VBoxGlobal::iconSet (
@@ -297 +302 @@
     vmMenu->insertSeparator();
     vmTakeSnapshotAction->addTo (vmMenu);
+    vmMenu->insertSeparator();
+    vmShowInformationDlgAction->addTo (vmMenu);
     vmMenu->insertSeparator();
     vmResetAction->addTo (vmMenu);
@@ -485 +492 @@
 
     connect (vmTakeSnapshotAction, SIGNAL(activated()), this, SLOT(vmTakeSnapshot()));
+    connect (vmShowInformationDlgAction, SIGNAL(activated()), this, SLOT (vmShowInfoDialog()));
 
     connect (vmDisableMouseIntegrAction, SIGNAL(toggled (bool)), this, SLOT(vmDisableMouseIntegr (bool)));
@@ -1460 +1468 @@
     vmTakeSnapshotAction->setStatusTip (tr ("Take a snapshot of the virtual machine"));
 
+    vmShowInformationDlgAction->setMenuText (tr ("Session I&nformation Dialog") +
+                                             "\tHost+N");
+    vmShowInformationDlgAction->setStatusTip (tr ("Show Session Information Dialog"));
+
     /* vmDisableMouseIntegrAction is set up in updateAppearanceOf() */
 
@@ -2408 +2420 @@
 }
 
+void VBoxConsoleWnd::vmShowInfoDialog()
+{
+    VBoxVMInformationDlg::createInformationDlg (csession, console);
+}
+
 void VBoxConsoleWnd::vmDisableMouseIntegr (bool aOff)
 {

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

@@ -1123 +1123 @@
  *  return an empty string.
  */
-QString VBoxGlobal::details (const CHardDisk &aHD, bool aPredict /* = false */)
+QString VBoxGlobal::details (const CHardDisk &aHD, bool aPredict /* = false */,
+                             bool aDoRefresh)
 {
     Assert (!aPredict || aHD.GetParent().isNull());
 
     VBoxMedia media;
-    if (!findMedia (CUnknown (aHD), media))
+    if (!aDoRefresh)
+        media = VBoxMedia (CUnknown (aHD), VBoxDefs::HD, VBoxMedia::Ok);
+    else if (!findMedia (CUnknown (aHD), media))
     {
         /* media may be new and not alredy in the media list, request refresh */
@@ -1271 +1274 @@
  */
 QString VBoxGlobal::detailsReport (const CMachine &m, bool isNewVM,
-                                   bool withLinks)
+                                   bool withLinks, bool aDoRefresh)
 {
     static const char *sTableTpl =
@@ -1320 +1323 @@
             + QString (sSectionItemTpl).arg (tr ("Boot Order", "details report"), "%5")
             + QString (sSectionItemTpl).arg (tr ("ACPI", "details report"), "%6")
-            + QString (sSectionItemTpl).arg (tr ("IO APIC", "details report"), "%7");
+            + QString (sSectionItemTpl).arg (tr ("IO APIC", "details report"), "%7")
+            + QString (sSectionItemTpl).arg (tr ("VT-x/AMD-V", "details report"), "%8");
 
         sGeneralFullHrefTpl = QString (sSectionHrefTpl)
-            .arg (2 + 7) /* rows */
+            .arg (2 + 8) /* rows */
             .arg ("machine_16px.png", /* icon */
                   "#general", /* link */
@@ -1329 +1333 @@
                   generalItems); /* items */
         sGeneralFullBoldTpl = QString (sSectionBoldTpl)
-            .arg (2 + 7) /* rows */
+            .arg (2 + 8) /* rows */
             .arg ("machine_16px.png", /* icon */
                   "#general", /* link */
@@ -1366 +1370 @@
                         .arg (QString ("%1 [<nobr>%2</nobr>]")
                               .arg (prepareFileNameForHTML (src))
-                              .arg (details (hd, isNewVM /* predict */)));
+                              .arg (details (hd, isNewVM /* predict */, aDoRefresh)));
                     ++ rows;
                 }
@@ -1435 +1439 @@
             ? tr ("Enabled", "details report (IO APIC)")
             : tr ("Disabled", "details report (IO APIC)");
+
+        /* VT-x/AMD-V */
+        CSystemProperties props = vboxGlobal().virtualBox().GetSystemProperties();
+        QString virt = m.GetHWVirtExEnabled() == True ?
+                       tr ("Enabled", "details report (VT-x/AMD-V)") :
+                       m.GetHWVirtExEnabled() == False ?
+                       tr ("Disabled", "details report (VT-x/AMD-V)") :
+                       props.GetHWVirtExEnabled() ?
+                       tr ("Enabled", "details report (VT-x/AMD-V)") :
+                       tr ("Disabled", "details report (VT-x/AMD-V)");
 
         /* General + Hard Disks */
@@ -1446 +1460 @@
                 .arg (acpi)
                 .arg (ioapic)
+                .arg (virt)
             + hardDisks;