Changeset 78063 in vbox

Timestamp:

Apr 9, 2019 1:59:20 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9434: Import Appliance wizard: Allow to make Import from OCI choice default.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/UIVirtualBoxManager.cpp (modified) (1 diff)
• wizards/importappliance/UIWizardImportApp.cpp (modified) (3 diffs)
• wizards/importappliance/UIWizardImportApp.h (modified) (2 diffs)
• wizards/importappliance/UIWizardImportAppPageBasic1.cpp (modified) (5 diffs)
• wizards/importappliance/UIWizardImportAppPageBasic1.h (modified) (2 diffs)
• wizards/importappliance/UIWizardImportAppPageExpert.cpp (modified) (1 diff)
• wizards/importappliance/UIWizardImportAppPageExpert.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -502 +502 @@
     /* Use the "safe way" to open stack of Mac OS X Sheets: */
     QWidget *pWizardParent = windowManager().realParentWindow(this);
-    UISafePointerWizardImportApp pWizard = new UIWizardImportApp(pWizardParent, strTmpFile);
+    UISafePointerWizardImportApp pWizard = new UIWizardImportApp(pWizardParent, false /* OCI by default? */, strTmpFile);
     windowManager().registerNewParent(pWizard, pWizardParent);
     pWizard->prepare();

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

@@ -143 +143 @@
 *********************************************************************************************************************************/
 
-UIWizardImportApp::UIWizardImportApp(QWidget *pParent, const QString &strFileName)
+UIWizardImportApp::UIWizardImportApp(QWidget *pParent, bool fImportFromOCIByDefault, const QString &strFileName)
     : UIWizard(pParent, WizardType_ImportAppliance)
+    , m_fImportFromOCIByDefault(fImportFromOCIByDefault)
     , m_strFileName(strFileName)
 {
@@ -163 +164 @@
         case WizardMode_Basic:
         {
-            if (m_strFileName.isEmpty())
-                setPage(Page1, new UIWizardImportAppPageBasic1);
+            if (m_fImportFromOCIByDefault || m_strFileName.isEmpty())
+                setPage(Page1, new UIWizardImportAppPageBasic1(m_fImportFromOCIByDefault));
             setPage(Page2, new UIWizardImportAppPageBasic2(m_strFileName));
             break;
@@ -170 +171 @@
         case WizardMode_Expert:
         {
-            setPage(PageExpert, new UIWizardImportAppPageExpert(m_strFileName));
+            setPage(PageExpert, new UIWizardImportAppPageExpert(m_fImportFromOCIByDefault, m_strFileName));
             break;
         }

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

@@ -47 +47 @@
     /** Constructs export appliance wizard passing @a pParent to the base-class.
       * @param  strFileName  Brings appliance file name. */
-    UIWizardImportApp(QWidget *pParent, const QString &strFileName);
+    UIWizardImportApp(QWidget *pParent, bool fImportFromOCIByDefault, const QString &strFileName);
 
     /** Prepares all. */
@@ -72 +72 @@
 private:
 
+    /** Holds whether default source should be Import from OCI. */
+    bool     m_fImportFromOCIByDefault;
     /** Handles the appliance file name. */
     QString  m_strFileName;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp

@@ -37 +37 @@
 *********************************************************************************************************************************/
 
-UIWizardImportAppPage1::UIWizardImportAppPage1()
-    : m_pSourceLabel(0)
+UIWizardImportAppPage1::UIWizardImportAppPage1(bool fImportFromOCIByDefault)
+    : m_fImportFromOCIByDefault(fImportFromOCIByDefault)
+    , m_pSourceLabel(0)
     , m_pSourceComboBox(0)
     , m_pStackedLayout(0)
@@ -61 +62 @@
 
     /* Initialize Cloud Provider Manager: */
+    bool fOCIPresent = false;
     CVirtualBox comVBox = vboxGlobal().virtualBox();
     m_comCloudProviderManager = comVBox.GetCloudProviderManager();
@@ -88 +90 @@
                 m_pSourceComboBox->setItemData(m_pSourceComboBox->count() - 1, comProvider.GetShortName(), SourceData_ShortName);
                 m_pSourceComboBox->setItemData(m_pSourceComboBox->count() - 1, true,                       SourceData_IsItCloudFormat);
+                if (m_pSourceComboBox->itemData(m_pSourceComboBox->count() - 1, SourceData_ShortName).toString() == "OCI")
+                    fOCIPresent = true;
             }
         }
@@ -93 +97 @@
 
     /* Set default: */
-    setSource("local");
+    if (m_fImportFromOCIByDefault && fOCIPresent)
+        setSource("OCI");
+    else
+        setSource("local");
 }
 
@@ -135 +142 @@
 *********************************************************************************************************************************/
 
-UIWizardImportAppPageBasic1::UIWizardImportAppPageBasic1()
-    : m_pLabel(0)
+UIWizardImportAppPageBasic1::UIWizardImportAppPageBasic1(bool fImportFromOCIByDefault)
+    : UIWizardImportAppPage1(fImportFromOCIByDefault)
+    , m_pLabel(0)
 {
     /* Create main layout: */

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

@@ -54 +54 @@
 
     /** Constructs 1st page base. */
-    UIWizardImportAppPage1();
+    UIWizardImportAppPage1(bool fImportFromOCIByDefault);
 
     /** Populates sources. */
@@ -104 +104 @@
 
     /** Constructs 1st basic page. */
-    UIWizardImportAppPageBasic1();
+    UIWizardImportAppPageBasic1(bool fImportFromOCIByDefault);
 
 protected:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.cpp

@@ -29 +29 @@
 
 
-UIWizardImportAppPageExpert::UIWizardImportAppPageExpert(const QString &strFileName)
-    : m_pApplianceCnt(0)
+UIWizardImportAppPageExpert::UIWizardImportAppPageExpert(bool fImportFromOCIByDefault, const QString &strFileName)
+    : UIWizardImportAppPage1(fImportFromOCIByDefault)
+    , m_pApplianceCnt(0)
     , m_pSettingsCnt(0)
 {

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

@@ -41 +41 @@
     /** Constructs expert page.
       * @param  strFileName  Brings appliance file name. */
-    UIWizardImportAppPageExpert(const QString &strFileName);
+    UIWizardImportAppPageExpert(bool fImportFromOCIByDefault, const QString &strFileName);
 
 private slots: