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

Timestamp:

Apr 22, 2019 2:43:59 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9434: Import Appliance wizard: Form Editor widget: Cache actual form values instead of acquiring them each time.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIFormEditorWidget.cpp (modified) (8 diffs)

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

@@ -201 +201 @@
     int  m_iGeneration;
 
+    /** Holds cached bool value. */
+    bool        m_fBool;
+    /** Holds cached string value. */
+    QString     m_strString;
+    /** Holds cached choice value. */
+    ChoiceData  m_choice;
+
     /** Holds the cell instances. */
     QVector<UIFormEditorCell*>  m_cells;
@@ -314 +321 @@
     , m_enmValueType(KFormValueType_Max)
     , m_iGeneration(0)
+    , m_fBool(false)
+    , m_strString(QString())
+    , m_choice(ChoiceData())
 {
     prepare();
@@ -341 +351 @@
 {
     AssertReturn(valueType() == KFormValueType_Boolean, false);
-    CBooleanFormValue comValue(m_comValue);
-    return comValue.GetSelected();
+    return m_fBool;
 }
 
@@ -371 +380 @@
 {
     AssertReturn(valueType() == KFormValueType_String, QString());
-    CStringFormValue comValue(m_comValue);
-    return comValue.GetString();
+    return m_strString;
 }
 
@@ -401 +409 @@
 {
     AssertReturn(valueType() == KFormValueType_Choice, ChoiceData());
-    CChoiceFormValue comValue(m_comValue);
-    return ChoiceData(comValue.GetValues(), comValue.GetSelectedIndex());
+    return m_choice;
 }
 
@@ -442 +449 @@
         {
             CBooleanFormValue comValue(m_comValue);
-            m_cells[UIFormEditorDataType_Value]->setText(comValue.GetSelected() ? "True" : "False");
+            m_fBool = comValue.GetSelected();
+            m_cells[UIFormEditorDataType_Value]->setText(m_fBool ? "True" : "False");
             /// @todo check for errors
             break;
@@ -449 +457 @@
         {
             CStringFormValue comValue(m_comValue);
-            m_cells[UIFormEditorDataType_Value]->setText(comValue.GetString());
+            m_strString = comValue.GetString();
+            m_cells[UIFormEditorDataType_Value]->setText(m_strString);
             /// @todo check for errors
             break;
@@ -457 +466 @@
             CChoiceFormValue comValue(m_comValue);
             const QVector<QString> values = comValue.GetValues();
-            m_cells[UIFormEditorDataType_Value]->setText(values.isEmpty() ? QString() : values.at(comValue.GetSelectedIndex()));
+            const int iSelectedIndex = comValue.GetSelectedIndex();
+            m_choice = ChoiceData(values, iSelectedIndex);
+            m_cells[UIFormEditorDataType_Value]->setText(  !m_choice.choices().isEmpty()
+                                                         ? m_choice.choices().at(m_choice.selectedChoice())
+                                                         : QString());
             /// @todo check for errors
             break;