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

Timestamp:

Jan 22, 2020 11:20:36 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9611: UIMachineSettingsSerial: Get rid of hardcoded port modes, instead acquire these modes through CSystemProperties interface; Besides that, using more modern Qt approach to cache enum data directly without casting it to int or string.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp (modified) (14 diffs)

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

@@ -122 +122 @@
     void sltGbSerialToggled(bool fOn);
     void sltCbNumberActivated(const QString &strText);
-    void sltCbModeActivated(const QString &strText);
+    /** Handles port mode change to item with certain @a iIndex. */
+    void sltHandlePortModeChange(int iIndex);
 
 private:
@@ -129 +130 @@
     void prepareValidation();
 
+    /** Populates combo-boxes. */
+    void populateComboboxes();
+
+    /** Holds the parent page reference. */
     UIMachineSettingsSerialPage *m_pParent;
-    int m_iSlot;
+
+    /** Holds the port slot number. */
+    int        m_iSlot;
+    /** Holds the port mode. */
+    KPortMode  m_enmPortMode;
 };
 
@@ -142 +151 @@
     , m_pParent(pParent)
     , m_iSlot(-1)
+    , m_enmPortMode(KPortMode_Max)
 {
     /* Apply UI decorations: */
@@ -159 +169 @@
     mCbNumber->insertItem(0, uiCommon().toCOMPortName(0, 0));
     mCbNumber->insertItems(0, uiCommon().COMPortNames());
-
-    mCbMode->addItem(""); /* KPortMode_Disconnected */
-    mCbMode->addItem(""); /* KPortMode_HostPipe */
-    mCbMode->addItem(""); /* KPortMode_HostDevice */
-    mCbMode->addItem(""); /* KPortMode_RawFile */
-    mCbMode->addItem(""); /* KPortMode_TCP */
 
     /* Setup connections: */
@@ -171 +175 @@
     connect(mCbNumber, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::activated),
             this, &UIMachineSettingsSerial::sltCbNumberActivated);
-    connect(mCbMode, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::activated),
-            this, &UIMachineSettingsSerial::sltCbModeActivated);
+    connect(mCbMode, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
+            this, &UIMachineSettingsSerial::sltHandlePortModeChange);
 
     /* Prepare validation: */
@@ -186 +190 @@
     ulong uIRQ, uIOBase;
     const bool fStd = uiCommon().toCOMPortNumbers(mCbNumber->currentText(), uIRQ, uIOBase);
-    const KPortMode enmMode = gpConverter->fromString<KPortMode>(mCbMode->currentText());
+    const KPortMode enmMode = mCbMode->currentData().value<KPortMode>();
     mGbSerial->setEnabled(m_pParent->isMachineOffline());
     mLbNumber->setEnabled(m_pParent->isMachineOffline());
@@ -198 +202 @@
     mCbPipe->setEnabled(   (enmMode == KPortMode_HostPipe || enmMode == KPortMode_TCP)
                         && m_pParent->isMachineOffline());
-    mLbPath->setEnabled(m_pParent->isMachineOffline());
-    mLePath->setEnabled(enmMode != KPortMode_Disconnected && m_pParent->isMachineOffline());
+    mLbPath->setEnabled(   enmMode != KPortMode_Disconnected
+                        && m_pParent->isMachineOffline());
+    mLePath->setEnabled(   enmMode != KPortMode_Disconnected
+                        && m_pParent->isMachineOffline());
 }
 
@@ -212 +218 @@
     mLeIRQ->setText(QString::number(portData.m_uIRQ));
     mLeIOPort->setText("0x" + QString::number(portData.m_uIOBase, 16).toUpper());
-    mCbMode->setCurrentIndex(mCbMode->findText(gpConverter->toString(portData.m_hostMode)));
+    m_enmPortMode = portData.m_hostMode;
     mCbPipe->setChecked(!portData.m_fServer);
     mLePath->setText(portData.m_strPath);
 
+    /* Repopulate combo-boxes content: */
+    populateComboboxes();
     /* Ensure everything is up-to-date */
     sltGbSerialToggled(mGbSerial->isChecked());
@@ -227 +235 @@
     portData.m_uIOBase = mLeIOPort->text().toULong(NULL, 0);
     portData.m_fServer = !mCbPipe->isChecked();
-    portData.m_hostMode = gpConverter->fromString<KPortMode>(mCbMode->currentText());
+    portData.m_hostMode = mCbMode->currentData().value<KPortMode>();
     portData.m_strPath = QDir::toNativeSeparators(mLePath->text());
 }
@@ -261 +269 @@
     mCbNumber->setItemText(mCbNumber->count() - 1, uiCommon().toCOMPortName(0, 0));
 
-    mCbMode->setItemText(4, gpConverter->toString(KPortMode_TCP));
-    mCbMode->setItemText(3, gpConverter->toString(KPortMode_RawFile));
-    mCbMode->setItemText(2, gpConverter->toString(KPortMode_HostDevice));
-    mCbMode->setItemText(1, gpConverter->toString(KPortMode_HostPipe));
-    mCbMode->setItemText(0, gpConverter->toString(KPortMode_Disconnected));
+    /* Translate combo-boxes content: */
+    populateComboboxes();
 }
 
@@ -273 +278 @@
     {
         sltCbNumberActivated(mCbNumber->currentText());
-        sltCbModeActivated(mCbMode->currentText());
+        sltHandlePortModeChange(mCbMode->currentIndex());
     }
 
@@ -297 +302 @@
 }
 
-void UIMachineSettingsSerial::sltCbModeActivated(const QString &strText)
-{
-    KPortMode enmMode = gpConverter->fromString<KPortMode>(strText);
+void UIMachineSettingsSerial::sltHandlePortModeChange(int iIndex)
+{
+    const KPortMode enmMode = mCbMode->itemData(iIndex).value<KPortMode>();
     mCbPipe->setEnabled(enmMode == KPortMode_HostPipe || enmMode == KPortMode_TCP);
     mLePath->setEnabled(enmMode != KPortMode_Disconnected);
+    mLbPath->setEnabled(enmMode != KPortMode_Disconnected);
 
     /* Revalidate: */
@@ -313 +319 @@
     connect(mLeIOPort, &QLineEdit::textChanged, m_pParent, &UIMachineSettingsSerialPage::revalidate);
     connect(mLePath, &QLineEdit::textChanged, m_pParent, &UIMachineSettingsSerialPage::revalidate);
+}
+
+void UIMachineSettingsSerial::populateComboboxes()
+{
+    /* Port mode: */
+    {
+        /* Clear the port mode combo-box: */
+        mCbMode->clear();
+
+        /* Load currently supported port moded: */
+        CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
+        QVector<KPortMode> supportedModes = comProperties.GetSupportedPortModes();
+        /* Take currently requested mode into account if it's sane: */
+        if (!supportedModes.contains(m_enmPortMode) && m_enmPortMode != KPortMode_Max)
+            supportedModes.prepend(m_enmPortMode);
+
+        /* Populate port modes: */
+        int iPortModeIndex = 0;
+        foreach (const KPortMode &enmMode, supportedModes)
+        {
+            mCbMode->insertItem(iPortModeIndex, gpConverter->toString(enmMode));
+            mCbMode->setItemData(iPortModeIndex, QVariant::fromValue(enmMode));
+            mCbMode->setItemData(iPortModeIndex, mCbMode->itemText(iPortModeIndex), Qt::ToolTipRole);
+            ++iPortModeIndex;
+        }
+
+        /* Choose requested port mode: */
+        const int iIndex = mCbMode->findData(m_enmPortMode);
+        mCbMode->setCurrentIndex(iIndex != -1 ? iIndex : 0);
+    }
 }
 
@@ -493 +529 @@
         ports << pair;
 
-        const KPortMode enmMode = gpConverter->fromString<KPortMode>(pPage->mCbMode->currentText());
+        const KPortMode enmMode = pPage->mCbMode->currentData().value<KPortMode>();
         if (enmMode != KPortMode_Disconnected)
         {