Changeset 56751 in vbox

Timestamp:

Jul 2, 2015 11:56:11 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Machine settings: Interface page: Do not apply status-bar restrictions/order changes on-the-fly, use common approach instead.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/UIStatusBarEditorWindow.cpp (modified) (6 diffs)
• runtime/UIStatusBarEditorWindow.h (modified) (2 diffs)
• settings/machine/UIMachineSettingsInterface.cpp (modified) (4 diffs)
• settings/machine/UIMachineSettingsInterface.h (modified) (2 diffs)

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

@@ -303 +303 @@
 }
 
+void UIStatusBarEditorWidget::setStatusBarConfiguration(const QList<IndicatorType> &restrictions,
+                                                        const QList<IndicatorType> &order)
+{
+    /* Cache passed restrictions: */
+    m_restrictions = restrictions;
+
+    /* Cache passed order: */
+    m_order = order;
+    /* Append order with missed indicators: */
+    for (int iType = IndicatorType_Invalid; iType < IndicatorType_Max; ++iType)
+        if (iType != IndicatorType_Invalid && iType != IndicatorType_KeyboardExtension &&
+            !m_order.contains((IndicatorType)iType))
+            m_order << (IndicatorType)iType;
+
+    /* Update configuration for all existing buttons: */
+    foreach (const IndicatorType &type, m_order)
+    {
+        /* Get button: */
+        UIStatusBarEditorButton *pButton = m_buttons.value(type);
+        /* Make sure button exists: */
+        if (!pButton)
+            continue;
+        /* Update button 'checked' state: */
+        pButton->setChecked(!m_restrictions.contains(type));
+        /* Make sure it have valid position: */
+        const int iWantedIndex = position(type);
+        const int iActualIndex = m_pButtonLayout->indexOf(pButton);
+        if (iActualIndex != iWantedIndex)
+        {
+            /* Re-inject button into main-layout at proper position: */
+            m_pButtonLayout->removeWidget(pButton);
+            m_pButtonLayout->insertWidget(iWantedIndex, pButton);
+        }
+    }
+}
+
 void UIStatusBarEditorWidget::sltHandleConfigurationChange(const QString &strMachineID)
 {
@@ -309 +345 @@
         return;
 
-    /* Update status buttons: */
-    updateStatusButtons();
+    /* Recache status-bar configuration: */
+    setStatusBarConfiguration(gEDataManager->restrictedStatusBarIndicators(machineID()),
+                              gEDataManager->statusBarIndicatorOrder(machineID()));
 }
 
@@ -322 +359 @@
     const IndicatorType type = pButton->type();
 
-    /* Load current status-bar indicator restrictions: */
-    QList<IndicatorType> restrictions =
-        gEDataManager->restrictedStatusBarIndicators(machineID());
-
     /* Invert restriction for sender type: */
-    if (restrictions.contains(type))
-        restrictions.removeAll(type);
+    if (m_restrictions.contains(type))
+        m_restrictions.removeAll(type);
     else
-        restrictions.append(type);
-
-    /* Save updated status-bar indicator restrictions: */
-    gEDataManager->setRestrictedStatusBarIndicators(restrictions, machineID());
+        m_restrictions.append(type);
+
+    if (m_fStartedFromVMSettings)
+    {
+        /* Reapply status-bar configuration from cache: */
+        setStatusBarConfiguration(m_restrictions, m_order);
+    }
+    else
+    {
+        /* Save updated status-bar indicator restrictions: */
+        gEDataManager->setRestrictedStatusBarIndicators(m_restrictions, machineID());
+    }
 }
 
@@ -443 +484 @@
     }
 
-    /* Listen for the status-bar configuration changes if necessary: */
     if (!m_fStartedFromVMSettings)
     {
+        /* Cache status-bar configuration: */
+        setStatusBarConfiguration(gEDataManager->restrictedStatusBarIndicators(machineID()),
+                                  gEDataManager->statusBarIndicatorOrder(machineID()));
+        /* And listen for the status-bar configuration changes after that: */
         connect(gEDataManager, SIGNAL(sigStatusBarConfigurationChange(const QString&)),
                 this, SLOT(sltHandleConfigurationChange(const QString&)));
     }
-
-    /* Update status buttons: */
-    updateStatusButtons();
 }
 
@@ -467 +508 @@
         /* Insert status button into map: */
         m_buttons.insert(type, pButton);
-    }
-}
-
-void UIStatusBarEditorWidget::updateStatusButtons()
-{
-    /* Recache status-bar configuration: */
-    m_restrictions = gEDataManager->restrictedStatusBarIndicators(machineID());
-    m_order = gEDataManager->statusBarIndicatorOrder(machineID());
-    for (int iType = IndicatorType_Invalid; iType < IndicatorType_Max; ++iType)
-        if (iType != IndicatorType_Invalid && iType != IndicatorType_KeyboardExtension &&
-            !m_order.contains((IndicatorType)iType))
-            m_order << (IndicatorType)iType;
-
-    /* Update configuration for all the status buttons: */
-    foreach (const IndicatorType &type, m_order)
-    {
-        /* Get button: */
-        UIStatusBarEditorButton *pButton = m_buttons.value(type);
-        /* Update button 'checked' state: */
-        pButton->setChecked(!m_restrictions.contains(type));
-        /* Make sure it have valid position: */
-        const int iWantedIndex = position(type);
-        const int iActualIndex = m_pButtonLayout->indexOf(pButton);
-        if (iActualIndex != iWantedIndex)
-        {
-            /* Re-inject button into main-layout at proper position: */
-            m_pButtonLayout->removeWidget(pButton);
-            m_pButtonLayout->insertWidget(iWantedIndex, pButton);
-        }
     }
 }
@@ -673 +685 @@
         return;
 
-    /* Load current status-bar indicator order and make sure it's complete: */
-    QList<IndicatorType> order =
-        gEDataManager->statusBarIndicatorOrder(machineID());
-    for (int iType = IndicatorType_Invalid; iType < IndicatorType_Max; ++iType)
-        if (iType != IndicatorType_Invalid && iType != IndicatorType_KeyboardExtension &&
-            !order.contains((IndicatorType)iType))
-            order << (IndicatorType)iType;
-
     /* Remove type of dropped-button: */
-    order.removeAll(droppedType);
+    m_order.removeAll(droppedType);
     /* Insert type of dropped-button into position of token-button: */
-    int iPosition = order.indexOf(tokenType);
+    int iPosition = m_order.indexOf(tokenType);
     if (m_fDropAfterTokenButton)
         ++iPosition;
-    order.insert(iPosition, droppedType);
-
-    /* Save updated status-bar indicator order: */
-    gEDataManager->setStatusBarIndicatorOrder(order, machineID());
+    m_order.insert(iPosition, droppedType);
+
+    if (m_fStartedFromVMSettings)
+    {
+        /* Reapply status-bar configuration from cache: */
+        setStatusBarConfiguration(m_restrictions, m_order);
+    }
+    else
+    {
+        /* Save updated status-bar indicator order: */
+        gEDataManager->setStatusBarIndicatorOrder(m_order, machineID());
+    }
 }
 

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

@@ -78 +78 @@
     void setStatusBarEnabled(bool fEnabled);
 
+    /** Returns status-bar indicator restrictions. */
+    const QList<IndicatorType>& statusBarIndicatorRestrictions() const { return m_restrictions; }
+    /** Returns status-bar indicator order. */
+    const QList<IndicatorType>& statusBarIndicatorOrder() const { return m_order; }
+    /** Defines status-bar indicator @a restrictions and @a order. */
+    void setStatusBarConfiguration(const QList<IndicatorType> &restrictions, const QList<IndicatorType> &order);
+
 private slots:
 
@@ -97 +104 @@
     /** Prepare status button routine. */
     void prepareStatusButton(IndicatorType type);
-
-    /** Update status buttons routine. */
-    void updateStatusButtons();
 
     /** Retranslation routine. */

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.cpp

@@ -56 +56 @@
     /* Cache interface data: */
     interfaceData.m_fStatusBarEnabled = gEDataManager->statusBarEnabled(m_machine.GetId());
+    interfaceData.m_statusBarRestrictions = gEDataManager->restrictedStatusBarIndicators(m_machine.GetId());
+    interfaceData.m_statusBarOrder = gEDataManager->statusBarIndicatorOrder(m_machine.GetId());
 #ifndef Q_WS_MAC
     interfaceData.m_fMenuBarEnabled = gEDataManager->menuBarEnabled(m_machine.GetId());
@@ -78 +80 @@
     /* Prepare interface data: */
     m_pStatusBarEditor->setStatusBarEnabled(interfaceData.m_fStatusBarEnabled);
+    m_pStatusBarEditor->setStatusBarConfiguration(interfaceData.m_statusBarRestrictions,
+                                                  interfaceData.m_statusBarOrder);
 #ifndef Q_WS_MAC
     m_pMenuBarEditor->setMenuBarEnabled(interfaceData.m_fMenuBarEnabled);
@@ -100 +104 @@
     /* Gather interface data from page: */
     interfaceData.m_fStatusBarEnabled = m_pStatusBarEditor->isStatusBarEnabled();
+    interfaceData.m_statusBarRestrictions = m_pStatusBarEditor->statusBarIndicatorRestrictions();
+    interfaceData.m_statusBarOrder = m_pStatusBarEditor->statusBarIndicatorOrder();
 #ifndef Q_WS_MAC
     interfaceData.m_fMenuBarEnabled = m_pMenuBarEditor->isMenuBarEnabled();
@@ -127 +133 @@
         {
             gEDataManager->setStatusBarEnabled(interfaceData.m_fStatusBarEnabled, m_machine.GetId());
+            gEDataManager->setRestrictedStatusBarIndicators(interfaceData.m_statusBarRestrictions, m_machine.GetId());
+            gEDataManager->setStatusBarIndicatorOrder(interfaceData.m_statusBarOrder, m_machine.GetId());
 #ifndef Q_WS_MAC
             gEDataManager->setMenuBarEnabled(interfaceData.m_fMenuBarEnabled, m_machine.GetId());

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.h

@@ -43 +43 @@
     {
         return    (m_fStatusBarEnabled == other.m_fStatusBarEnabled)
+               && (m_statusBarRestrictions == other.m_statusBarRestrictions)
+               && (m_statusBarOrder == other.m_statusBarOrder)
 #ifndef Q_WS_MAC
                && (m_fMenuBarEnabled == other.m_fMenuBarEnabled)
@@ -57 +59 @@
     /* Variables: */
     bool m_fStatusBarEnabled;
+    QList<IndicatorType> m_statusBarRestrictions;
+    QList<IndicatorType> m_statusBarOrder;
 #ifndef Q_WS_MAC
     bool m_fMenuBarEnabled;