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

Timestamp:

Jun 12, 2018 1:56:47 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: ​bugref:6769 Modifications to UIApplianceEditorWidget to reflect recent API changes about appliance import

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp (modified) (8 diffs)

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

@@ -372 +372 @@
              m_enmVSDType == KVirtualSystemDescriptionType_NetworkAdapter ||
              m_enmVSDType == KVirtualSystemDescriptionType_HardDiskControllerIDE ||
-             m_enmVSDType == KVirtualSystemDescriptionType_HardDiskImage) &&
+             m_enmVSDType == KVirtualSystemDescriptionType_HardDiskImage ||
+             m_enmVSDType == KVirtualSystemDescriptionType_SettingsFile ||
+             m_enmVSDType == KVirtualSystemDescriptionType_BaseFolder ||
+             m_enmVSDType == KVirtualSystemDescriptionType_PrimaryGroup) &&
             m_checkState == Qt::Checked) /* Item has to be enabled */
             enmFlags |= Qt::ItemIsEditable;
@@ -451 +454 @@
                     case KVirtualSystemDescriptionType_SoundCard:              value = UIApplianceEditorWidget::tr("Sound Card"); break;
                     case KVirtualSystemDescriptionType_HardDiskImage:          value = UIApplianceEditorWidget::tr("Virtual Disk Image"); break;
+                    case KVirtualSystemDescriptionType_SettingsFile:           value = UIApplianceEditorWidget::tr("Settings File"); break;
+                    case KVirtualSystemDescriptionType_BaseFolder:             value = UIApplianceEditorWidget::tr("Base Folder"); break;
+                    case KVirtualSystemDescriptionType_PrimaryGroup:           value = UIApplianceEditorWidget::tr("Primary Group"); break;
                     default:                                                   value = UIApplianceEditorWidget::tr("Unknown Hardware Item"); break;
                 }
@@ -516 +522 @@
                     case KVirtualSystemDescriptionType_USBController:          value = UIIconPool::iconSet(":/usb_16px.png"); break;
                     case KVirtualSystemDescriptionType_SoundCard:              value = UIIconPool::iconSet(":/sound_16px.png"); break;
+                    case KVirtualSystemDescriptionType_BaseFolder:             value = vboxGlobal().icon(QFileIconProvider::Folder); break;
+                    case KVirtualSystemDescriptionType_PrimaryGroup:              value = UIIconPool::iconSet(":/vm_group_name_16px.png"); break;
                     default: break;
                 }
@@ -666 +674 @@
             case KVirtualSystemDescriptionType_HardDiskImage:
             {
-                   UIFilePathSelector *pFileChooser = new UIFilePathSelector(pParent);
-                   pFileChooser->setMode(UIFilePathSelector::Mode_File_Save);
-                   pFileChooser->setResetEnabled(false);
-                   pEditor = pFileChooser;
+                UIFilePathSelector *pFileChooser = new UIFilePathSelector(pParent);
+                pFileChooser->setMode(UIFilePathSelector::Mode_File_Save);
+                pFileChooser->setResetEnabled(false);
+                pEditor = pFileChooser;
+                break;
+            }
+            case KVirtualSystemDescriptionType_SettingsFile:
+            {
+                UIFilePathSelector *pFileChooser = new UIFilePathSelector(pParent);
+                pFileChooser->setMode(UIFilePathSelector::Mode_File_Save);
+                pFileChooser->setResetEnabled(false);
+                pEditor = pFileChooser;
+                break;
+            }
+            case KVirtualSystemDescriptionType_BaseFolder:
+            {
+                UIFilePathSelector *pFileChooser = new UIFilePathSelector(pParent);
+                pFileChooser->setMode(UIFilePathSelector::Mode_Folder);
+                pFileChooser->setResetEnabled(false);
+                pEditor = pFileChooser;
+                break;
+            }
+            case KVirtualSystemDescriptionType_PrimaryGroup:
+            {
+                QComboBox *pComboBox = new QComboBox(pParent);
+                pComboBox->setEditable(true);
+                QVector<QString> groupsVector = vboxGlobal().virtualBox().GetMachineGroups();
+
+                for (int i = 0; i < groupsVector.size(); ++i)
+                    pComboBox->addItem(groupsVector.at(i));
+                pEditor = pComboBox;
                 break;
             }
@@ -750 +785 @@
         }
         case KVirtualSystemDescriptionType_HardDiskImage:
+        case KVirtualSystemDescriptionType_SettingsFile:
+        case KVirtualSystemDescriptionType_BaseFolder:
         {
             if (UIFilePathSelector *pFileChooser = qobject_cast<UIFilePathSelector*>(pEditor))
             {
                 pFileChooser->setPath(m_strConfigValue);
+                fDone = true;
+            }
+            break;
+        }
+        case KVirtualSystemDescriptionType_PrimaryGroup:
+        {
+            if (QComboBox *pGroupCombo = qobject_cast<QComboBox*>(pEditor))
+            {
+                pGroupCombo->setCurrentText(m_strConfigValue);
                 fDone = true;
             }
@@ -872 +918 @@
             {
                 m_strConfigValue = pComboBox->itemData(pComboBox->currentIndex()).toString();
+                printf("%s\n", qPrintable(pComboBox->itemData(pComboBox->currentIndex()).toString()));
+                fDone = true;
+            }
+            break;
+        }
+        case KVirtualSystemDescriptionType_PrimaryGroup:
+        {
+            if (QComboBox *pComboBox = qobject_cast<QComboBox*>(pEditor))
+            {
+                m_strConfigValue = pComboBox->currentText();
                 fDone = true;
             }
@@ -877 +933 @@
         }
         case KVirtualSystemDescriptionType_HardDiskImage:
+        case KVirtualSystemDescriptionType_BaseFolder:
         {
             if (UIFilePathSelector *pFileChooser = qobject_cast<UIFilePathSelector*>(pEditor))
@@ -935 +992 @@
         for (int i = 0; i < types.size(); ++i)
         {
+            if (types[i] == KVirtualSystemDescriptionType_SettingsFile)
+                continue;
             /* We add the hard disk images in an second step, so save a
                reference to them. */
-            if (types[i] == KVirtualSystemDescriptionType_HardDiskImage)
+            else if (types[i] == KVirtualSystemDescriptionType_HardDiskImage)
                 hdIndexes << i;
             else