Changeset 58689 in vbox for trunk

Timestamp:

Nov 13, 2015 3:19:03 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: ​​bugref:8088: Rework session-information window: Extra-Data Manager: Adding extra-data support for saving/loading information-window elements.

Location:

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

Files:

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

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

@@ -147 +147 @@
 /* Virtual Machine: Information dialog: */
 const char* UIExtraDataDefs::GUI_InformationWindowGeometry = "GUI/InformationWindowGeometry";
+const char* UIExtraDataDefs::GUI_InformationWindowElements = "GUI/InformationWindowElements";
 
 /* Virtual Machine: Close dialog: */

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

@@ -256 +256 @@
         /** Holds information-window geometry. */
         extern const char* GUI_InformationWindowGeometry;
+        /** Holds information-window elements. */
+        extern const char* GUI_InformationWindowElements;
     /** @} */
 

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

@@ -1882 +1882 @@
            << GUI_ScaleFactor << GUI_Scaling_Optimization
            << GUI_InformationWindowGeometry
+           << GUI_InformationWindowElements
            << GUI_DefaultCloseAction << GUI_RestrictedCloseActions
            << GUI_LastCloseAction << GUI_CloseActionHook
@@ -3561 +3562 @@
 }
 
+QMap<InformationElementType, bool> UIExtraDataManager::informationWindowElements()
+{
+    /* Get corresponding extra-data: */
+    const QStringList data = extraDataStringList(GUI_InformationWindowElements);
+
+    /* Desearialize passed elements: */
+    QMap<InformationElementType, bool> elements;
+    foreach (QString strItem, data)
+    {
+        bool fOpened = true;
+        if (strItem.endsWith("Closed", Qt::CaseInsensitive))
+        {
+            fOpened = false;
+            strItem.remove("Closed");
+        }
+        InformationElementType type = gpConverter->fromInternalString<InformationElementType>(strItem);
+        if (type != InformationElementType_Invalid)
+            elements[type] = fOpened;
+    }
+
+    /* Return elements: */
+    return elements;
+}
+
+void UIExtraDataManager::setInformationWindowElements(const QMap<InformationElementType, bool> &elements)
+{
+    /* Prepare corresponding extra-data: */
+    QStringList data;
+
+    /* Searialize passed elements: */
+    foreach (InformationElementType type, elements.keys())
+    {
+        QString strValue = gpConverter->toInternalString(type);
+        if (!elements[type])
+            strValue += "Closed";
+        data << strValue;
+    }
+
+    /* Re-cache corresponding extra-data: */
+    setExtraDataStringList(GUI_InformationWindowElements, data);
+}
+
 MachineCloseAction UIExtraDataManager::defaultMachineCloseAction(const QString &strID)
 {
@@ -3724 +3767 @@
     /* Parse loaded data: */
     int iX = 0, iY = 0, iW = 0, iH = 0;
-    bool fOk = data.size() >= 4;    
+    bool fOk = data.size() >= 4;
     do
     {

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

@@ -498 +498 @@
         /** Defines information-window @a geometry and @a fMaximized state. */
         void setInformationWindowGeometry(const QRect &geometry, bool fMaximized, const QString &strID);
+
+        /** Returns information-window elements. */
+        QMap<InformationElementType, bool> informationWindowElements();
+        /** Defines information-window @a elements. */
+        void setInformationWindowElements(const QMap<InformationElementType, bool> &elements);
     /** @} */