Changeset 77356 in vbox for trunk/src

Timestamp:

Feb 19, 2019 10:33:05 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9340. Updating recently used medium lists, and media folder lists.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (4 diffs)
• medium/UIFDCreationDialog.cpp (modified) (1 diff)
• medium/UIMediumSelector.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -2549 +2549 @@
     CVirtualBox comVBox = virtualBox();
 
-    updateRecentlyUsedMediumListAndFolder(enmMediumType, strMediumLocation);
-
     /* Open corresponding medium: */
     CMedium comMedium = comVBox.OpenMedium(strMediumLocation, mediumTypeToGlobal(enmMediumType), KAccessMode_ReadWrite, false);
@@ -2637 +2635 @@
     /* If dialog has some result: */
     if (!files.empty() && !files[0].isEmpty())
-        return openMedium(enmMediumType, files[0], pParent);
-
+    {
+        QUuid uMediumId = openMedium(enmMediumType, files[0], pParent);
+        updateRecentlyUsedMediumListAndFolder(enmMediumType, medium(uMediumId).location());
+        return uMediumId;
+    }
     return QUuid();
 }
@@ -2694 +2695 @@
             break;
     }
+    if (!uMediumId.isNull())
+        updateRecentlyUsedMediumListAndFolder(enmMediumType, medium(uMediumId).location());
 
     return uMediumId;
@@ -2829 +2832 @@
             returnCode = UIMediumSelector::ReturnCode_Rejected;
         else
+        {
             outUuid = selectedMediumIds[0];
+            updateRecentlyUsedMediumListAndFolder(enmMediumType, medium(outUuid).location());
+        }
     }
     delete pSelector;

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIFDCreationDialog.cpp

@@ -217 +217 @@
     /* Notify VBoxGlobal about the new medium: */
     vboxGlobal().createMedium(UIMedium(newMedium, UIMediumDeviceType_Floppy, KMediumState_Created));
-    /* Update the recently used media list: */
-    vboxGlobal().updateRecentlyUsedMediumListAndFolder(UIMediumDeviceType_Floppy, strMediumLocation);
 
     /* After a successful creation and initilization of the floppy disk we call base class accept

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp

@@ -443 +443 @@
     repopulateTreeWidget();
     selectMedium(uMediumID);
-
 }
 
@@ -450 +449 @@
     QUuid uMediumId = vboxGlobal().openMediumCreatorDialog(this, m_enmMediumType, m_strMachineFolder,
                                                            m_strMachineName, m_strMachineGuestOSTypeId);
-    if (!uMediumId.isNull())
-    {
-        /* Update the tree widget making sure we show the new item: */
-        repopulateTreeWidget();
-        /* Select the new item: */
-        selectMedium(uMediumId);
-        /* Update the search: */
-        m_pSearchWidget->search(m_pTreeWidget);
-    }
+    if (uMediumId.isNull())
+        return;
+    /* Update the tree widget making sure we show the new item: */
+    repopulateTreeWidget();
+    /* Select the new item: */
+    selectMedium(uMediumId);
+    /* Update the search: */
+    m_pSearchWidget->search(m_pTreeWidget);
 }