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

Timestamp:

May 28, 2014 1:22:45 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 6660: Advanced extra-data management framework: Remove GUI_Export_StorageType, GUI_Export_Username, GUI_Export_Hostname, GUI_Export_Bucket (no longer used).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• wizards/exportappliance/UIWizardExportApp.cpp (modified) (1 diff)
• wizards/exportappliance/UIWizardExportAppPageBasic2.cpp (modified) (1 diff)
• wizards/exportappliance/UIWizardExportAppPageBasic3.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -40 +40 @@
 const char* UIExtraDataDefs::GUI_FirstRun = "GUI/FirstRun";
 const char* UIExtraDataDefs::GUI_HideDescriptionForWizards = "GUI/HideDescriptionForWizards";
-const char* UIExtraDataDefs::GUI_Export_StorageType = "GUI/Export/StorageType";
-const char* UIExtraDataDefs::GUI_Export_Username = "GUI/Export/Username";
-const char* UIExtraDataDefs::GUI_Export_Hostname = "GUI/Export/Hostname";
-const char* UIExtraDataDefs::GUI_Export_Bucket = "GUI/Export/Bucket";
 
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -48 +48 @@
     extern const char* GUI_FirstRun;
     extern const char* GUI_HideDescriptionForWizards;
-    extern const char* GUI_Export_StorageType;
-    extern const char* GUI_Export_Username;
-    extern const char* GUI_Export_Hostname;
-    extern const char* GUI_Export_Bucket;
 
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp

@@ -121 +121 @@
 
     /* Export the VMs, on success we are finished: */
-    if (exportVMs(*pAppliance))
-    {
-#if 0
-        /* Save attributes to GUI extra data: */
-        StorageType storageType = field("storageType").value<StorageType>();
-        vboxGlobal().virtualBox().SetExtraData(GUI_Export_StorageType, QString::number(storageType));
-        vboxGlobal().virtualBox().SetExtraData(GUI_Export_Username, m_pLeUsername->text());
-        vboxGlobal().virtualBox().SetExtraData(GUI_Export_Hostname, m_pLeHostname->text());
-        vboxGlobal().virtualBox().SetExtraData(GUI_Export_Bucket, m_pLeBucket->text());
-#endif
-        return true;
-    }
-    return false;
+    return exportVMs(*pAppliance);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp

@@ -34 +34 @@
 void UIWizardExportAppPage2::chooseDefaultStorageType()
 {
-    /* Select default storage type: */
-#if 0
-    /* Load storage-type from GUI extra data: */
-    bool ok;
-    StorageType storageType = StorageType(vboxGlobal().virtualBox().GetExtraData(GUI_Export_StorageType).toInt(&ok));
-    if (ok)
-        setStorageType(storageType);
-#else
     /* Just select first of types: */
     setStorageType(Filesystem);
-#endif
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp

@@ -41 +41 @@
 void UIWizardExportAppPage3::chooseDefaultSettings()
 {
-    /* Select default settings: */
-#if 0
-    m_pUsernameEditor->setText(vboxGlobal().virtualBox().GetExtraData(GUI_Export_Username));
-    m_pHostnameEditor->setText(vboxGlobal().virtualBox().GetExtraData(GUI_Export_Hostname));
-    m_pBucketEditor->setText(vboxGlobal().virtualBox().GetExtraData(GUI_Export_Bucket));
-#else
-    /* Choose defalt format: */
+    /* Choose default format: */
     setFormat("ovf-1.0");
-#endif
 }