Changeset 50910 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 27, 2014 3:21:43 PM (11 years ago)

Author:

vboxsync

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

93034

Message:

FE/Qt: UIMediumTarget rework: Taking into account further use (hard-drive mediums) and some simplification.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (5 diffs)
• medium/UIMediumDefs.h (modified) (2 diffs)

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

@@ -1952 +1952 @@
     /* Prepare open-existing-medium action: */
     QAction *pActionOpenExistingMedium = menu.addAction(QIcon(":/select_file_16px.png"), QString(), pListener, pszSlotName);
-    pActionOpenExistingMedium->setData(QVariant::fromValue(UIMediumTarget(strControllerName, currentAttachment.GetPort(),
-                                                                          currentAttachment.GetDevice(), mediumType)));
+    pActionOpenExistingMedium->setData(QVariant::fromValue(UIMediumTarget(strControllerName, currentAttachment.GetPort(), currentAttachment.GetDevice(),
+                                                                          mediumType)));
 
 
@@ -1991 +1991 @@
             pActionChooseHostDrive->setCheckable(true);
             pActionChooseHostDrive->setChecked(!currentMedium.isNull() && medium.GetId() == strCurrentID);
-            pActionChooseHostDrive->setData(QVariant::fromValue(UIMediumTarget(strControllerName, currentAttachment.GetPort(),
-                                                                               currentAttachment.GetDevice(), medium.GetId())));
+            pActionChooseHostDrive->setData(QVariant::fromValue(UIMediumTarget(strControllerName, currentAttachment.GetPort(), currentAttachment.GetDevice(),
+                                                                               mediumType, UIMediumTarget::UIMediumTargetType_WithID, medium.GetId())));
         }
     }
@@ -2034 +2034 @@
             pActionChooseRecentMedium->setCheckable(true);
             pActionChooseRecentMedium->setChecked(!currentMedium.isNull() && strRecentMediumLocation == strCurrentLocation);
-            pActionChooseRecentMedium->setData(QVariant::fromValue(UIMediumTarget(strControllerName, currentAttachment.GetPort(),
-                                                                                  currentAttachment.GetDevice(), mediumType,
-                                                                                  strRecentMediumLocation)));
+            pActionChooseRecentMedium->setData(QVariant::fromValue(UIMediumTarget(strControllerName, currentAttachment.GetPort(), currentAttachment.GetDevice(),
+                                                                                  mediumType, UIMediumTarget::UIMediumTargetType_WithLocation, strRecentMediumLocation)));
             pActionChooseRecentMedium->setToolTip(strRecentMediumLocation);
         }
@@ -2049 +2048 @@
     QAction *pActionUnmountMedium = menu.addAction(QString(), pListener, pszSlotName);
     pActionUnmountMedium->setEnabled(!currentMedium.isNull());
-    pActionUnmountMedium->setData(QVariant::fromValue(UIMediumTarget(strControllerName,
-                                                                     currentAttachment.GetPort(), currentAttachment.GetDevice())));
+    pActionUnmountMedium->setData(QVariant::fromValue(UIMediumTarget(strControllerName, currentAttachment.GetPort(), currentAttachment.GetDevice())));
 
 
@@ -2093 +2091 @@
             /* New mount-target attributes: */
             QString strNewID;
-            const bool fSelectWithMediaManager = target.mediumType != UIMediumType_Invalid;
+            const bool fSelectWithMediaManager = target.mediumType != UIMediumType_Invalid && target.data.isNull();
 
             /* Invoke file-open dialog to choose medium ID: */

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

@@ -49 +49 @@
     enum UIMediumTargetType { UIMediumTargetType_WithID, UIMediumTargetType_WithLocation };
 
-    /** Default medium-target constructor. */
-    UIMediumTarget()
-        : type(UIMediumTargetType_WithID)
-        , name(QString()), port(0), device(0), mediumType(UIMediumType_Invalid)
-        , data(QString())
+    /** Medium-target constructor. */
+    UIMediumTarget(const QString &strName = QString(), LONG iPort = 0, LONG iDevice = 0,
+                   UIMediumType aMediumType = UIMediumType_Invalid,
+                   UIMediumTargetType aType = UIMediumTargetType_WithID, const QString &strData = QString())
+        : name(strName), port(iPort), device(iDevice)
+        , mediumType(aMediumType)
+        , type(aType), data(strData)
     {}
-
-    /** Unmount medium-target constructor. */
-    UIMediumTarget(const QString &strName, LONG iPort, LONG iDevice)
-        : type(UIMediumTargetType_WithID)
-        , name(strName), port(iPort), device(iDevice), mediumType(UIMediumType_Invalid)
-        , data(QString())
-    {}
-
-    /** Open medium-target constructor. */
-    UIMediumTarget(const QString &strName, LONG iPort, LONG iDevice, UIMediumType otherMediumType)
-        : type(UIMediumTargetType_WithID)
-        , name(strName), port(iPort), device(iDevice), mediumType(otherMediumType)
-        , data(QString())
-    {}
-
-    /** Predefined medium-target constructor. */
-    UIMediumTarget(const QString &strName, LONG iPort, LONG iDevice, const QString &strID)
-        : type(UIMediumTargetType_WithID)
-        , name(strName), port(iPort), device(iDevice), mediumType(UIMediumType_Invalid)
-        , data(strID)
-    {}
-
-    /** Recent medium-target constructor. */
-    UIMediumTarget(const QString &strName, LONG iPort, LONG iDevice, UIMediumType otherMediumType, const QString &strLocation)
-        : type(UIMediumTargetType_WithLocation)
-        , name(strName), port(iPort), device(iDevice), mediumType(otherMediumType)
-        , data(strLocation)
-    {}
-
-    /** Determines medium-target type. */
-    UIMediumTargetType type;
 
     /** Determines controller name. */
@@ -97 +68 @@
     UIMediumType mediumType;
 
+    /** Determines medium-target type. */
+    UIMediumTargetType type;
     /** Depending on medium-target type holds <i>ID</i> or <i>location</i>. */
     QString data;