Merge branch 'ipconflict' into 'dbus-interface'

修改控制面板移动热点GHz单位拼写

See merge request kylin-desktop/kylin-nm!697
This commit is contained in:
赵世旭 2022-08-22 06:39:51 +00:00
commit bed4d3e420
1 changed files with 4 additions and 4 deletions

View File

@ -538,8 +538,8 @@ void MobileHotspotWidget::setFreqBandFrame()
m_freqBandComboBox->setInsertPolicy(QComboBox::NoInsert); m_freqBandComboBox->setInsertPolicy(QComboBox::NoInsert);
m_freqBandComboBox->setMinimumWidth(COMBOBOX_MIN_WIDTH); m_freqBandComboBox->setMinimumWidth(COMBOBOX_MIN_WIDTH);
m_freqBandComboBox->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed); m_freqBandComboBox->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed);
m_freqBandComboBox->addItem("2.4Ghz"); m_freqBandComboBox->addItem("2.4GHz");
m_freqBandComboBox->addItem("5Ghz"); m_freqBandComboBox->addItem("5GHz");
freqBandHLayout->setContentsMargins(ITEM_MARGINS); freqBandHLayout->setContentsMargins(ITEM_MARGINS);
freqBandHLayout->setSpacing(0); freqBandHLayout->setSpacing(0);
freqBandHLayout->addWidget(m_freqBandLabel); freqBandHLayout->addWidget(m_freqBandLabel);
@ -746,10 +746,10 @@ void MobileHotspotWidget::updateBandCombox()
} }
QMap<QString, int> devCapMap = capReply.value(); QMap<QString, int> devCapMap = capReply.value();
if (devCapMap[m_interfaceName] & 0x02) { if (devCapMap[m_interfaceName] & 0x02) {
m_freqBandComboBox->addItem("2.4Ghz"); m_freqBandComboBox->addItem("2.4GHz");
} }
if (devCapMap[m_interfaceName] & 0x04) { if (devCapMap[m_interfaceName] & 0x04) {
m_freqBandComboBox->addItem("5Ghz"); m_freqBandComboBox->addItem("5GHz");
} }
} }