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

Timestamp:

Aug 14, 2018 4:28:27 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9152: Export Appliance wizard: Separate handling for CloudOCIPublicIP parameter: Check-box value should be tied to actual config value which should still be a string true/false tag.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• widgets/UIApplianceEditorWidget.cpp (modified) (3 diffs)
• wizards/exportappliance/UIWizardExportAppPageBasic3.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp

@@ -404 +404 @@
         case Qt::CheckStateRole:
         {
-            if (iColumn == ApplianceViewSection_ConfigValue &&
-                (m_enmVSDType == KVirtualSystemDescriptionType_Floppy ||
-                 m_enmVSDType == KVirtualSystemDescriptionType_CDROM ||
-                 m_enmVSDType == KVirtualSystemDescriptionType_USBController ||
-                 m_enmVSDType == KVirtualSystemDescriptionType_SoundCard ||
-                 m_enmVSDType == KVirtualSystemDescriptionType_NetworkAdapter ||
-                 m_enmVSDType == KVirtualSystemDescriptionType_CloudOCIPublicIP))
-            {
-                m_checkState = static_cast<Qt::CheckState>(value.toInt());
-                fDone = true;
+            if (iColumn == ApplianceViewSection_ConfigValue)
+            {
+                switch (m_enmVSDType)
+                {
+                    /* These hardware items can be disabled: */
+                    case KVirtualSystemDescriptionType_Floppy:
+                    case KVirtualSystemDescriptionType_CDROM:
+                    case KVirtualSystemDescriptionType_USBController:
+                    case KVirtualSystemDescriptionType_SoundCard:
+                    case KVirtualSystemDescriptionType_NetworkAdapter:
+                    {
+                        m_checkState = static_cast<Qt::CheckState>(value.toInt());
+                        fDone = true;
+                        break;
+                    }
+                    /* These option items can be enabled: */
+                    case KVirtualSystemDescriptionType_CloudOCIPublicIP:
+                    {
+                        if (value.toInt() == Qt::Unchecked)
+                            m_strConfigValue = "false";
+                        else if (value.toInt() == Qt::Checked)
+                            m_strConfigValue = "true";
+                        fDone = true;
+                        break;
+                    }
+                    default:
+                        break;
+                }
             }
             break;
@@ -499 +517 @@
                         value = strTmp; break;
                     }
-                    case KVirtualSystemDescriptionType_OS:             value = vboxGlobal().vmGuestOSTypeDescription(m_strConfigValue); break;
-                    case KVirtualSystemDescriptionType_Memory:         value = m_strConfigValue + " " + VBoxGlobal::tr("MB", "size suffix MBytes=1024 KBytes"); break;
-                    case KVirtualSystemDescriptionType_SoundCard:      value = gpConverter->toString(static_cast<KAudioControllerType>(m_strConfigValue.toInt())); break;
-                    case KVirtualSystemDescriptionType_NetworkAdapter: value = gpConverter->toString(static_cast<KNetworkAdapterType>(m_strConfigValue.toInt())); break;
-                    default:                                           value = m_strConfigValue; break;
+                    case KVirtualSystemDescriptionType_OS:               value = vboxGlobal().vmGuestOSTypeDescription(m_strConfigValue); break;
+                    case KVirtualSystemDescriptionType_Memory:           value = m_strConfigValue + " " + VBoxGlobal::tr("MB", "size suffix MBytes=1024 KBytes"); break;
+                    case KVirtualSystemDescriptionType_SoundCard:        value = gpConverter->toString(static_cast<KAudioControllerType>(m_strConfigValue.toInt())); break;
+                    case KVirtualSystemDescriptionType_NetworkAdapter:   value = gpConverter->toString(static_cast<KNetworkAdapterType>(m_strConfigValue.toInt())); break;
+                    case KVirtualSystemDescriptionType_CloudOCIPublicIP: break;
+                    default:                                             value = m_strConfigValue; break;
                 }
             }
@@ -584 +603 @@
         case Qt::CheckStateRole:
         {
-            if (iColumn == ApplianceViewSection_ConfigValue &&
-                (m_enmVSDType == KVirtualSystemDescriptionType_Floppy ||
-                 m_enmVSDType == KVirtualSystemDescriptionType_CDROM ||
-                 m_enmVSDType == KVirtualSystemDescriptionType_USBController ||
-                 m_enmVSDType == KVirtualSystemDescriptionType_SoundCard ||
-                 m_enmVSDType == KVirtualSystemDescriptionType_NetworkAdapter ||
-                 m_enmVSDType == KVirtualSystemDescriptionType_CloudOCIPublicIP))
-                value = m_checkState;
+            if (iColumn == ApplianceViewSection_ConfigValue)
+            {
+                switch (m_enmVSDType)
+                {
+                    /* These hardware items can be disabled: */
+                    case KVirtualSystemDescriptionType_Floppy:
+                    case KVirtualSystemDescriptionType_CDROM:
+                    case KVirtualSystemDescriptionType_USBController:
+                    case KVirtualSystemDescriptionType_SoundCard:
+                    case KVirtualSystemDescriptionType_NetworkAdapter:
+                    {
+                        value = m_checkState;
+                        break;
+                    }
+                    /* These option items can be enabled: */
+                    case KVirtualSystemDescriptionType_CloudOCIPublicIP:
+                    {
+                        if (m_strConfigValue == "true")
+                            value = Qt::Checked;
+                        else
+                            value = Qt::Unchecked;
+                        break;
+                    }
+                    default:
+                        break;
+                }
+            }
             break;
         }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp

@@ -271 +271 @@
                             {
                                 case ParameterKind_Bool:
-                                    strValue = QString();
+                                    strValue = QString("true");
                                     break;
                                 case ParameterKind_Double: