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

Timestamp:

Oct 12, 2007 8:24:28 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt: Don't disable the Release Media action only because the name of the VM the DVD/Floppy is mounted to contains parenthesis; also lots of optimizations and small fixes.

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxDiskImageManagerDlg.ui (modified) (2 diffs)
• VBoxDiskImageManagerDlg.ui.h (modified) (28 diffs)

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxDiskImageManagerDlg.ui

@@ -597 +597 @@
     <function access="private" returnType="DiskImageItem*">searchItem( QListView*, const QUuid &amp; )</function>
     <function access="private" returnType="DiskImageItem*">searchItem( QListView*, VBoxMedia::Status )</function>
-    <function specifier="static" access="private" returnType="QString">getDVDImageUsage( const QUuid &amp; id )</function>
-    <function specifier="static" access="private" returnType="QString">getFloppyImageUsage( const QUuid &amp; id )</function>
-    <function specifier="static" access="private">sourceSnapshotsCD( const QUuid &amp; aImageId, const CSnapshot &amp; aSnapshot, QString &amp; aUsage )</function>
-    <function specifier="static" access="private">sourceSnapshotsFD( const QUuid &amp; aImageId, const CSnapshot &amp; aSnapshot, QString &amp; aUsage )</function>
+    <function specifier="static" access="private" returnType="QString">getDVDImageUsage( const QUuid &amp; aId, QString &amp; aSnapshotUsage )</function>
+    <function specifier="static" access="private" returnType="QString">getFloppyImageUsage( const QUuid &amp; aId, QString &amp; aSnapshotUsage )</function>
+    <function specifier="static" access="private">getDVDImageSnapshotUsage( const QUuid &amp; aImageId, const CSnapshot &amp; aSnapshot, QString &amp; aUsage )</function>
+    <function specifier="static" access="private">getFloppyImageSnapshotUsage( const QUuid &amp; aImageId, const CSnapshot &amp; aSnapshot, QString &amp; aUsage )</function>
     <function access="private" returnType="bool">checkImage( DiskImageItem* item )</function>
     <function access="private">releaseDisk( QUuid machineId, QUuid itemId, VBoxDefs::DiskType diskType )</function>
@@ -627 +627 @@
     <function access="protected">setCurrentItem( QListView*, QListViewItem* )</function>
     <function specifier="static"> showModeless( bool aRefresh = true )</function>
-    <function specifier="static" returnType="QString">composeHdToolTip( CHardDisk &amp;, VBoxMedia::Status = VBoxMedia::Ok )</function>
-    <function specifier="static" returnType="QString">composeCdToolTip( CDVDImage &amp;, VBoxMedia::Status = VBoxMedia::Ok )</function>
-    <function specifier="static" returnType="QString">composeFdToolTip( CFloppyImage &amp;, VBoxMedia::Status = VBoxMedia::Ok )</function>
+    <function specifier="static" returnType="QString">composeHdToolTip( CHardDisk &amp;, VBoxMedia::Status = VBoxMedia::Ok, DiskImageItem *aItem = NULL )</function>
+    <function specifier="static" returnType="QString">composeCdToolTip( CDVDImage &amp;, VBoxMedia::Status = VBoxMedia::Ok, DiskImageItem *aItem = NULL )</function>
+    <function specifier="static" returnType="QString">composeFdToolTip( CFloppyImage &amp;, VBoxMedia::Status = VBoxMedia::Ok, DiskImageItem *aItem = NULL )</function>
     <function access="protected">clearInfoPanes()</function>
     <function access="protected">prepareToRefresh( int aTotal = 0 )</function>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxDiskImageManagerDlg.ui.h

@@ -40 +40 @@
 
     void setMedia (const VBoxMedia &aMedia) { mMedia = aMedia; }
-    VBoxMedia &getMedia() { return mMedia; }
-
-    QString getName() { return mName; }
+    const VBoxMedia &getMedia() const { return mMedia; }
 
     void setPath (QString aPath) { mPath = aPath; }
-    const QString &getPath() { return mPath; }
+    const QString &getPath() const { return mPath; }
 
     void setUsage (QString aUsage) { mUsage = aUsage; }
-    const QString &getUsage() { return mUsage; }
+    const QString &getUsage() const { return mUsage; }
+
+    void setSnapshotUsage (QString aSnapshotUsage) { mSnapshotUsage = aSnapshotUsage; }
+    const QString &getSnapshotUsage() const { return mSnapshotUsage; }
+
+    QString getTotalUsage() const
+    {
+        /* should correlate with VBoxDiskImageManagerDlg::compose[Cd/Fd]Tooltip */
+        return mSnapshotUsage.isNull() ? mUsage :
+            QString ("%1 (%2)").arg (mUsage, mSnapshotUsage); 
+    }
 
     void setSnapshotName (QString aSnapshotName) { mSnapshotName = aSnapshotName; }
-    const QString &getSnapshotName() { return mSnapshotName; }
+    const QString &getSnapshotName() const { return mSnapshotName; }
 
     void setDiskType (QString aDiskType) { mDiskType = aDiskType; }
-    const QString &getDiskType() { return mDiskType; }
+    const QString &getDiskType() const { return mDiskType; }
 
     void setStorageType (QString aStorageType) { mStorageType = aStorageType; }
-    const QString &getStorageType() { return mStorageType; }
+    const QString &getStorageType() const { return mStorageType; }
 
     void setVirtualSize (QString aVirtualSize) { mVirtualSize = aVirtualSize; }
-    const QString &getVirtualSize() { return mVirtualSize; }
+    const QString &getVirtualSize() const { return mVirtualSize; }
 
     void setActualSize (QString aActualSize) { mActualSize = aActualSize; }
-    const QString &getActualSize() { return mActualSize; }
-
+    const QString &getActualSize() const { return mActualSize; }
 
     void setUuid (QUuid aUuid) { mUuid = aUuid; }
-    const QString &getUuid() { return mUuid; }
+    const QString &getUuid() const { return mUuid; }
 
     void setMachineId (QString aMachineId) { mMachineId = aMachineId; }
-    const QString &getMachineId() { return mMachineId; }
-
+    const QString &getMachineId() const { return mMachineId; }
 
     void setStatus (VBoxMedia::Status aStatus) { mStatus = aStatus; }
-    VBoxMedia::Status getStatus() { return mStatus; }
-
+    VBoxMedia::Status getStatus() const { return mStatus; }
 
     void setToolTip (QString aToolTip) { mToolTip = aToolTip; }
-    const QString &getToolTip() { return mToolTip; }
+    const QString &getToolTip() const { return mToolTip; }
 
     QString getInformation (const QString &aInfo, bool aCompact = true,
@@ -133 +138 @@
     QString mPath;
     QString mUsage;
+    QString mSnapshotUsage;
     QString mSnapshotName;
     QString mDiskType;
@@ -857 +863 @@
 
 
-QString VBoxDiskImageManagerDlg::getDVDImageUsage (const QUuid &aId)
+QString VBoxDiskImageManagerDlg::getDVDImageUsage (const QUuid &aId,
+                                                   QString &aSnapshotUsage)
 {
     CVirtualBox vbox = vboxGlobal().virtualBox();
@@ -877 +884 @@
         usage += machine.GetName();
 
-        QString snapshots;
-        sourceSnapshotsCD (aId, machine.GetSnapshot (QUuid()), snapshots);
-        if (!snapshots.isEmpty())
-            usage += QString (" (%1)").arg (snapshots);
+        getDVDImageSnapshotUsage (aId, machine.GetSnapshot (QUuid()),
+                                  aSnapshotUsage);
     }
 
@@ -897 +902 @@
             usage += machine.GetName() + "]";
 
-            QString snapshots;
-            sourceSnapshotsCD (aId, machine.GetSnapshot (QUuid()), snapshots);
-            if (!snapshots.isEmpty())
-                usage += QString (" (%1)").arg (snapshots);
+            getDVDImageSnapshotUsage (aId, machine.GetSnapshot (QUuid()),
+                                      aSnapshotUsage);
         }
     }
@@ -907 +910 @@
 }
 
-QString VBoxDiskImageManagerDlg::getFloppyImageUsage (const QUuid &aId)
+QString VBoxDiskImageManagerDlg::getFloppyImageUsage (const QUuid &aId,
+                                                      QString &aSnapshotUsage)
 {
     CVirtualBox vbox = vboxGlobal().virtualBox();
@@ -927 +931 @@
         usage += machine.GetName();
 
-        QString snapshots;
-        sourceSnapshotsFD (aId, machine.GetSnapshot (QUuid()), snapshots);
-        if (!snapshots.isEmpty())
-            usage += QString (" (%1)").arg (snapshots);
+        getFloppyImageSnapshotUsage (aId, machine.GetSnapshot (QUuid()),
+                                     aSnapshotUsage);
     }
 
@@ -947 +949 @@
             usage += machine.GetName() + "]";
 
-            QString snapshots;
-            sourceSnapshotsFD (aId, machine.GetSnapshot (QUuid()), snapshots);
-            if (!snapshots.isEmpty())
-                usage += QString (" (%1)").arg (snapshots);
+            getFloppyImageSnapshotUsage (aId, machine.GetSnapshot (QUuid()),
+                                         aSnapshotUsage);
         }
     }
@@ -958 +958 @@
 
 
-void VBoxDiskImageManagerDlg::sourceSnapshotsCD (const QUuid &aImageId,
-                                                 const CSnapshot &aSnapshot,
-                                                 QString &aUsage)
+void VBoxDiskImageManagerDlg::getDVDImageSnapshotUsage (const QUuid &aImageId,
+                                                        const CSnapshot &aSnapshot,
+                                                        QString &aUsage)
 {
     if (aSnapshot.isNull())
@@ -975 +975 @@
     CSnapshotEnumerator en = aSnapshot.GetChildren().Enumerate();
     while (en.HasMore())
-        sourceSnapshotsCD (aImageId, en.GetNext(), aUsage);
-}
-
-void VBoxDiskImageManagerDlg::sourceSnapshotsFD (const QUuid &aImageId,
-                                                 const CSnapshot &aSnapshot,
-                                                 QString &aUsage)
+        getDVDImageSnapshotUsage (aImageId, en.GetNext(), aUsage);
+}
+
+void VBoxDiskImageManagerDlg::getFloppyImageSnapshotUsage (const QUuid &aImageId,
+                                                           const CSnapshot &aSnapshot,
+                                                           QString &aUsage)
 {
     if (aSnapshot.isNull())
@@ -995 +995 @@
     CSnapshotEnumerator en = aSnapshot.GetChildren().Enumerate();
     while (en.HasMore())
-        sourceSnapshotsFD (aImageId, en.GetNext(), aUsage);
+        getFloppyImageSnapshotUsage (aImageId, en.GetNext(), aUsage);
 }
 
 
 QString VBoxDiskImageManagerDlg::composeHdToolTip (CHardDisk &aHd,
-                                                   VBoxMedia::Status aStatus)
+                                                   VBoxMedia::Status aStatus,
+                                                   DiskImageItem *aItem)
 {
     CVirtualBox vbox = vboxGlobal().virtualBox();
-    QUuid machineId = aHd.GetMachineId();
-
-    QString src = aHd.GetLocation();
-    QFileInfo fi (src);
-    QString location = aHd.GetStorageType() == CEnums::ISCSIHardDisk ? src :
-                       QDir::convertSeparators (fi.absFilePath());
-
-    QString storageType = vboxGlobal().toString (aHd.GetStorageType());
-    QString hardDiskType = vboxGlobal().hardDiskTypeString (aHd);
+    QUuid machineId = aItem ? aItem->getMachineId() : aHd.GetMachineId();
+
+    QString src = aItem ? aItem->getPath() : aHd.GetLocation();
+    QString location = aItem || aHd.GetStorageType() == CEnums::ISCSIHardDisk ? src :
+        QDir::convertSeparators (QFileInfo (src).absFilePath());
+
+    QString storageType = aItem ? aItem->getStorageType() :
+        vboxGlobal().toString (aHd.GetStorageType());
+    QString hardDiskType = aItem ? aItem->getDiskType() :
+        vboxGlobal().hardDiskTypeString (aHd);
 
     QString usage;
-    if (!machineId.isNull())
+    if (aItem)
+        usage = aItem->getUsage();
+    else if (!machineId.isNull())
         usage = vbox.GetMachine (machineId).GetName();
 
+    QUuid snapshotId = aItem ? aItem->getUuid() : aHd.GetSnapshotId();
     QString snapshotName;
-    if (!machineId.isNull() && !aHd.GetSnapshotId().isNull())
+    if (aItem)
+        snapshotName = aItem->getSnapshotName();
+    else if (!machineId.isNull() && !snapshotId.isNull())
     {
         CSnapshot snapshot = vbox.GetMachine (machineId).
@@ -1078 +1085 @@
 
 QString VBoxDiskImageManagerDlg::composeCdToolTip (CDVDImage &aCd,
-                                                   VBoxMedia::Status aStatus)
-{
-    QString src = aCd.GetFilePath();
-    QFileInfo fi (src);
-    QString location = QDir::convertSeparators (fi.absFilePath ());
-    QUuid uuid = aCd.GetId();
-    QString usage = getDVDImageUsage (uuid);
+                                                   VBoxMedia::Status aStatus,
+                                                   DiskImageItem *aItem)
+{
+    QString location = aItem ? aItem->getPath() :
+        QDir::convertSeparators (QFileInfo (aCd.GetFilePath()).absFilePath());
+    QUuid uuid = aItem ? aItem->getUuid() : aCd.GetId();
+    QString usage;
+    if (aItem)
+        usage = aItem->getTotalUsage();
+    else
+    {
+        QString snapshotUsage;
+        usage = getDVDImageUsage (uuid, snapshotUsage);
+        /* should correlate with DiskImageItem::getTotalUsage() */
+        if (!snapshotUsage.isNull())
+            usage = QString ("%1 (%2)").arg (usage, snapshotUsage);
+    }
 
     /* compose tool-tip information */
@@ -1134 +1151 @@
 
 QString VBoxDiskImageManagerDlg::composeFdToolTip (CFloppyImage &aFd,
-                                                   VBoxMedia::Status aStatus)
-{
-    QString src = aFd.GetFilePath();
-    QFileInfo fi (src);
-    QString location = QDir::convertSeparators (fi.absFilePath ());
-    QUuid uuid = aFd.GetId();
-    QString usage = getFloppyImageUsage (uuid);
-
-    /* compose tool-tip information */
+                                                   VBoxMedia::Status aStatus,
+                                                   DiskImageItem *aItem)
+{
+    QString location = aItem ? aItem->getPath() :
+        QDir::convertSeparators (QFileInfo (aFd.GetFilePath()).absFilePath());
+    QUuid uuid = aItem ? aItem->getUuid() : aFd.GetId();
+    QString usage;
+    if (aItem)
+        usage = aItem->getTotalUsage();
+    else
+    {
+        QString snapshotUsage;
+        usage = getFloppyImageUsage (uuid, snapshotUsage);
+        /* should correlate with DiskImageItem::getTotalUsage() */
+        if (!snapshotUsage.isNull())
+            usage = QString ("%1 (%2)").arg (usage, snapshotUsage);
+    }
+
     /* compose tool-tip information */
     QString tip;
@@ -1194 +1220 @@
                                             const VBoxMedia &aMedia)
 {
-    if (!aItem) return;
+    if (!aItem)
+        return;
+
     CHardDisk hd = aMedia.disk;
     VBoxMedia::Status status = aMedia.status;
@@ -1224 +1252 @@
     aItem->setText (2, actualSize);
     aItem->setPath (hd.GetStorageType() == CEnums::ISCSIHardDisk ? src :
-                   QDir::convertSeparators (fi.absFilePath()));
+                    QDir::convertSeparators (fi.absFilePath()));
     aItem->setUsage (usage);
     aItem->setSnapshotName (snapshotName);
@@ -1233 +1261 @@
     aItem->setUuid (uuid);
     aItem->setMachineId (machineId);
-    aItem->setToolTip (composeHdToolTip (hd, status));
+    aItem->setToolTip (composeHdToolTip (hd, status, aItem));
     aItem->setStatus (status);
 
@@ -1242 +1270 @@
                                             const VBoxMedia &aMedia)
 {
-    if (!aItem) return;
+    if (!aItem)
+        return;
+
     CDVDImage cd = aMedia.disk;
     VBoxMedia::Status status = aMedia.status;
@@ -1248 +1278 @@
     QUuid uuid = cd.GetId();
     QString src = cd.GetFilePath();
-    QString usage = getDVDImageUsage (uuid);
+    QString snapshotUsage;
+    QString usage = getDVDImageUsage (uuid, snapshotUsage);
     QString size = status == VBoxMedia::Ok ?
         vboxGlobal().formatSize (cd.GetSize()) : QString ("--");
@@ -1257 +1288 @@
     aItem->setPath (QDir::convertSeparators (fi.absFilePath ()));
     aItem->setUsage (usage);
+    aItem->setSnapshotUsage (snapshotUsage);
     aItem->setActualSize (size);
     aItem->setUuid (uuid);
-    aItem->setToolTip (composeCdToolTip (cd, status));
+    aItem->setToolTip (composeCdToolTip (cd, status, aItem));
     aItem->setStatus (status);
 
@@ -1268 +1300 @@
                                             const VBoxMedia &aMedia)
 {
-    if (!aItem) return;
+    if (!aItem)
+        return;
+
     CFloppyImage fd = aMedia.disk;
     VBoxMedia::Status status = aMedia.status;
@@ -1274 +1308 @@
     QUuid uuid = fd.GetId();
     QString src = fd.GetFilePath();
-    QString usage = getFloppyImageUsage (uuid);
+    QString snapshotUsage;
+    QString usage = getFloppyImageUsage (uuid, snapshotUsage);
     QString size = status == VBoxMedia::Ok ?
         vboxGlobal().formatSize (fd.GetSize()) : QString ("--");
@@ -1283 +1318 @@
     aItem->setPath (QDir::convertSeparators (fi.absFilePath ()));
     aItem->setUsage (usage);
+    aItem->setSnapshotUsage (snapshotUsage);
     aItem->setActualSize (size);
     aItem->setUuid (uuid);
-    aItem->setToolTip (composeFdToolTip (fd, status));
+    aItem->setToolTip (composeFdToolTip (fd, status, aItem));
     aItem->setStatus (status);
 
@@ -1718 +1754 @@
     else if (parentList == cdsView)
     {
-        QString usage = getDVDImageUsage (itemId);
         /* check if there is temporary usage: */
         QStringList tempMachines =
@@ -1737 +1772 @@
     else if (parentList == fdsView)
     {
-        QString usage = getFloppyImageUsage(itemId);
         /* check if there is temporary usage: */
         QStringList tempMachines =
@@ -1810 +1844 @@
                           !item->firstChild() && !item->getPath().isNull();
     bool releaseEnabled = item && !item->getUsage().isNull() &&
-        item->getUsage().find (QRegExp ("\\([\\s\\S]+\\)")) == -1 &&
-        checkImage (item) &&
-        !item->parent() && !item->firstChild() &&
-        item->getSnapshotName().isNull();
+                          item->getSnapshotUsage().isNull() &&
+                          checkImage (item) &&
+                          !item->parent() && !item->firstChild() &&
+                          item->getSnapshotName().isNull();
     bool newEnabled     = notInEnum &&
                           getCurrentListView() == hdsView ? true : false;
@@ -1851 +1885 @@
         {
             cdsPane1->setText (item->getInformation (item->getPath(), true, "end"));
-            cdsPane2->setText (item->getInformation (item->getUsage()));
+            cdsPane2->setText (item->getInformation (item->getTotalUsage()));
         }
         else if (item->listView() == fdsView)
         {
             fdsPane1->setText (item->getInformation (item->getPath(), true, "end"));
-            fdsPane2->setText (item->getInformation (item->getUsage()));
+            fdsPane2->setText (item->getInformation (item->getTotalUsage()));
         }
     }
@@ -2041 +2075 @@
     else if (currentList == cdsView)
     {
-        QString usage = getDVDImageUsage (itemId);
-        /* only permamently mounted .iso could be released */
+        QString usage = item->getTotalUsage();
         if (vboxProblem().confirmReleaseImage (this, usage))
         {
@@ -2059 +2092 @@
     else if (currentList == fdsView)
     {
-        QString usage = getFloppyImageUsage (itemId);
-        /* only permamently mounted .img could be released */
+        QString usage = item->getTotalUsage();
         if (vboxProblem().confirmReleaseImage (this, usage))
         {