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

Timestamp:

May 16, 2019 1:10:28 PM (6 years ago)

Author:

vboxsync

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

130593

Message:

FE/Qt: bugref:6247: VM Settings / Storage page: Finally add combo-box allowing to change bus type for existing controllers; This also requires a bit of UIConverter stuff to be extended to parse bus types on the fly.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackend.h (modified) (1 diff)
• converter/UIConverterBackendCOM.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (5 diffs)
• settings/machine/UIMachineSettingsStorage.ui (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h

@@ -298 +298 @@
 template<> SHARED_LIBRARY_STUFF KAuthType fromString<KAuthType>(const QString &strType);
 template<> SHARED_LIBRARY_STUFF QString toString(const KStorageBus &bus);
+template<> SHARED_LIBRARY_STUFF KStorageBus fromString<KStorageBus>(const QString &strType);
 template<> SHARED_LIBRARY_STUFF QString toString(const KStorageControllerType &type);
 template<> SHARED_LIBRARY_STUFF KStorageControllerType fromString<KStorageControllerType>(const QString &strType);

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp

@@ -585 +585 @@
 }
 
+/* KStorageBus <= QString: */
+template<> KStorageBus fromString<KStorageBus>(const QString &strType)
+{
+    QHash<QString, KStorageBus> list;
+    list.insert(QApplication::translate("VBoxGlobal", "IDE", "StorageBus"),         KStorageBus_IDE);
+    list.insert(QApplication::translate("VBoxGlobal", "SATA", "StorageBus"),        KStorageBus_SATA);
+    list.insert(QApplication::translate("VBoxGlobal", "SCSI", "StorageBus"),        KStorageBus_SCSI);
+    list.insert(QApplication::translate("VBoxGlobal", "Floppy", "StorageBus"),      KStorageBus_Floppy);
+    list.insert(QApplication::translate("VBoxGlobal", "SAS", "StorageBus"),         KStorageBus_SAS);
+    list.insert(QApplication::translate("VBoxGlobal", "USB", "StorageBus"),         KStorageBus_USB);
+    list.insert(QApplication::translate("VBoxGlobal", "PCIe", "StorageBus"),        KStorageBus_PCIe);
+    list.insert(QApplication::translate("VBoxGlobal", "virtio-scsi", "StorageBus"), KStorageBus_VirtioSCSI);
+    if (!list.contains(strType))
+    {
+        AssertMsgFailed(("No value for '%s'", strType.toUtf8().constData()));
+    }
+    return list.value(strType, KStorageBus_Null);
+}
+
 /* QString <= KStorageControllerType: */
 template<> QString toString(const KStorageControllerType &type)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -2611 +2611 @@
     mLbName->setEnabled(isMachineOffline());
     mLeName->setEnabled(isMachineOffline());
+    mLbBus->setEnabled(isMachineOffline());
+    mCbBus->setEnabled(isMachineOffline());
     mLbType->setEnabled(isMachineOffline());
     mCbType->setEnabled(isMachineOffline());
@@ -2895 +2897 @@
                     mLeName->setText(strCtrName);
 
+                /* Getting Controller Bus type: */
+                mCbBus->clear();
+                const ControllerBusList controllerBusList(m_pModelStorage->data(index, StorageModel::R_CtrBusTypes).value<ControllerBusList>());
+                for (int i = 0; i < controllerBusList.size(); ++i)
+                    mCbBus->insertItem(mCbBus->count(), gpConverter->toString(controllerBusList[i]));
+                const KStorageBus enmBus = m_pModelStorage->data(index, StorageModel::R_CtrBusType).value<KStorageBus>();
+                const int iBusPos = mCbBus->findText(gpConverter->toString(enmBus));
+                mCbBus->setCurrentIndex(iBusPos == -1 ? 0 : iBusPos);
+
                 /* Getting Controller Sub type: */
                 mCbType->clear();
@@ -2904 +2915 @@
                 mCbType->setCurrentIndex(iCtrPos == -1 ? 0 : iCtrPos);
 
-                const KStorageBus enmBus = m_pModelStorage->data(index, StorageModel::R_CtrBusType).value <KStorageBus>();
                 mLbPortCount->setVisible(enmBus == KStorageBus_SATA || enmBus == KStorageBus_SAS);
                 mSbPortCount->setVisible(enmBus == KStorageBus_SATA || enmBus == KStorageBus_SAS);
@@ -3033 +3043 @@
             if (pSdr == mLeName)
                 m_pModelStorage->setData(index, mLeName->text(), StorageModel::R_CtrName);
+            /* Setting Controller Bus-Type: */
+            else if (pSdr == mCbBus)
+                m_pModelStorage->setData(index, QVariant::fromValue(gpConverter->fromString<KStorageBus>(mCbBus->currentText())),
+                                         StorageModel::R_CtrBusType);
             /* Setting Controller Sub-Type: */
             else if (pSdr == mCbType)
@@ -3827 +3841 @@
     connect(mSbPortCount, SIGNAL(valueChanged(int)), this, SLOT(sltSetInformation()));
     connect(mLeName, SIGNAL(textEdited(const QString &)), this, SLOT(sltSetInformation()));
+    connect(mCbBus, SIGNAL(activated(int)), this, SLOT(sltSetInformation()));
     connect(mCbType, SIGNAL(activated(int)), this, SLOT(sltSetInformation()));
     connect(mCbSlot, SIGNAL(activated(int)), this, SLOT(sltSetInformation()));

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.ui

@@ -174 +174 @@
         </item>
         <item row="2" column="1" >
+         <widget class="QLabel" name="mLbBus" >
+          <property name="text" >
+           <string>&amp;Bus:</string>
+          </property>
+          <property name="buddy" >
+           <cstring>mCbBus</cstring>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="2" >
+         <widget class="QComboBox" name="mCbBus" >
+          <property name="whatsThis" >
+           <string>Selects the bus type of the storage controller currently selected in the Storage Tree.</string>
+          </property>
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1" >
          <widget class="QLabel" name="mLbType" >
           <property name="text" >
@@ -186 +212 @@
          </widget>
         </item>
-        <item row="2" column="2" >
+        <item row="3" column="2" >
          <widget class="QComboBox" name="mCbType" >
           <property name="whatsThis" >
@@ -199 +225 @@
          </widget>
         </item>
-        <item row="3" column="1" >
+        <item row="4" column="1" >
          <widget class="QLabel" name="mLbPortCount" >
           <property name="text" >
@@ -212 +238 @@
          </widget>
         </item>
-        <item row="3" column="2" >
+        <item row="4" column="2" >
          <widget class="QSpinBox" name="mSbPortCount" >
           <property name="whatsThis" >
@@ -225 +251 @@
          </widget>
         </item>
-        <item row="4" column="2" >
+        <item row="5" column="2" >
          <widget class="QCheckBox" name="mCbIoCache" >
           <property name="whatsThis" >
@@ -235 +261 @@
          </widget>
         </item>
-        <item row="5" column="0" colspan="3" >
+        <item row="6" column="0" colspan="3" >
          <spacer name="mSp3" >
           <property name="orientation" >