Changeset 25091 in vbox

Timestamp:

Nov 30, 2009 9:19:48 AM (15 years ago)

Author:

vboxsync

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

55452

Message:

FE/Qt4: Ask for confirmation when the user try to delete the last CD/DVD device.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxProblemReporter.h (modified) (1 diff)
• include/VBoxVMSettingsHD.h (modified) (1 diff)
• src/VBoxProblemReporter.cpp (modified) (1 diff)
• src/VBoxVMSettingsHD.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h

@@ -245 +245 @@
     int confirmRunNewHDWzdOrVDM (KDeviceType aDeviceType);
 
+    int confirmRemovingOfLastDVDDevice() const;
+
     void cannotCreateHardDiskStorage (QWidget *aParent, const CVirtualBox &aVBox,
                                       const QString &aLocaiton,

trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMSettingsHD.h

@@ -582 +582 @@
     QString generateUniqueName (const QString &aTemplate) const;
 
+    uint32_t deviceCount (KDeviceType aType) const;
+
     CMachine mMachine;
     QIWidgetValidator *mValidator;

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

@@ -1144 +1144 @@
 }
 
+int VBoxProblemReporter::confirmRemovingOfLastDVDDevice() const
+{
+    return messageOkCancel (QApplication::activeWindow(), Info,
+                    tr ("<p>Are you sure you want to delete the CDROM device? "
+                        "You will not be able to mount any CDs or ISO images "
+                        "without it.</p>"),
+                    0, /* aAutoConfirmId */
+                    tr ("&Remove", "medium"));
+}
+
 void VBoxProblemReporter::cannotCreateHardDiskStorage (
     QWidget *aParent, const CVirtualBox &aVBox, const QString &aLocation,

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

@@ -1984 +1984 @@
 {
     QModelIndex index = mTwStorageTree->currentIndex();
+
+    KDeviceType device = mStorageModel->data (index, StorageModel::R_AttDevice).value <KDeviceType>();
+    /* Check if this would be the last DVD. If so let the user confirm this again. */
+    if (   device == KDeviceType_DVD
+        && deviceCount (KDeviceType_DVD) == 1)
+    {
+        if (vboxProblem().confirmRemovingOfLastDVDDevice() != QIMessageBox::Ok)
+            return;
+    }
+
     QModelIndex parent = index.parent();
     if (!index.isValid() || !parent.isValid() ||
@@ -2540 +2550 @@
 }
 
+uint32_t VBoxVMSettingsHD::deviceCount (KDeviceType aType) const
+{
+    uint32_t cDevices = 0;
+    QModelIndex rootIndex = mStorageModel->root();
+    for (int i = 0; i < mStorageModel->rowCount (rootIndex); ++ i)
+    {
+        QModelIndex ctrIndex = rootIndex.child (i, 0);
+        for (int j = 0; j < mStorageModel->rowCount (ctrIndex); ++ j)
+        {
+            QModelIndex attIndex = ctrIndex.child (j, 0);
+            KDeviceType attDevice = mStorageModel->data (attIndex, StorageModel::R_AttDevice).value <KDeviceType>();
+            if (attDevice == aType)
+                ++cDevices;
+        }
+    }
+
+    return cDevices;
+}
+