Changeset 51514 in vbox for trunk/src/VBox

Timestamp:

Jun 3, 2014 2:42:36 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 6660: Advanced extra-data management framework: Integrate GUI_SplitterSizes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (3 diffs)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (2 diffs)

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

@@ -311 +311 @@
 }
 
-QRect UIExtraDataManager::selectorWindowGeometry(QWidget *pHintWidget /* = 0 */)
+QRect UIExtraDataManager::selectorWindowGeometry(QWidget *pHintWidget /* = 0 */) const
 {
     /* Load corresponding extra-data: */
@@ -354 +354 @@
 }
 
-bool UIExtraDataManager::isSelectorWindowShouldBeMaximized()
+bool UIExtraDataManager::isSelectorWindowShouldBeMaximized() const
 {
     /* Load corresponding extra-data: */
@@ -376 +376 @@
     /* Re-cache corresponding extra-data: */
     setExtraDataStringList(GUI_LastSelectorWindowPosition, data);
+}
+
+QList<int> UIExtraDataManager::selectorWindowSplitterHints() const
+{
+    /* Load corresponding extra-data list: */
+    const QStringList data = extraDataStringList(GUI_SplitterSizes);
+
+    /* Parse loaded data: */
+    QList<int> hints;
+    hints << (data.size() > 0 ? data[0].toInt() : 0);
+    hints << (data.size() > 1 ? data[1].toInt() : 0);
+
+    /* Return hints: */
+    return hints;
+}
+
+void UIExtraDataManager::setSelectorWindowSplitterHints(const QList<int> &hints)
+{
+    /* Parse passed hints: */
+    QStringList data;
+    data << (hints.size() > 0 ? QString::number(hints[0]) : QString());
+    data << (hints.size() > 1 ? QString::number(hints[1]) : QString());
+
+    /* Re-cache corresponding extra-data: */
+    setExtraDataStringList(GUI_SplitterSizes, data);
 }
 

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

@@ -132 +132 @@
 
     /** Returns selector-window geometry using @a pHintWidget as the hint. */
-    QRect selectorWindowGeometry(QWidget *pHintWidget = 0);
+    QRect selectorWindowGeometry(QWidget *pHintWidget = 0) const;
     /** Returns whether selector-window should be maximized or not. */
-    bool isSelectorWindowShouldBeMaximized();
+    bool isSelectorWindowShouldBeMaximized() const;
     /** Defines selector-window geometry to passed @a geometry which is @a fMaximized. */
     void setSelectorWindowGeometry(const QRect &geometry, bool fMaximized);
+
+    /** Returns selector-window splitter hints. */
+    QList<int> selectorWindowSplitterHints() const;
+    /** Defines selector-window splitter @a hints. */
+    void setSelectorWindowSplitterHints(const QList<int> &hints);
 
     /** Returns whether this machine started for the first time. */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -1543 +1543 @@
     /* Restore splitter handle position: */
     {
-        QList<int> sizes = vbox.GetExtraDataIntList(GUI_SplitterSizes);
-
-        if (sizes.size() == 2)
-            m_pSplitter->setSizes(sizes);
+        m_pSplitter->setSizes(gEDataManager->selectorWindowSplitterHints());
     }
 
@@ -1570 +1567 @@
     /* Save splitter handle position: */
     {
-        vbox.SetExtraDataIntList(GUI_SplitterSizes, m_pSplitter->sizes());
+        gEDataManager->setSelectorWindowSplitterHints(m_pSplitter->sizes());
     }