Changeset 9612 in vbox for trunk/src

Timestamp:

Jun 11, 2008 1:40:32 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: An instance of CVirtualBox have to be there all the time. This fixed
the no message box display after an error bug. Fixed some D&D misbehavior.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxDiskImageManagerDlg.h (modified) (1 diff)
• src/VBoxDiskImageManagerDlg.cpp (modified) (29 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxDiskImageManagerDlg.h

@@ -141 +141 @@
     VBoxProgressBar  *mProgressBar;
 
+    /* The global VirtualBox instance */
+    CVirtualBox mVBox;
+
     /* Type if we are in the select modus */
     int mType;

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxDiskImageManagerDlg.cpp

@@ -251 +251 @@
     Ui::VBoxDiskImageManagerDlg::setupUi (this);
 
-//    defaultButton = searchDefaultButton();
+    mVBox = vboxGlobal().virtualBox();
+    Assert (!mVBox.isNull());
 
     mType = VBoxDefs::InvalidType;
@@ -585 +586 @@
 {
     CVirtualBox vbox = vboxGlobal().virtualBox();
+
     QUuid machineId = aItem ? aItem->machineId() : aHd.GetMachineId();
 
@@ -871 +873 @@
                 if (deEvent->mimeData()->hasUrls())
                 {
-                    if (checkDndUrls (deEvent->mimeData()->urls()))
+                    QList<QUrl> urls = deEvent->mimeData()->urls();
+                    /* Sometimes urls has an empty Url entry. Filter them out. */
+                    urls.removeAll (QUrl());
+                    if (checkDndUrls (urls))
                     {
                         deEvent->setDropAction (Qt::LinkAction);
@@ -885 +890 @@
                 if (dEvent->mimeData()->hasUrls())
                 {
-                    AddVDMUrlsEvent *event = new AddVDMUrlsEvent (dEvent->mimeData()->urls());
+                    QList<QUrl> urls = dEvent->mimeData()->urls();
+                    /* Sometimes urls has an empty Url entry. Filter them out. */
+                    urls.removeAll (QUrl());
+                    AddVDMUrlsEvent *event = new AddVDMUrlsEvent (urls);
                     QApplication::postEvent (currentTreeWidget(), event);
                     dEvent->acceptProposedAction();
@@ -1116 +1124 @@
     DiskImageItem *item = toDiskImageItem (tree->currentItem());
 
-    CVirtualBox vbox = vboxGlobal().virtualBox();
+    mVBox = vboxGlobal().virtualBox();
 
     QString title;
@@ -1128 +1136 @@
     if (dir.isEmpty())
         if (type == VBoxDefs::HD)
-            dir = vbox.GetSystemProperties().GetDefaultVDIFolder();
+            dir = mVBox.GetSystemProperties().GetDefaultVDIFolder();
 
     if (dir.isEmpty() || !QFileInfo (dir).exists())
-        dir = vbox.GetHomeFolder();
+        dir = mVBox.GetHomeFolder();
 
     switch (type)
@@ -1167 +1175 @@
 
     addImageToList (src, type);
-    if (!vbox.isOk())
-        vboxProblem().cannotRegisterMedia (this, vbox, type, src);
+    if (!mVBox.isOk())
+        vboxProblem().cannotRegisterMedia (this, mVBox, type, src);
 }
 
@@ -1176 +1184 @@
     DiskImageItem *item = toDiskImageItem (tree->currentItem());
     AssertMsg (item, ("Current item must not be null\n"));
-
-    CVirtualBox vbox = vboxGlobal().virtualBox();
 
     QUuid uuid = item->uuid();
@@ -1215 +1221 @@
                 }
 
-                CHardDisk hd = vbox.UnregisterHardDisk (uuid);
-                if (!vbox.isOk())
-                    vboxProblem().cannotUnregisterMedia (this, vbox, type, src);
+                CHardDisk hd = mVBox.UnregisterHardDisk (uuid);
+                if (!mVBox.isOk())
+                    vboxProblem().cannotUnregisterMedia (this, mVBox, type, src);
                 else if (deleteImage)
                 {
@@ -1232 +1238 @@
             }
         case VBoxDefs::CD:
-            vbox.UnregisterDVDImage (uuid);
+            mVBox.UnregisterDVDImage (uuid);
             break;
         case VBoxDefs::FD:
-            vbox.UnregisterFloppyImage (uuid);
+            mVBox.UnregisterFloppyImage (uuid);
             break;
         default:
@@ -1242 +1248 @@
     }
 
-    if (vbox.isOk())
+    if (mVBox.isOk())
         vboxGlobal().removeMedia (type, uuid);
     else
-        vboxProblem().cannotUnregisterMedia (this, vbox, type, src);
+        vboxProblem().cannotUnregisterMedia (this, mVBox, type, src);
 }
 
@@ -1253 +1259 @@
     DiskImageItem *item = toDiskImageItem (tree->currentItem());
     AssertMsg (item, ("Current item must not be null\n"));
-
-    CVirtualBox vbox = vboxGlobal().virtualBox();
 
     QUuid itemId = item->uuid();
@@ -1267 +1271 @@
                 QUuid machineId = hd.GetMachineId();
                 if (vboxProblem().confirmReleaseImage (this,
-                                                       vbox.GetMachine (machineId).GetName()))
+                                                       mVBox.GetMachine (machineId).GetName()))
                 {
                     releaseDisk (machineId, itemId, VBoxDefs::HD);
@@ -1285 +1289 @@
                 {
                     QStringList permMachines =
-                        vbox.GetDVDImageUsage (itemId,
+                        mVBox.GetDVDImageUsage (itemId,
                                                KResourceUsage_Permanent).split (' ', QString::SkipEmptyParts);
                     for (QStringList::Iterator it = permMachines.begin();
@@ -1291 +1295 @@
                         releaseDisk (QUuid (*it), itemId, VBoxDefs::CD);
 
-                    CDVDImage cd = vbox.GetDVDImage (itemId);
+                    CDVDImage cd = mVBox.GetDVDImage (itemId);
                     VBoxMedia media (item->media());
                     media.status = cd.GetAccessible() ? VBoxMedia::Ok :
@@ -1306 +1310 @@
                 {
                     QStringList permMachines =
-                        vbox.GetFloppyImageUsage (itemId,
+                        mVBox.GetFloppyImageUsage (itemId,
                                                   KResourceUsage_Permanent).split (' ', QString::SkipEmptyParts);
                     for (QStringList::Iterator it = permMachines.begin();
@@ -1312 +1316 @@
                         releaseDisk (QUuid (*it), itemId, VBoxDefs::FD);
 
-                    CFloppyImage fd = vbox.GetFloppyImage (itemId);
+                    CFloppyImage fd = mVBox.GetFloppyImage (itemId);
                     VBoxMedia media (item->media());
                     media.status = fd.GetAccessible() ? VBoxMedia::Ok :
@@ -1590 +1594 @@
         return;
 
-    CVirtualBox vbox = vboxGlobal().virtualBox();
-
     QUuid uuid;
     VBoxMedia media;
@@ -1598 +1600 @@
         case VBoxDefs::HD:
         {
-            CHardDisk hd = vbox.OpenHardDisk (aSource);
-            if (vbox.isOk())
+            CHardDisk hd = mVBox.OpenHardDisk (aSource);
+            if (mVBox.isOk())
             {
-                vbox.RegisterHardDisk (hd);
-                if (vbox.isOk())
+                mVBox.RegisterHardDisk (hd);
+                if (mVBox.isOk())
                 {
                     VBoxMedia::Status status =
@@ -1615 +1617 @@
         case VBoxDefs::CD:
         {
-            CDVDImage cd = vbox.OpenDVDImage (aSource, uuid);
-            if (vbox.isOk())
+            CDVDImage cd = mVBox.OpenDVDImage (aSource, uuid);
+            if (mVBox.isOk())
             {
-                vbox.RegisterDVDImage (cd);
-                if (vbox.isOk())
+                mVBox.RegisterDVDImage (cd);
+                if (mVBox.isOk())
                 {
                     VBoxMedia::Status status =
@@ -1632 +1634 @@
         case VBoxDefs::FD:
         {
-            CFloppyImage fd = vbox.OpenFloppyImage (aSource, uuid);
-            if (vbox.isOk())
+            CFloppyImage fd = mVBox.OpenFloppyImage (aSource, uuid);
+            if (mVBox.isOk())
             {
-                vbox.RegisterFloppyImage (fd);
-                if (vbox.isOk())
+                mVBox.RegisterFloppyImage (fd);
+                if (mVBox.isOk())
                 {
                     VBoxMedia::Status status =
@@ -1848 +1850 @@
         return false;
 
-    CVirtualBox vbox = vboxGlobal().virtualBox();
-
     switch (currentTreeWidgetType())
     {
@@ -1857 +1857 @@
                 QUuid machineId = hd.GetMachineId();
                 if (machineId.isNull() ||
-                    (vbox.GetMachine (machineId).GetState() != KMachineState_PoweredOff &&
-                     vbox.GetMachine (machineId).GetState() != KMachineState_Aborted))
+                    (mVBox.GetMachine (machineId).GetState() != KMachineState_PoweredOff &&
+                     mVBox.GetMachine (machineId).GetState() != KMachineState_Aborted))
                     return false;
                 break;
@@ -1866 +1866 @@
                 /* Check if there is temporary usage: */
                 QStringList tempMachines =
-                    vbox.GetDVDImageUsage (itemId,
+                    mVBox.GetDVDImageUsage (itemId,
                                            KResourceUsage_Temporary).split (' ', QString::SkipEmptyParts);
                 if (!tempMachines.isEmpty())
@@ -1872 +1872 @@
                 /* Only permanently mounted .iso could be released */
                 QStringList permMachines =
-                    vbox.GetDVDImageUsage (itemId,
+                    mVBox.GetDVDImageUsage (itemId,
                                            KResourceUsage_Permanent).split (' ', QString::SkipEmptyParts);
                 for (QStringList::Iterator it = permMachines.begin();
                      it != permMachines.end(); ++it)
-                    if (vbox.GetMachine(QUuid (*it)).GetState() != KMachineState_PoweredOff &&
-                        vbox.GetMachine(QUuid (*it)).GetState() != KMachineState_Aborted)
+                    if (mVBox.GetMachine(QUuid (*it)).GetState() != KMachineState_PoweredOff &&
+                        mVBox.GetMachine(QUuid (*it)).GetState() != KMachineState_Aborted)
                         return false;
                 break;
@@ -1885 +1885 @@
                 /* Check if there is temporary usage: */
                 QStringList tempMachines =
-                    vbox.GetFloppyImageUsage (itemId,
+                    mVBox.GetFloppyImageUsage (itemId,
                                               KResourceUsage_Temporary).split (' ', QString::SkipEmptyParts);
                 if (!tempMachines.isEmpty())
@@ -1891 +1891 @@
                 /* Only permanently mounted floppies could be released */
                 QStringList permMachines =
-                    vbox.GetFloppyImageUsage (itemId,
+                    mVBox.GetFloppyImageUsage (itemId,
                                               KResourceUsage_Permanent).split (' ', QString::SkipEmptyParts);
                 for (QStringList::Iterator it = permMachines.begin();
                      it != permMachines.end(); ++it)
-                    if (vbox.GetMachine(QUuid (*it)).GetState() != KMachineState_PoweredOff &&
-                        vbox.GetMachine(QUuid (*it)).GetState() != KMachineState_Aborted)
+                    if (mVBox.GetMachine(QUuid (*it)).GetState() != KMachineState_PoweredOff &&
+                        mVBox.GetMachine(QUuid (*it)).GetState() != KMachineState_Aborted)
                         return false;
                 break;
@@ -1942 +1942 @@
 void VBoxDiskImageManagerDlg::addDndUrls (const QList<QUrl> &aUrls)
 {
-    CVirtualBox vbox = vboxGlobal().virtualBox();
     foreach (QUrl u, aUrls)
     {
@@ -1948 +1947 @@
         VBoxDefs::DiskType type = currentTreeWidgetType();
         addImageToList (file, type);
-        if (!vbox.isOk())
-            vboxProblem().cannotRegisterMedia (this, vbox, type, file);
+        if (!mVBox.isOk())
+            vboxProblem().cannotRegisterMedia (this, mVBox, type, file);
     }
 }