Changeset 75306 in vbox

Timestamp:

Nov 7, 2018 1:27:24 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9289: UIExtraDataDefs & UIExtraDataManager: Move to new extra-data flags for Details pane.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/extradata

Files:

• UIExtraDataDefs.cpp (modified) (2 diffs)
• UIExtraDataDefs.h (modified) (1 diff)
• UIExtraDataManager.cpp (modified) (5 diffs)

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

@@ -98 +98 @@
 const char *UIExtraDataDefs::GUI_DetailsPageBoxes = "GUI/DetailsPageBoxes";
 const char *UIExtraDataDefs::GUI_PreviewUpdate = "GUI/PreviewUpdate";
+const char *UIExtraDataDefs::GUI_Details_Elements = "GUI/Details/Elements";
+const char *UIExtraDataDefs::GUI_Details_Elements_Preview_UpdateInterval = "GUI/Details/Elements/Preview/UpdateInterval";
 
 /* Snapshot Manager: */
@@ -226 +228 @@
 {
     QMap<QString, QString> map;
-    // Define substitutes here..
+    map.insertMulti(GUI_Details_Elements, GUI_DetailsPageBoxes);
+    map.insertMulti(GUI_Details_Elements_Preview_UpdateInterval, GUI_PreviewUpdate);
     return map;
 }

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

@@ -167 +167 @@
         SHARED_LIBRARY_STUFF extern const char *GUI_LastItemSelected;
         /** Holds selector-window details-pane' elements. */
+        /// @todo remove GUI_DetailsPageBoxes in 6.2
         SHARED_LIBRARY_STUFF extern const char *GUI_DetailsPageBoxes;
+        /// @todo remove GUI_PreviewUpdate in 6.2
         /** Holds selector-window details-pane' preview update interval. */
         SHARED_LIBRARY_STUFF extern const char *GUI_PreviewUpdate;
+        /** Holds VirtualBox Manager Details-pane elements. */
+        SHARED_LIBRARY_STUFF extern const char *GUI_Details_Elements;
+        /** Holds VirtualBox Manager Details-pane / Preview element update interval. */
+        SHARED_LIBRARY_STUFF extern const char *GUI_Details_Elements_Preview_UpdateInterval;
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -1974 +1974 @@
            << GUI_Statusbar
            << GUI_GroupDefinitions << GUI_LastItemSelected
-           << GUI_DetailsPageBoxes << GUI_PreviewUpdate
+           << GUI_Details_Elements
+           << GUI_Details_Elements_Preview_UpdateInterval
            << GUI_SnapshotManager_Details_Expanded
            << GUI_VirtualMediaManager_Details_Expanded
@@ -2869 +2870 @@
 {
     /* Get corresponding extra-data: */
-    const QStringList data = extraDataStringList(GUI_DetailsPageBoxes);
+    const QStringList data = extraDataStringList(GUI_Details_Elements);
 
     /* Desearialize passed elements: */
@@ -2879 +2880 @@
         {
             fOpened = false;
-            strItem.remove("Closed");
+            strItem.remove("Closed", Qt::CaseInsensitive);
         }
-        DetailsElementType type = gpConverter->fromInternalString<DetailsElementType>(strItem);
-        if (type != DetailsElementType_Invalid)
-            elements[type] = fOpened;
+        const DetailsElementType enmType = gpConverter->fromInternalString<DetailsElementType>(strItem);
+        if (enmType != DetailsElementType_Invalid)
+            elements[enmType] = fOpened;
     }
 
@@ -2896 +2897 @@
 
     /* Searialize passed elements: */
-    foreach (DetailsElementType type, elements.keys())
-    {
-        QString strValue = gpConverter->toInternalString(type);
-        if (!elements[type])
+    foreach (DetailsElementType enmType, elements.keys())
+    {
+        QString strValue = gpConverter->toInternalString(enmType);
+        if (!elements[enmType])
             strValue += "Closed";
         data << strValue;
@@ -2905 +2906 @@
 
     /* Re-cache corresponding extra-data: */
-    setExtraDataStringList(GUI_DetailsPageBoxes, data);
+    setExtraDataStringList(GUI_Details_Elements, data);
 }
 
 PreviewUpdateIntervalType UIExtraDataManager::selectorWindowPreviewUpdateInterval()
 {
-    return gpConverter->fromInternalString<PreviewUpdateIntervalType>(extraDataString(GUI_PreviewUpdate));
+    return gpConverter->fromInternalString<PreviewUpdateIntervalType>(extraDataString(GUI_Details_Elements_Preview_UpdateInterval));
 }
 
 void UIExtraDataManager::setSelectorWindowPreviewUpdateInterval(PreviewUpdateIntervalType interval)
 {
-    setExtraDataString(GUI_PreviewUpdate, gpConverter->toInternalString(interval));
+    setExtraDataString(GUI_Details_Elements_Preview_UpdateInterval, gpConverter->toInternalString(interval));
 }