Changeset 73926 in vbox for trunk

Timestamp:

Aug 28, 2018 10:02:14 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8472. Refactoring the term 'mediums' to media

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• UITakeSnapshotDialog.cpp (modified) (3 diffs)
• UITakeSnapshotDialog.h (modified) (1 diff)
• globals/UIActionPoolSelector.cpp (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (6 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• manager/UIVirtualBoxManager.cpp (modified) (1 diff)
• manager/chooser/UIChooserModel.cpp (modified) (5 diffs)
• medium/UIMedium.cpp (modified) (3 diffs)
• medium/UIMedium.h (modified) (2 diffs)
• medium/UIMediumEnumerator.cpp (modified) (23 diffs)
• medium/UIMediumEnumerator.h (modified) (3 diffs)
• medium/UIMediumManager.cpp (modified) (2 diffs)
• medium/UIMediumSelector.cpp (modified) (2 diffs)
• runtime/UIMachineLogic.cpp (modified) (4 diffs)
• selector/UISelectorWindow.cpp (modified) (1 diff)
• selector/graphics/chooser/UIGChooserModel.cpp (modified) (5 diffs)
• settings/machine/UIMachineSettingsGeneral.cpp (modified) (9 diffs)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (4 diffs)
• settings/machine/UIMachineSettingsStorage.h (modified) (1 diff)
• widgets/UIAddDiskEncryptionPasswordDialog.cpp (modified) (14 diffs)
• widgets/UIAddDiskEncryptionPasswordDialog.h (modified) (2 diffs)
• widgets/UIMediaComboBox.cpp (modified) (2 diffs)
• wizards/exportappliance/UIWizardExportApp.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/UITakeSnapshotDialog.cpp

@@ -47 +47 @@
     : QIWithRetranslateUI<QIDialog>(pParent)
     , m_comMachine(comMachine)
-    , m_cImmutableMediums(0)
+    , m_cImmutableMedia(0)
     , m_pLabelIcon(0)
     , m_pLabelName(0), m_pEditorName(0)
@@ -106 +106 @@
     m_pLabelInfo->setText(tr("Warning: You are taking a snapshot of a running machine which has %n immutable image(s) "
                              "attached to it. As long as you are working from this snapshot the immutable image(s) "
-                             "will not be reset to avoid loss of data.", "", m_cImmutableMediums));
+                             "will not be reset to avoid loss of data.", "", m_cImmutableMedia));
 }
 
@@ -263 +263 @@
                         && !comMedium.GetParent().isNull()
                         && comMedium.GetBase().GetType() == KMediumType_Immutable)
-                        ++m_cImmutableMediums;
+                        ++m_cImmutableMedia;
                 }
             }
             /* Hide if machine have no immutable attachments: */
-            if (!m_cImmutableMediums)
+            if (!m_cImmutableMedia)
                 m_pLabelInfo->setHidden(true);
 

trunk/src/VBox/Frontends/VirtualBox/src/UITakeSnapshotDialog.h

@@ -87 +87 @@
 
     /** Holds the amount of immutable attachments. */
-    int  m_cImmutableMediums;
+    int  m_cImmutableMedia;
 
     /** Holds the icon label instance. */

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

@@ -2080 +2080 @@
     virtual QString shortcutExtraDataID() const /* override */
     {
-        return QString("RefreshMediums");
+        return QString("RefreshMedia");
     }
 

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

@@ -2440 +2440 @@
         /* Redirect request to medium-enumerator: */
         if (m_pMediumEnumerator)
-            m_pMediumEnumerator->enumerateMediums();
+            m_pMediumEnumerator->enumerateMedia();
         m_meCleanupProtectionToken.unlock();
     }
 }
 
-void VBoxGlobal::refreshMediums()
+void VBoxGlobal::refreshMedia()
 {
     /* Make sure VBoxGlobal is already valid: */
@@ -2469 +2469 @@
     /* We assume it's safe to call it without locking,
      * since we are performing blocking operation here. */
-    m_pMediumEnumerator->refreshMediums();
+    m_pMediumEnumerator->refreshMedia();
 }
 
@@ -2498 +2498 @@
     {
         /* Redirect call to medium-enumerator: */
-        QList<QString> listOfMediums;
+        QList<QString> listOfMedia;
         if (m_pMediumEnumerator)
-            listOfMediums = m_pMediumEnumerator->mediumIDs();
+            listOfMedia = m_pMediumEnumerator->mediumIDs();
         m_meCleanupProtectionToken.unlock();
-        return listOfMediums;
+        return listOfMedia;
     }
     return QList<QString>();
@@ -2782 +2782 @@
 
     /* Get existing-host-drive vector: */
-    CMediumVector comMediums;
+    CMediumVector comMedia;
     switch (enmMediumType)
     {
-        case UIMediumType_DVD:    comMediums = host().GetDVDDrives(); break;
-        case UIMediumType_Floppy: comMediums = host().GetFloppyDrives(); break;
+        case UIMediumType_DVD:    comMedia = host().GetDVDDrives(); break;
+        case UIMediumType_Floppy: comMedia = host().GetFloppyDrives(); break;
         default: break;
     }
     /* Prepare choose-existing-host-drive actions: */
-    foreach (const CMedium &comMedium, comMediums)
+    foreach (const CMedium &comMedium, comMedia)
     {
         /* Make sure host-drive usage is unique: */
@@ -3083 +3083 @@
     if (!comMedium.isNull() && guiMedium.isNull())
     {
-        /* UI medium may be new and not among our mediums, request enumeration: */
+        /* UI medium may be new and not among our media, request enumeration: */
         startMediumEnumeration();
 
@@ -3711 +3711 @@
     /* Re-enumerate uimedium since they contain some translations too: */
     if (m_fValid)
-        refreshMediums();
+        refreshMedia();
 
 #ifdef VBOX_WS_X11

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

@@ -479 +479 @@
         void startMediumEnumeration();
         /** Calls refresh for each medium which has been already enumerated. */
-        void refreshMediums();
+        void refreshMedia();
         /** Returns whether medium enumeration is in progress. */
         bool isMediumEnumerationInProgress() const;

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -276 +276 @@
 void UIVirtualBoxManager::sltHandleMediumEnumerationFinish()
 {
-    /* To avoid annoying the user, we check for inaccessible mediums just once, after
+    /* To avoid annoying the user, we check for inaccessible media just once, after
      * the first media emumeration [started from main() at startup] is complete. */
     if (m_fFirstMediumEnumerationHandled)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -1593 +1593 @@
         {
             /* Unregister machine first: */
-            CMediumVector mediums = machine.Unregister(KCleanupMode_DetachAllReturnHardDisksOnly);
+            CMediumVector media = machine.Unregister(KCleanupMode_DetachAllReturnHardDisksOnly);
             if (!machine.isOk())
             {
@@ -1600 +1600 @@
             }
             /* Prepare cleanup progress: */
-            CProgress progress = machine.DeleteConfig(mediums);
+            CProgress progress = machine.DeleteConfig(media);
             if (!machine.isOk())
             {
@@ -1617 +1617 @@
         {
             /* Unregister machine first: */
-            CMediumVector mediums = machine.Unregister(KCleanupMode_DetachAllReturnHardDisksOnly);
+            CMediumVector media = machine.Unregister(KCleanupMode_DetachAllReturnHardDisksOnly);
             if (!machine.isOk())
             {
@@ -1624 +1624 @@
             }
             /* Finally close all media, deliberately ignoring errors: */
-            foreach (CMedium medium, mediums)
+            foreach (CMedium medium, media)
             {
                 if (!medium.isNull())
@@ -2267 +2267 @@
     COMBase::CleanupCOM();
 }
-

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

@@ -228 +228 @@
         if (!m_fHostDrive)
         {
-            /* Only for created and accessible mediums: */
+            /* Only for created and accessible media: */
             if (m_state != KMediumState_Inaccessible && m_state != KMediumState_NotCreated)
             {
@@ -275 +275 @@
                 m_strParentId = normalizedID(parentMedium.GetId());
 
-            /* Only for created and accessible mediums: */
+            /* Only for created and accessible media: */
             if (m_state != KMediumState_Inaccessible && m_state != KMediumState_NotCreated)
             {
@@ -662 +662 @@
     return gpConverter->toString(comMedium.GetType());
 }
-

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMedium.h

@@ -72 +72 @@
   * will cause the corresponding property of this object's root medium to be returned instead
   * of its own one. This is useful when hard drive medium is reflected in the user-friendly
-  * "don't show diffs" mode. For non-hard drive mediums, the value of this argument is irrelevant
+  * "don't show diffs" mode. For non-hard drive media, the value of this argument is irrelevant
   * because the root object for such medium is the medium itself.
   *
@@ -79 +79 @@
   * and therefore some parameters such as #size() are meaningless because they can be read only
   * from the accessible medium. The real KMediumState_NotCreated state is not necessary because
-  * this class is only used with created (existing) mediums. */
+  * this class is only used with created (existing) media. */
 class SHARED_LIBRARY_STUFF UIMedium
 {

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

@@ -89 +89 @@
 {
     /* Return keys of current medium-map: */
-    return m_mediums.keys();
+    return m_media.keys();
 }
 
@@ -95 +95 @@
 {
     /* Search through current medium-map for the medium with passed ID: */
-    if (m_mediums.contains(strMediumID))
-        return m_mediums[strMediumID];
+    if (m_media.contains(strMediumID))
+        return m_media[strMediumID];
     /* Return NULL medium otherwise: */
     return UIMedium();
@@ -110 +110 @@
     AssertReturnVoid(strMediumID != UIMedium::nullID());
     /* Make sure medium doesn't exists already: */
-    AssertReturnVoid(!m_mediums.contains(strMediumID));
+    AssertReturnVoid(!m_media.contains(strMediumID));
 
     /* Insert medium: */
-    m_mediums[strMediumID] = medium;
+    m_media[strMediumID] = medium;
     LogRel(("GUI: UIMediumEnumerator: Medium with key={%s} created\n", strMediumID.toUtf8().constData()));
 
@@ -126 +126 @@
     AssertReturnVoid(strMediumID != UIMedium::nullID());
     /* Make sure medium still exists: */
-    AssertReturnVoid(m_mediums.contains(strMediumID));
+    AssertReturnVoid(m_media.contains(strMediumID));
 
     /* Remove medium: */
-    m_mediums.remove(strMediumID);
+    m_media.remove(strMediumID);
     LogRel(("GUI: UIMediumEnumerator: Medium with key={%s} deleted\n", strMediumID.toUtf8().constData()));
 
@@ -136 +136 @@
 }
 
-void UIMediumEnumerator::enumerateMediums()
+void UIMediumEnumerator::enumerateMedia()
 {
     /* Make sure we are not already in progress: */
     AssertReturnVoid(!m_fMediumEnumerationInProgress);
 
-    /* Compose new map of all currently known mediums & their children.
-     * While composing we are using data from already existing mediums. */
-    UIMediumMap mediums;
-    addNullMediumToMap(mediums);
-    addHardDisksToMap(vboxGlobal().virtualBox().GetHardDisks(), mediums);
-    addMediumsToMap(vboxGlobal().host().GetDVDDrives(), mediums, UIMediumType_DVD);
-    addMediumsToMap(vboxGlobal().virtualBox().GetDVDImages(), mediums, UIMediumType_DVD);
-    addMediumsToMap(vboxGlobal().host().GetFloppyDrives(), mediums, UIMediumType_Floppy);
-    addMediumsToMap(vboxGlobal().virtualBox().GetFloppyImages(), mediums, UIMediumType_Floppy);
+    /* Compose new map of all currently known media & their children.
+     * While composing we are using data from already existing media. */
+    UIMediumMap media;
+    addNullMediumToMap(media);
+    addHardDisksToMap(vboxGlobal().virtualBox().GetHardDisks(), media);
+    addMediaToMap(vboxGlobal().host().GetDVDDrives(), media, UIMediumType_DVD);
+    addMediaToMap(vboxGlobal().virtualBox().GetDVDImages(), media, UIMediumType_DVD);
+    addMediaToMap(vboxGlobal().host().GetFloppyDrives(), media, UIMediumType_Floppy);
+    addMediaToMap(vboxGlobal().virtualBox().GetFloppyImages(), media, UIMediumType_Floppy);
     if (VBoxGlobal::isCleaningUp())
         return; /* VBoxGlobal is cleaning up, abort immediately. */
-    m_mediums = mediums;
+    m_media = media;
 
     /* Notify listener: */
@@ -160 +160 @@
 
     /* Make sure we really have more than one medium (which is Null): */
-    if (m_mediums.size() == 1)
+    if (m_media.size() == 1)
     {
         /* Notify listener: */
@@ -169 +169 @@
 
     /* Start enumeration for UIMedium(s) with correct ID: */
-    foreach (const QString &strMediumID, m_mediums.keys())
+    foreach (const QString &strMediumID, m_media.keys())
         if (!strMediumID.isNull() && strMediumID != UIMedium::nullID())
-            createMediumEnumerationTask(m_mediums[strMediumID]);
-}
-
-void UIMediumEnumerator::refreshMediums()
+            createMediumEnumerationTask(m_media[strMediumID]);
+}
+
+void UIMediumEnumerator::refreshMedia()
 {
     /* Make sure we are not already in progress: */
@@ -180 +180 @@
 
     /* Refresh all known media we have: */
-    foreach (const QString &strMediumID, m_mediums.keys())
-        m_mediums[strMediumID].refresh();
+    foreach (const QString &strMediumID, m_media.keys())
+        m_media[strMediumID].refresh();
 }
 
@@ -202 +202 @@
              currentCMediumIDs.isEmpty() ? "<empty>" : currentCMediumIDs.join(", ").toUtf8().constData()));
 
-    /* Determine excluded mediums: */
+    /* Determine excluded media: */
     const QSet<QString> previousSet = previousUIMediumIDs.toSet();
     const QSet<QString> currentSet = currentCMediumIDs.toSet();
@@ -299 +299 @@
 
     /* Make sure such UIMedium still exists: */
-    if (!m_mediums.contains(strUIMediumKey))
+    if (!m_media.contains(strUIMediumKey))
     {
         LogRel2(("GUI: UIMediumEnumerator: Medium with key={%s} already deleted by a third party\n", strUIMediumKey.toUtf8().constData()));
@@ -311 +311 @@
     {
         /* Delete this medium: */
-        m_mediums.remove(strUIMediumKey);
+        m_media.remove(strUIMediumKey);
         LogRel2(("GUI: UIMediumEnumerator: Medium with key={%s} closed and deleted (after enumeration)\n", strUIMediumKey.toUtf8().constData()));
 
@@ -321 +321 @@
     {
         /* We have to reinject enumerated medium: */
-        m_mediums.remove(strUIMediumKey);
-        m_mediums[strUIMediumID] = uimedium;
-        m_mediums[strUIMediumID].setKey(strUIMediumID);
+        m_media.remove(strUIMediumKey);
+        m_media[strUIMediumID] = uimedium;
+        m_media[strUIMediumID].setKey(strUIMediumID);
         LogRel2(("GUI: UIMediumEnumerator: Medium with key={%s} has it changed to {%s}\n", strUIMediumKey.toUtf8().constData(),
                                                                                            strUIMediumID.toUtf8().constData()));
@@ -335 +335 @@
     {
         /* Just update enumerated medium: */
-        m_mediums[strUIMediumID] = uimedium;
+        m_media[strUIMediumID] = uimedium;
         LogRel2(("GUI: UIMediumEnumerator: Medium with key={%s} updated\n", strUIMediumID.toUtf8().constData()));
 
@@ -355 +355 @@
 {
     /* Translating NULL uimedium by recreating it: */
-    if (m_mediums.contains(UIMedium::nullID()))
-        m_mediums[UIMedium::nullID()] = UIMedium();
+    if (m_media.contains(UIMedium::nullID()))
+        m_media[UIMedium::nullID()] = UIMedium();
 }
 
@@ -369 +369 @@
 }
 
-void UIMediumEnumerator::addNullMediumToMap(UIMediumMap &mediums)
+void UIMediumEnumerator::addNullMediumToMap(UIMediumMap &media)
 {
     /* Insert NULL uimedium to the passed uimedium map.
      * Get existing one from the previous map if any. */
     QString strNullMediumID = UIMedium::nullID();
-    UIMedium uimedium = m_mediums.contains(strNullMediumID) ? m_mediums[strNullMediumID] : UIMedium();
-    mediums.insert(strNullMediumID, uimedium);
-}
-
-void UIMediumEnumerator::addMediumsToMap(const CMediumVector &inputMediums, UIMediumMap &outputMediums, UIMediumType mediumType)
+    UIMedium uimedium = m_media.contains(strNullMediumID) ? m_media[strNullMediumID] : UIMedium();
+    media.insert(strNullMediumID, uimedium);
+}
+
+void UIMediumEnumerator::addMediaToMap(const CMediumVector &inputMedia, UIMediumMap &outputMedia, UIMediumType mediumType)
 {
     /* Insert hard-disks to the passed uimedium map.
      * Get existing one from the previous map if any. */
-    foreach (CMedium medium, inputMediums)
+    foreach (CMedium medium, inputMedia)
     {
         /* If VBoxGlobal is cleaning up, abort immediately: */
@@ -390 +390 @@
         /* Prepare uimedium on the basis of current medium: */
         QString strMediumID = medium.GetId();
-        UIMedium uimedium = m_mediums.contains(strMediumID) ? m_mediums[strMediumID] :
+        UIMedium uimedium = m_media.contains(strMediumID) ? m_media[strMediumID] :
                                                               UIMedium(medium, mediumType);
 
         /* Insert uimedium into map: */
-        outputMediums.insert(uimedium.id(), uimedium);
-    }
-}
-
-void UIMediumEnumerator::addHardDisksToMap(const CMediumVector &inputMediums, UIMediumMap &outputMediums)
+        outputMedia.insert(uimedium.id(), uimedium);
+    }
+}
+
+void UIMediumEnumerator::addHardDisksToMap(const CMediumVector &inputMedia, UIMediumMap &outputMedia)
 {
     /* Insert hard-disks to the passed uimedium map.
      * Get existing one from the previous map if any. */
-    foreach (CMedium medium, inputMediums)
+    foreach (CMedium medium, inputMedia)
     {
         /* If VBoxGlobal is cleaning up, abort immediately: */
@@ -410 +410 @@
         /* Prepare uimedium on the basis of current medium: */
         QString strMediumID = medium.GetId();
-        UIMedium uimedium = m_mediums.contains(strMediumID) ? m_mediums[strMediumID] :
+        UIMedium uimedium = m_media.contains(strMediumID) ? m_media[strMediumID] :
                                                               UIMedium(medium, UIMediumType_HardDisk);
 
         /* Insert uimedium into map: */
-        outputMediums.insert(uimedium.id(), uimedium);
+        outputMedia.insert(uimedium.id(), uimedium);
 
         /* Insert medium children into map too: */
-        addHardDisksToMap(medium.GetChildren(), outputMediums);
+        addHardDisksToMap(medium.GetChildren(), outputMedia);
     }
 }
@@ -433 +433 @@
     {
         /* Get corresponding UIMedium: */
-        const UIMedium &uimedium = m_mediums[strMediumID];
+        const UIMedium &uimedium = m_media[strMediumID];
         /* Get the list of the machines this UIMedium attached to.
          * Take into account current-state only if necessary. */
@@ -528 +528 @@
     {
         /* Make sure this ID still in our map: */
-        if (m_mediums.contains(strMediumID))
+        if (m_media.contains(strMediumID))
         {
             /* Get corresponding UIMedium: */
-            UIMedium &uimedium = m_mediums[strMediumID];
+            UIMedium &uimedium = m_media[strMediumID];
 
             /* If corresponding CMedium still exists: */
@@ -546 +546 @@
             {
                 /* Uncache corresponding UIMedium: */
-                m_mediums.remove(strMediumID);
+                m_media.remove(strMediumID);
                 LogRel2(("GUI: UIMediumEnumerator:  Medium with key={%s} uncached\n", strMediumID.toUtf8().constData()));
 
@@ -567 +567 @@
     {
         /* If that ID is not in our map: */
-        if (!m_mediums.contains(strCMediumID))
+        if (!m_media.contains(strCMediumID))
         {
             /* Create new UIMedium: */
@@ -575 +575 @@
 
             /* Cache created UIMedium: */
-            m_mediums.insert(strUIMediumKey, uimedium);
+            m_media.insert(strUIMediumKey, uimedium);
             LogRel2(("GUI: UIMediumEnumerator:  Medium with key={%s} cached\n", strUIMediumKey.toUtf8().constData()));
 
@@ -583 +583 @@
 
         /* Enumerate corresponding UIMedium: */
-        createMediumEnumerationTask(m_mediums[strCMediumID]);
+        createMediumEnumerationTask(m_media[strCMediumID]);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.h

@@ -65 +65 @@
     /* API: Medium-enumeration stuff: */
     bool isMediumEnumerationInProgress() const { return m_fMediumEnumerationInProgress; }
-    void enumerateMediums();
-    void refreshMediums();
+    void enumerateMedia();
+    void refreshMedia();
 
 private slots:
@@ -87 +87 @@
     /* Helpers: Medium-enumeration stuff: */
     void createMediumEnumerationTask(const UIMedium &medium);
-    void addNullMediumToMap(UIMediumMap &mediums);
-    void addMediumsToMap(const CMediumVector &inputMediums, UIMediumMap &outputMediums, UIMediumType mediumType);
-    void addHardDisksToMap(const CMediumVector &inputMediums, UIMediumMap &outputMediums);
+    void addNullMediumToMap(UIMediumMap &media);
+    void addMediaToMap(const CMediumVector &inputMedia, UIMediumMap &outputMedia, UIMediumType mediumType);
+    void addHardDisksToMap(const CMediumVector &inputMedia, UIMediumMap &outputMedia);
 
     /* Helpers: Medium re-caching stuff: */
@@ -102 +102 @@
     bool m_fMediumEnumerationInProgress;
     QSet<UITask*> m_tasks;
-    UIMediumMap m_mediums;
+    UIMediumMap m_media;
 };
 

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

@@ -388 +388 @@
     UIMedium medium = vboxGlobal().medium(strMediumID);
 
-    /* Ignore non-interesting mediums: */
+    /* Ignore non-interesting media: */
     if (medium.isNull() || medium.isHostDrive())
         return;
 
-    /* Ignore mediums (and their children) which are
+    /* Ignore media (and their children) which are
      * marked as hidden or attached to hidden machines only: */
     if (UIMedium::isMediumAttachedToHiddenMachinesOnly(medium))
@@ -464 +464 @@
     UIMedium medium = vboxGlobal().medium(strMediumID);
 
-    /* Ignore non-interesting mediums: */
+    /* Ignore non-interesting media: */
     if (medium.isNull() || medium.isHostDrive())
         return;
 
-    /* Ignore mediums (and their children) which are
+    /* Ignore media (and their children) which are
      * marked as hidden or attached to hidden machines only: */
     if (UIMedium::isMediumAttachedToHiddenMachinesOnly(medium))

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

@@ -624 +624 @@
     /* Cache the currently selected items: */
     QList<QTreeWidgetItem*> selectedItems = m_pTreeWidget->selectedItems();
-    QStringList selectedMediums = selectedMediumIds();
+    QStringList selectedMedia = selectedMediumIds();
     /* uuid list of selected items: */
     /* Reset the related data structure: */
@@ -667 +667 @@
         }
     }
-    restoreSelection(selectedMediums, menuItemVector);
+    restoreSelection(selectedMedia, menuItemVector);
     saveDefaultForeground();
     updateOkButton();

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

@@ -2914 +2914 @@
 void UIMachineLogic::askUserForTheDiskEncryptionPasswords()
 {
-    /* Prepare the map of the encrypted mediums: */
-    EncryptedMediumMap encryptedMediums;
+    /* Prepare the map of the encrypted media: */
+    EncryptedMediumMap encryptedMedia;
     foreach (const CMediumAttachment &attachment, machine().GetMediumAttachments())
     {
@@ -2927 +2927 @@
             const QString strPasswordId = medium.GetEncryptionSettings(strCipher);
             if (medium.isOk())
-                encryptedMediums.insert(strPasswordId, medium.GetId());
+                encryptedMedia.insert(strPasswordId, medium.GetId());
         }
     }
@@ -2933 +2933 @@
     /* Ask for the disk encryption passwords if necessary: */
     EncryptionPasswordMap encryptionPasswords;
-    if (!encryptedMediums.isEmpty())
+    if (!encryptedMedia.isEmpty())
     {
         /* Create the dialog for acquiring encryption passwords: */
@@ -2940 +2940 @@
              new UIAddDiskEncryptionPasswordDialog(pDlgParent,
                                                    machineName(),
-                                                   encryptedMediums);
+                                                   encryptedMedia);
         /* Execute the dialog: */
         if (pDlg->exec() == QDialog::Accepted)

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

@@ -326 +326 @@
 void UISelectorWindow::sltHandleMediumEnumerationFinish()
 {
-    /* We try to warn about inaccessible mediums only once
+    /* We try to warn about inaccessible media only once
      * (after media emumeration started from main() at startup),
      * to avoid annoying the user: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -1572 +1572 @@
         {
             /* Unregister machine first: */
-            CMediumVector mediums = machine.Unregister(KCleanupMode_DetachAllReturnHardDisksOnly);
+            CMediumVector media = machine.Unregister(KCleanupMode_DetachAllReturnHardDisksOnly);
             if (!machine.isOk())
             {
@@ -1579 +1579 @@
             }
             /* Prepare cleanup progress: */
-            CProgress progress = machine.DeleteConfig(mediums);
+            CProgress progress = machine.DeleteConfig(media);
             if (!machine.isOk())
             {
@@ -1596 +1596 @@
         {
             /* Unregister machine first: */
-            CMediumVector mediums = machine.Unregister(KCleanupMode_DetachAllReturnHardDisksOnly);
+            CMediumVector media = machine.Unregister(KCleanupMode_DetachAllReturnHardDisksOnly);
             if (!machine.isOk())
             {
@@ -1603 +1603 @@
             }
             /* Finally close all media, deliberately ignoring errors: */
-            foreach (CMedium medium, mediums)
+            foreach (CMedium medium, media)
             {
                 if (!medium.isNull())
@@ -2240 +2240 @@
     COMBase::CleanupCOM();
 }
-

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

@@ -112 +112 @@
     QString                m_strEncryptionPassword;
     /** Holds the encrypted medium ids. */
-    EncryptedMediumMap     m_encryptedMediums;
+    EncryptedMediumMap     m_encryptedMedia;
     /** Holds the encryption passwords. */
     EncryptionPasswordMap  m_encryptionPasswords;
@@ -201 +201 @@
     QString strCipher;
     bool fEncryptionCipherCommon = true;
-    /* Prepare the map of the encrypted mediums: */
-    EncryptedMediumMap encryptedMediums;
+    /* Prepare the map of the encrypted media: */
+    EncryptedMediumMap encryptedMedia;
     foreach (const CMediumAttachment &attachment, m_machine.GetMediumAttachments())
     {
@@ -215 +215 @@
             if (comMedium.isOk())
             {
-                encryptedMediums.insert(strCurrentPasswordId, comMedium.GetId());
+                encryptedMedia.insert(strCurrentPasswordId, comMedium.GetId());
                 if (strCurrentCipher != strCipher)
                 {
@@ -226 +226 @@
         }
     }
-    oldGeneralData.m_fEncryptionEnabled = !encryptedMediums.isEmpty();
+    oldGeneralData.m_fEncryptionEnabled = !encryptedMedia.isEmpty();
     oldGeneralData.m_fEncryptionCipherChanged = false;
     oldGeneralData.m_fEncryptionPasswordChanged = false;
@@ -233 +233 @@
     if (oldGeneralData.m_iEncryptionCipherIndex == -1)
         oldGeneralData.m_iEncryptionCipherIndex = 0;
-    oldGeneralData.m_encryptedMediums = encryptedMediums;
+    oldGeneralData.m_encryptedMedia = encryptedMedia;
 
     /* Cache old general data: */
@@ -312 +312 @@
     newGeneralData.m_iEncryptionCipherIndex = m_pComboCipher->currentIndex();
     newGeneralData.m_strEncryptionPassword = m_pEditorEncryptionPassword->text();
-    newGeneralData.m_encryptedMediums = m_pCache->base().m_encryptedMediums;
+    newGeneralData.m_encryptedMedia = m_pCache->base().m_encryptedMedia;
     /* If encryption status, cipher or password is changed: */
     if (newGeneralData.m_fEncryptionEnabled != m_pCache->base().m_fEncryptionEnabled ||
@@ -319 +319 @@
     {
         /* Ask for the disk encryption passwords if necessary: */
-        if (!m_pCache->base().m_encryptedMediums.isEmpty())
+        if (!m_pCache->base().m_encryptedMedia.isEmpty())
         {
             /* Create corresponding dialog: */
@@ -326 +326 @@
                  new UIAddDiskEncryptionPasswordDialog(pDlgParent,
                                                        newGeneralData.m_strName,
-                                                       newGeneralData.m_encryptedMediums);
+                                                       newGeneralData.m_encryptedMedia);
             /* Execute it and acquire the result: */
             if (pDlg->exec() == QDialog::Accepted)
@@ -901 +901 @@
                         }
 
-                        /* Get the maps of encrypted mediums and their passwords: */
-                        const EncryptedMediumMap &encryptedMedium = newGeneralData.m_encryptedMediums;
+                        /* Get the maps of encrypted media and their passwords: */
+                        const EncryptedMediumMap &encryptedMedium = newGeneralData.m_encryptedMedia;
                         const EncryptionPasswordMap &encryptionPasswords = newGeneralData.m_encryptionPasswords;
 

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

@@ -3044 +3044 @@
                 /* Add "Choose a virtual hard disk file" action: */
                 addChooseExistingMediumAction(pOpenMediumMenu, tr("Choose Virtual Hard Disk File..."));
-                /* Add recent mediums list: */
+                /* Add recent media list: */
                 addRecentMediumActions(pOpenMediumMenu, m_pMediumIdHolder->type());
                 break;
@@ -3054 +3054 @@
                 /* Add "Choose a physical drive" actions: */
                 addChooseHostDriveActions(pOpenMediumMenu);
-                /* Add recent mediums list: */
+                /* Add recent media list: */
                 addRecentMediumActions(pOpenMediumMenu, m_pMediumIdHolder->type());
                 /* Add "Eject current medium" action: */
@@ -3070 +3070 @@
                 /* Add "Choose a physical drive" actions: */
                 addChooseHostDriveActions(pOpenMediumMenu);
-                /* Add recent mediums list: */
+                /* Add recent media list: */
                 addRecentMediumActions(pOpenMediumMenu, m_pMediumIdHolder->type());
                 /* Add "Eject current medium" action: */
@@ -3443 +3443 @@
     UIIconPoolStorageSettings::create();
 
-    /* Enumerate Mediums. We need at least the MediaList filled, so this is the
+    /* Enumerate Media. We need at least the MediaList filled, so this is the
      * lasted point, where we can start. The rest of the media checking is done
      * in a background thread. */

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

@@ -704 +704 @@
     /** Mounts existing host-drive. */
     void sltChooseHostDrive();
-    /** Mounts one of recent mediums. */
+    /** Mounts one of recent media. */
     void sltChooseRecentMedium();
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIAddDiskEncryptionPasswordDialog.cpp

@@ -109 +109 @@
 
     /** Constructs model passing @a pParent to the base-class.
-      * @param  encryptedMediums  Brings the lists of medium ids (values) encrypted with passwords with ids (keys). */
-    UIEncryptionDataModel(QObject *pParent, const EncryptedMediumMap &encryptedMediums);
+      * @param  encryptedMedia  Brings the lists of medium ids (values) encrypted with passwords with ids (keys). */
+    UIEncryptionDataModel(QObject *pParent, const EncryptedMediumMap &encryptedMedia);
 
     /** Returns the shallow copy of the encryption password map instance. */
@@ -137 +137 @@
 
     /** Holds the encrypted medium map reference. */
-    const EncryptedMediumMap &m_encryptedMediums;
+    const EncryptedMediumMap &m_encryptedMedia;
 
     /** Holds the encryption password map instance. */
@@ -159 +159 @@
 
     /** Constructs table.
-      * @param  encryptedMediums  Brings the lists of medium ids (values) encrypted with passwords with ids (keys). */
-    UIEncryptionDataTable(const EncryptedMediumMap &encryptedMediums);
+      * @param  encryptedMedia  Brings the lists of medium ids (values) encrypted with passwords with ids (keys). */
+    UIEncryptionDataTable(const EncryptedMediumMap &encryptedMedia);
 
     /** Returns the shallow copy of the encryption password map
@@ -175 +175 @@
 
     /** Holds the encrypted medium map reference. */
-    const EncryptedMediumMap &m_encryptedMediums;
+    const EncryptedMediumMap &m_encryptedMedia;
 
     /** Holds the encryption-data model instance. */
@@ -225 +225 @@
 *********************************************************************************************************************************/
 
-UIEncryptionDataModel::UIEncryptionDataModel(QObject *pParent, const EncryptedMediumMap &encryptedMediums)
+UIEncryptionDataModel::UIEncryptionDataModel(QObject *pParent, const EncryptedMediumMap &encryptedMedia)
     : QAbstractTableModel(pParent)
-    , m_encryptedMediums(encryptedMediums)
+    , m_encryptedMedia(encryptedMedia)
 {
     /* Prepare: */
@@ -315 +315 @@
             /* We are generating tool-tip here and not in retranslateUi() because of the tricky plural form handling,
              * but be quiet, it's safe enough because the tool-tip being re-acquired every time on mouse-hovering. */
-            const QStringList encryptedMediums = m_encryptedMediums.values(m_encryptionPasswords.keys().at(index.row()));
+            const QStringList encryptedMedia = m_encryptedMedia.values(m_encryptionPasswords.keys().at(index.row()));
             return UIAddDiskEncryptionPasswordDialog::tr("<nobr>Used by the following %n hard disk(s):</nobr><br>%1",
                                                          "This text is never used with n == 0. "
@@ -322 +322 @@
                                                          "(but the user can see how many hard drives are in the tool-tip "
                                                          "and doesn't need to be told).",
-                                                         encryptedMediums.size())
-                                                         .arg(encryptedMediums.join("<br>"));
+                                                         encryptedMedia.size())
+                                                         .arg(encryptedMedia.join("<br>"));
         }
         default:
@@ -359 +359 @@
 {
     /* Populate the map of passwords and statuses: */
-    foreach (const QString &strPasswordId, m_encryptedMediums.keys())
+    foreach (const QString &strPasswordId, m_encryptedMedia.keys())
         m_encryptionPasswords.insert(strPasswordId, QString());
 }
@@ -368 +368 @@
 *********************************************************************************************************************************/
 
-UIEncryptionDataTable::UIEncryptionDataTable(const EncryptedMediumMap &encryptedMediums)
-    : m_encryptedMediums(encryptedMediums)
+UIEncryptionDataTable::UIEncryptionDataTable(const EncryptedMediumMap &encryptedMedia)
+    : m_encryptedMedia(encryptedMedia)
     , m_pModelEncryptionData(0)
 {
@@ -398 +398 @@
 {
     /* Create encryption-data model: */
-    m_pModelEncryptionData = new UIEncryptionDataModel(this, m_encryptedMediums);
+    m_pModelEncryptionData = new UIEncryptionDataModel(this, m_encryptedMedia);
     if (m_pModelEncryptionData)
     {
@@ -458 +458 @@
 UIAddDiskEncryptionPasswordDialog::UIAddDiskEncryptionPasswordDialog(QWidget *pParent,
                                                                      const QString &strMachineName,
-                                                                     const EncryptedMediumMap &encryptedMediums)
+                                                                     const EncryptedMediumMap &encryptedMedia)
     : QIWithRetranslateUI<QDialog>(pParent)
     , m_strMachineName(strMachineName)
-    , m_encryptedMediums(encryptedMediums)
+    , m_encryptedMedia(encryptedMedia)
     , m_pLabelDescription(0)
     , m_pTableEncryptionData(0)
@@ -492 +492 @@
                                     "(but the user can see how many passwords are in the list "
                                     "and doesn't need to be told).",
-                                    m_encryptedMediums.uniqueKeys().size()));
+                                    m_encryptedMedia.uniqueKeys().size()));
 }
 
@@ -498 +498 @@
 {
     /* Validate passwords status: */
-    foreach (const QString &strPasswordId, m_encryptedMediums.uniqueKeys())
-    {
-        const QString strMediumId = m_encryptedMediums.values(strPasswordId).first();
+    foreach (const QString &strPasswordId, m_encryptedMedia.uniqueKeys())
+    {
+        const QString strMediumId = m_encryptedMedia.values(strPasswordId).first();
         const QString strPassword = m_pTableEncryptionData->encryptionPasswords().value(strPasswordId);
         if (!isPasswordValid(strMediumId, strPassword))
@@ -537 +537 @@
 
             /* Create encryption-data table: */
-            m_pTableEncryptionData = new UIEncryptionDataTable(m_encryptedMediums);
+            m_pTableEncryptionData = new UIEncryptionDataTable(m_encryptedMedia);
             if (m_pTableEncryptionData)
             {

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIAddDiskEncryptionPasswordDialog.h

@@ -48 +48 @@
     /** Constructs dialog passing @a pParent to the base-class.
       * @param  strMachineName    Brings the name of the machine we show this dialog for.
-      * @param  encryptedMediums  Brings the lists of medium ids (values) encrypted with passwords with ids (keys). */
-    UIAddDiskEncryptionPasswordDialog(QWidget *pParent, const QString &strMachineName, const EncryptedMediumMap &encryptedMediums);
+      * @param  encryptedMedia  Brings the lists of medium ids (values) encrypted with passwords with ids (keys). */
+    UIAddDiskEncryptionPasswordDialog(QWidget *pParent, const QString &strMachineName, const EncryptedMediumMap &encryptedMedia);
 
     /** Returns the shallow copy of the encryption password map
@@ -82 +82 @@
 
     /** Holds the encrypted medium map reference. */
-    const EncryptedMediumMap &m_encryptedMediums;
+    const EncryptedMediumMap &m_encryptedMedia;
 
     /** Holds the description label instance. */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediaComboBox.cpp

@@ -112 +112 @@
     UIMedium guiMedium = vboxGlobal().medium(strMediumId);
 
-    /* Ignore mediums (and their children) which are
+    /* Ignore media (and their children) which are
      * marked as hidden or attached to hidden machines only: */
     if (UIMedium::isMediumAttachedToHiddenMachinesOnly(guiMedium))
         return;
 
-    /* Add only 1. NULL medium and 2. mediums of required type: */
+    /* Add only 1. NULL medium and 2. media of required type: */
     if (!guiMedium.isNull() && guiMedium.type() != m_enmMediaType)
         return;
@@ -141 +141 @@
     UIMedium guiMedium = vboxGlobal().medium(strMediumId);
 
-    /* Add only 1. NULL medium and 2. mediums of required type: */
+    /* Add only 1. NULL medium and 2. media of required type: */
     if (!guiMedium.isNull() && guiMedium.type() != m_enmMediaType)
         return;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp

@@ -237 +237 @@
 {
     /* Get the map of the password IDs: */
-    EncryptedMediumMap encryptedMediums;
+    EncryptedMediumMap encryptedMedia;
     foreach (const QString &strPasswordId, comAppliance.GetPasswordIds())
         foreach (const QString &strMediumId, comAppliance.GetMediumIdsForPasswordId(strPasswordId))
-            encryptedMediums.insert(strPasswordId, strMediumId);
+            encryptedMedia.insert(strPasswordId, strMediumId);
 
     /* Ask for the disk encryption passwords if necessary: */
-    if (!encryptedMediums.isEmpty())
+    if (!encryptedMedia.isEmpty())
     {
         /* Modal dialog can be destroyed in own event-loop as a part of application
@@ -251 +251 @@
              new UIAddDiskEncryptionPasswordDialog(this,
                                                    window()->windowTitle(),
-                                                   encryptedMediums);
+                                                   encryptedMedia);
 
         /* Execute the dialog: */