Changeset 43424 in vbox

Timestamp:

Sep 25, 2012 9:01:47 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: 6380: Double-clicking .ova/.ovf file should propose to import the
appliance.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• medium/UIMediumManager.cpp (modified) (1 diff)
• runtime/UISession.cpp (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (3 diffs)
• selector/VBoxSnapshotsWgt.cpp (modified) (1 diff)
• selector/graphics/chooser/UIGChooserModel.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (1 diff)
• wizards/UIWizard.cpp (modified) (2 diffs)
• wizards/UIWizard.h (modified) (4 diffs)
• wizards/importappliance/UIWizardImportApp.h (modified) (2 diffs)
• wizards/newvd/UIWizardNewVD.h (modified) (3 diffs)
• wizards/newvm/UIWizardNewVMPageBasic3.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -1097 +1097 @@
 
     /* Show Clone VD wizard: */
-    UIWizardCloneVD wizard(this, pItem->medium().medium());
-    wizard.exec();
+    UISafePointerWizard pWizard = new UIWizardCloneVD(this, pItem->medium().medium());
+    pWizard->prepare();
+    pWizard->exec();
+    if (pWizard)
+        delete pWizard;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -1136 +1136 @@
              && machine.GetTeleporterEnabled()))
     {
-        UIWizardFirstRun wzd(mainMachineWindow(), session().GetMachine());
-        wzd.exec();
+        UISafePointerWizard pWizard = new UIWizardFirstRun(mainMachineWindow(), session().GetMachine());
+        pWizard->prepare();
+        pWizard->exec();
+        if (pWizard)
+            delete pWizard;
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -278 +278 @@
     QString strTmpFile = strFileName;
 #endif /* !Q_WS_MAC */
-    UIWizardImportApp wizard(this, strTmpFile);
-    if (strFileName.isEmpty() || wizard.isValid())
-        wizard.exec();
+    UISafePointerWizardImportApp pWizard = new UIWizardImportApp(this, strTmpFile);
+    pWizard->prepare();
+    if (strFileName.isEmpty() || pWizard->isValid())
+        pWizard->exec();
+    if (pWizard)
+        delete pWizard;
 }
 
@@ -294 +297 @@
         names << items[i]->name();
     /* Show Export Appliance wizard: */
-    UIWizardExportApp wizard(this, names);
-    wizard.exec();
+    UISafePointerWizard pWizard = new UIWizardExportApp(this, names);
+    pWizard->prepare();
+    pWizard->exec();
+    if (pWizard)
+        delete pWizard;
 }
 
@@ -416 +422 @@
 
     /* Show Clone VM wizard: */
-    UIWizardCloneVM wizard(this, pItem->machine());
-    wizard.exec();
+    UISafePointerWizard pWizard = new UIWizardCloneVM(this, pItem->machine());
+    pWizard->prepare();
+    pWizard->exec();
+    if (pWizard)
+        delete pWizard;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp

@@ -705 +705 @@
 
     /* Show Clone VM wizard: */
-    UIWizardCloneVM wzd(this, machine, snapshot);
-    wzd.exec();
+    UISafePointerWizard pWizard = new UIWizardCloneVM(this, machine, snapshot);
+    pWizard->prepare();
+    pWizard->exec();
+    if (pWizard)
+        delete pWizard;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -899 +899 @@
     else if (!selectionList().isEmpty())
         pGroup = selectionList().first()->parentItem();
+    QString strGroupName;
     if (pGroup)
-    {
-        UIWizardNewVM wizard(&vboxGlobal().selectorWnd(), fullName(pGroup));
-        wizard.exec();
-    }
-    else
-    {
-        UIWizardNewVM wizard(&vboxGlobal().selectorWnd());
-        wizard.exec();
-    }
+        strGroupName = fullName(pGroup);
+    UISafePointerWizard pWizard = new UIWizardNewVM(&vboxGlobal().selectorWnd(), strGroupName);
+    pWizard->prepare();
+    pWizard->exec();
+    if (pWizard)
+        delete pWizard;
 }
 

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

@@ -3088 +3088 @@
     QFileInfo fileInfo(m_strMachineSettingsFilePath);
     /* Show New VD wizard: */
-    UIWizardNewVD dlg(this, QString(), fileInfo.absolutePath(), guestOSType.GetRecommendedHDD());
-    return dlg.exec() == QDialog::Accepted ? dlg.virtualDisk().GetId() : QString();
+    UISafePointerWizardNewVD pWizard = new UIWizardNewVD(this, QString(), fileInfo.absolutePath(), guestOSType.GetRecommendedHDD());
+    pWizard->prepare();
+    QString strResult = pWizard->exec() == QDialog::Accepted ? pWizard->virtualDisk().GetId() : QString();
+    if (pWizard)
+        delete pWizard;
+    return strResult;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp

@@ -28 +28 @@
 #include "VBoxGlobal.h"
 #include "QIRichTextLabel.h"
-
-int     UIWizard::exec()
-{
-    /* Prepare wizard: */
-    prepare();
-    /* Call to base-class: */
-    return QWizard::exec();
-}
 
 void UIWizard::sltCurrentIdChanged(int iId)
@@ -243 +235 @@
 
         /* Get some (first) of those pages: */
-        UIWizardPage *pPage = qobject_cast<UIWizardPage*>(page(0));
+        QList<int> pids = pageIds();
+        UIWizardPage *pPage = qobject_cast<UIWizardPage*>(page(pids.first()));
         /* Calculate actual label width: */
         int iPageWidth = pPage->minimumWidth();

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.h

@@ -20 +20 @@
 #define __UIWizard_h__
 
-/* Global includes: */
+/* Qt includes: */
 #include <QWizard>
+#include <QPointer>
 
 /* Local includes: */
@@ -54 +55 @@
     Q_OBJECT;
 
-public slots:
-
-    /* Exec slot: */
-    int exec();
-
 public:
 
     /* Mode related stuff: */
     UIWizardMode mode() { return m_mode; }
+
+    /* Page related methods: */
+    virtual void prepare();
 
 protected slots:
@@ -82 +81 @@
     /* Page related methods: */
     void setPage(int iId, UIWizardPage *pPage);
-    virtual void prepare();
     void cleanup();
 
@@ -119 +117 @@
 };
 
+typedef QPointer<UIWizard> UISafePointerWizard;
+
 #endif // __UIWizard_h__
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportApp.h

@@ -46 +46 @@
     UIWizardImportApp(QWidget *pParent, const QString &strFileName);
 
+    /* Pages related stuff: */
+    void prepare();
+
     /* Is appliance valid? */
     bool isValid() const;
@@ -70 +73 @@
     void retranslateUi();
 
-    /* Pages related stuff: */
-    void prepare();
-
     /* Variables: */
     QString m_strFileName;
 };
 
+typedef QPointer<UIWizardImportApp> UISafePointerWizardImportApp;
+
 #endif /* __UIWizardImportApp_h__ */
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.h

@@ -54 +54 @@
                   UIWizardMode mode = UIWizardMode_Auto);
 
+    /* Pages related stuff: */
+    void prepare();
+
     /* Returns virtual-disk: */
     CMedium virtualDisk() const { return m_virtualDisk; }
@@ -71 +74 @@
     void retranslateUi();
 
-    /* Pages related stuff: */
-    void prepare();
-
     /* Variables: */
     QString m_strDefaultName;
@@ -81 +81 @@
 };
 
+typedef QPointer<UIWizardNewVD> UISafePointerWizardNewVD;
+
 #endif // __UIWizardNewVD_h__
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.cpp

@@ -77 +77 @@
 {
     /* Create New Virtual Hard Drive wizard: */
-    UIWizardNewVD dlg(thisImp(),
-                      fieldImp("machineBaseName").toString(),
-                      fieldImp("machineFolder").toString(),
-                      fieldImp("type").value<CGuestOSType>().GetRecommendedHDD(),
-                      wizardImp()->mode());
-    if (dlg.exec() == QDialog::Accepted)
-    {
-        m_virtualDisk = dlg.virtualDisk();
+    UISafePointerWizardNewVD pWizard = new UIWizardNewVD(thisImp(),
+                                                         fieldImp("machineBaseName").toString(),
+                                                         fieldImp("machineFolder").toString(),
+                                                         fieldImp("type").value<CGuestOSType>().GetRecommendedHDD(),
+                                                         wizardImp()->mode());
+    pWizard->prepare();
+    bool fResult = false;
+    if (pWizard->exec() == QDialog::Accepted)
+    {
+        fResult = true;
+        m_virtualDisk = pWizard->virtualDisk();
         m_pDiskSelector->setCurrentItem(m_virtualDisk.GetId());
         m_pDiskPresent->click();
-        return true;
-    }
-    return false;
+    }
+    if (pWizard)
+        delete pWizard;
+    return fResult;
 }