Index: /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h (revision 51213) +++ /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h (revision 51214) @@ -76,4 +76,5 @@ template<> bool canConvert(); template<> bool canConvert(); +template<> bool canConvert(); template<> bool canConvert(); template<> bool canConvert(); @@ -139,4 +140,6 @@ template<> MachineSettingsPageType fromInternalString(const QString &strMachineSettingsPageType); template<> QPixmap toWarningPixmap(const MachineSettingsPageType &machineSettingsPageType); +template<> QString toInternalString(const WizardType &wizardType); +template<> WizardType fromInternalString(const QString &strWizardType); template<> QString toInternalString(const IndicatorType &indicatorType); template<> IndicatorType fromInternalString(const QString &strIndicatorType); Index: /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (revision 51213) +++ /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (revision 51214) @@ -48,4 +48,5 @@ template<> bool canConvert() { return true; } template<> bool canConvert() { return true; } +template<> bool canConvert() { return true; } template<> bool canConvert() { return true; } template<> bool canConvert() { return true; } @@ -963,4 +964,46 @@ } +/* QString <= WizardType: */ +template<> QString toInternalString(const WizardType &wizardType) +{ + QString strResult; + switch (wizardType) + { + case WizardType_NewVM: strResult = "NewVM"; break; + case WizardType_CloneVM: strResult = "CloneVM"; break; + case WizardType_ExportAppliance: strResult = "ExportAppliance"; break; + case WizardType_ImportAppliance: strResult = "ImportAppliance"; break; + case WizardType_FirstRun: strResult = "FirstRun"; break; + case WizardType_NewVD: strResult = "NewVD"; break; + case WizardType_CloneVD: strResult = "CloneVD"; break; + default: + { + AssertMsgFailed(("No text for wizard type=%d", wizardType)); + break; + } + } + return strResult; +} + +/* WizardType <= QString: */ +template<> WizardType fromInternalString(const QString &strWizardType) +{ + /* Here we have some fancy stuff allowing us + * to search through the keys using 'case-insensitive' rule: */ + QStringList keys; QList values; + keys << "NewVM"; values << WizardType_NewVM; + keys << "CloneVM"; values << WizardType_CloneVM; + keys << "ExportAppliance"; values << WizardType_ExportAppliance; + keys << "ImportAppliance"; values << WizardType_ImportAppliance; + keys << "FirstRun"; values << WizardType_FirstRun; + keys << "NewVD"; values << WizardType_NewVD; + keys << "CloneVD"; values << WizardType_CloneVD; + /* Invalid type for unknown words: */ + if (!keys.contains(strWizardType, Qt::CaseInsensitive)) + return WizardType_Invalid; + /* Corresponding type for known words: */ + return values.at(keys.indexOf(QRegExp(strWizardType, Qt::CaseInsensitive))); +} + /* QString <= IndicatorType: */ template<> QString toInternalString(const IndicatorType &indicatorType) Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 51213) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 51214) @@ -190,4 +190,17 @@ Q_DECLARE_METATYPE(MachineSettingsPageType); +/** Common UI: Wizard types. */ +enum WizardType +{ + WizardType_Invalid, + WizardType_NewVM, + WizardType_CloneVM, + WizardType_ExportAppliance, + WizardType_ImportAppliance, + WizardType_FirstRun, + WizardType_NewVD, + WizardType_CloneVD +}; + /** Selector UI: Details-element types. */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp (revision 51213) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp (revision 51214) @@ -29,4 +29,5 @@ #include "QIRichTextLabel.h" #include "UIExtraDataManager.h" +#include "UIConverter.h" void UIWizard::sltCurrentIdChanged(int iId) @@ -38,5 +39,5 @@ fIsHideShowDescriptionButtonAvailable = true; /* But first-run wizard has no such button anyway: */ - if (m_type == UIWizardType_FirstRun) + if (m_type == WizardType_FirstRun) fIsHideShowDescriptionButtonAvailable = false; /* Set a flag for hide/show description button finally: */ @@ -61,5 +62,5 @@ /* Save mode settings: */ - gEDataManager->setDescriptionHiddenForWizard(nameForType(m_type), m_mode == UIWizardMode_Expert); + gEDataManager->setDescriptionHiddenForWizard(gpConverter->toInternalString(m_type), m_mode == UIWizardMode_Expert); /* Prepare: */ @@ -68,8 +69,8 @@ } -UIWizard::UIWizard(QWidget *pParent, UIWizardType type, UIWizardMode mode) +UIWizard::UIWizard(QWidget *pParent, WizardType type, UIWizardMode mode) : QIWithRetranslateUI(pParent) , m_type(type) - , m_mode(mode == UIWizardMode_Auto ? loadModeForType(m_type) : mode) + , m_mode(mode == UIWizardMode_Auto ? modeForType(m_type) : mode) { #ifdef Q_WS_WIN @@ -382,15 +383,15 @@ switch (m_type) { - case UIWizardType_CloneVM: + case WizardType_CloneVM: dRatio -= 0.4; break; - case UIWizardType_NewVD: - case UIWizardType_CloneVD: + case WizardType_NewVD: + case WizardType_CloneVD: dRatio += 0.1; break; - case UIWizardType_ExportAppliance: + case WizardType_ExportAppliance: dRatio += 0.3; break; - case UIWizardType_FirstRun: + case WizardType_FirstRun: dRatio += 0.3; break; @@ -505,28 +506,11 @@ /* static */ -QString UIWizard::nameForType(UIWizardType type) -{ - QString strName; - switch (type) - { - case UIWizardType_NewVM: strName = "NewVM"; break; - case UIWizardType_CloneVM: strName = "CloneVM"; break; - case UIWizardType_ExportAppliance: strName = "ExportAppliance"; break; - case UIWizardType_ImportAppliance: strName = "ImportAppliance"; break; - case UIWizardType_FirstRun: strName = "FirstRun"; break; - case UIWizardType_NewVD: strName = "NewVD"; break; - case UIWizardType_CloneVD: strName = "CloneVD"; break; - } - return strName; -} - -/* static */ -UIWizardMode UIWizard::loadModeForType(UIWizardType type) +UIWizardMode UIWizard::modeForType(WizardType type) { /* Some wizard use only basic mode: */ - if (type == UIWizardType_FirstRun) + if (type == WizardType_FirstRun) return UIWizardMode_Basic; /* Otherwise get mode from extra-data manager: */ - return gEDataManager->isDescriptionHiddenForWizard(nameForType(type)) + return gEDataManager->isDescriptionHiddenForWizard(gpConverter->toInternalString(type)) ? UIWizardMode_Expert : UIWizardMode_Basic; } Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.h (revision 51213) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.h (revision 51214) @@ -26,19 +26,8 @@ /* Local includes: */ #include "QIWithRetranslateUI.h" +#include "UIExtraDataDefs.h" /* Forward declarations: */ class UIWizardPage; - -/* Wizard type: */ -enum UIWizardType -{ - UIWizardType_NewVM, - UIWizardType_CloneVM, - UIWizardType_ExportAppliance, - UIWizardType_ImportAppliance, - UIWizardType_FirstRun, - UIWizardType_NewVD, - UIWizardType_CloneVD -}; /* Wizard mode: */ @@ -73,5 +62,5 @@ /* Constructor: */ - UIWizard(QWidget *pParent, UIWizardType type, UIWizardMode mode = UIWizardMode_Auto); + UIWizard(QWidget *pParent, WizardType type, UIWizardMode mode = UIWizardMode_Auto); /* Translation stuff: */ @@ -106,9 +95,8 @@ void assignWatermarkHelper(); #endif /* !Q_WS_MAC */ - static QString nameForType(UIWizardType type); - static UIWizardMode loadModeForType(UIWizardType type); + static UIWizardMode modeForType(WizardType type); /* Variables: */ - UIWizardType m_type; + WizardType m_type; UIWizardMode m_mode; #ifndef Q_WS_MAC Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.cpp (revision 51213) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.cpp (revision 51214) @@ -35,5 +35,5 @@ UIWizardCloneVD::UIWizardCloneVD(QWidget *pParent, const CMedium &sourceVirtualDisk) - : UIWizard(pParent, UIWizardType_CloneVD) + : UIWizard(pParent, WizardType_CloneVD) , m_sourceVirtualDisk(sourceVirtualDisk) { Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.cpp (revision 51213) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.cpp (revision 51214) @@ -31,5 +31,5 @@ UIWizardCloneVM::UIWizardCloneVM(QWidget *pParent, const CMachine &machine, CSnapshot snapshot /* = CSnapshot() */) - : UIWizard(pParent, UIWizardType_CloneVM) + : UIWizard(pParent, WizardType_CloneVM) , m_machine(machine) , m_snapshot(snapshot) Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp (revision 51213) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp (revision 51214) @@ -37,5 +37,5 @@ UIWizardExportApp::UIWizardExportApp(QWidget *pParent, const QStringList &selectedVMNames) - : UIWizard(pParent, UIWizardType_ExportAppliance) + : UIWizard(pParent, WizardType_ExportAppliance) , m_selectedVMNames(selectedVMNames) { Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRun.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRun.cpp (revision 51213) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRun.cpp (revision 51214) @@ -30,5 +30,5 @@ UIWizardFirstRun::UIWizardFirstRun(QWidget *pParent, const CMachine &machine) - : UIWizard(pParent, UIWizardType_FirstRun) + : UIWizard(pParent, WizardType_FirstRun) , m_machine(machine) , m_fHardDiskWasSet(isBootHardDiskAttached(m_machine)) Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportApp.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportApp.cpp (revision 51213) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportApp.cpp (revision 51214) @@ -136,5 +136,5 @@ UIWizardImportApp::UIWizardImportApp(QWidget *pParent, const QString &strFileName) - : UIWizard(pParent, UIWizardType_ImportAppliance) + : UIWizard(pParent, WizardType_ImportAppliance) , m_strFileName(strFileName) { Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp (revision 51213) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp (revision 51214) @@ -38,5 +38,5 @@ qulonglong uDefaultSize, UIWizardMode mode) - : UIWizard(pParent, UIWizardType_NewVD, mode) + : UIWizard(pParent, WizardType_NewVD, mode) , m_strDefaultName(strDefaultName) , m_strDefaultPath(strDefaultPath) Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp (revision 51213) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp (revision 51214) @@ -36,5 +36,5 @@ UIWizardNewVM::UIWizardNewVM(QWidget *pParent, const QString &strGroup /* = QString() */) - : UIWizard(pParent, UIWizardType_NewVM) + : UIWizard(pParent, WizardType_NewVM) , m_strGroup(strGroup) , m_iIDECount(0)