Changeset 52035 in vbox for trunk/src

Timestamp:

Jul 15, 2014 12:15:46 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 3646: Extra-data Manager: Allow to change status-bar order at runtime; Indicators Pool: Handle runtime order change.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (4 diffs)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• runtime/UIIndicatorsPool.cpp (modified) (3 diffs)
• runtime/UIIndicatorsPool.h (modified) (2 diffs)

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

@@ -110 +110 @@
 const char* UIExtraDataDefs::GUI_MiniToolBarAlignment = "GUI/MiniToolBarAlignment";
 const char* UIExtraDataDefs::GUI_RestrictedStatusBarIndicators = "GUI/RestrictedStatusBarIndicators";
+const char* UIExtraDataDefs::GUI_StatusBar_IndicatorOrder = "GUI/StatusBar/IndicatorOrder";
 #ifdef Q_WS_MAC
 const char* UIExtraDataDefs::GUI_PresentationModeEnabled = "GUI/PresentationModeEnabled";

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

@@ -203 +203 @@
         /** Holds restricted Runtime UI status-bar indicators. */
         extern const char* GUI_RestrictedStatusBarIndicators;
+        /** Holds Runtime UI status-bar indicator order. */
+        extern const char* GUI_StatusBar_IndicatorOrder;
 #ifdef Q_WS_MAC
         /** Mac OS X: Holds whether 'presentation mode' enabled. */

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

@@ -1783 +1783 @@
            << GUI_HiDPI_Optimization
            << GUI_ShowMiniToolBar << GUI_MiniToolBarAutoHide << GUI_MiniToolBarAlignment
-           << GUI_RestrictedStatusBarIndicators
+           << GUI_RestrictedStatusBarIndicators << GUI_StatusBar_IndicatorOrder
 #ifdef Q_WS_MAC
            << GUI_PresentationModeEnabled
@@ -2810 +2810 @@
     /* Prepare result: */
     QList<IndicatorType> result;
-    /* Get restricted status-bar-indicators: */
+    /* Get restricted status-bar indicators: */
     foreach (const QString &strValue, extraDataStringList(GUI_RestrictedStatusBarIndicators, strID))
     {
-        IndicatorType value = gpConverter->fromInternalString<IndicatorType>(strValue);
-        if (value != IndicatorType_Invalid)
+        const IndicatorType value = gpConverter->fromInternalString<IndicatorType>(strValue);
+        if (value != IndicatorType_Invalid && !result.contains(value))
             result << value;
     }
@@ -2830 +2830 @@
     /* Re-cache corresponding extra-data: */
     setExtraDataStringList(GUI_RestrictedStatusBarIndicators, data, strID);
+}
+
+QList<IndicatorType> UIExtraDataManager::statusBarIndicatorOrder(const QString &strID)
+{
+    /* Prepare result: */
+    QList<IndicatorType> result;
+    /* Get status-bar indicator order: */
+    foreach (const QString &strValue, extraDataStringList(GUI_StatusBar_IndicatorOrder, strID))
+    {
+        const IndicatorType value = gpConverter->fromInternalString<IndicatorType>(strValue);
+        if (value != IndicatorType_Invalid && !result.contains(value))
+            result << value;
+    }
+    /* Return result: */
+    return result;
+}
+
+void UIExtraDataManager::setStatusBarIndicatorOrder(const QList<IndicatorType> &list, const QString &strID)
+{
+    /* Parse passed list: */
+    QStringList data;
+    foreach (const IndicatorType &indicatorType, list)
+        data << gpConverter->toInternalString(indicatorType);
+
+    /* Re-cache corresponding extra-data: */
+    setExtraDataStringList(GUI_StatusBar_IndicatorOrder, data, strID);
 }
 
@@ -3139 +3165 @@
     {
         /* Status-bar configuration change: */
-        if (strKey == GUI_RestrictedStatusBarIndicators)
+        if (strKey == GUI_RestrictedStatusBarIndicators ||
+            strKey == GUI_StatusBar_IndicatorOrder)
             emit sigStatusBarConfigurationChange();
         /* HID LEDs sync state changed (allowed if not restricted)? */

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

@@ -369 +369 @@
         void setRestrictedStatusBarIndicators(const QList<IndicatorType> &list, const QString &strID);
 
+        /** Returns Runtime UI status-bar indicator order list. */
+        QList<IndicatorType> statusBarIndicatorOrder(const QString &strID);
+        /** Defines Runtime UI status-bar indicator order @a list. */
+        void setStatusBarIndicatorOrder(const QList<IndicatorType> &list, const QString &strID);
+
 #ifdef Q_WS_MAC
         /** Mac OS X: Returns whether 'presentation mode' enabled. */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp

@@ -1040 +1040 @@
 void UIIndicatorsPool::updatePool()
 {
-    /* Recache the list of restricted indicators: */
-    m_configuration = gEDataManager->restrictedStatusBarIndicators(vboxGlobal().managedVMUuid());
-
-    /* Update indicators: */
+    /* Recache status-bar configuration: */
+    m_restrictions = gEDataManager->restrictedStatusBarIndicators(vboxGlobal().managedVMUuid());
+    m_order = gEDataManager->statusBarIndicatorOrder(vboxGlobal().managedVMUuid());
+
+    /* Make sure the order is complete taking restrictions into account: */
     for (int iType = IndicatorType_Invalid; iType < IndicatorType_Max; ++iType)
     {
-        /* Determine indicator presence: */
-        const IndicatorType indicatorType = static_cast<IndicatorType>(iType);
-        bool fPresenceAllowed = !m_configuration.contains(indicatorType);
-
-        /* If presence restricted: */
-        if (!fPresenceAllowed && m_pool.contains(indicatorType))
-        {
-            /* Cleanup indicator: */
+        /* Get iterated type: */
+        IndicatorType type = (IndicatorType)iType;
+        /* Skip invalid type: */
+        if (type == IndicatorType_Invalid)
+            continue;
+        /* Take restriction/presence into account: */
+        bool fRestricted = m_restrictions.contains(type);
+        bool fPresent = m_order.contains(type);
+        if (fRestricted && fPresent)
+            m_order.removeAll(type);
+        else if (!fRestricted && !fPresent)
+            m_order << type;
+    }
+
+    /* Remove restricted indicators: */
+    foreach (const IndicatorType &indicatorType, m_restrictions)
+        if (m_pool.contains(indicatorType))
+        {
             delete m_pool.value(indicatorType);
             m_pool.remove(indicatorType);
         }
-        /* If presence allowed: */
-        else if (fPresenceAllowed && !m_pool.contains(indicatorType))
+
+    /* Add/Update allowed indicators: */
+    foreach (const IndicatorType &indicatorType, m_order)
+    {
+        /* Indicator exists: */
+        if (m_pool.contains(indicatorType))
+        {
+            /* Get indicator: */
+            QIStatusBarIndicator *pIndicator = m_pool.value(indicatorType);
+            /* Make sure it have valid position: */
+            const int iWantedIndex = indicatorPosition(indicatorType);
+            const int iActualIndex = m_pMainLayout->indexOf(pIndicator);
+            if (iActualIndex != iWantedIndex)
+            {
+                /* Re-inject indicator into main-layout at proper position: */
+                m_pMainLayout->removeWidget(pIndicator);
+                m_pMainLayout->insertWidget(iWantedIndex, pIndicator);
+            }
+        }
+        /* Indicator missed: */
+        else
         {
             /* Create indicator: */
@@ -1079 +1109 @@
             connect(m_pool.value(indicatorType), SIGNAL(sigContextMenuRequest(QIStatusBarIndicator*, QContextMenuEvent*)),
                     this, SLOT(sltContextMenuRequest(QIStatusBarIndicator*, QContextMenuEvent*)));
-            /* Insert indicator into main-layout: */
+            /* Insert indicator into main-layout at proper position: */
             m_pMainLayout->insertWidget(indicatorPosition(indicatorType), m_pool.value(indicatorType));
         }
@@ -1118 +1148 @@
 {
     int iPosition = 0;
-    foreach (const IndicatorType &iteratedIndicatorType, m_pool.keys())
+    foreach (const IndicatorType &iteratedIndicatorType, m_order)
         if (iteratedIndicatorType == indicatorType)
             return iPosition;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.h

@@ -57 +57 @@
     ~UIIndicatorsPool();
 
-    /** Returns indicator corresponding to passed @a indicatorType. */
-    QIStatusBarIndicator* indicator(IndicatorType indicatorType) const { return m_pool.value(indicatorType); }
-
     /** Updates appearance for passed @a indicatorType. */
     void updateAppearance(IndicatorType indicatorType);
@@ -108 +105 @@
     /** Holds the session reference. */
     CSession &m_session;
-    /** Holds the cached configuration. */
-    QList<IndicatorType> m_configuration;
+    /** Holds the cached restrictions. */
+    QList<IndicatorType> m_restrictions;
+    /** Holds the cached order. */
+    QList<IndicatorType> m_order;
     /** Holds cached indicator instances. */
     QMap<IndicatorType, QIStatusBarIndicator*> m_pool;