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

Timestamp:

Nov 20, 2018 11:51:33 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9289: VirtualBox Manager / Details pane: No need for Summary options, disabling them do nothing in any case.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (4 diffs)
• extradata/UIExtraDataDefs.h (modified) (2 diffs)
• manager/details/UIDetailsElements.cpp (modified) (3 diffs)

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

@@ -1183 +1183 @@
     switch (enmDetailsElementOptionTypeSharedFolders)
     {
-        case UIExtraDataMetaDefs::DetailsElementOptionTypeSharedFolders_Summary: strResult = "Summary"; break;
         default:
         {
@@ -1199 +1198 @@
      * to search through the keys using 'case-insensitive' rule: */
     QStringList keys;  QList<UIExtraDataMetaDefs::DetailsElementOptionTypeSharedFolders> values;
-    keys << "Summary"; values << UIExtraDataMetaDefs::DetailsElementOptionTypeSharedFolders_Summary;
     /* Invalid type for unknown words: */
     if (!keys.contains(strDetailsElementOptionTypeSharedFolders, Qt::CaseInsensitive))
@@ -1247 +1245 @@
     switch (enmDetailsElementOptionTypeDescription)
     {
-        case UIExtraDataMetaDefs::DetailsElementOptionTypeDescription_Summary: strResult = "Summary"; break;
         default:
         {
@@ -1263 +1260 @@
      * to search through the keys using 'case-insensitive' rule: */
     QStringList keys;  QList<UIExtraDataMetaDefs::DetailsElementOptionTypeDescription> values;
-    keys << "Summary"; values << UIExtraDataMetaDefs::DetailsElementOptionTypeDescription_Summary;
     /* Invalid type for unknown words: */
     if (!keys.contains(strDetailsElementOptionTypeDescription, Qt::CaseInsensitive))

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

@@ -710 +710 @@
     {
         DetailsElementOptionTypeSharedFolders_Invalid = 0,
-        DetailsElementOptionTypeSharedFolders_Summary = RT_BIT(0),
         DetailsElementOptionTypeSharedFolders_Default = 0xFFFF
     };
@@ -730 +729 @@
     {
         DetailsElementOptionTypeDescription_Invalid = 0,
-        DetailsElementOptionTypeDescription_Summary = RT_BIT(0),
         DetailsElementOptionTypeDescription_Default = 0xFFFF
     };

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

@@ -957 +957 @@
     {
         /* Summary: */
-        if (m_fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeSharedFolders_Summary)
-        {
-            const ulong uCount = comMachine.GetSharedFolders().size();
-            if (uCount > 0)
-                table << UITextTableLine(QApplication::translate("UIDetails", "Shared Folders", "details (shared folders)"), QString::number(uCount));
-            else
-                table << UITextTableLine(QApplication::translate("UIDetails", "None", "details (shared folders)"), QString());
-        }
+        const ulong uCount = comMachine.GetSharedFolders().size();
+        if (uCount > 0)
+            table << UITextTableLine(QApplication::translate("UIDetails", "Shared Folders", "details (shared folders)"), QString::number(uCount));
+        else
+            table << UITextTableLine(QApplication::translate("UIDetails", "None", "details (shared folders)"), QString());
     }
     else
@@ -1079 +1076 @@
 {
     /* Acquire corresponding machine: */
-    CMachine machine = property("machine").value<CMachine>();
-    if (machine.isNull())
+    CMachine comMachine = property("machine").value<CMachine>();
+    if (comMachine.isNull())
         return;
 
@@ -1087 +1084 @@
 
     /* Gather information: */
-    if (machine.GetAccessible())
+    if (comMachine.GetAccessible())
     {
         /* Summary: */
-        if (m_fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeDescription_Summary)
-        {
-            const QString strDescription = machine.GetDescription();
-            if (!strDescription.isEmpty())
-                table << UITextTableLine(strDescription, QString());
-            else
-                table << UITextTableLine(QApplication::translate("UIDetails", "None", "details (description)"), QString());
-        }
+        const QString strDescription = comMachine.GetDescription();
+        if (!strDescription.isEmpty())
+            table << UITextTableLine(strDescription, QString());
+        else
+            table << UITextTableLine(QApplication::translate("UIDetails", "None", "details (description)"), QString());
     }
     else