Changeset 80773 in vbox

Timestamp:

Sep 13, 2019 11:10:21 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9510: Extra data related cleanup

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (6 diffs)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• runtime/information/UIVMInformationDialog.cpp (modified) (3 diffs)

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

@@ -194 +194 @@
 const char *UIExtraDataDefs::GUI_Scaling_Optimization = "GUI/Scaling/Optimization";
 
-/* Virtual Machine: Information dialog: */
-const char *UIExtraDataDefs::GUI_InformationWindowGeometry = "GUI/InformationWindowGeometry";
-const char *UIExtraDataDefs::GUI_InformationWindowElements = "GUI/InformationWindowElements";
+/* Virtual Machine: Session Information Dialog: */
+const char *UIExtraDataDefs::GUI_SessionInformationDialogGeometry = "GUI/SessionInformationDialogGeometry";
 
 /* Guest control UI: */

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

@@ -369 +369 @@
       * @{ */
         /** Holds information-window geometry. */
-        SHARED_LIBRARY_STUFF extern const char *GUI_InformationWindowGeometry;
-        /** Holds information-window elements. */
-        SHARED_LIBRARY_STUFF extern const char *GUI_InformationWindowElements;
+        SHARED_LIBRARY_STUFF extern const char *GUI_SessionInformationDialogGeometry;
     /** @} */
 

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

@@ -2023 +2023 @@
            << GUI_HidLedsSync
            << GUI_ScaleFactor << GUI_Scaling_Optimization
-           << GUI_InformationWindowGeometry
-           << GUI_InformationWindowElements
+           << GUI_SessionInformationDialogGeometry
            << GUI_GuestControl_ProcessControlSplitterHints
            << GUI_GuestControl_FileManagerDialogGeometry
@@ -4161 +4160 @@
 }
 
-QRect UIExtraDataManager::informationWindowGeometry(QWidget *pWidget, QWidget *pParentWidget, const QUuid &uID)
+QRect UIExtraDataManager::sessionInformationDialogGeometry(QWidget *pWidget, QWidget *pParentWidget)
 {
     /* Get corresponding extra-data: */
-    const QStringList data = extraDataStringList(GUI_InformationWindowGeometry, uID);
+    const QStringList data = extraDataStringList(GUI_SessionInformationDialogGeometry);
 
     /* Parse loaded data: */
@@ -4211 +4210 @@
 }
 
-bool UIExtraDataManager::informationWindowShouldBeMaximized(const QUuid &uID)
+bool UIExtraDataManager::sessionInformationDialogShouldBeMaximized()
 {
     /* Get corresponding extra-data: */
-    const QStringList data = extraDataStringList(GUI_InformationWindowGeometry, uID);
+    const QStringList data = extraDataStringList(GUI_SessionInformationDialogGeometry);
 
     /* Make sure 5th item has required value: */
@@ -4220 +4219 @@
 }
 
-void UIExtraDataManager::setInformationWindowGeometry(const QRect &geometry, bool fMaximized, const QUuid &uID)
+void UIExtraDataManager::setSessionInformationDialogGeometry(const QRect &geometry, bool fMaximized)
 {
     /* Serialize passed values: */
@@ -4232 +4231 @@
 
     /* Re-cache corresponding extra-data: */
-    setExtraDataStringList(GUI_InformationWindowGeometry, data, uID);
+    setExtraDataStringList(GUI_SessionInformationDialogGeometry, data);
 }
 
@@ -4436 +4435 @@
 {
     setDialogGeometry(GUI_GuestControl_ProcessControlDialogGeometry, geometry, fMaximized);
-}
-
-
-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);
 }
 

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

@@ -642 +642 @@
     /** @} */
 
-    /** @name Virtual Machine: Information dialog
-      * @{ */
-        /** Returns information-window geometry using @a pWidget and @a pParentWidget as hints. */
-        QRect informationWindowGeometry(QWidget *pWidget, QWidget *pParentWidget, const QUuid &uID);
+    /** @name Virtual Machine: Session Information dialog
+      * @{ */
+        /** Returns session information dialog geometry using @a pWidget and @a pParentWidget as hints. */
+        QRect sessionInformationDialogGeometry(QWidget *pWidget, QWidget *pParentWidget);
         /** Returns whether information-window should be maximized or not. */
-        bool informationWindowShouldBeMaximized(const QUuid &uID);
+        bool sessionInformationDialogShouldBeMaximized();
         /** Defines information-window @a geometry and @a fMaximized state. */
-        void setInformationWindowGeometry(const QRect &geometry, bool fMaximized, const QUuid &uID);
-
-        /** Returns information-window elements. */
-        QMap<InformationElementType, bool> informationWindowElements();
-        /** Defines information-window @a elements. */
-        void setInformationWindowElements(const QMap<InformationElementType, bool> &elements);
+        void setSessionInformationDialogGeometry(const QRect &geometry, bool fMaximized);
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp

@@ -100 +100 @@
 bool UIVMInformationDialog::shouldBeMaximized() const
 {
-    return gEDataManager->informationWindowShouldBeMaximized(uiCommon().managedVMUuid());
+    return gEDataManager->sessionInformationDialogShouldBeMaximized();
 }
 
@@ -292 +292 @@
     {
         /* Load geometry: */
-        m_geometry = gEDataManager->informationWindowGeometry(this, m_pMachineWindow, uiCommon().managedVMUuid());
+        m_geometry = gEDataManager->sessionInformationDialogGeometry(this, m_pMachineWindow);
 
         /* Restore geometry: */
@@ -307 +307 @@
         /* Save geometry: */
 #ifdef VBOX_WS_MAC
-        gEDataManager->setInformationWindowGeometry(m_geometry, ::darwinIsWindowMaximized(this), uiCommon().managedVMUuid());
+        gEDataManager->setSessionInformationDialogGeometry(m_geometry, ::darwinIsWindowMaximized(this));
 #else /* VBOX_WS_MAC */
-        gEDataManager->setInformationWindowGeometry(m_geometry, isMaximized(), uiCommon().managedVMUuid());
+        gEDataManager->setSessionInformationDialogGeometry(m_geometry, isMaximized());
 #endif /* !VBOX_WS_MAC */
         LogRel2(("GUI: UIVMInformationDialog: Geometry saved as: Origin=%dx%d, Size=%dx%d\n",