Changeset 68342 in vbox for trunk/src

Timestamp:

Aug 8, 2017 3:02:43 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

117466

Message:

FE/Qt: bugref:8900: Make sure at least one Machine tool (Details) is opened by default (when extra-data flag is empty) but still allow user to save them all closed.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• extradata/UIExtraDataManager.cpp (modified) (4 diffs)
• selector/UISelectorWindow.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -864 +864 @@
     switch (enmToolTypeMachine)
     {
+        case ToolTypeMachine_Invalid:   strResult = "None"; break;
         case ToolTypeMachine_Details:   strResult = "Details"; break;
         case ToolTypeMachine_Snapshots: strResult = "Snapshots"; break;
@@ -881 +882 @@
      * to search through the keys using 'case-insensitive' rule: */
     QStringList keys;    QList<ToolTypeMachine> values;
+    keys << "None";      values << ToolTypeMachine_Invalid;
     keys << "Details";   values << ToolTypeMachine_Details;
     keys << "Snapshots"; values << ToolTypeMachine_Snapshots;

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

@@ -2688 +2688 @@
 {
     /* Prepare result: */
-    QList<ToolTypeMachine> result;
+    QList<ToolTypeMachine> aLoadedOrder;
     /* Get machine tools order: */
     foreach (const QString &strValue, extraDataStringList(GUI_Toolbar_MachineTools_Order))
     {
         const ToolTypeMachine enmValue = gpConverter->fromInternalString<ToolTypeMachine>(strValue);
-        if (enmValue != ToolTypeMachine_Invalid && !result.contains(enmValue))
-            result << enmValue;
-    }
+        if (!aLoadedOrder.contains(enmValue))
+            aLoadedOrder << enmValue;
+    }
+
+    /* If the list is empty => add 'Details' at least: */
+    if (aLoadedOrder.isEmpty())
+        aLoadedOrder << ToolTypeMachine_Details;
+
     /* Return result: */
-    return result;
+    return aLoadedOrder;
 }
 
@@ -2703 +2708 @@
 {
     /* Parse passed list: */
-    QStringList aSerializedOrder;
+    QStringList aSavedOrder;
     foreach (const ToolTypeMachine &enmToolType, aOrder)
-        aSerializedOrder << gpConverter->toInternalString(enmToolType);
+        aSavedOrder << gpConverter->toInternalString(enmToolType);
+
+    /* If the list is empty => add 'None' at least: */
+    if (aSavedOrder.isEmpty())
+        aSavedOrder << gpConverter->toInternalString(ToolTypeMachine_Invalid);
 
     /* Re-cache corresponding extra-data: */
-    setExtraDataStringList(GUI_Toolbar_MachineTools_Order, aSerializedOrder);
+    setExtraDataStringList(GUI_Toolbar_MachineTools_Order, aSavedOrder);
 }
 
@@ -2714 +2723 @@
 {
     /* Prepare result: */
-    QList<ToolTypeGlobal> result;
+    QList<ToolTypeGlobal> aLoadedOrder;
     /* Get global tools order: */
     foreach (const QString &strValue, extraDataStringList(GUI_Toolbar_GlobalTools_Order))
     {
         const ToolTypeGlobal enmValue = gpConverter->fromInternalString<ToolTypeGlobal>(strValue);
-        if (enmValue != ToolTypeGlobal_Invalid && !result.contains(enmValue))
-            result << enmValue;
-    }
+        if (enmValue != ToolTypeGlobal_Invalid && !aLoadedOrder.contains(enmValue))
+            aLoadedOrder << enmValue;
+    }
+
     /* Return result: */
-    return result;
+    return aLoadedOrder;
 }
 
@@ -2729 +2739 @@
 {
     /* Parse passed list: */
-    QStringList aSerializedOrder;
+    QStringList aSavedOrder;
     foreach (const ToolTypeGlobal &enmToolType, aOrder)
-        aSerializedOrder << gpConverter->toInternalString(enmToolType);
+        aSavedOrder << gpConverter->toInternalString(enmToolType);
 
     /* Re-cache corresponding extra-data: */
-    setExtraDataStringList(GUI_Toolbar_GlobalTools_Order, aSerializedOrder);
+    setExtraDataStringList(GUI_Toolbar_GlobalTools_Order, aSavedOrder);
 }
 

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

@@ -161 +161 @@
         mapActionsMachine[ToolTypeMachine_Snapshots] = actionPool()->action(UIActionIndexST_M_Tools_M_Machine_Snapshots);
         for (int i = m_orderMachine.size() - 1; i >= 0; --i)
-            mapActionsMachine.value(m_orderMachine.at(i))->trigger();
+            if (m_orderMachine.at(i) != ToolTypeMachine_Invalid)
+                mapActionsMachine.value(m_orderMachine.at(i))->trigger();
         /* Make sure further action triggering cause tool type switch as well: */
         actionPool()->action(UIActionIndexST_M_Tools_T_Machine)->setProperty("watch_child_activation", true);
@@ -2133 +2134 @@
         mapActionsGlobal[ToolTypeGlobal_HostNetwork] = actionPool()->action(UIActionIndexST_M_Tools_M_Global_HostNetworkManager);
         for (int i = m_orderGlobal.size() - 1; i >= 0; --i)
-            mapActionsGlobal.value(m_orderGlobal.at(i))->trigger();
+            if (m_orderGlobal.at(i) != ToolTypeGlobal_Invalid)
+                mapActionsGlobal.value(m_orderGlobal.at(i))->trigger();
         /* Make sure further action triggering cause tool type switch as well: */
         actionPool()->action(UIActionIndexST_M_Tools_T_Global)->setProperty("watch_child_activation", true);