Changeset 14437 in vbox for trunk/src/VBox/Frontends/VirtualBox4/include

Timestamp:

Nov 20, 2008 9:37:06 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

39691

Message:

FE/Qt4: 2883: Structure OS list. Feature request implemented in base designed variant.

Location:

trunk/src/VBox/Frontends/VirtualBox4/include

Files:

• VBoxGlobal.h (modified) (2 diffs)
• VBoxNewVMWzd.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxGlobal.h

@@ -474 +474 @@
     /* VBox enum to/from string/icon/color convertors */
 
-    QStringList vmGuestOSTypeDescriptions() const;
-    QList<QPixmap> vmGuestOSTypeIcons (int aHorizonalMargin, int aVerticalMargin) const;
-    CGuestOSType vmGuestOSType (int aIndex) const;
-    int vmGuestOSTypeIndex (const QString &aId) const;
-    QPixmap vmGuestOSTypeIcon (const QString &aId) const;
-    QString vmGuestOSTypeDescription (const QString &aId) const;
+    QList <CGuestOSType> vmGuestOSFamilyList() const;
+    QList <CGuestOSType> vmGuestOSTypeList (const QString &aFamilyId) const;
+    QPixmap vmGuestOSTypeIcon (const QString &aTypeId) const;
+    CGuestOSType vmGuestOSType (const QString &aTypeId,
+                                const QString &aFamilyId = QString::null) const;
+    QString vmGuestOSTypeDescription (const QString &aTypeId) const;
 
     QPixmap toIcon (KMachineState s) const
@@ -986 +986 @@
     QString verString;
 
-    QVector <CGuestOSType> vm_os_types;
-    QHash <QString, QPixmap *> vm_os_type_icons;
+    QList <QString> mFamilyIDs;
+    QList <QList <CGuestOSType> > mTypes;
+    QHash <QString, QPixmap *> mOsTypeIcons;
     QVector <QColor *> vm_state_color;
 

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxNewVMWzd.h

@@ -49 +49 @@
 
     void accept();
-    void showHardDiskManager();
-    void showNewHardDiskWizard();
+    void showMediaManager();
+    void showNewHDWizard();
+    void onOSTypeChanged();
     void slRAMValueChanged (int aValue);
     void leRAMTextChanged (const QString &aTtext);
-    void cbOSActivated (int aItem);
     void revalidate (QIWidgetValidator *aWval);
     void enableNext (const QIWidgetValidator *aWval);