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

Timestamp:

Jan 7, 2011 10:48:48 AM (14 years ago)

Author:

vboxsync

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

69290

Message:

FE/Qt4: fix error dialog position on storage errors

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (2 diffs)

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

@@ -2660 +2660 @@
     /* If dialog has some result: */
     if (!files.empty() && !files[0].isEmpty())
-        return openMedium(mediumType, files[0]);
+        return openMedium(mediumType, files[0], pParent);
 
     return QString();
 }
 
-QString VBoxGlobal::openMedium(VBoxDefs::MediumType mediumType, QString strMediumLocation)
+QString VBoxGlobal::openMedium(VBoxDefs::MediumType mediumType, QString strMediumLocation, QWidget *pParent /* = 0*/)
 {
     /* Convert to native separators: */
@@ -2708 +2708 @@
     }
     else
-        vboxProblem().cannotOpenMedium(0, vbox, mediumType, strMediumLocation);
+        vboxProblem().cannotOpenMedium(pParent, vbox, mediumType, strMediumLocation);
 
     return QString();

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

@@ -596 +596 @@
     QString openMediumWithFileOpenDialog(VBoxDefs::MediumType mediumType, QWidget *pParent = 0,
                                          const QString &strDefaultFolder = QString(), bool fUseLastFolder = true);
-    QString openMedium(VBoxDefs::MediumType mediumType, QString strMediumLocation);
+    QString openMedium(VBoxDefs::MediumType mediumType, QString strMediumLocation, QWidget *pParent = 0);
 
     /* Returns the number of current running Fe/Qt4 main windows. */

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

@@ -1931 +1931 @@
                                                  StorageSlot(controllerData.m_controllerBus,
                                                              attachmentData.m_iAttachmentPort,
-                                                             attachmentData.m_iAttachmentDevice));
+                                                             attachmentData.m_iAttachmentDevice), this);
             }
         }
@@ -2488 +2488 @@
         VBoxDefs::MediumType mediumType = (VBoxDefs::MediumType)mediumInfoList[0].toUInt();
         QString strMediumLocation = mediumInfoList[1];
-        QString strMediumId = vboxGlobal().openMedium(mediumType, strMediumLocation);
+        QString strMediumId = vboxGlobal().openMedium(mediumType, strMediumLocation, this);
         if (!strMediumId.isNull())
             m_pMediumIdHolder->setId(strMediumId);