Changeset 75966 in vbox for trunk/src

Timestamp:

Dec 5, 2018 10:57:38 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9314: Pass Graphics Controller info through VM Details and Snapshot Details panes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (3 diffs)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• manager/details/UIDetailsElements.cpp (modified) (1 diff)
• snapshots/UISnapshotDetailsWidget.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -1006 +1006 @@
     switch (enmDetailsElementOptionTypeDisplay)
     {
-        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_VRAM:         strResult = QApplication::translate("VBoxGlobal", "VRAM"); break;
-        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_ScreenCount:  strResult = QApplication::translate("VBoxGlobal", "Screen Count"); break;
-        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_ScaleFactor:  strResult = QApplication::translate("VBoxGlobal", "Scale Factor"); break;
-        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_Acceleration: strResult = QApplication::translate("VBoxGlobal", "Acceleration"); break;
-        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_VRDE:         strResult = QApplication::translate("VBoxGlobal", "VRDE"); break;
-        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_Recording:    strResult = QApplication::translate("VBoxGlobal", "Recording"); break;
+        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_VRAM:               strResult = QApplication::translate("VBoxGlobal", "VRAM"); break;
+        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_ScreenCount:        strResult = QApplication::translate("VBoxGlobal", "Screen Count"); break;
+        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_ScaleFactor:        strResult = QApplication::translate("VBoxGlobal", "Scale Factor"); break;
+        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_GraphicsController: strResult = QApplication::translate("VBoxGlobal", "Graphics Controller"); break;
+        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_Acceleration:       strResult = QApplication::translate("VBoxGlobal", "Acceleration"); break;
+        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_VRDE:               strResult = QApplication::translate("VBoxGlobal", "VRDE"); break;
+        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_Recording:          strResult = QApplication::translate("VBoxGlobal", "Recording"); break;
         default:
         {
@@ -1027 +1028 @@
     switch (enmDetailsElementOptionTypeDisplay)
     {
-        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_VRAM:         strResult = "VRAM"; break;
-        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_ScreenCount:  strResult = "ScreenCount"; break;
-        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_ScaleFactor:  strResult = "ScaleFactor"; break;
-        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_Acceleration: strResult = "Acceleration"; break;
-        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_VRDE:         strResult = "VRDE"; break;
-        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_Recording:    strResult = "Recording"; break;
+        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_VRAM:               strResult = "VRAM"; break;
+        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_ScreenCount:        strResult = "ScreenCount"; break;
+        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_ScaleFactor:        strResult = "ScaleFactor"; break;
+        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_GraphicsController: strResult = "GraphicsController"; break;
+        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_Acceleration:       strResult = "Acceleration"; break;
+        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_VRDE:               strResult = "VRDE"; break;
+        case UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_Recording:          strResult = "Recording"; break;
         default:
         {
@@ -1047 +1049 @@
     /* Here we have some fancy stuff allowing us
      * to search through the keys using 'case-insensitive' rule: */
-    QStringList keys;       QList<UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay> values;
-    keys << "VRAM";         values << UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_VRAM;
-    keys << "ScreenCount";  values << UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_ScreenCount;
-    keys << "ScaleFactor";  values << UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_ScaleFactor;
-    keys << "Acceleration"; values << UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_Acceleration;
-    keys << "VRDE";         values << UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_VRDE;
-    keys << "Recording";    values << UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_Recording;
+    QStringList keys;             QList<UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay> values;
+    keys << "VRAM";               values << UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_VRAM;
+    keys << "ScreenCount";        values << UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_ScreenCount;
+    keys << "ScaleFactor";        values << UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_ScaleFactor;
+    keys << "GraphicsController"; values << UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_GraphicsController;
+    keys << "Acceleration";       values << UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_Acceleration;
+    keys << "VRDE";               values << UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_VRDE;
+    keys << "Recording";          values << UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_Recording;
     /* Invalid type for unknown words: */
     if (!keys.contains(strDetailsElementOptionTypeDisplay, Qt::CaseInsensitive))

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -644 +644 @@
     enum DetailsElementOptionTypeDisplay
     {
-        DetailsElementOptionTypeDisplay_Invalid      = 0,
-        DetailsElementOptionTypeDisplay_VRAM         = RT_BIT(0),
-        DetailsElementOptionTypeDisplay_ScreenCount  = RT_BIT(1),
-        DetailsElementOptionTypeDisplay_ScaleFactor  = RT_BIT(2),
-        DetailsElementOptionTypeDisplay_Acceleration = RT_BIT(3),
-        DetailsElementOptionTypeDisplay_VRDE         = RT_BIT(4),
-        DetailsElementOptionTypeDisplay_Recording    = RT_BIT(5),
-        DetailsElementOptionTypeDisplay_Default      = 0xFFFF
+        DetailsElementOptionTypeDisplay_Invalid            = 0,
+        DetailsElementOptionTypeDisplay_VRAM               = RT_BIT(0),
+        DetailsElementOptionTypeDisplay_ScreenCount        = RT_BIT(1),
+        DetailsElementOptionTypeDisplay_ScaleFactor        = RT_BIT(2),
+        DetailsElementOptionTypeDisplay_GraphicsController = RT_BIT(3),
+        DetailsElementOptionTypeDisplay_Acceleration       = RT_BIT(4),
+        DetailsElementOptionTypeDisplay_VRDE               = RT_BIT(5),
+        DetailsElementOptionTypeDisplay_Recording          = RT_BIT(6),
+        DetailsElementOptionTypeDisplay_Default            = 0xFFFF
     };
     Q_ENUM(DetailsElementOptionTypeDisplay);

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElements.cpp

@@ -464 +464 @@
         }
 
+        /* Graphics Controller: */
+        if (m_fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_GraphicsController)
+            table << UITextTableLine(QApplication::translate("UIDetails", "Graphics Controller", "details (display)"),
+                                     gpConverter->toString(comMachine.GetGraphicsControllerType()));
+
         /* Acceleration: */
         if (m_fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeDisplay_Acceleration)

trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.cpp

@@ -1344 +1344 @@
                                                                    QString::number(uScaleFactorOld, 'f', 2)));
             }
+
+            /* Graphics Controller: */
+            ++iRowCount;
+            const QString strGc = gpConverter->toString(comMachine.GetGraphicsControllerType());
+            const QString strGcOld = gpConverter->toString(comMachineOld.GetGraphicsControllerType());
+            strItem += QString(sSectionItemTpl2).arg(QApplication::translate("UIGDetails", "Graphics Controller", "details (display)"),
+                                                     empReport(strGc, strGcOld));
 
             /* Acceleration? */