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

Timestamp:

Mar 27, 2009 10:45:19 AM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4-OVF: complete rearrangement of all ovf related classes; added export settings like license, product info & friends

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (4 diffs)
• VBoxUI.pro (modified) (1 diff)
• include/VBoxApplianceEditorWgt.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/include/VBoxImportApplianceWgt.h ) (3 diffs)
• include/VBoxExportApplianceWgt.h (added)
• include/VBoxExportApplianceWzd.h (modified) (1 diff)
• include/VBoxImportApplianceWgt.h (modified) (3 diffs)
• include/VBoxLineTextEdit.h (added)
• src/VBoxApplianceEditorWgt.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/VBoxImportApplianceWgt.cpp ) (33 diffs)
• src/VBoxExportApplianceWgt.cpp (added)
• src/VBoxExportApplianceWzd.cpp (modified) (6 diffs)
• src/VBoxImportApplianceWgt.cpp (modified) (4 diffs)
• src/VBoxLineTextEdit.cpp (added)
• ui/VBoxApplianceEditorWgt.ui (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/ui/VBoxImportApplianceWgt.ui ) (1 diff)
• ui/VBoxExportApplianceWzd.ui (modified) (10 diffs)
• ui/VBoxImportApplianceWzd.ui (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -242 +242 @@
         include/VBoxOSTypeSelectorButton.h \
         include/VBoxOSTypeSelectorWidget.h \
+        include/VBoxLineTextEdit.h \
         include/VBoxUtils.h \
         include/VBoxGlobalSettings.h \
@@ -291 +292 @@
         include/VBoxSettingsPage.h \
         include/VBoxSettingsSelector.h \
+        include/VBoxApplianceEditorWgt.h \
         include/VBoxImportApplianceWgt.h \
         include/VBoxImportApplianceWzd.h \
+        include/VBoxExportApplianceWgt.h \
         include/VBoxExportApplianceWzd.h
 
@@ -327 +330 @@
         src/VBoxOSTypeSelectorButton.cpp \
         src/VBoxOSTypeSelectorWidget.cpp \
+        src/VBoxLineTextEdit.cpp \
         src/VBoxDefs.cpp \
         src/VBoxGlobalSettings.cpp \
@@ -377 +381 @@
         src/VBoxMediaManagerDlg.cpp \
         src/VBoxMedium.cpp \
+        src/VBoxApplianceEditorWgt.cpp \
         src/VBoxImportApplianceWgt.cpp \
         src/VBoxImportApplianceWzd.cpp \
+        src/VBoxExportApplianceWgt.cpp \
         src/VBoxExportApplianceWzd.cpp
 

trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro

@@ -59 +59 @@
     ui/VBoxGLSettingsNetwork.ui \
     ui/VBoxGLSettingsNetworkDetails.ui \
-    ui/VBoxImportApplianceWgt.ui \
+    ui/VBoxApplianceEditorWgt.ui \
     ui/VBoxImportApplianceWzd.ui \
     ui/VBoxExportApplianceWzd.ui

trunk/src/VBox/Frontends/VirtualBox/include/VBoxApplianceEditorWgt.h

@@ -2 +2 @@
  *
  * VBox frontends: Qt4 GUI ("VirtualBox"):
- * VBoxImportApplianceWgt class declaration
+ * VBoxApplianceEditorWgt class declaration
  */
 
@@ -21 +21 @@
  */
 
-#ifndef __VBoxImportApplianceWgt_h__
-#define __VBoxImportApplianceWgt_h__
-
-#include "VBoxImportApplianceWgt.gen.h"
+#ifndef __VBoxApplianceEditorWgt_h__
+#define __VBoxApplianceEditorWgt_h__
+
+/* VBox includes */
+#include "COMDefs.h"
+#include "VBoxApplianceEditorWgt.gen.h"
 #include "QIWithRetranslateUI.h"
 
-class CAppliance;
-class VirtualSystemModel;
-
-class VBoxImportApplianceWgt : public QIWithRetranslateUI<QWidget>,
-                               public Ui::VBoxImportApplianceWgt
+/* Qt includes */
+#include <QSortFilterProxyModel>
+#include <QItemDelegate>
+
+/* VBox forward declarations */
+class ModelItem;
+
+////////////////////////////////////////////////////////////////////////////////
+// Globals
+
+enum TreeViewSection { DescriptionSection = 0, OriginalValueSection, ConfigValueSection };
+
+////////////////////////////////////////////////////////////////////////////////
+// ModelItem
+
+enum ModelItemType { RootType, VirtualSystemType, HardwareType };
+
+/* This & the following derived classes represent the data items of a Virtual
+   System. All access/manipulation is done with the help of virtual functions
+   to keep the interface clean. ModelItem is able to handle tree structures
+   with a parent & several children's. */
+class ModelItem
+{
+public:
+    ModelItem (int aNumber, ModelItemType aType, ModelItem *aParent = NULL);
+
+    ~ModelItem();
+
+    ModelItem *parent() const { return mParentItem; }
+
+    void appendChild (ModelItem *aChild);
+    ModelItem * child (int aRow) const;
+
+    int row() const;
+
+    int childCount() const;
+    int columnCount() const { return 3; }
+
+    virtual Qt::ItemFlags itemFlags (int /* aColumn */) const { return 0; }
+    virtual bool setData (int /* aColumn */, const QVariant & /* aValue */, int /* aRole */) { return false; }
+    virtual QVariant data (int /* aColumn */, int /* aRole */) const { return QVariant(); }
+    virtual QWidget * createEditor (QWidget * /* aParent */, const QStyleOptionViewItem & /* aOption */, const QModelIndex & /* aIndex */) const { return NULL; }
+    virtual bool setEditorData (QWidget * /* aEditor */, const QModelIndex & /* aIndex */) const { return false; }
+    virtual bool setModelData (QWidget * /* aEditor */, QAbstractItemModel * /* aModel */, const QModelIndex & /* aIndex */) { return false; }
+
+    virtual void restoreDefaults() {}
+    virtual void putBack (QVector<BOOL>& aFinalStates, QVector<QString>& aFinalValues, QVector<QString>& aFinalExtraValues);
+
+    ModelItemType type() const { return mType; }
+
+protected:
+    /* Protected member vars */
+    int mNumber;
+    ModelItemType mType;
+
+    ModelItem *mParentItem;
+    QList<ModelItem*> mChildItems;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// VirtualSystemItem
+
+/* This class represent a Virtual System with an index. */
+class VirtualSystemItem: public ModelItem
+{
+public:
+    VirtualSystemItem (int aNumber, CVirtualSystemDescription aDesc, ModelItem *aParent);
+
+    virtual QVariant data (int aColumn, int aRole) const;
+
+    virtual void putBack (QVector<BOOL>& aFinalStates, QVector<QString>& aFinalValues, QVector<QString>& aFinalExtraValues);
+
+private:
+    CVirtualSystemDescription mDesc;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// HardwareItem
+
+/* This class represent an hardware item of a Virtual System. All values of
+   KVirtualSystemDescriptionType are supported & handled differently. */
+class HardwareItem: public ModelItem
+{
+    friend class VirtualSystemSortProxyModel;
+public:
+
+    HardwareItem (int aNumber,
+                  KVirtualSystemDescriptionType aType,
+                  const QString &aRef,
+                  const QString &aOrigValue,
+                  const QString &aConfigValue,
+                  const QString &aExtraConfigValue,
+                  ModelItem *aParent);
+
+    virtual void putBack (QVector<BOOL>& aFinalStates, QVector<QString>& aFinalValues, QVector<QString>& aFinalExtraValues);
+
+    virtual bool setData (int aColumn, const QVariant &aValue, int aRole);
+    virtual QVariant data (int aColumn, int aRole) const;
+
+    virtual Qt::ItemFlags itemFlags (int aColumn) const;
+
+    virtual QWidget * createEditor (QWidget *aParent, const QStyleOptionViewItem &aOption, const QModelIndex &aIndex) const;
+    virtual bool setEditorData (QWidget *aEditor, const QModelIndex &aIndex) const;
+
+    virtual bool setModelData (QWidget *aEditor, QAbstractItemModel *aModel, const QModelIndex &aIndex);
+
+    virtual void restoreDefaults()
+    {
+        mConfigValue = mConfigDefaultValue;
+        mCheckState = Qt::Checked;
+    }
+
+private:
+
+    /* Private member vars */
+    KVirtualSystemDescriptionType mType;
+    QString mRef;
+    QString mOrigValue;
+    QString mConfigValue;
+    QString mConfigDefaultValue;
+    QString mExtraConfigValue;
+    Qt::CheckState mCheckState;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// VirtualSystemModel
+
+class VirtualSystemModel: public QAbstractItemModel
+{
+
+public:
+    VirtualSystemModel (QVector<CVirtualSystemDescription>& aVSDs, QObject *aParent = NULL);
+
+    QModelIndex index (int aRow, int aColumn, const QModelIndex &aParent = QModelIndex()) const;
+    QModelIndex parent (const QModelIndex &aIndex) const;
+    int rowCount (const QModelIndex &aParent = QModelIndex()) const;
+    int columnCount (const QModelIndex &aParent = QModelIndex()) const;
+    bool setData (const QModelIndex &aIndex, const QVariant &aValue, int aRole);
+    QVariant data (const QModelIndex &aIndex, int aRole = Qt::DisplayRole) const;
+    Qt::ItemFlags flags (const QModelIndex &aIndex) const;
+    QVariant headerData (int aSection, Qt::Orientation aOrientation, int aRole) const;
+
+    void restoreDefaults (const QModelIndex& aParent = QModelIndex());
+    void putBack();
+
+private:
+    /* Private member vars */
+    ModelItem *mRootItem;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// VirtualSystemDelegate
+
+/* The delegate is used for creating/handling the different editors for the
+   various types we support. This class forward the requests to the virtual
+   methods of our different ModelItems. If this is not possible the default
+   methods of QItemDelegate are used to get some standard behavior. Note: We
+   have to handle the proxy model ourself. I really don't understand why Qt is
+   not doing this for us. */
+class VirtualSystemDelegate: public QItemDelegate
+{
+public:
+    VirtualSystemDelegate (QAbstractProxyModel *aProxy, QObject *aParent = NULL);
+
+    QWidget * createEditor (QWidget *aParent, const QStyleOptionViewItem &aOption, const QModelIndex &aIndex) const;
+    void setEditorData (QWidget *aEditor, const QModelIndex &aIndex) const;
+    void setModelData (QWidget *aEditor, QAbstractItemModel *aModel, const QModelIndex &aIndex) const;
+    void updateEditorGeometry (QWidget *aEditor, const QStyleOptionViewItem &aOption, const QModelIndex &aIndex) const;
+
+    QSize sizeHint (const QStyleOptionViewItem &aOption, const QModelIndex &aIndex) const
+    {
+        QSize size = QItemDelegate::sizeHint (aOption, aIndex);
+#ifdef Q_WS_MAC
+        int h = 28;
+#else /* Q_WS_MAC */
+        int h = 24;
+#endif /* Q_WS_MAC */
+        size.setHeight (RT_MAX (h, size.height()));
+        return size;
+    }
+private:
+    /* Private member vars */
+    QAbstractProxyModel *mProxy;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// VirtualSystemSortProxyModel
+
+class VirtualSystemSortProxyModel: public QSortFilterProxyModel
+{
+public:
+    VirtualSystemSortProxyModel (QObject *aParent = NULL);
+
+protected:
+    bool filterAcceptsRow (int aSourceRow, const QModelIndex & aSourceParent) const;
+    bool lessThan (const QModelIndex &aLeft, const QModelIndex &aRight) const;
+
+    static KVirtualSystemDescriptionType mSortList[];
+
+    QList<KVirtualSystemDescriptionType> mFilterList;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// VBoxApplianceEditorWgt
+
+class VBoxApplianceEditorWgt : public QIWithRetranslateUI<QWidget>,
+                               public Ui::VBoxApplianceEditorWgt
 {
     Q_OBJECT;
 
 public:
-    VBoxImportApplianceWgt (QWidget *aParent);
-
-    bool setFile (const QString& aFile);
-    void prepareImport();
-    bool import();
+    VBoxApplianceEditorWgt (QWidget *aParent = NULL);
 
     bool isValid() const { return mAppliance != NULL; }
-    QList < QPair <QString, QString> > licenseAgreements() const;
-
-    static int minGuestRAM() { return mMinGuestRAM; }
-    static int maxGuestRAM() { return mMaxGuestRAM; }
-    static int minGuestCPUCount() { return mMinGuestCPUCount; }
-    static int maxGuestCPUCount() { return mMaxGuestCPUCount; }
+    CAppliance* appliance() const { return mAppliance; }
 
 public slots:
@@ -54 +249 @@
 
 protected:
-    void retranslateUi();
-
-private:
-    static void initSystemSettings();
-
-    /* Private member vars */
+    virtual void retranslateUi();
+
+    /* Protected member vars */
     CAppliance *mAppliance;
     VirtualSystemModel *mModel;
-
-    static int mMinGuestRAM;
-    static int mMaxGuestRAM;
-    static int mMinGuestCPUCount;
-    static int mMaxGuestCPUCount;
-};
-
-#endif /* __VBoxImportApplianceWgt_h__ */
-
+};
+
+#endif /* __VBoxApplianceEditorWgt_h__ */
+

trunk/src/VBox/Frontends/VirtualBox/include/VBoxExportApplianceWzd.h

@@ -53 +53 @@
 private:
     void addListViewVMItems (const QString& aSelectName);
-    bool prepareForExportVMs (CAppliance &aAppliance);
+    bool prepareSettingsWidget();
     bool exportVMs (CAppliance &aAppliance);
 

trunk/src/VBox/Frontends/VirtualBox/include/VBoxImportApplianceWgt.h

@@ -24 +24 @@
 #define __VBoxImportApplianceWgt_h__
 
-#include "VBoxImportApplianceWgt.gen.h"
-#include "QIWithRetranslateUI.h"
+/* VBox includes */
+#include "VBoxApplianceEditorWgt.h"
 
-class CAppliance;
-class VirtualSystemModel;
-
-class VBoxImportApplianceWgt : public QIWithRetranslateUI<QWidget>,
-                               public Ui::VBoxImportApplianceWgt
+class VBoxImportApplianceWgt : public VBoxApplianceEditorWgt
 {
     Q_OBJECT;
@@ -42 +38 @@
     bool import();
 
-    bool isValid() const { return mAppliance != NULL; }
     QList < QPair <QString, QString> > licenseAgreements() const;
 
@@ -50 +45 @@
     static int maxGuestCPUCount() { return mMaxGuestCPUCount; }
 
-public slots:
-    void restoreDefaults();
-
-protected:
-    void retranslateUi();
-
 private:
     static void initSystemSettings();
 
     /* Private member vars */
-    CAppliance *mAppliance;
-    VirtualSystemModel *mModel;
-
     static int mMinGuestRAM;
     static int mMaxGuestRAM;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxApplianceEditorWgt.cpp

@@ -2 +2 @@
  *
  * VBox frontends: Qt4 GUI ("VirtualBox"):
- * VBoxImportApplianceWgt class implementation
+ * VBoxApplianceEditorWgt class implementation
  */
 
@@ -21 +21 @@
  */
 
-#include "VBoxImportApplianceWgt.h"
+/* VBox includes */
+#include "VBoxApplianceEditorWgt.h"
 #include "VBoxImportApplianceWzd.h"
 #include "VBoxGlobal.h"
@@ -27 +28 @@
 #include "VBoxFilePathSelectorWidget.h"
 #include "VBoxOSTypeSelectorButton.h"
+#include "VBoxLineTextEdit.h"
 
 /* Qt includes */
@@ -37 +39 @@
 #include <QComboBox>
 
-class ModelItem;
-
-////////////////////////////////////////////////////////////////////////////////
-// Globals
-
-enum TreeViewSection { DescriptionSection = 0, OriginalValueSection, ConfigValueSection };
-
-////////////////////////////////////////////////////////////////////////////////
-// Private helper class declarations
-
-class VirtualSystemSortProxyModel: public QSortFilterProxyModel
-{
-public:
-    VirtualSystemSortProxyModel (QObject *aParent = NULL);
-
-protected:
-    bool filterAcceptsRow (int aSourceRow, const QModelIndex & aSourceParent) const;
-    bool lessThan (const QModelIndex &aLeft, const QModelIndex &aRight) const;
-
-    static KVirtualSystemDescriptionType mSortList[];
-};
-
-class VirtualSystemModel: public QAbstractItemModel
-{
-
-public:
-    VirtualSystemModel (QVector<CVirtualSystemDescription>& aVSDs, QObject *aParent = NULL);
-
-    inline QModelIndex index (int aRow, int aColumn, const QModelIndex &aParent = QModelIndex()) const;
-    inline QModelIndex parent (const QModelIndex &aIndex) const;
-    inline int rowCount (const QModelIndex &aParent = QModelIndex()) const;
-    inline int columnCount (const QModelIndex &aParent = QModelIndex()) const;
-    inline bool setData (const QModelIndex &aIndex, const QVariant &aValue, int aRole);
-    inline QVariant data (const QModelIndex &aIndex, int aRole = Qt::DisplayRole) const;
-    inline Qt::ItemFlags flags (const QModelIndex &aIndex) const;
-    inline QVariant headerData (int aSection, Qt::Orientation aOrientation, int aRole) const;
-
-    inline void restoreDefaults (const QModelIndex& aParent = QModelIndex());
-    inline void putBack();
-
-private:
-    /* Private member vars */
-    ModelItem *mRootItem;
-};
-
 ////////////////////////////////////////////////////////////////////////////////
 // ModelItem
-
-enum ModelItemType { RootType, VirtualSystemType, HardwareType };
 
 /* This & the following derived classes represent the data items of a Virtual
@@ -91 +46 @@
    to keep the interface clean. ModelItem is able to handle tree structures
    with a parent & several children's. */
-class ModelItem
-{
-public:
-    ModelItem (int aNumber, ModelItemType aType, ModelItem *aParent = NULL)
-      : mNumber (aNumber)
-      , mType (aType)
-      , mParentItem (aParent)
-    {}
-
-    ~ModelItem()
+ModelItem::ModelItem (int aNumber, ModelItemType aType, ModelItem *aParent /* = NULL */)
+  : mNumber (aNumber)
+  , mType (aType)
+  , mParentItem (aParent)
+{}
+
+ModelItem::~ModelItem()
+{
+    qDeleteAll (mChildItems);
+}
+
+void ModelItem::appendChild (ModelItem *aChild)
+{
+    AssertPtr (aChild);
+    mChildItems << aChild;
+}
+
+ModelItem * ModelItem::child (int aRow) const
+{
+    return mChildItems.value (aRow);
+}
+
+int ModelItem::row() const
+{
+    if (mParentItem)
+        return mParentItem->mChildItems.indexOf (const_cast<ModelItem*> (this));
+
+    return 0;
+}
+
+int ModelItem::childCount() const
+{
+    return mChildItems.count();
+}
+
+void ModelItem::putBack (QVector<BOOL>& aFinalStates, QVector<QString>& aFinalValues, QVector<QString>& aFinalExtraValues)
+{
+    for (int i = 0; i < childCount(); ++i)
+        child (i)->putBack (aFinalStates, aFinalValues, aFinalExtraValues);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// VirtualSystemItem
+
+VirtualSystemItem::VirtualSystemItem (int aNumber, CVirtualSystemDescription aDesc, ModelItem *aParent)
+  : ModelItem (aNumber, VirtualSystemType, aParent)
+  , mDesc (aDesc)
+{}
+
+QVariant VirtualSystemItem::data (int aColumn, int aRole) const
+{
+    QVariant v;
+    if (aColumn == DescriptionSection &&
+        aRole == Qt::DisplayRole)
+        v = VBoxImportApplianceWgt::tr ("Virtual System %1").arg (mNumber + 1);
+    return v;
+}
+
+void VirtualSystemItem::putBack (QVector<BOOL>& aFinalStates, QVector<QString>& aFinalValues, QVector<QString>& aFinalExtraValues)
+{
+    /* Resize the vectors */
+    unsigned long count = mDesc.GetCount();
+    aFinalStates.resize (count);
+    aFinalValues.resize (count);
+    aFinalExtraValues.resize (count);
+    /* Recursively fill the vectors */
+    ModelItem::putBack (aFinalStates, aFinalValues, aFinalExtraValues);
+    /* Set all final values at once */
+    mDesc.SetFinalValues (aFinalStates, aFinalValues, aFinalExtraValues);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// HardwareItem
+
+HardwareItem::HardwareItem (int aNumber,
+                            KVirtualSystemDescriptionType aType,
+                            const QString &aRef,
+                            const QString &aOrigValue,
+                            const QString &aConfigValue,
+                            const QString &aExtraConfigValue,
+                            ModelItem *aParent)
+  : ModelItem (aNumber, HardwareType, aParent)
+  , mType (aType)
+  , mRef (aRef)
+  , mOrigValue (aOrigValue)
+  , mConfigValue (aConfigValue)
+  , mConfigDefaultValue (aConfigValue)
+  , mExtraConfigValue (aExtraConfigValue)
+  , mCheckState (Qt::Checked)
+{}
+
+void HardwareItem::putBack (QVector<BOOL>& aFinalStates, QVector<QString>& aFinalValues, QVector<QString>& aFinalExtraValues)
+{
+    aFinalStates[mNumber] = mCheckState == Qt::Checked;
+    aFinalValues[mNumber] = mConfigValue;
+    aFinalExtraValues[mNumber] = mExtraConfigValue;
+    ModelItem::putBack (aFinalStates, aFinalValues, aFinalExtraValues);
+}
+
+bool HardwareItem::setData (int aColumn, const QVariant &aValue, int aRole)
+{
+    bool fDone = false;
+    switch (aRole)
     {
-        qDeleteAll (mChildItems);
-    }
-
-    ModelItem *parent() const { return mParentItem; }
-
-    void appendChild (ModelItem *aChild)
-    {
-        AssertPtr (aChild);
-        mChildItems << aChild;
-    }
-    ModelItem * child (int aRow) const { return mChildItems.value (aRow); }
-
-    int row() const
-    {
-        if (mParentItem)
-            return mParentItem->mChildItems.indexOf (const_cast<ModelItem*> (this));
-
-        return 0;
-    }
-
-    int childCount() const { return mChildItems.count(); }
-    int columnCount() const { return 3; }
-
-    virtual Qt::ItemFlags itemFlags (int /* aColumn */) const { return 0; }
-    virtual bool setData (int /* aColumn */, const QVariant & /* aValue */, int /* aRole */) { return false; }
-    virtual QVariant data (int /* aColumn */, int /* aRole */) const { return QVariant(); }
-    virtual QWidget * createEditor (QWidget * /* aParent */, const QStyleOptionViewItem & /* aOption */, const QModelIndex & /* aIndex */) const { return NULL; }
-    virtual bool setEditorData (QWidget * /* aEditor */, const QModelIndex & /* aIndex */) const { return false; }
-    virtual bool setModelData (QWidget * /* aEditor */, QAbstractItemModel * /* aModel */, const QModelIndex & /* aIndex */) { return false; }
-
-    virtual void restoreDefaults() {}
-    virtual void putBack (QVector<BOOL>& aFinalStates, QVector<QString>& aFinalValues, QVector<QString>& aFinalExtraValues)
-    {
-        for (int i = 0; i < childCount(); ++i)
-            child (i)->putBack (aFinalStates, aFinalValues, aFinalExtraValues);
-    }
-
-    ModelItemType type() const { return mType; }
-
-protected:
-    int mNumber;
-    ModelItemType mType;
-
-    ModelItem *mParentItem;
-    QList<ModelItem*> mChildItems;
-};
-
-/* This class represent a Virtual System with an index. */
-class VirtualSystemItem: public ModelItem
-{
-public:
-    VirtualSystemItem (int aNumber, CVirtualSystemDescription aDesc, ModelItem *aParent)
-      : ModelItem (aNumber, VirtualSystemType, aParent)
-      , mDesc (aDesc)
-    {}
-
-    virtual QVariant data (int aColumn, int aRole) const
-    {
-        QVariant v;
-        if (aColumn == DescriptionSection &&
-            aRole == Qt::DisplayRole)
-            v = VBoxImportApplianceWgt::tr ("Virtual System %1").arg (mNumber + 1);
-        return v;
-    }
-
-    virtual void putBack (QVector<BOOL>& aFinalStates, QVector<QString>& aFinalValues, QVector<QString>& aFinalExtraValues)
-    {
-        /* Resize the vectors */
-        unsigned long count = mDesc.GetCount();
-        aFinalStates.resize (count);
-        aFinalValues.resize (count);
-        aFinalExtraValues.resize (count);
-        /* Recursively fill the vectors */
-        ModelItem::putBack (aFinalStates, aFinalValues, aFinalExtraValues);
-        /* Set all final values at once */
-        mDesc.SetFinalValues (aFinalStates, aFinalValues, aFinalExtraValues);
-    }
-
-private:
-    CVirtualSystemDescription mDesc;
-};
-
-/* This class represent an hardware item of a Virtual System. All values of
-   KVirtualSystemDescriptionType are supported & handled differently. */
-class HardwareItem: public ModelItem
-{
-    friend class VirtualSystemSortProxyModel;
-public:
-
-    HardwareItem (int aNumber,
-                  KVirtualSystemDescriptionType aType,
-                  const QString &aRef,
-                  const QString &aOrigValue,
-                  const QString &aConfigValue,
-                  const QString &aExtraConfigValue,
-                  ModelItem *aParent)
-        : ModelItem (aNumber, HardwareType, aParent)
-        , mType (aType)
-        , mRef (aRef)
-        , mOrigValue (aOrigValue)
-        , mConfigValue (aConfigValue)
-        , mConfigDefaultValue (aConfigValue)
-        , mExtraConfigValue (aExtraConfigValue)
-        , mCheckState (Qt::Checked)
-    {}
-
-    virtual void putBack (QVector<BOOL>& aFinalStates, QVector<QString>& aFinalValues, QVector<QString>& aFinalExtraValues)
-    {
-        aFinalStates[mNumber] = mCheckState == Qt::Checked;
-        aFinalValues[mNumber] = mConfigValue;
-        aFinalExtraValues[mNumber] = mExtraConfigValue;
-        ModelItem::putBack (aFinalStates, aFinalValues, aFinalExtraValues);
-    }
-
-    bool setData (int aColumn, const QVariant &aValue, int aRole)
-    {
-        bool fDone = false;
-        switch (aRole)
-        {
-            case Qt::CheckStateRole:
+        case Qt::CheckStateRole:
             {
                 if (aColumn == ConfigValueSection &&
@@ -235 +164 @@
                 break;
             }
-            default: break;
-        }
-        return fDone;
+        default: break;
     }
-
-    virtual QVariant data (int aColumn, int aRole) const
+    return fDone;
+}
+
+QVariant HardwareItem::data (int aColumn, int aRole) const
+{
+    QVariant v;
+    switch (aRole)
     {
-        QVariant v;
-        switch (aRole)
-        {
-            case Qt::DisplayRole:
+        case Qt::DisplayRole:
             {
                 if (aColumn == DescriptionSection)
@@ -252 +181 @@
                     {
                         case KVirtualSystemDescriptionType_Name: v = VBoxImportApplianceWgt::tr ("Name"); break;
+                        case KVirtualSystemDescriptionType_Product: v = VBoxImportApplianceWgt::tr ("Product"); break;
+                        case KVirtualSystemDescriptionType_ProductUrl: v = VBoxImportApplianceWgt::tr ("Product-URL"); break;
+                        case KVirtualSystemDescriptionType_Vendor: v = VBoxImportApplianceWgt::tr ("Vendor"); break;
+                        case KVirtualSystemDescriptionType_VendorUrl: v = VBoxImportApplianceWgt::tr ("Vendor-URL"); break;
+                        case KVirtualSystemDescriptionType_Version: v = VBoxImportApplianceWgt::tr ("Version"); break;
                         case KVirtualSystemDescriptionType_Description: v = VBoxImportApplianceWgt::tr ("Description"); break;
+                        case KVirtualSystemDescriptionType_License: v = VBoxImportApplianceWgt::tr ("License"); break;
                         case KVirtualSystemDescriptionType_OS: v = VBoxImportApplianceWgt::tr ("Guest OS Type"); break;
                         case KVirtualSystemDescriptionType_CPU: v = VBoxImportApplianceWgt::tr ("CPU"); break;
@@ -274 +209 @@
                     switch (mType)
                     {
+                        case KVirtualSystemDescriptionType_Description:
+                        case KVirtualSystemDescriptionType_License:
+                            {
+                                /* Shorten the big text if there is more than
+                                 * one line */
+                                QString tmp (mConfigValue);
+                                tmp.replace (tmp.indexOf ('\n'), tmp.length(), "...");
+                                v = tmp; break;
+                            }
                         case KVirtualSystemDescriptionType_OS: v = vboxGlobal().vmGuestOSTypeDescription (mConfigValue); break;
                         case KVirtualSystemDescriptionType_Memory: v = mConfigValue + " " + VBoxImportApplianceWgt::tr ("MB"); break;
@@ -283 +227 @@
                 break;
             }
-            case Qt::ToolTipRole:
+        case Qt::ToolTipRole:
             {
                 if (aColumn == ConfigValueSection)
@@ -292 +236 @@
                 break;
             }
-            case Qt::DecorationRole:
+        case Qt::DecorationRole:
             {
                 if (aColumn == DescriptionSection)
@@ -299 +243 @@
                     {
                         case KVirtualSystemDescriptionType_Name: v = QIcon (":/name_16px.png"); break;
-                        case KVirtualSystemDescriptionType_Description: v = QIcon (":/description_16px.png"); break;
+                        case KVirtualSystemDescriptionType_Product:
+                        case KVirtualSystemDescriptionType_ProductUrl:
+                        case KVirtualSystemDescriptionType_Vendor:
+                        case KVirtualSystemDescriptionType_VendorUrl:
+                        case KVirtualSystemDescriptionType_Version:
+                        case KVirtualSystemDescriptionType_Description:
+                        case KVirtualSystemDescriptionType_License: v = QIcon (":/description_16px.png"); break;
                         case KVirtualSystemDescriptionType_OS: v = QIcon (":/os_type_16px.png"); break;
                         case KVirtualSystemDescriptionType_CPU: v = QIcon (":/cpu_16px.png"); break;
@@ -322 +272 @@
                 break;
             }
-            case Qt::FontRole:
+        case Qt::FontRole:
             {
                 /* If the item is unchecked mark it with italic text. */
@@ -334 +284 @@
                 break;
             }
-            case Qt::ForegroundRole:
+        case Qt::ForegroundRole:
             {
                 /* If the item is unchecked mark it with gray text. */
@@ -345 +295 @@
                 break;
             }
-            case Qt::CheckStateRole:
+        case Qt::CheckStateRole:
             {
                 if (aColumn == ConfigValueSection &&
@@ -356 +306 @@
                 break;
             }
-        }
-        return v;
     }
-
-    virtual Qt::ItemFlags itemFlags (int aColumn) const
+    return v;
+}
+
+Qt::ItemFlags HardwareItem::itemFlags (int aColumn) const
+{
+    Qt::ItemFlags flags = 0;
+    if (aColumn == ConfigValueSection)
     {
-        Qt::ItemFlags flags = 0;
-        if (aColumn == ConfigValueSection)
+        /* Some items are checkable */
+        if (mType == KVirtualSystemDescriptionType_Floppy ||
+            mType == KVirtualSystemDescriptionType_CDROM ||
+            mType == KVirtualSystemDescriptionType_USBController ||
+            mType == KVirtualSystemDescriptionType_SoundCard ||
+            mType == KVirtualSystemDescriptionType_NetworkAdapter)
+            flags |= Qt::ItemIsUserCheckable;
+        /* Some items are editable */
+        if ((mType == KVirtualSystemDescriptionType_Name ||
+             mType == KVirtualSystemDescriptionType_Product ||
+             mType == KVirtualSystemDescriptionType_ProductUrl ||
+             mType == KVirtualSystemDescriptionType_Vendor ||
+             mType == KVirtualSystemDescriptionType_VendorUrl ||
+             mType == KVirtualSystemDescriptionType_Version ||
+             mType == KVirtualSystemDescriptionType_Description ||
+             mType == KVirtualSystemDescriptionType_License ||
+             mType == KVirtualSystemDescriptionType_OS ||
+             mType == KVirtualSystemDescriptionType_Memory ||
+             mType == KVirtualSystemDescriptionType_SoundCard ||
+             mType == KVirtualSystemDescriptionType_NetworkAdapter ||
+             mType == KVirtualSystemDescriptionType_HardDiskControllerIDE ||
+             mType == KVirtualSystemDescriptionType_HardDiskImage) &&
+            mCheckState == Qt::Checked) /* Item has to be enabled */
+            flags |= Qt::ItemIsEditable;
+    }
+    return flags;
+}
+
+QWidget * HardwareItem::createEditor (QWidget *aParent, const QStyleOptionViewItem & /* aOption */, const QModelIndex &aIndex) const
+{
+    QWidget *editor = NULL;
+    if (aIndex.column() == ConfigValueSection)
+    {
+        switch (mType)
         {
-            /* Some items are checkable */
-            if (mType == KVirtualSystemDescriptionType_Floppy ||
-                mType == KVirtualSystemDescriptionType_CDROM ||
-                mType == KVirtualSystemDescriptionType_USBController ||
-                mType == KVirtualSystemDescriptionType_SoundCard ||
-                mType == KVirtualSystemDescriptionType_NetworkAdapter)
-                flags |= Qt::ItemIsUserCheckable;
-            /* Some items are editable */
-            if ((mType == KVirtualSystemDescriptionType_Name ||
-                 mType == KVirtualSystemDescriptionType_Description ||
-                 mType == KVirtualSystemDescriptionType_OS ||
-                 mType == KVirtualSystemDescriptionType_Memory ||
-                 mType == KVirtualSystemDescriptionType_SoundCard ||
-                 mType == KVirtualSystemDescriptionType_NetworkAdapter ||
-                 mType == KVirtualSystemDescriptionType_HardDiskControllerIDE ||
-                 mType == KVirtualSystemDescriptionType_HardDiskImage) &&
-                mCheckState == Qt::Checked) /* Item has to be enabled */
-                flags |= Qt::ItemIsEditable;
-        }
-        return flags;
-    }
-
-    virtual QWidget * createEditor (QWidget *aParent, const QStyleOptionViewItem & /* aOption */, const QModelIndex &aIndex) const
-    {
-        QWidget *editor = NULL;
-        if (aIndex.column() == ConfigValueSection)
-        {
-            switch (mType)
-            {
-                case KVirtualSystemDescriptionType_OS:
+            case KVirtualSystemDescriptionType_OS:
                 {
                     VBoxOSTypeSelectorButton *e = new VBoxOSTypeSelectorButton (aParent);
@@ -405 +361 @@
                     break;
                 }
-                case KVirtualSystemDescriptionType_Name:
+            case KVirtualSystemDescriptionType_Name:
+            case KVirtualSystemDescriptionType_Product:
+            case KVirtualSystemDescriptionType_ProductUrl:
+            case KVirtualSystemDescriptionType_Vendor:
+            case KVirtualSystemDescriptionType_VendorUrl:
+            case KVirtualSystemDescriptionType_Version:
                 {
                     QLineEdit *e = new QLineEdit (aParent);
@@ -411 +372 @@
                     break;
                 }
-                case KVirtualSystemDescriptionType_Description:
-                {
-                    QTextEdit *e = new QTextEdit (aParent);
+            case KVirtualSystemDescriptionType_Description:
+            case KVirtualSystemDescriptionType_License:
+                {
+                    VBoxLineTextEdit *e = new VBoxLineTextEdit (aParent);
                     editor = e;
                     break;
                 }
-                case KVirtualSystemDescriptionType_CPU:
+            case KVirtualSystemDescriptionType_CPU:
                 {
                     QSpinBox *e = new QSpinBox (aParent);
@@ -424 +386 @@
                     break;
                 }
-                case KVirtualSystemDescriptionType_Memory:
+            case KVirtualSystemDescriptionType_Memory:
                 {
                     QSpinBox *e = new QSpinBox (aParent);
@@ -432 +394 @@
                     break;
                 }
-                case KVirtualSystemDescriptionType_SoundCard:
+            case KVirtualSystemDescriptionType_SoundCard:
                 {
                     QComboBox *e = new QComboBox (aParent);
@@ -440 +402 @@
                     break;
                 }
-                case KVirtualSystemDescriptionType_NetworkAdapter:
+            case KVirtualSystemDescriptionType_NetworkAdapter:
                 {
                     QComboBox *e = new QComboBox (aParent);
@@ -452 +414 @@
                     break;
                 }
-                case KVirtualSystemDescriptionType_HardDiskControllerIDE:
+            case KVirtualSystemDescriptionType_HardDiskControllerIDE:
                 {
                     QComboBox *e = new QComboBox (aParent);
@@ -461 +423 @@
                     break;
                 }
-                case KVirtualSystemDescriptionType_HardDiskImage:
-                {
-                /* disabled for now
-                    VBoxFilePathSelectorWidget *e = new VBoxFilePathSelectorWidget (aParent);
-                    e->setMode (VBoxFilePathSelectorWidget::Mode_File);
-                    e->setResetEnabled (false);
-                */
+            case KVirtualSystemDescriptionType_HardDiskImage:
+                {
+                    /* disabled for now
+                       VBoxFilePathSelectorWidget *e = new VBoxFilePathSelectorWidget (aParent);
+                       e->setMode (VBoxFilePathSelectorWidget::Mode_File);
+                       e->setResetEnabled (false);
+                       */
                     QLineEdit *e = new QLineEdit (aParent);
                     editor = e;
                     break;
                 }
-                default: break;
-            }
+            default: break;
         }
-        return editor;
     }
-
-    virtual bool setEditorData (QWidget *aEditor, const QModelIndex & /* aIndex */) const
+    return editor;
+}
+
+bool HardwareItem::setEditorData (QWidget *aEditor, const QModelIndex & /* aIndex */) const
+{
+    bool fDone = false;
+    switch (mType)
     {
-        bool fDone = false;
-        switch (mType)
-        {
-            case KVirtualSystemDescriptionType_OS:
+        case KVirtualSystemDescriptionType_OS:
             {
                 if (VBoxOSTypeSelectorButton *e = qobject_cast<VBoxOSTypeSelectorButton*> (aEditor))
@@ -492 +454 @@
                 break;
             }
-            case KVirtualSystemDescriptionType_HardDiskControllerIDE:
+        case KVirtualSystemDescriptionType_HardDiskControllerIDE:
             {
                 if (QComboBox *e = qobject_cast<QComboBox*> (aEditor))
@@ -503 +465 @@
                 break;
             }
-            case KVirtualSystemDescriptionType_CPU:
-            case KVirtualSystemDescriptionType_Memory:
+        case KVirtualSystemDescriptionType_CPU:
+        case KVirtualSystemDescriptionType_Memory:
             {
                 if (QSpinBox *e = qobject_cast<QSpinBox*> (aEditor))
@@ -513 +475 @@
                 break;
             }
-            case KVirtualSystemDescriptionType_Name:
+        case KVirtualSystemDescriptionType_Name:
+        case KVirtualSystemDescriptionType_Product:
+        case KVirtualSystemDescriptionType_ProductUrl:
+        case KVirtualSystemDescriptionType_Vendor:
+        case KVirtualSystemDescriptionType_VendorUrl:
+        case KVirtualSystemDescriptionType_Version:
             {
                 if (QLineEdit *e = qobject_cast<QLineEdit*> (aEditor))
@@ -522 +489 @@
                 break;
             }
-            case KVirtualSystemDescriptionType_Description:
-            {
-                if (QTextEdit *e = qobject_cast<QTextEdit*> (aEditor))
-                {
-                    e->setPlainText (mConfigValue);
-                    fDone = true;
-                }
-                break;
-            }
-            case KVirtualSystemDescriptionType_SoundCard:
-            case KVirtualSystemDescriptionType_NetworkAdapter:
+        case KVirtualSystemDescriptionType_Description:
+        case KVirtualSystemDescriptionType_License:
+            {
+                if (VBoxLineTextEdit *e = qobject_cast<VBoxLineTextEdit*> (aEditor))
+                {
+                    e->setText (mConfigValue);
+                    fDone = true;
+                }
+                break;
+            }
+        case KVirtualSystemDescriptionType_SoundCard:
+        case KVirtualSystemDescriptionType_NetworkAdapter:
             {
                 if (QComboBox *e = qobject_cast<QComboBox*> (aEditor))
@@ -543 +511 @@
                 break;
             }
-            case KVirtualSystemDescriptionType_HardDiskImage:
+        case KVirtualSystemDescriptionType_HardDiskImage:
             {
                 /* disabled for now
-                if (VBoxFilePathSelectorWidget *e = qobject_cast<VBoxFilePathSelectorWidget*> (aEditor))
-                {
-                    e->setPath (mConfigValue);
-                */
+                   if (VBoxFilePathSelectorWidget *e = qobject_cast<VBoxFilePathSelectorWidget*> (aEditor))
+                   {
+                   e->setPath (mConfigValue);
+                   }
+                   */
                 if (QLineEdit *e = qobject_cast<QLineEdit*> (aEditor))
                 {
@@ -557 +526 @@
                 break;
             }
-            default: break;
+        default: break;
+    }
+    return fDone;
+}
+
+bool HardwareItem::setModelData (QWidget *aEditor, QAbstractItemModel * /* aModel */, const QModelIndex & /* aIndex */)
+{
+    bool fDone = false;
+    switch (mType)
+    {
+        case KVirtualSystemDescriptionType_OS:
+            {
+                if (VBoxOSTypeSelectorButton *e = qobject_cast<VBoxOSTypeSelectorButton*> (aEditor))
+                {
+                    mConfigValue = e->osTypeId();
+                    fDone = true;
+                }
+                break;
+            }
+        case KVirtualSystemDescriptionType_HardDiskControllerIDE:
+            {
+                if (QComboBox *e = qobject_cast<QComboBox*> (aEditor))
+                {
+                    mConfigValue = e->itemData (e->currentIndex()).toString();
+                    fDone = true;
+                }
+                break;
+            }
+        case KVirtualSystemDescriptionType_CPU:
+        case KVirtualSystemDescriptionType_Memory:
+            {
+                if (QSpinBox *e = qobject_cast<QSpinBox*> (aEditor))
+                {
+                    mConfigValue = QString::number (e->value());
+                    fDone = true;
+                }
+                break;
+            }
+        case KVirtualSystemDescriptionType_Name:
+        case KVirtualSystemDescriptionType_Product:
+        case KVirtualSystemDescriptionType_ProductUrl:
+        case KVirtualSystemDescriptionType_Vendor:
+        case KVirtualSystemDescriptionType_VendorUrl:
+        case KVirtualSystemDescriptionType_Version:
+            {
+                if (QLineEdit *e = qobject_cast<QLineEdit*> (aEditor))
+                {
+                    mConfigValue = e->text();
+                    fDone = true;
+                }
+                break;
+            }
+        case KVirtualSystemDescriptionType_Description:
+        case KVirtualSystemDescriptionType_License:
+            {
+                if (VBoxLineTextEdit *e = qobject_cast<VBoxLineTextEdit*> (aEditor))
+                {
+                    mConfigValue = e->text();
+                    fDone = true;
+                }
+                break;
+            }
+        case KVirtualSystemDescriptionType_SoundCard:
+        case KVirtualSystemDescriptionType_NetworkAdapter:
+            {
+                if (QComboBox *e = qobject_cast<QComboBox*> (aEditor))
+                {
+                    mConfigValue = e->itemData (e->currentIndex()).toString();
+                    fDone = true;
+                }
+                break;
+            }
+        case KVirtualSystemDescriptionType_HardDiskImage:
+            {
+                /* disabled for now
+                   if (VBoxFilePathSelectorWidget *e = qobject_cast<VBoxFilePathSelectorWidget*> (aEditor))
+                   {
+                   mConfigValue = e->path();
+                   }
+                   */
+                if (QLineEdit *e = qobject_cast<QLineEdit*> (aEditor))
+                {
+                    mConfigValue = e->text();
+                    fDone = true;
+                }
+                break;
+            }
+        default: break;
+    }
+    return fDone;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// VirtualSystemModel
+
+/* This class is a wrapper model for our ModelItem. It could be used with any
+   TreeView & forward mostly all calls to the methods of ModelItem. The
+   ModelItems itself are stored as internal pointers in the QModelIndex class. */
+VirtualSystemModel::VirtualSystemModel (QVector<CVirtualSystemDescription>& aVSDs, QObject *aParent /* = NULL */)
+   : QAbstractItemModel (aParent)
+{
+    mRootItem = new ModelItem (0, RootType);
+    for (int a = 0; a < aVSDs.size(); ++a)
+    {
+        CVirtualSystemDescription vs = aVSDs[a];
+
+        VirtualSystemItem *vi = new VirtualSystemItem (a, vs, mRootItem);
+        mRootItem->appendChild (vi);
+
+        /* @todo: ask Dmitry about include/COMDefs.h:232 */
+        QVector<KVirtualSystemDescriptionType> types;
+        QVector<QString> refs;
+        QVector<QString> origValues;
+        QVector<QString> configValues;
+        QVector<QString> extraConfigValues;
+
+        QList<int> hdIndizies;
+        QMap<int, HardwareItem*> controllerMap;
+        vs.GetDescription (types, refs, origValues, configValues, extraConfigValues);
+        for (int i = 0; i < types.size(); ++i)
+        {
+            /* We add the hard disk images in an second step, so save a
+               reference to them. */
+            if (types[i] == KVirtualSystemDescriptionType_HardDiskImage)
+                hdIndizies << i;
+            else
+            {
+                HardwareItem *hi = new HardwareItem (i, types[i], refs[i], origValues[i], configValues[i], extraConfigValues[i], vi);
+                vi->appendChild (hi);
+                /* Save the hard disk controller types in an extra map */
+                if (types[i] == KVirtualSystemDescriptionType_HardDiskControllerIDE ||
+                    types[i] == KVirtualSystemDescriptionType_HardDiskControllerSATA ||
+                    types[i] == KVirtualSystemDescriptionType_HardDiskControllerSCSI)
+                    controllerMap[i] = hi;
+            }
         }
-        return fDone;
+        QRegExp rx ("controller=(\\d+);?");
+        /* Now process the hard disk images */
+        for (int a = 0; a < hdIndizies.size(); ++a)
+        {
+            int i = hdIndizies[a];
+            QString ecnf = extraConfigValues[i];
+            if (rx.indexIn (ecnf) != -1)
+            {
+                /* Get the controller */
+                HardwareItem *ci = controllerMap[rx.cap (1).toInt()];
+                if (ci)
+                {
+                    /* New hardware item as child of the controller */
+                    HardwareItem *hi = new HardwareItem (i, types[i], refs[i], origValues[i], configValues[i], extraConfigValues[i], ci);
+                    ci->appendChild (hi);
+                }
+            }
+        }
     }
-
-    virtual bool setModelData (QWidget *aEditor, QAbstractItemModel * /* aModel */, const QModelIndex & /* aIndex */)
+}
+
+QModelIndex VirtualSystemModel::index (int aRow, int aColumn, const QModelIndex &aParent /* = QModelIndex() */) const
+{
+    if (!hasIndex (aRow, aColumn, aParent))
+        return QModelIndex();
+
+    ModelItem *parentItem;
+
+    if (!aParent.isValid())
+        parentItem = mRootItem;
+    else
+        parentItem = static_cast<ModelItem*> (aParent.internalPointer());
+
+    ModelItem *childItem = parentItem->child (aRow);
+    if (childItem)
+        return createIndex (aRow, aColumn, childItem);
+    else
+        return QModelIndex();
+}
+
+QModelIndex VirtualSystemModel::parent (const QModelIndex &aIndex) const
+{
+    if (!aIndex.isValid())
+        return QModelIndex();
+
+    ModelItem *childItem = static_cast<ModelItem*> (aIndex.internalPointer());
+    ModelItem *parentItem = childItem->parent();
+
+    if (parentItem == mRootItem)
+        return QModelIndex();
+
+    return createIndex (parentItem->row(), 0, parentItem);
+}
+
+int VirtualSystemModel::rowCount (const QModelIndex &aParent /* = QModelIndex() */) const
+{
+    ModelItem *parentItem;
+    if (aParent.column() > 0)
+        return 0;
+
+    if (!aParent.isValid())
+        parentItem = mRootItem;
+    else
+        parentItem = static_cast<ModelItem*> (aParent.internalPointer());
+
+    return parentItem->childCount();
+}
+
+int VirtualSystemModel::columnCount (const QModelIndex &aParent /* = QModelIndex() */) const
+{
+    if (aParent.isValid())
+        return static_cast<ModelItem*> (aParent.internalPointer())->columnCount();
+    else
+        return mRootItem->columnCount();
+}
+
+bool VirtualSystemModel::setData (const QModelIndex &aIndex, const QVariant &aValue, int aRole)
+{
+    if (!aIndex.isValid())
+        return false;
+
+    ModelItem *item = static_cast<ModelItem*> (aIndex.internalPointer());
+
+    return item->setData (aIndex.column(), aValue, aRole);
+}
+
+QVariant VirtualSystemModel::data (const QModelIndex &aIndex, int aRole /* = Qt::DisplayRole */) const
+{
+    if (!aIndex.isValid())
+        return QVariant();
+
+    ModelItem *item = static_cast<ModelItem*> (aIndex.internalPointer());
+
+    return item->data (aIndex.column(), aRole);
+}
+
+Qt::ItemFlags VirtualSystemModel::flags (const QModelIndex &aIndex) const
+{
+    if (!aIndex.isValid())
+        return 0;
+
+    ModelItem *item = static_cast<ModelItem*> (aIndex.internalPointer());
+
+    return Qt::ItemIsEnabled | Qt::ItemIsSelectable | item->itemFlags (aIndex.column());
+}
+
+QVariant VirtualSystemModel::headerData (int aSection, Qt::Orientation aOrientation, int aRole) const
+{
+    if (aRole != Qt::DisplayRole ||
+        aOrientation != Qt::Horizontal)
+        return QVariant();
+
+    QString title;
+    switch (aSection)
     {
-        bool fDone = false;
-        switch (mType)
-        {
-            case KVirtualSystemDescriptionType_OS:
-            {
-                if (VBoxOSTypeSelectorButton *e = qobject_cast<VBoxOSTypeSelectorButton*> (aEditor))
-                {
-                    mConfigValue = e->osTypeId();
-                    fDone = true;
-                }
-                break;
-            }
-            case KVirtualSystemDescriptionType_HardDiskControllerIDE:
-            {
-                if (QComboBox *e = qobject_cast<QComboBox*> (aEditor))
-                {
-                    mConfigValue = e->itemData (e->currentIndex()).toString();
-                    fDone = true;
-                }
-                break;
-            }
-            case KVirtualSystemDescriptionType_CPU:
-            case KVirtualSystemDescriptionType_Memory:
-            {
-                if (QSpinBox *e = qobject_cast<QSpinBox*> (aEditor))
-                {
-                    mConfigValue = QString::number (e->value());
-                    fDone = true;
-                }
-                break;
-            }
-            case KVirtualSystemDescriptionType_Name:
-            {
-                if (QLineEdit *e = qobject_cast<QLineEdit*> (aEditor))
-                {
-                    mConfigValue = e->text();
-                    fDone = true;
-                }
-                break;
-            }
-            case KVirtualSystemDescriptionType_Description:
-            {
-                if (QTextEdit *e = qobject_cast<QTextEdit*> (aEditor))
-                {
-                    mConfigValue = e->toPlainText();
-                    fDone = true;
-                }
-                break;
-            }
-            case KVirtualSystemDescriptionType_SoundCard:
-            case KVirtualSystemDescriptionType_NetworkAdapter:
-            {
-                if (QComboBox *e = qobject_cast<QComboBox*> (aEditor))
-                {
-                    mConfigValue = e->itemData (e->currentIndex()).toString();
-                    fDone = true;
-                }
-                break;
-            }
-            case KVirtualSystemDescriptionType_HardDiskImage:
-            {
-                /* disabled for now
-                if (VBoxFilePathSelectorWidget *e = qobject_cast<VBoxFilePathSelectorWidget*> (aEditor))
-                {
-                    mConfigValue = e->path();
-                */
-                if (QLineEdit *e = qobject_cast<QLineEdit*> (aEditor))
-                {
-                    mConfigValue = e->text();
-                    fDone = true;
-                }
-                break;
-            }
-            default: break;
-        }
-        return fDone;
+        case DescriptionSection: title = VBoxImportApplianceWgt::tr ("Description"); break;
+        case ConfigValueSection: title = VBoxImportApplianceWgt::tr ("Configuration"); break;
     }
-
-    virtual void restoreDefaults()
+    return title;
+}
+
+void VirtualSystemModel::restoreDefaults (const QModelIndex& aParent /* = QModelIndex() */)
+{
+    ModelItem *parentItem;
+
+    if (!aParent.isValid())
+        parentItem = mRootItem;
+    else
+        parentItem = static_cast<ModelItem*> (aParent.internalPointer());
+
+    for (int i = 0; i < parentItem->childCount(); ++i)
     {
-        mConfigValue = mConfigDefaultValue;
-        mCheckState = Qt::Checked;
+        parentItem->child (i)->restoreDefaults();
+        restoreDefaults (index (i, 0, aParent));
     }
-
-private:
-
-    /* Private member vars */
-    KVirtualSystemDescriptionType mType;
-    QString mRef;
-    QString mOrigValue;
-    QString mConfigValue;
-    QString mConfigDefaultValue;
-    QString mExtraConfigValue;
-    Qt::CheckState mCheckState;
-};
+    emit dataChanged (index (0, 0, aParent), index (parentItem->childCount()-1, 0, aParent));
+}
+
+void VirtualSystemModel::putBack()
+{
+    QVector<BOOL> v1;
+    QVector<QString> v2;
+    QVector<QString> v3;
+    mRootItem->putBack (v1, v2, v3);
+}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -669 +817 @@
    have to handle the proxy model ourself. I really don't understand why Qt is
    not doing this for us. */
-class VirtualSystemDelegate: public QItemDelegate
-{
-public:
-    VirtualSystemDelegate (QAbstractProxyModel *aProxy, QObject *aParent = NULL)
-        : QItemDelegate (aParent)
-        , mProxy (aProxy)
-    {}
-
-    QWidget * createEditor (QWidget *aParent, const QStyleOptionViewItem &aOption, const QModelIndex &aIndex) const
-    {
-        if (!aIndex.isValid())
-            return QItemDelegate::createEditor (aParent, aOption, aIndex);
-
-        QModelIndex index (aIndex);
-        if (mProxy)
-            index = mProxy->mapToSource (aIndex);
-
-        ModelItem *item = static_cast<ModelItem*> (index.internalPointer());
-        QWidget *editor = item->createEditor (aParent, aOption, index);
-
-        if (editor == NULL)
-            return QItemDelegate::createEditor (aParent, aOption, index);
-        else
-            return editor;
-    }
-
-    void setEditorData (QWidget *aEditor, const QModelIndex &aIndex) const
-    {
-        if (!aIndex.isValid())
-            return QItemDelegate::setEditorData (aEditor, aIndex);
-
-        QModelIndex index (aIndex);
-        if (mProxy)
-            index = mProxy->mapToSource (aIndex);
-
-        ModelItem *item = static_cast<ModelItem*> (index.internalPointer());
-
-        if (!item->setEditorData (aEditor, index))
-            QItemDelegate::setEditorData (aEditor, index);
-    }
-
-    void setModelData (QWidget *aEditor, QAbstractItemModel *aModel, const QModelIndex &aIndex) const
-    {
-        if (!aIndex.isValid())
-            return QItemDelegate::setModelData (aEditor, aModel, aIndex);
-
-        QModelIndex index = aModel->index (aIndex.row(), aIndex.column());
-        if (mProxy)
-            index = mProxy->mapToSource (aIndex);
-
-        ModelItem *item = static_cast<ModelItem*> (index.internalPointer());
-        if (!item->setModelData (aEditor, aModel, index))
-            QItemDelegate::setModelData (aEditor, aModel, aIndex);
-    }
-
-    void updateEditorGeometry (QWidget *aEditor, const QStyleOptionViewItem &aOption, const QModelIndex & /* aIndex */) const
-    {
-        if (aEditor)
-            aEditor->setGeometry (aOption.rect);
-    }
-
-    QSize sizeHint (const QStyleOptionViewItem &aOption, const QModelIndex &aIndex) const
-    {
-        QSize size = QItemDelegate::sizeHint (aOption, aIndex);
-#ifdef Q_WS_MAC
-        int h = 28;
-#else /* Q_WS_MAC */
-        int h = 24;
-#endif /* Q_WS_MAC */
-        size.setHeight (RT_MAX (h, size.height()));
-        return size;
-    }
-private:
-    /* Private member vars */
-    QAbstractProxyModel *mProxy;
-};
+VirtualSystemDelegate::VirtualSystemDelegate (QAbstractProxyModel *aProxy, QObject *aParent /* = NULL */)
+  : QItemDelegate (aParent)
+  , mProxy (aProxy)
+{}
+
+QWidget * VirtualSystemDelegate::createEditor (QWidget *aParent, const QStyleOptionViewItem &aOption, const QModelIndex &aIndex) const
+{
+    if (!aIndex.isValid())
+        return QItemDelegate::createEditor (aParent, aOption, aIndex);
+
+    QModelIndex index (aIndex);
+    if (mProxy)
+        index = mProxy->mapToSource (aIndex);
+
+    ModelItem *item = static_cast<ModelItem*> (index.internalPointer());
+    QWidget *editor = item->createEditor (aParent, aOption, index);
+
+    if (editor == NULL)
+        return QItemDelegate::createEditor (aParent, aOption, index);
+    else
+        return editor;
+}
+
+void VirtualSystemDelegate::setEditorData (QWidget *aEditor, const QModelIndex &aIndex) const
+{
+    if (!aIndex.isValid())
+        return QItemDelegate::setEditorData (aEditor, aIndex);
+
+    QModelIndex index (aIndex);
+    if (mProxy)
+        index = mProxy->mapToSource (aIndex);
+
+    ModelItem *item = static_cast<ModelItem*> (index.internalPointer());
+
+    if (!item->setEditorData (aEditor, index))
+        QItemDelegate::setEditorData (aEditor, index);
+}
+
+void VirtualSystemDelegate::setModelData (QWidget *aEditor, QAbstractItemModel *aModel, const QModelIndex &aIndex) const
+{
+    if (!aIndex.isValid())
+        return QItemDelegate::setModelData (aEditor, aModel, aIndex);
+
+    QModelIndex index = aModel->index (aIndex.row(), aIndex.column());
+    if (mProxy)
+        index = mProxy->mapToSource (aIndex);
+
+    ModelItem *item = static_cast<ModelItem*> (index.internalPointer());
+    if (!item->setModelData (aEditor, aModel, index))
+        QItemDelegate::setModelData (aEditor, aModel, aIndex);
+}
+
+void VirtualSystemDelegate::updateEditorGeometry (QWidget *aEditor, const QStyleOptionViewItem &aOption, const QModelIndex & /* aIndex */) const
+{
+    if (aEditor)
+        aEditor->setGeometry (aOption.rect);
+}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -753 +882 @@
 {
     KVirtualSystemDescriptionType_Name,
+    KVirtualSystemDescriptionType_Product,
+    KVirtualSystemDescriptionType_ProductUrl,
+    KVirtualSystemDescriptionType_Vendor,
+    KVirtualSystemDescriptionType_VendorUrl,
+    KVirtualSystemDescriptionType_Version,
     KVirtualSystemDescriptionType_Description,
+    KVirtualSystemDescriptionType_License,
     KVirtualSystemDescriptionType_OS,
-    KVirtualSystemDescriptionType_License,
     KVirtualSystemDescriptionType_CPU,
     KVirtualSystemDescriptionType_Memory,
@@ -786 +920 @@
                 HardwareItem *hwItem = static_cast<HardwareItem*> (item);
                 /* The license type shouldn't be displayed */
-                if (hwItem->mType == KVirtualSystemDescriptionType_License)
+                if (mFilterList.contains (hwItem->mType))
                     return false;
             }
@@ -824 +958 @@
 
 ////////////////////////////////////////////////////////////////////////////////
-// VirtualSystemModel
-
-/* This class is a wrapper model for our ModelItem. It could be used with any
-   TreeView & forward mostly all calls to the methods of ModelItem. The
-   ModelItems itself are stored as internal pointers in the QModelIndex class. */
-VirtualSystemModel::VirtualSystemModel (QVector<CVirtualSystemDescription>& aVSDs, QObject *aParent /* = NULL */)
-   : QAbstractItemModel (aParent)
-{
-    mRootItem = new ModelItem (0, RootType);
-    for (int a = 0; a < aVSDs.size(); ++a)
-    {
-        CVirtualSystemDescription vs = aVSDs[a];
-
-        VirtualSystemItem *vi = new VirtualSystemItem (a, vs, mRootItem);
-        mRootItem->appendChild (vi);
-
-        /* @todo: ask Dmitry about include/COMDefs.h:232 */
-        QVector<KVirtualSystemDescriptionType> types;
-        QVector<QString> refs;
-        QVector<QString> origValues;
-        QVector<QString> configValues;
-        QVector<QString> extraConfigValues;
-
-        QList<int> hdIndizies;
-        QMap<int, HardwareItem*> controllerMap;
-        vs.GetDescription (types, refs, origValues, configValues, extraConfigValues);
-        for (int i = 0; i < types.size(); ++i)
-        {
-            /* We add the hard disk images in an second step, so save a
-               reference to them. */
-            if (types[i] == KVirtualSystemDescriptionType_HardDiskImage)
-                hdIndizies << i;
-            else
-            {
-                HardwareItem *hi = new HardwareItem (i, types[i], refs[i], origValues[i], configValues[i], extraConfigValues[i], vi);
-                vi->appendChild (hi);
-                /* Save the hard disk controller types in an extra map */
-                if (types[i] == KVirtualSystemDescriptionType_HardDiskControllerIDE ||
-                    types[i] == KVirtualSystemDescriptionType_HardDiskControllerSATA ||
-                    types[i] == KVirtualSystemDescriptionType_HardDiskControllerSCSI)
-                    controllerMap[i] = hi;
-            }
-        }
-        QRegExp rx ("controller=(\\d+);?");
-        /* Now process the hard disk images */
-        for (int a = 0; a < hdIndizies.size(); ++a)
-        {
-            int i = hdIndizies[a];
-            QString ecnf = extraConfigValues[i];
-            if (rx.indexIn (ecnf) != -1)
-            {
-                /* Get the controller */
-                HardwareItem *ci = controllerMap[rx.cap (1).toInt()];
-                if (ci)
-                {
-                    /* New hardware item as child of the controller */
-                    HardwareItem *hi = new HardwareItem (i, types[i], refs[i], origValues[i], configValues[i], extraConfigValues[i], ci);
-                    ci->appendChild (hi);
-                }
-            }
-        }
-    }
-}
-
-QModelIndex VirtualSystemModel::index (int aRow, int aColumn, const QModelIndex &aParent /* = QModelIndex() */) const
-{
-    if (!hasIndex (aRow, aColumn, aParent))
-        return QModelIndex();
-
-    ModelItem *parentItem;
-
-    if (!aParent.isValid())
-        parentItem = mRootItem;
-    else
-        parentItem = static_cast<ModelItem*> (aParent.internalPointer());
-
-    ModelItem *childItem = parentItem->child (aRow);
-    if (childItem)
-        return createIndex (aRow, aColumn, childItem);
-    else
-        return QModelIndex();
-}
-
-QModelIndex VirtualSystemModel::parent (const QModelIndex &aIndex) const
-{
-    if (!aIndex.isValid())
-        return QModelIndex();
-
-    ModelItem *childItem = static_cast<ModelItem*> (aIndex.internalPointer());
-    ModelItem *parentItem = childItem->parent();
-
-    if (parentItem == mRootItem)
-        return QModelIndex();
-
-    return createIndex (parentItem->row(), 0, parentItem);
-}
-
-int VirtualSystemModel::rowCount (const QModelIndex &aParent /* = QModelIndex() */) const
-{
-    ModelItem *parentItem;
-    if (aParent.column() > 0)
-        return 0;
-
-    if (!aParent.isValid())
-        parentItem = mRootItem;
-    else
-        parentItem = static_cast<ModelItem*> (aParent.internalPointer());
-
-    return parentItem->childCount();
-}
-
-int VirtualSystemModel::columnCount (const QModelIndex &aParent /* = QModelIndex() */) const
-{
-    if (aParent.isValid())
-        return static_cast<ModelItem*> (aParent.internalPointer())->columnCount();
-    else
-        return mRootItem->columnCount();
-}
-
-bool VirtualSystemModel::setData (const QModelIndex &aIndex, const QVariant &aValue, int aRole)
-{
-    if (!aIndex.isValid())
-        return false;
-
-    ModelItem *item = static_cast<ModelItem*> (aIndex.internalPointer());
-
-    return item->setData (aIndex.column(), aValue, aRole);
-}
-
-QVariant VirtualSystemModel::data (const QModelIndex &aIndex, int aRole /* = Qt::DisplayRole */) const
-{
-    if (!aIndex.isValid())
-        return QVariant();
-
-    ModelItem *item = static_cast<ModelItem*> (aIndex.internalPointer());
-
-    return item->data (aIndex.column(), aRole);
-}
-
-Qt::ItemFlags VirtualSystemModel::flags (const QModelIndex &aIndex) const
-{
-    if (!aIndex.isValid())
-        return 0;
-
-    ModelItem *item = static_cast<ModelItem*> (aIndex.internalPointer());
-
-    return Qt::ItemIsEnabled | Qt::ItemIsSelectable | item->itemFlags (aIndex.column());
-}
-
-QVariant VirtualSystemModel::headerData (int aSection, Qt::Orientation aOrientation, int aRole) const
-{
-    if (aRole != Qt::DisplayRole ||
-        aOrientation != Qt::Horizontal)
-        return QVariant();
-
-    QString title;
-    switch (aSection)
-    {
-        case DescriptionSection: title = VBoxImportApplianceWgt::tr ("Description"); break;
-        case ConfigValueSection: title = VBoxImportApplianceWgt::tr ("Configuration"); break;
-    }
-    return title;
-}
-
-void VirtualSystemModel::restoreDefaults (const QModelIndex& aParent /* = QModelIndex() */)
-{
-    ModelItem *parentItem;
-
-    if (!aParent.isValid())
-        parentItem = mRootItem;
-    else
-        parentItem = static_cast<ModelItem*> (aParent.internalPointer());
-
-    for (int i = 0; i < parentItem->childCount(); ++i)
-    {
-        parentItem->child (i)->restoreDefaults();
-        restoreDefaults (index (i, 0, aParent));
-    }
-    emit dataChanged (index (0, 0, aParent), index (parentItem->childCount()-1, 0, aParent));
-}
-
-void VirtualSystemModel::putBack()
-{
-    QVector<BOOL> v1;
-    QVector<QString> v2;
-    QVector<QString> v3;
-    mRootItem->putBack (v1, v2, v3);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// VBoxImportApplianceWgt
-
-int VBoxImportApplianceWgt::mMinGuestRAM = -1;
-int VBoxImportApplianceWgt::mMaxGuestRAM = -1;
-int VBoxImportApplianceWgt::mMinGuestCPUCount = -1;
-int VBoxImportApplianceWgt::mMaxGuestCPUCount = -1;
-
-VBoxImportApplianceWgt::VBoxImportApplianceWgt (QWidget *aParent)
+// VBoxApplianceEditorWgt
+
+VBoxApplianceEditorWgt::VBoxApplianceEditorWgt (QWidget *aParent /* = NULL */)
     : QIWithRetranslateUI<QWidget> (aParent)
     , mAppliance (NULL)
     , mModel (NULL)
 {
-    /* Make sure all static content is properly initialized */
-    initSystemSettings();
-
     /* Apply UI decorations */
-    Ui::VBoxImportApplianceWgt::setupUi (this);
+    Ui::VBoxApplianceEditorWgt::setupUi (this);
 
     /* Make the tree looking nicer */
@@ -1042 +978 @@
 }
 
-bool VBoxImportApplianceWgt::setFile (const QString& aFile)
-{
-    bool fResult = false;
-    if (!aFile.isEmpty())
-    {
-        CVirtualBox vbox = vboxGlobal().virtualBox();
-        /* Create a appliance object */
-        mAppliance = new CAppliance(vbox.CreateAppliance());
-        fResult = mAppliance->isOk();
-        if (fResult)
-        {
-            /* Read the appliance */
-            mAppliance->Read (aFile);
-            fResult = mAppliance->isOk();
-            if (fResult)
-            {
-                /* Now we have to interpret that stuff */
-                mAppliance->Interpret();
-                fResult = mAppliance->isOk();
-                if (fResult)
-                {
-                    if (mModel)
-                        delete mModel;
-
-                    QVector<CVirtualSystemDescription> vsds = mAppliance->GetVirtualSystemDescriptions();
-
-                    mModel = new VirtualSystemModel (vsds, this);
-
-                    VirtualSystemSortProxyModel *proxy = new VirtualSystemSortProxyModel (this);
-                    proxy->setSourceModel (mModel);
-                    proxy->sort (DescriptionSection, Qt::DescendingOrder);
-
-                    VirtualSystemDelegate *delegate = new VirtualSystemDelegate (proxy, this);
-
-                    /* Set our own model */
-                    mTvSettings->setModel (proxy);
-                    /* Set our own delegate */
-                    mTvSettings->setItemDelegate (delegate);
-                    /* For now we hide the original column. This data is displayed as tooltip
-                       also. */
-                    mTvSettings->setColumnHidden (OriginalValueSection, true);
-                    mTvSettings->expandAll();
-
-                    /* Check for warnings & if there are one display them. */
-                    bool fWarningsEnabled = false;
-                    QVector<QString> warnings = mAppliance->GetWarnings();
-                    if (warnings.size() > 0)
-                    {
-                        foreach (const QString& text, warnings)
-                            mWarningTextEdit->append ("- " + text);
-                        fWarningsEnabled = true;
-                    }
-                    mWarningWidget->setShown (fWarningsEnabled);
-                }
-            }
-        }
-        if (!fResult)
-        {
-            vboxProblem().cannotImportAppliance (mAppliance, this);
-            /* Delete the appliance in a case of an error */
-            delete mAppliance;
-            mAppliance = NULL;
-        }
-    }
-    return fResult;
-}
-
-void VBoxImportApplianceWgt::prepareImport()
-{
-    if (mAppliance)
-        mModel->putBack();
-}
-
-bool VBoxImportApplianceWgt::import()
-{
-    if (mAppliance)
-    {
-        /* Start the import asynchronously */
-        CProgress progress;
-        progress = mAppliance->ImportMachines();
-        bool fResult = mAppliance->isOk();
-        if (fResult)
-        {
-            /* Show some progress, so the user know whats going on */
-            vboxProblem().showModalProgressDialog (progress, tr ("Importing Appliance ..."), this);
-            if (!progress.isOk() || progress.GetResultCode() != 0)
-            {
-                vboxProblem().cannotImportAppliance (progress, mAppliance, this);
-                return false;
-            }
-            else
-                return true;
-        }
-        if (!fResult)
-            vboxProblem().cannotImportAppliance (mAppliance, this);
-    }
-    return false;
-}
-
-QList < QPair<QString, QString> > VBoxImportApplianceWgt::licenseAgreements() const
-{
-    QList < QPair<QString, QString> > list;
-
-    CVirtualSystemDescriptionVector vsds = mAppliance->GetVirtualSystemDescriptions();
-    for (int i=0; i < vsds.size(); ++i)
-    {
-        QVector<QString> license;
-        license = vsds[i].GetValuesByType (KVirtualSystemDescriptionType_License,
-                                           KVirtualSystemDescriptionValueType_Original);
-        if (!license.isEmpty())
-        {
-            QVector<QString> name;
-            name = vsds[i].GetValuesByType (KVirtualSystemDescriptionType_Name,
-                                            KVirtualSystemDescriptionValueType_Auto);
-            list << QPair<QString, QString> (name.first(), license.first());
-        }
-    }
-
-    return list;
-}
-
-void VBoxImportApplianceWgt::restoreDefaults()
+void VBoxApplianceEditorWgt::restoreDefaults()
 {
     mModel->restoreDefaults();
 }
 
-void VBoxImportApplianceWgt::retranslateUi()
+void VBoxApplianceEditorWgt::retranslateUi()
 {
     /* Translate uic generated strings */
-    Ui::VBoxImportApplianceWgt::retranslateUi (this);
-}
-
-/* static */
-void VBoxImportApplianceWgt::initSystemSettings()
-{
-    if (mMinGuestRAM == -1)
-    {
-        /* We need some global defaults from the current VirtualBox
-           installation */
-        CSystemProperties sp = vboxGlobal().virtualBox().GetSystemProperties();
-        mMinGuestRAM = sp.GetMinGuestRAM();
-        mMaxGuestRAM = sp.GetMaxGuestRAM();
-        mMinGuestCPUCount = sp.GetMinGuestCPUCount();
-        mMaxGuestCPUCount = sp.GetMaxGuestCPUCount();
-    }
-}
-
+    Ui::VBoxApplianceEditorWgt::retranslateUi (this);
+}
+
+

trunk/src/VBox/Frontends/VirtualBox/src/VBoxExportApplianceWzd.cpp

@@ -82 +82 @@
 #endif /* Q_WS_MAC */
 
+    /* Connect the restore button with the settings widget */
+    connect (mBtnRestore, SIGNAL (clicked()),
+             mExportSettingsWgt, SLOT (restoreDefaults()));
+
     /* Validator for the file selector page */
     mWValFileSelector = new QIWidgetValidator (mFileSelectPage, this);
@@ -131 +135 @@
 void VBoxExportApplianceWzd::accept()
 {
-    CAppliance appliance;
-    /* Prepare the export of the VM's. */
-    if (prepareForExportVMs (appliance))
-    {
-        QFileInfo fi (mFileSelector->path());
-        QStringList files;
-        files << mFileSelector->path();
-        /* We need to know every filename which will be created, so that we can
-         * ask the user for confirmation of overwriting. For that we iterating
-         * over all virtual systems & fetch all descriptions of the type
-         * HardDiskImage. */
-        CVirtualSystemDescriptionVector vsds = appliance.GetVirtualSystemDescriptions();
-        for (int i=0; i < vsds.size(); ++i)
-        {
-            QVector<KVirtualSystemDescriptionType> types;
-            QVector<QString> refs, origValues, configValues, extraConfigValues;
-
-            vsds[i].GetDescriptionByType (KVirtualSystemDescriptionType_HardDiskImage, types, refs, origValues, configValues, extraConfigValues);
-            foreach (const QString &s, origValues)
-                files << QString ("%1/%2").arg (fi.absolutePath()).arg (s);
-        }
-        /* Check if the file exists already, if yes get confirmation for
-         * overwriting from the user. */
-        if (!vboxProblem().askForOverridingFilesIfExists (files, this))
-            return;
-        /* Export the VMs, on success we are finished */
-        if (exportVMs(appliance))
-            QIAbstractWizard::accept();
-    }
+    CAppliance *appliance = mExportSettingsWgt->appliance();
+    QFileInfo fi (mFileSelector->path());
+    QStringList files;
+    files << mFileSelector->path();
+    /* We need to know every filename which will be created, so that we can
+     * ask the user for confirmation of overwriting. For that we iterating
+     * over all virtual systems & fetch all descriptions of the type
+     * HardDiskImage. */
+    CVirtualSystemDescriptionVector vsds = appliance->GetVirtualSystemDescriptions();
+    for (int i=0; i < vsds.size(); ++i)
+    {
+        QVector<KVirtualSystemDescriptionType> types;
+        QVector<QString> refs, origValues, configValues, extraConfigValues;
+
+        vsds[i].GetDescriptionByType (KVirtualSystemDescriptionType_HardDiskImage, types, refs, origValues, configValues, extraConfigValues);
+        foreach (const QString &s, origValues)
+            files << QString ("%1/%2").arg (fi.absolutePath()).arg (s);
+    }
+    /* Check if the file exists already, if yes get confirmation for
+     * overwriting from the user. */
+    if (!vboxProblem().askForOverridingFilesIfExists (files, this))
+        return;
+    /* Export the VMs, on success we are finished */
+    if (exportVMs(*appliance))
+        QIAbstractWizard::accept();
 }
 
@@ -166 +166 @@
     /* We propose a filename the first time the second page is displayed */
     if (sender() == mBtnNext1)
+    {
+        prepareSettingsWidget();
+    }
+    else if (sender() == mBtnNext2)
+    {
         if (mFileSelector->path().isEmpty())
         {
@@ -178 +183 @@
             mWValFileSelector->revalidate();
         }
+        mExportSettingsWgt->prepareExport();
+    }
 
     QIAbstractWizard::showNextPage();
@@ -236 +243 @@
 }
 
-bool VBoxExportApplianceWzd::prepareForExportVMs (CAppliance &aAppliance)
+bool VBoxExportApplianceWzd::prepareSettingsWidget()
 {
     CVirtualBox vbox = vboxGlobal().virtualBox();
-    /* Create a appliance object */
-    aAppliance = vbox.CreateAppliance();
-    bool fResult = aAppliance.isOk();
+    CAppliance *appliance = mExportSettingsWgt->init();
+    bool fResult = appliance->isOk();
     if (fResult)
     {
@@ -256 +262 @@
             {
                 /* Add the export description to our appliance object */
-                CVirtualSystemDescription vsd = m.Export (aAppliance);
+                CVirtualSystemDescription vsd = m.Export (*appliance);
                 fResult = m.isOk();
                 if (!fResult)
                 {
-                    vboxProblem().cannotExportAppliance (m, &aAppliance, this);
+                    vboxProblem().cannotExportAppliance (m, appliance, this);
                     return false;
                 }
+                /* Now add some new fields the user may change */
+                vsd.AddDescription (KVirtualSystemDescriptionType_Product, "", "");
+                vsd.AddDescription (KVirtualSystemDescriptionType_ProductUrl, "", "");
+                vsd.AddDescription (KVirtualSystemDescriptionType_Vendor, "", "");
+                vsd.AddDescription (KVirtualSystemDescriptionType_VendorUrl, "", "");
+                vsd.AddDescription (KVirtualSystemDescriptionType_Version, "", "");
+                vsd.AddDescription (KVirtualSystemDescriptionType_License, "", "");
             }
             else
                 break;
         }
+        /* Make sure the settings widget get the new descriptions */
+        mExportSettingsWgt->populate();
     }
     if (!fResult)
-        vboxProblem().cannotExportAppliance (&aAppliance, this);
+        vboxProblem().cannotExportAppliance (appliance, this);
     return fResult;
 }

trunk/src/VBox/Frontends/VirtualBox/src/VBoxImportApplianceWgt.cpp

@@ -21 +21 @@
  */
 
+/* VBox includes */
 #include "VBoxImportApplianceWgt.h"
-#include "VBoxImportApplianceWzd.h"
 #include "VBoxGlobal.h"
 #include "VBoxProblemReporter.h"
-#include "VBoxFilePathSelectorWidget.h"
-#include "VBoxOSTypeSelectorButton.h"
-
-/* Qt includes */
-#include <QItemDelegate>
-#include <QSortFilterProxyModel>
-#include <QHeaderView>
-#include <QLineEdit>
-#include <QTextEdit>
-#include <QSpinBox>
-#include <QComboBox>
-
-class ModelItem;
 
 ////////////////////////////////////////////////////////////////////////////////
-// Globals
+// ImportSortProxyModel
 
-enum TreeViewSection { DescriptionSection = 0, OriginalValueSection, ConfigValueSection };
-
-////////////////////////////////////////////////////////////////////////////////
-// Private helper class declarations
-
-class VirtualSystemSortProxyModel: public QSortFilterProxyModel
+class ImportSortProxyModel: public VirtualSystemSortProxyModel
 {
 public:
-    VirtualSystemSortProxyModel (QObject *aParent = NULL);
-
-protected:
-    bool filterAcceptsRow (int aSourceRow, const QModelIndex & aSourceParent) const;
-    bool lessThan (const QModelIndex &aLeft, const QModelIndex &aRight) const;
-
-    static KVirtualSystemDescriptionType mSortList[];
+    ImportSortProxyModel (QObject *aParent = NULL)
+      : VirtualSystemSortProxyModel (aParent)
+    {
+        mFilterList << KVirtualSystemDescriptionType_License;
+    }
 };
-
-class VirtualSystemModel: public QAbstractItemModel
-{
-
-public:
-    VirtualSystemModel (QVector<CVirtualSystemDescription>& aVSDs, QObject *aParent = NULL);
-
-    inline QModelIndex index (int aRow, int aColumn, const QModelIndex &aParent = QModelIndex()) const;
-    inline QModelIndex parent (const QModelIndex &aIndex) const;
-    inline int rowCount (const QModelIndex &aParent = QModelIndex()) const;
-    inline int columnCount (const QModelIndex &aParent = QModelIndex()) const;
-    inline bool setData (const QModelIndex &aIndex, const QVariant &aValue, int aRole);
-    inline QVariant data (const QModelIndex &aIndex, int aRole = Qt::DisplayRole) const;
-    inline Qt::ItemFlags flags (const QModelIndex &aIndex) const;
-    inline QVariant headerData (int aSection, Qt::Orientation aOrientation, int aRole) const;
-
-    inline void restoreDefaults (const QModelIndex& aParent = QModelIndex());
-    inline void putBack();
-
-private:
-    /* Private member vars */
-    ModelItem *mRootItem;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// ModelItem
-
-enum ModelItemType { RootType, VirtualSystemType, HardwareType };
-
-/* This & the following derived classes represent the data items of a Virtual
-   System. All access/manipulation is done with the help of virtual functions
-   to keep the interface clean. ModelItem is able to handle tree structures
-   with a parent & several children's. */
-class ModelItem
-{
-public:
-    ModelItem (int aNumber, ModelItemType aType, ModelItem *aParent = NULL)
-      : mNumber (aNumber)
-      , mType (aType)
-      , mParentItem (aParent)
-    {}
-
-    ~ModelItem()
-    {
-        qDeleteAll (mChildItems);
-    }
-
-    ModelItem *parent() const { return mParentItem; }
-
-    void appendChild (ModelItem *aChild)
-    {
-        AssertPtr (aChild);
-        mChildItems << aChild;
-    }
-    ModelItem * child (int aRow) const { return mChildItems.value (aRow); }
-
-    int row() const
-    {
-        if (mParentItem)
-            return mParentItem->mChildItems.indexOf (const_cast<ModelItem*> (this));
-
-        return 0;
-    }
-
-    int childCount() const { return mChildItems.count(); }
-    int columnCount() const { return 3; }
-
-    virtual Qt::ItemFlags itemFlags (int /* aColumn */) const { return 0; }
-    virtual bool setData (int /* aColumn */, const QVariant & /* aValue */, int /* aRole */) { return false; }
-    virtual QVariant data (int /* aColumn */, int /* aRole */) const { return QVariant(); }
-    virtual QWidget * createEditor (QWidget * /* aParent */, const QStyleOptionViewItem & /* aOption */, const QModelIndex & /* aIndex */) const { return NULL; }
-    virtual bool setEditorData (QWidget * /* aEditor */, const QModelIndex & /* aIndex */) const { return false; }
-    virtual bool setModelData (QWidget * /* aEditor */, QAbstractItemModel * /* aModel */, const QModelIndex & /* aIndex */) { return false; }
-
-    virtual void restoreDefaults() {}
-    virtual void putBack (QVector<BOOL>& aFinalStates, QVector<QString>& aFinalValues, QVector<QString>& aFinalExtraValues)
-    {
-        for (int i = 0; i < childCount(); ++i)
-            child (i)->putBack (aFinalStates, aFinalValues, aFinalExtraValues);
-    }
-
-    ModelItemType type() const { return mType; }
-
-protected:
-    int mNumber;
-    ModelItemType mType;
-
-    ModelItem *mParentItem;
-    QList<ModelItem*> mChildItems;
-};
-
-/* This class represent a Virtual System with an index. */
-class VirtualSystemItem: public ModelItem
-{
-public:
-    VirtualSystemItem (int aNumber, CVirtualSystemDescription aDesc, ModelItem *aParent)
-      : ModelItem (aNumber, VirtualSystemType, aParent)
-      , mDesc (aDesc)
-    {}
-
-    virtual QVariant data (int aColumn, int aRole) const
-    {
-        QVariant v;
-        if (aColumn == DescriptionSection &&
-            aRole == Qt::DisplayRole)
-            v = VBoxImportApplianceWgt::tr ("Virtual System %1").arg (mNumber + 1);
-        return v;
-    }
-
-    virtual void putBack (QVector<BOOL>& aFinalStates, QVector<QString>& aFinalValues, QVector<QString>& aFinalExtraValues)
-    {
-        /* Resize the vectors */
-        unsigned long count = mDesc.GetCount();
-        aFinalStates.resize (count);
-        aFinalValues.resize (count);
-        aFinalExtraValues.resize (count);
-        /* Recursively fill the vectors */
-        ModelItem::putBack (aFinalStates, aFinalValues, aFinalExtraValues);
-        /* Set all final values at once */
-        mDesc.SetFinalValues (aFinalStates, aFinalValues, aFinalExtraValues);
-    }
-
-private:
-    CVirtualSystemDescription mDesc;
-};
-
-/* This class represent an hardware item of a Virtual System. All values of
-   KVirtualSystemDescriptionType are supported & handled differently. */
-class HardwareItem: public ModelItem
-{
-    friend class VirtualSystemSortProxyModel;
-public:
-
-    HardwareItem (int aNumber,
-                  KVirtualSystemDescriptionType aType,
-                  const QString &aRef,
-                  const QString &aOrigValue,
-                  const QString &aConfigValue,
-                  const QString &aExtraConfigValue,
-                  ModelItem *aParent)
-        : ModelItem (aNumber, HardwareType, aParent)
-        , mType (aType)
-        , mRef (aRef)
-        , mOrigValue (aOrigValue)
-        , mConfigValue (aConfigValue)
-        , mConfigDefaultValue (aConfigValue)
-        , mExtraConfigValue (aExtraConfigValue)
-        , mCheckState (Qt::Checked)
-    {}
-
-    virtual void putBack (QVector<BOOL>& aFinalStates, QVector<QString>& aFinalValues, QVector<QString>& aFinalExtraValues)
-    {
-        aFinalStates[mNumber] = mCheckState == Qt::Checked;
-        aFinalValues[mNumber] = mConfigValue;
-        aFinalExtraValues[mNumber] = mExtraConfigValue;
-        ModelItem::putBack (aFinalStates, aFinalValues, aFinalExtraValues);
-    }
-
-    bool setData (int aColumn, const QVariant &aValue, int aRole)
-    {
-        bool fDone = false;
-        switch (aRole)
-        {
-            case Qt::CheckStateRole:
-            {
-                if (aColumn == ConfigValueSection &&
-                    (mType == KVirtualSystemDescriptionType_Floppy ||
-                     mType == KVirtualSystemDescriptionType_CDROM ||
-                     mType == KVirtualSystemDescriptionType_USBController ||
-                     mType == KVirtualSystemDescriptionType_SoundCard ||
-                     mType == KVirtualSystemDescriptionType_NetworkAdapter))
-                {
-                    mCheckState = static_cast<Qt::CheckState> (aValue.toInt());
-                    fDone = true;
-                }
-                break;
-            }
-            default: break;
-        }
-        return fDone;
-    }
-
-    virtual QVariant data (int aColumn, int aRole) const
-    {
-        QVariant v;
-        switch (aRole)
-        {
-            case Qt::DisplayRole:
-            {
-                if (aColumn == DescriptionSection)
-                {
-                    switch (mType)
-                    {
-                        case KVirtualSystemDescriptionType_Name: v = VBoxImportApplianceWgt::tr ("Name"); break;
-                        case KVirtualSystemDescriptionType_Description: v = VBoxImportApplianceWgt::tr ("Description"); break;
-                        case KVirtualSystemDescriptionType_OS: v = VBoxImportApplianceWgt::tr ("Guest OS Type"); break;
-                        case KVirtualSystemDescriptionType_CPU: v = VBoxImportApplianceWgt::tr ("CPU"); break;
-                        case KVirtualSystemDescriptionType_Memory: v = VBoxImportApplianceWgt::tr ("RAM"); break;
-                        case KVirtualSystemDescriptionType_HardDiskControllerIDE: v = VBoxImportApplianceWgt::tr ("Hard Disk Controller IDE"); break;
-                        case KVirtualSystemDescriptionType_HardDiskControllerSATA: v = VBoxImportApplianceWgt::tr ("Hard Disk Controller SATA"); break;
-                        case KVirtualSystemDescriptionType_HardDiskControllerSCSI: v = VBoxImportApplianceWgt::tr ("Hard Disk Controller SCSI"); break;
-                        case KVirtualSystemDescriptionType_CDROM: v = VBoxImportApplianceWgt::tr ("DVD"); break;
-                        case KVirtualSystemDescriptionType_Floppy: v = VBoxImportApplianceWgt::tr ("Floppy"); break;
-                        case KVirtualSystemDescriptionType_NetworkAdapter: v = VBoxImportApplianceWgt::tr ("Network Adapter"); break;
-                        case KVirtualSystemDescriptionType_USBController: v = VBoxImportApplianceWgt::tr ("USB Controller"); break;
-                        case KVirtualSystemDescriptionType_SoundCard: v = VBoxImportApplianceWgt::tr ("Sound Card"); break;
-                        case KVirtualSystemDescriptionType_HardDiskImage: v = VBoxImportApplianceWgt::tr ("Virtual Disk Image"); break;
-                        default: v = VBoxImportApplianceWgt::tr ("Unknown Hardware Item"); break;
-                    }
-                }
-                else if (aColumn == OriginalValueSection)
-                    v = mOrigValue;
-                else if (aColumn == ConfigValueSection)
-                {
-                    switch (mType)
-                    {
-                        case KVirtualSystemDescriptionType_OS: v = vboxGlobal().vmGuestOSTypeDescription (mConfigValue); break;
-                        case KVirtualSystemDescriptionType_Memory: v = mConfigValue + " " + VBoxImportApplianceWgt::tr ("MB"); break;
-                        case KVirtualSystemDescriptionType_SoundCard: v = vboxGlobal().toString (static_cast<KAudioControllerType> (mConfigValue.toInt())); break;
-                        case KVirtualSystemDescriptionType_NetworkAdapter: v = vboxGlobal().toString (static_cast<KNetworkAdapterType> (mConfigValue.toInt())); break;
-                        default: v = mConfigValue; break;
-                    }
-                }
-                break;
-            }
-            case Qt::ToolTipRole:
-            {
-                if (aColumn == ConfigValueSection)
-                {
-                    if (!mOrigValue.isEmpty())
-                        v = VBoxImportApplianceWgt::tr ("<b>Original Value:</b> %1").arg (mOrigValue);
-                }
-                break;
-            }
-            case Qt::DecorationRole:
-            {
-                if (aColumn == DescriptionSection)
-                {
-                    switch (mType)
-                    {
-                        case KVirtualSystemDescriptionType_Name: v = QIcon (":/name_16px.png"); break;
-                        case KVirtualSystemDescriptionType_Description: v = QIcon (":/description_16px.png"); break;
-                        case KVirtualSystemDescriptionType_OS: v = QIcon (":/os_type_16px.png"); break;
-                        case KVirtualSystemDescriptionType_CPU: v = QIcon (":/cpu_16px.png"); break;
-                        case KVirtualSystemDescriptionType_Memory: v = QIcon (":/ram_16px.png"); break;
-                        case KVirtualSystemDescriptionType_HardDiskControllerIDE: v = QIcon (":/ide_16px.png"); break;
-                        case KVirtualSystemDescriptionType_HardDiskControllerSATA: v = QIcon (":/sata_16px.png"); break;
-                        case KVirtualSystemDescriptionType_HardDiskControllerSCSI: v = QIcon (":/scsi_16px.png"); break;
-                        case KVirtualSystemDescriptionType_HardDiskImage: v = QIcon (":/hd_16px.png"); break;
-                        case KVirtualSystemDescriptionType_CDROM: v = QIcon (":/cd_16px.png"); break;
-                        case KVirtualSystemDescriptionType_Floppy: v = QIcon (":/fd_16px.png"); break;
-                        case KVirtualSystemDescriptionType_NetworkAdapter: v = QIcon (":/nw_16px.png"); break;
-                        case KVirtualSystemDescriptionType_USBController: v = QIcon (":/usb_16px.png"); break;
-                        case KVirtualSystemDescriptionType_SoundCard: v = QIcon (":/sound_16px.png"); break;
-                        default: break;
-                    }
-                }
-                else if (aColumn == ConfigValueSection &&
-                         mType == KVirtualSystemDescriptionType_OS)
-                {
-                    v = vboxGlobal().vmGuestOSTypeIcon (mConfigValue).scaledToHeight (16, Qt::SmoothTransformation);
-                }
-                break;
-            }
-            case Qt::FontRole:
-            {
-                /* If the item is unchecked mark it with italic text. */
-                if (aColumn == ConfigValueSection &&
-                    mCheckState == Qt::Unchecked)
-                {
-                    QFont font = qApp->font();
-                    font.setItalic (true);
-                    v = font;
-                }
-                break;
-            }
-            case Qt::ForegroundRole:
-            {
-                /* If the item is unchecked mark it with gray text. */
-                if (aColumn == ConfigValueSection &&
-                    mCheckState == Qt::Unchecked)
-                {
-                    QPalette pal = qApp->palette();
-                    v = pal.brush (QPalette::Disabled, QPalette::WindowText);
-                }
-                break;
-            }
-            case Qt::CheckStateRole:
-            {
-                if (aColumn == ConfigValueSection &&
-                    (mType == KVirtualSystemDescriptionType_Floppy ||
-                     mType == KVirtualSystemDescriptionType_CDROM ||
-                     mType == KVirtualSystemDescriptionType_USBController ||
-                     mType == KVirtualSystemDescriptionType_SoundCard ||
-                     mType == KVirtualSystemDescriptionType_NetworkAdapter))
-                    v = mCheckState;
-                break;
-            }
-        }
-        return v;
-    }
-
-    virtual Qt::ItemFlags itemFlags (int aColumn) const
-    {
-        Qt::ItemFlags flags = 0;
-        if (aColumn == ConfigValueSection)
-        {
-            /* Some items are checkable */
-            if (mType == KVirtualSystemDescriptionType_Floppy ||
-                mType == KVirtualSystemDescriptionType_CDROM ||
-                mType == KVirtualSystemDescriptionType_USBController ||
-                mType == KVirtualSystemDescriptionType_SoundCard ||
-                mType == KVirtualSystemDescriptionType_NetworkAdapter)
-                flags |= Qt::ItemIsUserCheckable;
-            /* Some items are editable */
-            if ((mType == KVirtualSystemDescriptionType_Name ||
-                 mType == KVirtualSystemDescriptionType_Description ||
-                 mType == KVirtualSystemDescriptionType_OS ||
-                 mType == KVirtualSystemDescriptionType_Memory ||
-                 mType == KVirtualSystemDescriptionType_SoundCard ||
-                 mType == KVirtualSystemDescriptionType_NetworkAdapter ||
-                 mType == KVirtualSystemDescriptionType_HardDiskControllerIDE ||
-                 mType == KVirtualSystemDescriptionType_HardDiskImage) &&
-                mCheckState == Qt::Checked) /* Item has to be enabled */
-                flags |= Qt::ItemIsEditable;
-        }
-        return flags;
-    }
-
-    virtual QWidget * createEditor (QWidget *aParent, const QStyleOptionViewItem & /* aOption */, const QModelIndex &aIndex) const
-    {
-        QWidget *editor = NULL;
-        if (aIndex.column() == ConfigValueSection)
-        {
-            switch (mType)
-            {
-                case KVirtualSystemDescriptionType_OS:
-                {
-                    VBoxOSTypeSelectorButton *e = new VBoxOSTypeSelectorButton (aParent);
-                    /* Fill the background with the highlight color in the case
-                     * the button hasn't a rectangle shape. This prevents the
-                     * display of parts from the current text on the Mac. */
-                    e->setAutoFillBackground (true);
-                    e->setBackgroundRole (QPalette::Highlight);
-                    editor = e;
-                    break;
-                }
-                case KVirtualSystemDescriptionType_Name:
-                {
-                    QLineEdit *e = new QLineEdit (aParent);
-                    editor = e;
-                    break;
-                }
-                case KVirtualSystemDescriptionType_Description:
-                {
-                    QTextEdit *e = new QTextEdit (aParent);
-                    editor = e;
-                    break;
-                }
-                case KVirtualSystemDescriptionType_CPU:
-                {
-                    QSpinBox *e = new QSpinBox (aParent);
-                    e->setRange (VBoxImportApplianceWgt::minGuestCPUCount(), VBoxImportApplianceWgt::maxGuestCPUCount());
-                    editor = e;
-                    break;
-                }
-                case KVirtualSystemDescriptionType_Memory:
-                {
-                    QSpinBox *e = new QSpinBox (aParent);
-                    e->setRange (VBoxImportApplianceWgt::minGuestRAM(), VBoxImportApplianceWgt::maxGuestRAM());
-                    e->setSuffix (" " + VBoxImportApplianceWgt::tr ("MB"));
-                    editor = e;
-                    break;
-                }
-                case KVirtualSystemDescriptionType_SoundCard:
-                {
-                    QComboBox *e = new QComboBox (aParent);
-                    e->addItem (vboxGlobal().toString (KAudioControllerType_AC97), KAudioControllerType_AC97);
-                    e->addItem (vboxGlobal().toString (KAudioControllerType_SB16), KAudioControllerType_SB16);
-                    editor = e;
-                    break;
-                }
-                case KVirtualSystemDescriptionType_NetworkAdapter:
-                {
-                    QComboBox *e = new QComboBox (aParent);
-                    e->addItem (vboxGlobal().toString (KNetworkAdapterType_Am79C970A), KNetworkAdapterType_Am79C970A);
-                    e->addItem (vboxGlobal().toString (KNetworkAdapterType_Am79C973), KNetworkAdapterType_Am79C973);
-#ifdef VBOX_WITH_E1000
-                    e->addItem (vboxGlobal().toString (KNetworkAdapterType_I82540EM), KNetworkAdapterType_I82540EM);
-                    e->addItem (vboxGlobal().toString (KNetworkAdapterType_I82543GC), KNetworkAdapterType_I82543GC);
-#endif /* VBOX_WITH_E1000 */
-                    editor = e;
-                    break;
-                }
-                case KVirtualSystemDescriptionType_HardDiskControllerIDE:
-                {
-                    QComboBox *e = new QComboBox (aParent);
-                    e->addItem (vboxGlobal().toString (KStorageControllerType_PIIX3), "PIIX3");
-                    e->addItem (vboxGlobal().toString (KStorageControllerType_PIIX4), "PIIX4");
-                    e->addItem (vboxGlobal().toString (KStorageControllerType_ICH6),  "ICH6");
-                    editor = e;
-                    break;
-                }
-                case KVirtualSystemDescriptionType_HardDiskImage:
-                {
-                /* disabled for now
-                    VBoxFilePathSelectorWidget *e = new VBoxFilePathSelectorWidget (aParent);
-                    e->setMode (VBoxFilePathSelectorWidget::Mode_File);
-                    e->setResetEnabled (false);
-                */
-                    QLineEdit *e = new QLineEdit (aParent);
-                    editor = e;
-                    break;
-                }
-                default: break;
-            }
-        }
-        return editor;
-    }
-
-    virtual bool setEditorData (QWidget *aEditor, const QModelIndex & /* aIndex */) const
-    {
-        bool fDone = false;
-        switch (mType)
-        {
-            case KVirtualSystemDescriptionType_OS:
-            {
-                if (VBoxOSTypeSelectorButton *e = qobject_cast<VBoxOSTypeSelectorButton*> (aEditor))
-                {
-                    e->setOSTypeId (mConfigValue);
-                    fDone = true;
-                }
-                break;
-            }
-            case KVirtualSystemDescriptionType_HardDiskControllerIDE:
-            {
-                if (QComboBox *e = qobject_cast<QComboBox*> (aEditor))
-                {
-                    int i = e->findData (mConfigValue);
-                    if (i != -1)
-                        e->setCurrentIndex (i);
-                    fDone = true;
-                }
-                break;
-            }
-            case KVirtualSystemDescriptionType_CPU:
-            case KVirtualSystemDescriptionType_Memory:
-            {
-                if (QSpinBox *e = qobject_cast<QSpinBox*> (aEditor))
-                {
-                    e->setValue (mConfigValue.toInt());
-                    fDone = true;
-                }
-                break;
-            }
-            case KVirtualSystemDescriptionType_Name:
-            {
-                if (QLineEdit *e = qobject_cast<QLineEdit*> (aEditor))
-                {
-                    e->setText (mConfigValue);
-                    fDone = true;
-                }
-                break;
-            }
-            case KVirtualSystemDescriptionType_Description:
-            {
-                if (QTextEdit *e = qobject_cast<QTextEdit*> (aEditor))
-                {
-                    e->setPlainText (mConfigValue);
-                    fDone = true;
-                }
-                break;
-            }
-            case KVirtualSystemDescriptionType_SoundCard:
-            case KVirtualSystemDescriptionType_NetworkAdapter:
-            {
-                if (QComboBox *e = qobject_cast<QComboBox*> (aEditor))
-                {
-                    int i = e->findData (mConfigValue.toInt());
-                    if (i != -1)
-                        e->setCurrentIndex (i);
-                    fDone = true;
-                }
-                break;
-            }
-            case KVirtualSystemDescriptionType_HardDiskImage:
-            {
-                /* disabled for now
-                if (VBoxFilePathSelectorWidget *e = qobject_cast<VBoxFilePathSelectorWidget*> (aEditor))
-                {
-                    e->setPath (mConfigValue);
-                */
-                if (QLineEdit *e = qobject_cast<QLineEdit*> (aEditor))
-                {
-                    e->setText (mConfigValue);
-                    fDone = true;
-                }
-                break;
-            }
-            default: break;
-        }
-        return fDone;
-    }
-
-    virtual bool setModelData (QWidget *aEditor, QAbstractItemModel * /* aModel */, const QModelIndex & /* aIndex */)
-    {
-        bool fDone = false;
-        switch (mType)
-        {
-            case KVirtualSystemDescriptionType_OS:
-            {
-                if (VBoxOSTypeSelectorButton *e = qobject_cast<VBoxOSTypeSelectorButton*> (aEditor))
-                {
-                    mConfigValue = e->osTypeId();
-                    fDone = true;
-                }
-                break;
-            }
-            case KVirtualSystemDescriptionType_HardDiskControllerIDE:
-            {
-                if (QComboBox *e = qobject_cast<QComboBox*> (aEditor))
-                {
-                    mConfigValue = e->itemData (e->currentIndex()).toString();
-                    fDone = true;
-                }
-                break;
-            }
-            case KVirtualSystemDescriptionType_CPU:
-            case KVirtualSystemDescriptionType_Memory:
-            {
-                if (QSpinBox *e = qobject_cast<QSpinBox*> (aEditor))
-                {
-                    mConfigValue = QString::number (e->value());
-                    fDone = true;
-                }
-                break;
-            }
-            case KVirtualSystemDescriptionType_Name:
-            {
-                if (QLineEdit *e = qobject_cast<QLineEdit*> (aEditor))
-                {
-                    mConfigValue = e->text();
-                    fDone = true;
-                }
-                break;
-            }
-            case KVirtualSystemDescriptionType_Description:
-            {
-                if (QTextEdit *e = qobject_cast<QTextEdit*> (aEditor))
-                {
-                    mConfigValue = e->toPlainText();
-                    fDone = true;
-                }
-                break;
-            }
-            case KVirtualSystemDescriptionType_SoundCard:
-            case KVirtualSystemDescriptionType_NetworkAdapter:
-            {
-                if (QComboBox *e = qobject_cast<QComboBox*> (aEditor))
-                {
-                    mConfigValue = e->itemData (e->currentIndex()).toString();
-                    fDone = true;
-                }
-                break;
-            }
-            case KVirtualSystemDescriptionType_HardDiskImage:
-            {
-                /* disabled for now
-                if (VBoxFilePathSelectorWidget *e = qobject_cast<VBoxFilePathSelectorWidget*> (aEditor))
-                {
-                    mConfigValue = e->path();
-                */
-                if (QLineEdit *e = qobject_cast<QLineEdit*> (aEditor))
-                {
-                    mConfigValue = e->text();
-                    fDone = true;
-                }
-                break;
-            }
-            default: break;
-        }
-        return fDone;
-    }
-
-    virtual void restoreDefaults()
-    {
-        mConfigValue = mConfigDefaultValue;
-        mCheckState = Qt::Checked;
-    }
-
-private:
-
-    /* Private member vars */
-    KVirtualSystemDescriptionType mType;
-    QString mRef;
-    QString mOrigValue;
-    QString mConfigValue;
-    QString mConfigDefaultValue;
-    QString mExtraConfigValue;
-    Qt::CheckState mCheckState;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// VirtualSystemDelegate
-
-/* The delegate is used for creating/handling the different editors for the
-   various types we support. This class forward the requests to the virtual
-   methods of our different ModelItems. If this is not possible the default
-   methods of QItemDelegate are used to get some standard behavior. Note: We
-   have to handle the proxy model ourself. I really don't understand why Qt is
-   not doing this for us. */
-class VirtualSystemDelegate: public QItemDelegate
-{
-public:
-    VirtualSystemDelegate (QAbstractProxyModel *aProxy, QObject *aParent = NULL)
-        : QItemDelegate (aParent)
-        , mProxy (aProxy)
-    {}
-
-    QWidget * createEditor (QWidget *aParent, const QStyleOptionViewItem &aOption, const QModelIndex &aIndex) const
-    {
-        if (!aIndex.isValid())
-            return QItemDelegate::createEditor (aParent, aOption, aIndex);
-
-        QModelIndex index (aIndex);
-        if (mProxy)
-            index = mProxy->mapToSource (aIndex);
-
-        ModelItem *item = static_cast<ModelItem*> (index.internalPointer());
-        QWidget *editor = item->createEditor (aParent, aOption, index);
-
-        if (editor == NULL)
-            return QItemDelegate::createEditor (aParent, aOption, index);
-        else
-            return editor;
-    }
-
-    void setEditorData (QWidget *aEditor, const QModelIndex &aIndex) const
-    {
-        if (!aIndex.isValid())
-            return QItemDelegate::setEditorData (aEditor, aIndex);
-
-        QModelIndex index (aIndex);
-        if (mProxy)
-            index = mProxy->mapToSource (aIndex);
-
-        ModelItem *item = static_cast<ModelItem*> (index.internalPointer());
-
-        if (!item->setEditorData (aEditor, index))
-            QItemDelegate::setEditorData (aEditor, index);
-    }
-
-    void setModelData (QWidget *aEditor, QAbstractItemModel *aModel, const QModelIndex &aIndex) const
-    {
-        if (!aIndex.isValid())
-            return QItemDelegate::setModelData (aEditor, aModel, aIndex);
-
-        QModelIndex index = aModel->index (aIndex.row(), aIndex.column());
-        if (mProxy)
-            index = mProxy->mapToSource (aIndex);
-
-        ModelItem *item = static_cast<ModelItem*> (index.internalPointer());
-        if (!item->setModelData (aEditor, aModel, index))
-            QItemDelegate::setModelData (aEditor, aModel, aIndex);
-    }
-
-    void updateEditorGeometry (QWidget *aEditor, const QStyleOptionViewItem &aOption, const QModelIndex & /* aIndex */) const
-    {
-        if (aEditor)
-            aEditor->setGeometry (aOption.rect);
-    }
-
-    QSize sizeHint (const QStyleOptionViewItem &aOption, const QModelIndex &aIndex) const
-    {
-        QSize size = QItemDelegate::sizeHint (aOption, aIndex);
-#ifdef Q_WS_MAC
-        int h = 28;
-#else /* Q_WS_MAC */
-        int h = 24;
-#endif /* Q_WS_MAC */
-        size.setHeight (RT_MAX (h, size.height()));
-        return size;
-    }
-private:
-    /* Private member vars */
-    QAbstractProxyModel *mProxy;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// VirtualSystemSortProxyModel
-
-/* How to sort the items in the tree view */
-KVirtualSystemDescriptionType VirtualSystemSortProxyModel::mSortList[] =
-{
-    KVirtualSystemDescriptionType_Name,
-    KVirtualSystemDescriptionType_Description,
-    KVirtualSystemDescriptionType_OS,
-    KVirtualSystemDescriptionType_License,
-    KVirtualSystemDescriptionType_CPU,
-    KVirtualSystemDescriptionType_Memory,
-    KVirtualSystemDescriptionType_Floppy,
-    KVirtualSystemDescriptionType_CDROM,
-    KVirtualSystemDescriptionType_USBController,
-    KVirtualSystemDescriptionType_SoundCard,
-    KVirtualSystemDescriptionType_NetworkAdapter,
-    KVirtualSystemDescriptionType_HardDiskControllerIDE,
-    KVirtualSystemDescriptionType_HardDiskControllerSATA,
-    KVirtualSystemDescriptionType_HardDiskControllerSCSI
-};
-
-VirtualSystemSortProxyModel::VirtualSystemSortProxyModel (QObject *aParent)
-    : QSortFilterProxyModel (aParent)
-{}
-
-bool VirtualSystemSortProxyModel::filterAcceptsRow (int aSourceRow, const QModelIndex & aSourceParent) const
-{
-    /* By default enable all, we will explicitly filter out below */
-    if (aSourceParent.isValid())
-    {
-        QModelIndex i = aSourceParent.child (aSourceRow, 0);
-        if (i.isValid())
-        {
-            ModelItem *item = static_cast<ModelItem*> (i.internalPointer());
-            /* We filter hardware types only */
-            if (item->type() == HardwareType)
-            {
-                HardwareItem *hwItem = static_cast<HardwareItem*> (item);
-                /* The license type shouldn't be displayed */
-                if (hwItem->mType == KVirtualSystemDescriptionType_License)
-                    return false;
-            }
-        }
-    }
-    return true;
-}
-
-bool VirtualSystemSortProxyModel::lessThan (const QModelIndex &aLeft, const QModelIndex &aRight) const
-{
-    if (!aLeft.isValid() ||
-        !aRight.isValid())
-        return false;
-
-    ModelItem *leftItem = static_cast<ModelItem*> (aLeft.internalPointer());
-    ModelItem *rightItem = static_cast<ModelItem*> (aRight.internalPointer());
-
-    /* We sort hardware types only */
-    if (!(leftItem->type() == HardwareType &&
-          rightItem->type() == HardwareType))
-        return false;
-
-    HardwareItem *hwLeft = static_cast<HardwareItem*> (leftItem);
-    HardwareItem *hwRight = static_cast<HardwareItem*> (rightItem);
-
-    for (unsigned int i = 0; i < RT_ELEMENTS (mSortList); ++i)
-        if (hwLeft->mType == mSortList[i])
-        {
-            for (unsigned int a = 0; a <= i; ++a)
-                if (hwRight->mType == mSortList[a])
-                    return true;
-            return false;
-        }
-
-    return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// VirtualSystemModel
-
-/* This class is a wrapper model for our ModelItem. It could be used with any
-   TreeView & forward mostly all calls to the methods of ModelItem. The
-   ModelItems itself are stored as internal pointers in the QModelIndex class. */
-VirtualSystemModel::VirtualSystemModel (QVector<CVirtualSystemDescription>& aVSDs, QObject *aParent /* = NULL */)
-   : QAbstractItemModel (aParent)
-{
-    mRootItem = new ModelItem (0, RootType);
-    for (int a = 0; a < aVSDs.size(); ++a)
-    {
-        CVirtualSystemDescription vs = aVSDs[a];
-
-        VirtualSystemItem *vi = new VirtualSystemItem (a, vs, mRootItem);
-        mRootItem->appendChild (vi);
-
-        /* @todo: ask Dmitry about include/COMDefs.h:232 */
-        QVector<KVirtualSystemDescriptionType> types;
-        QVector<QString> refs;
-        QVector<QString> origValues;
-        QVector<QString> configValues;
-        QVector<QString> extraConfigValues;
-
-        QList<int> hdIndizies;
-        QMap<int, HardwareItem*> controllerMap;
-        vs.GetDescription (types, refs, origValues, configValues, extraConfigValues);
-        for (int i = 0; i < types.size(); ++i)
-        {
-            /* We add the hard disk images in an second step, so save a
-               reference to them. */
-            if (types[i] == KVirtualSystemDescriptionType_HardDiskImage)
-                hdIndizies << i;
-            else
-            {
-                HardwareItem *hi = new HardwareItem (i, types[i], refs[i], origValues[i], configValues[i], extraConfigValues[i], vi);
-                vi->appendChild (hi);
-                /* Save the hard disk controller types in an extra map */
-                if (types[i] == KVirtualSystemDescriptionType_HardDiskControllerIDE ||
-                    types[i] == KVirtualSystemDescriptionType_HardDiskControllerSATA ||
-                    types[i] == KVirtualSystemDescriptionType_HardDiskControllerSCSI)
-                    controllerMap[i] = hi;
-            }
-        }
-        QRegExp rx ("controller=(\\d+);?");
-        /* Now process the hard disk images */
-        for (int a = 0; a < hdIndizies.size(); ++a)
-        {
-            int i = hdIndizies[a];
-            QString ecnf = extraConfigValues[i];
-            if (rx.indexIn (ecnf) != -1)
-            {
-                /* Get the controller */
-                HardwareItem *ci = controllerMap[rx.cap (1).toInt()];
-                if (ci)
-                {
-                    /* New hardware item as child of the controller */
-                    HardwareItem *hi = new HardwareItem (i, types[i], refs[i], origValues[i], configValues[i], extraConfigValues[i], ci);
-                    ci->appendChild (hi);
-                }
-            }
-        }
-    }
-}
-
-QModelIndex VirtualSystemModel::index (int aRow, int aColumn, const QModelIndex &aParent /* = QModelIndex() */) const
-{
-    if (!hasIndex (aRow, aColumn, aParent))
-        return QModelIndex();
-
-    ModelItem *parentItem;
-
-    if (!aParent.isValid())
-        parentItem = mRootItem;
-    else
-        parentItem = static_cast<ModelItem*> (aParent.internalPointer());
-
-    ModelItem *childItem = parentItem->child (aRow);
-    if (childItem)
-        return createIndex (aRow, aColumn, childItem);
-    else
-        return QModelIndex();
-}
-
-QModelIndex VirtualSystemModel::parent (const QModelIndex &aIndex) const
-{
-    if (!aIndex.isValid())
-        return QModelIndex();
-
-    ModelItem *childItem = static_cast<ModelItem*> (aIndex.internalPointer());
-    ModelItem *parentItem = childItem->parent();
-
-    if (parentItem == mRootItem)
-        return QModelIndex();
-
-    return createIndex (parentItem->row(), 0, parentItem);
-}
-
-int VirtualSystemModel::rowCount (const QModelIndex &aParent /* = QModelIndex() */) const
-{
-    ModelItem *parentItem;
-    if (aParent.column() > 0)
-        return 0;
-
-    if (!aParent.isValid())
-        parentItem = mRootItem;
-    else
-        parentItem = static_cast<ModelItem*> (aParent.internalPointer());
-
-    return parentItem->childCount();
-}
-
-int VirtualSystemModel::columnCount (const QModelIndex &aParent /* = QModelIndex() */) const
-{
-    if (aParent.isValid())
-        return static_cast<ModelItem*> (aParent.internalPointer())->columnCount();
-    else
-        return mRootItem->columnCount();
-}
-
-bool VirtualSystemModel::setData (const QModelIndex &aIndex, const QVariant &aValue, int aRole)
-{
-    if (!aIndex.isValid())
-        return false;
-
-    ModelItem *item = static_cast<ModelItem*> (aIndex.internalPointer());
-
-    return item->setData (aIndex.column(), aValue, aRole);
-}
-
-QVariant VirtualSystemModel::data (const QModelIndex &aIndex, int aRole /* = Qt::DisplayRole */) const
-{
-    if (!aIndex.isValid())
-        return QVariant();
-
-    ModelItem *item = static_cast<ModelItem*> (aIndex.internalPointer());
-
-    return item->data (aIndex.column(), aRole);
-}
-
-Qt::ItemFlags VirtualSystemModel::flags (const QModelIndex &aIndex) const
-{
-    if (!aIndex.isValid())
-        return 0;
-
-    ModelItem *item = static_cast<ModelItem*> (aIndex.internalPointer());
-
-    return Qt::ItemIsEnabled | Qt::ItemIsSelectable | item->itemFlags (aIndex.column());
-}
-
-QVariant VirtualSystemModel::headerData (int aSection, Qt::Orientation aOrientation, int aRole) const
-{
-    if (aRole != Qt::DisplayRole ||
-        aOrientation != Qt::Horizontal)
-        return QVariant();
-
-    QString title;
-    switch (aSection)
-    {
-        case DescriptionSection: title = VBoxImportApplianceWgt::tr ("Description"); break;
-        case ConfigValueSection: title = VBoxImportApplianceWgt::tr ("Configuration"); break;
-    }
-    return title;
-}
-
-void VirtualSystemModel::restoreDefaults (const QModelIndex& aParent /* = QModelIndex() */)
-{
-    ModelItem *parentItem;
-
-    if (!aParent.isValid())
-        parentItem = mRootItem;
-    else
-        parentItem = static_cast<ModelItem*> (aParent.internalPointer());
-
-    for (int i = 0; i < parentItem->childCount(); ++i)
-    {
-        parentItem->child (i)->restoreDefaults();
-        restoreDefaults (index (i, 0, aParent));
-    }
-    emit dataChanged (index (0, 0, aParent), index (parentItem->childCount()-1, 0, aParent));
-}
-
-void VirtualSystemModel::putBack()
-{
-    QVector<BOOL> v1;
-    QVector<QString> v2;
-    QVector<QString> v3;
-    mRootItem->putBack (v1, v2, v3);
-}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1022 +48 @@
 
 VBoxImportApplianceWgt::VBoxImportApplianceWgt (QWidget *aParent)
-    : QIWithRetranslateUI<QWidget> (aParent)
-    , mAppliance (NULL)
-    , mModel (NULL)
+    : VBoxApplianceEditorWgt (aParent)
 {
     /* Make sure all static content is properly initialized */
     initSystemSettings();
-
-    /* Apply UI decorations */
-    Ui::VBoxImportApplianceWgt::setupUi (this);
-
-    /* Make the tree looking nicer */
-    mTvSettings->setRootIsDecorated (false);
-    mTvSettings->setAlternatingRowColors (true);
-    mTvSettings->header()->setStretchLastSection (true);
-    mTvSettings->header()->setResizeMode (QHeaderView::ResizeToContents);
-
-    /* Applying language settings */
-    retranslateUi();
 }
 
@@ -1070 +82 @@
                     mModel = new VirtualSystemModel (vsds, this);
 
-                    VirtualSystemSortProxyModel *proxy = new VirtualSystemSortProxyModel (this);
+                    ImportSortProxyModel *proxy = new ImportSortProxyModel (this);
                     proxy->setSourceModel (mModel);
                     proxy->sort (DescriptionSection, Qt::DescendingOrder);
@@ -1163 +175 @@
 }
 
-void VBoxImportApplianceWgt::restoreDefaults()
-{
-    mModel->restoreDefaults();
-}
-
-void VBoxImportApplianceWgt::retranslateUi()
-{
-    /* Translate uic generated strings */
-    Ui::VBoxImportApplianceWgt::retranslateUi (this);
-}
-
 /* static */
 void VBoxImportApplianceWgt::initSystemSettings()

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxApplianceEditorWgt.ui

@@ -18 +18 @@
  additional information or have any questions.
  </comment>
- <class>VBoxImportApplianceWgt</class>
- <widget class="QWidget" name="VBoxImportApplianceWgt">
+ <class>VBoxApplianceEditorWgt</class>
+ <widget class="QWidget" name="VBoxApplianceEditorWgt">
   <property name="geometry">
    <rect>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxExportApplianceWzd.ui

@@ -2 +2 @@
 <ui version="4.0">
  <comment>
- VBox frontends: Qt4 GUI ("VirtualBox"):
+ VBox frontends: Qt4 GUI (&quot;VirtualBox&quot;):
 
  Copyright (C) 2009 Sun Microsystems, Inc.
@@ -10 +10 @@
  you can redistribute it and/or modify it under the terms of the GNU
  General Public License (GPL) as published by the Free Software
- Foundation, in version 2 as it comes in the "COPYING" file of the
+ Foundation, in version 2 as it comes in the &quot;COPYING&quot; file of the
  VirtualBox OSE distribution. VirtualBox OSE is distributed in the
  hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
@@ -38 +38 @@
     <widget class="QStackedWidget" name="mPageStack">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="mVMSelectPage">
@@ -187 +187 @@
       </layout>
      </widget>
-     <widget class="QWidget" name="mFileSelectPage">
-      <layout class="QVBoxLayout" name="verticalLayout_3">
+     <widget class="QWidget" name="mVMSettingsPage">
+      <layout class="QVBoxLayout" name="verticalLayout_4">
        <item>
         <widget class="QLabel" name="mPageSettingsHdr">
@@ -205 +205 @@
        </item>
        <item>
+        <widget class="Line" name="line21_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QGridLayout" name="gridLayout_3">
+         <item row="0" column="0" rowspan="2">
+          <widget class="QLabel" name="mLogoSettings">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="autoFillBackground">
+            <bool>true</bool>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="pixmap">
+            <pixmap resource="../VirtualBox.qrc">:/vmw_ovf_import.png</pixmap>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QILabel" name="mTextSettings">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>300</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Here you can change additional configuration values of the selected Virtual Machines. You can modify most of the shown properties by double clicking on the items.</string>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="VBoxExportApplianceWgt" name="mExportSettingsWgt" native="true">
+           <property name="enabled">
+            <bool>true</bool>
+           </property>
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="baseSize">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="Line" name="line22_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="_4">
+         <item>
+          <widget class="QPushButton" name="mBtnRestore">
+           <property name="text">
+            <string>Restore Defaults</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer>
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="mBtnBack2">
+           <property name="text">
+            <string>&lt; &amp;Back</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="mBtnNext2">
+           <property name="text">
+            <string>&amp;Next &gt;</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer>
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Fixed</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>5</width>
+             <height>0</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="mBtnCancel2">
+           <property name="text">
+            <string>Cancel</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="mFileSelectPage">
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QLabel" name="mPageFileSelectHdr">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+           <pointsize>12</pointsize>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Appliance Export Settings</string>
+         </property>
+        </widget>
+       </item>
+       <item>
         <widget class="Line" name="line21">
          <property name="orientation">
@@ -214 +381 @@
         <layout class="QGridLayout" name="gridLayout_2">
          <item row="0" column="0" rowspan="3">
-          <widget class="QLabel" name="mLogoSettings">
+          <widget class="QLabel" name="mLogoFileSelect">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
@@ -236 +403 @@
          </item>
          <item row="0" column="1">
-          <widget class="QILabel" name="mTextSettings">
+          <widget class="QILabel" name="mTextFileSelect">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
@@ -298 +465 @@
          </item>
          <item>
-          <widget class="QPushButton" name="mBtnBack2">
+          <widget class="QPushButton" name="mBtnBack3">
            <property name="text">
             <string>&lt; &amp;Back</string>
@@ -328 +495 @@
          </item>
          <item>
-          <widget class="QPushButton" name="mBtnCancel2">
+          <widget class="QPushButton" name="mBtnCancel3">
            <property name="text">
             <string>Cancel</string>
@@ -353 +520 @@
    <header>VBoxFilePathSelectorWidget.h</header>
   </customwidget>
+  <customwidget>
+   <class>VBoxExportApplianceWgt</class>
+   <extends>QWidget</extends>
+   <header>VBoxExportApplianceWgt.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxImportApplianceWzd.ui

@@ -2 +2 @@
 <ui version="4.0">
  <comment>
- VBox frontends: Qt4 GUI ("VirtualBox"):
+ VBox frontends: Qt4 GUI (&quot;VirtualBox&quot;):
 
  Copyright (C) 2009 Sun Microsystems, Inc.
@@ -10 +10 @@
  you can redistribute it and/or modify it under the terms of the GNU
  General Public License (GPL) as published by the Free Software
- Foundation, in version 2 as it comes in the "COPYING" file of the
+ Foundation, in version 2 as it comes in the &quot;COPYING&quot; file of the
  VirtualBox OSE distribution. VirtualBox OSE is distributed in the
  hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
@@ -38 +38 @@
     <widget class="QStackedWidget" name="mPageStack">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="mFileSelectPage">
@@ -378 +378 @@
   </customwidget>
   <customwidget>
+   <class>VBoxFilePathSelectorWidget</class>
+   <extends>QComboBox</extends>
+   <header>VBoxFilePathSelectorWidget.h</header>
+  </customwidget>
+  <customwidget>
    <class>VBoxImportApplianceWgt</class>
    <extends>QWidget</extends>
    <header>VBoxImportApplianceWgt.h</header>
    <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>VBoxFilePathSelectorWidget</class>
-   <extends>QComboBox</extends>
-   <header>VBoxFilePathSelectorWidget.h</header>
   </customwidget>
  </customwidgets>