Changeset 78167 in vbox

Timestamp:

Apr 17, 2019 2:57:04 PM (6 years ago)

Author:

vboxsync

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

130082

Message:

FE/Qt: bugref:9434: Import Appliance wizard: Form Editor widget: A bit of cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance

Files:

• UIFormEditorWidget.cpp (modified) (2 diffs)
• UIFormEditorWidget.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIFormEditorWidget.cpp

@@ -49 +49 @@
 
 
+/** Class used to hold choice data. */
+class ChoiceData
+{
+public:
+
+    /** Constructs null choice data. */
+    ChoiceData() {}
+    /** Constructs choice data on the basis of passed @a choices and @a iSelectedChoice. */
+    ChoiceData(const QVector<QString> &choices, int iSelectedChoice)
+        : m_choices(choices), m_iSelectedChoice(iSelectedChoice) {}
+
+    /** Returns choice list. */
+    QVector<QString> choices() const { return m_choices; }
+    /** Returns current selected choice. */
+    int selectedChoice() const { return m_iSelectedChoice; }
+
+private:
+
+    /** Holds choice list. */
+    QVector<QString>  m_choices;
+    /** Holds current selected choice. */
+    int               m_iSelectedChoice;
+};
+Q_DECLARE_METATYPE(ChoiceData);
+
+
 /** QComboBox extension used as Port editor. */
 class ChoiceEditor : public QComboBox
@@ -391 +417 @@
             return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
         case UIFormEditorDataType_Value:
-            return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
+            return   m_dataList[index.row()]->valueType() != KFormValueType_Boolean
+                   ? Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable
+                   : Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable;
         default:
             return Qt::NoItemFlags;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIFormEditorWidget.h

@@ -29 +29 @@
 class UIFormEditorView;
 class CVirtualSystemDescriptionForm;
-
-
-/** Class used to hold choice data. */
-class ChoiceData
-{
-public:
-
-    /** Constructs null choice data. */
-    ChoiceData() {}
-    /** Constructs choice data on the basis of passed @a choices and @a iSelectedChoice. */
-    ChoiceData(const QVector<QString> &choices, int iSelectedChoice)
-        : m_choices(choices), m_iSelectedChoice(iSelectedChoice) {}
-
-    /** Returns choice list. */
-    QVector<QString> choices() const { return m_choices; }
-    /** Returns current selected choice. */
-    int selectedChoice() const { return m_iSelectedChoice; }
-
-private:
-
-    /** Holds choice list. */
-    QVector<QString>  m_choices;
-    /** Holds current selected choice. */
-    int               m_iSelectedChoice;
-};
-Q_DECLARE_METATYPE(ChoiceData);
-
 
 /** QWidget subclass representing model/view Form Editor widget. */
@@ -92 +65 @@
 typedef QPointer<UIFormEditorWidget> UIFormEditorWidgetPointer;
 
-
 #endif /* !FEQT_INCLUDED_SRC_wizards_importappliance_UIFormEditorWidget_h */