Changeset 16736 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 13, 2009 1:41:04 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4-OVF: Displays the OS types as menu with submenus.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxImportAppliance.h (modified) (1 diff)
• include/VBoxOSTypeSelectorButton.h (added)
• src/VBoxImportAppliance.cpp (modified) (5 diffs)
• src/VBoxOSTypeSelectorButton.cpp (added)

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

@@ -27 +27 @@
 #include "QIWithRetranslateUI.h"
 #include "QIDialog.h"
-
-#include <QSortFilterProxyModel>
 
 class CAppliance;

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

@@ -25 +25 @@
 #include "VBoxProblemReporter.h"
 #include "VBoxFilePathSelectorWidget.h"
+#include "VBoxOSTypeSelectorButton.h"
 
 #include <QItemDelegate>
+#include <QSortFilterProxyModel>
 #include <QHeaderView>
 #include <QLineEdit>
 #include <QSpinBox>
 #include <QComboBox>
-#include <QPushButton>
 
 class ModelItem;
@@ -388 +389 @@
                 case KVirtualSystemDescriptionType_OS:
                 {
-                    QComboBox *e = new QComboBox (aParent);
-                    /* Create a list of all possible OS types */
-                    QList <CGuestOSType> families = vboxGlobal().vmGuestOSFamilyList();
-                    QList <CGuestOSType> types;
-                    foreach (const CGuestOSType& family, families)
-                        types << vboxGlobal().vmGuestOSTypeList (family.GetFamilyId());
-                    /* Fill the combobox */
-                    foreach (const CGuestOSType& type, types)
-                        e->addItem (vboxGlobal().vmGuestOSTypeIcon (type.GetId()), type.GetDescription(), type.GetId());
+                    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;
@@ -472 +470 @@
         {
             case KVirtualSystemDescriptionType_OS:
+            {
+                if (VBoxOSTypeSelectorButton *e = qobject_cast<VBoxOSTypeSelectorButton*> (aEditor))
+                {
+                    e->setOSTypeId (mConfigValue);
+                    fDone = true;
+                }
+                break;
+            }
             case KVirtualSystemDescriptionType_HardDiskControllerIDE:
             {
@@ -539 +545 @@
         {
             case KVirtualSystemDescriptionType_OS:
+            {
+                if (VBoxOSTypeSelectorButton *e = qobject_cast<VBoxOSTypeSelectorButton*> (aEditor))
+                {
+                    mConfigValue = e->osTypeId();
+                    fDone = true;
+                }
+                break;
+            }
             case KVirtualSystemDescriptionType_HardDiskControllerIDE:
             {
@@ -687 +701 @@
     {
         QSize size = QItemDelegate::sizeHint (aOption, aIndex);
-        size.setHeight (RT_MAX (24, size.height()));
+#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;
     }