diff --git a/libs/editor/settings/wiredconnectionwidget.cpp b/libs/editor/settings/wiredconnectionwidget.cpp index 986627ec..ab6be83a 100644 --- a/libs/editor/settings/wiredconnectionwidget.cpp +++ b/libs/editor/settings/wiredconnectionwidget.cpp @@ -1,159 +1,160 @@ /* Copyright 2013 Jan Grulich This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) version 3, or any later version accepted by the membership of KDE e.V. (or its successor approved by the membership of KDE e.V.), which shall act as a proxy defined in Section 6 of version 3 of the license. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . */ #include "wiredconnectionwidget.h" #include "ui_wiredconnectionwidget.h" #include "uiutils.h" #include #include WiredConnectionWidget::WiredConnectionWidget(const NetworkManager::Setting::Ptr &setting, QWidget* parent, Qt::WindowFlags f): SettingWidget(setting, parent, f), m_widget(new Ui::WiredConnectionWidget) { qsrand(QTime::currentTime().msec()); m_widget->setupUi(this); m_widget->speedLabel->setHidden(true); m_widget->speed->setHidden(true); m_widget->duplexLabel->setHidden(true); m_widget->duplex->setHidden(true); connect(m_widget->btnRandomMacAddr, &QPushButton::clicked, this, &WiredConnectionWidget::generateRandomClonedMac); // Connect for setting check watchChangedSetting(); // Connect for validity check connect(m_widget->autonegotiate, &QCheckBox::stateChanged, this, &WiredConnectionWidget::slotWidgetChanged); connect(m_widget->clonedMacAddress, &KLineEdit::textChanged, this, &WiredConnectionWidget::slotWidgetChanged); connect(m_widget->macAddress, &HwAddrComboBox::hwAddressChanged, this, &WiredConnectionWidget::slotWidgetChanged); connect(m_widget->speed, QOverload::of(&QSpinBox::valueChanged), this, &WiredConnectionWidget::slotWidgetChanged); KAcceleratorManager::manage(this); if (setting) { loadConfig(setting); } } WiredConnectionWidget::~WiredConnectionWidget() { delete m_widget; } void WiredConnectionWidget::loadConfig(const NetworkManager::Setting::Ptr &setting) { NetworkManager::WiredSetting::Ptr wiredSetting = setting.staticCast(); m_widget->macAddress->init(NetworkManager::Device::Ethernet, NetworkManager::macAddressAsString(wiredSetting->macAddress())); if (!wiredSetting->clonedMacAddress().isEmpty()) { m_widget->clonedMacAddress->setText(NetworkManager::macAddressAsString(wiredSetting->clonedMacAddress())); } if (wiredSetting->mtu()) { m_widget->mtu->setValue(wiredSetting->mtu()); } if (!wiredSetting->autoNegotiate()) { m_widget->autonegotiate->setChecked(false); if (wiredSetting->speed()) { m_widget->speed->setValue(wiredSetting->speed()); } - if (wiredSetting->duplexType() == NetworkManager::WiredSetting::Full) { + // Default to "Full" duplex when duplex type is not set + if (wiredSetting->duplexType() == NetworkManager::WiredSetting::Full || wiredSetting->duplexType() == NetworkManager::WiredSetting::UnknownDuplexType) { m_widget->duplex->setCurrentIndex(0); } else { m_widget->duplex->setCurrentIndex(1); } } } QVariantMap WiredConnectionWidget::setting() const { NetworkManager::WiredSetting wiredSetting; wiredSetting.setMacAddress(NetworkManager::macAddressFromString(m_widget->macAddress->hwAddress())); if (!m_widget->clonedMacAddress->text().isEmpty() && m_widget->clonedMacAddress->text() != ":::::") { wiredSetting.setClonedMacAddress(NetworkManager::macAddressFromString(m_widget->clonedMacAddress->text())); } if (m_widget->mtu->value()) { wiredSetting.setMtu(m_widget->mtu->value()); } if (m_widget->autonegotiate->isChecked()) { wiredSetting.setAutoNegotiate(true); wiredSetting.setDuplexType(NetworkManager::WiredSetting::UnknownDuplexType); wiredSetting.setSpeed(0); } else { wiredSetting.setAutoNegotiate(false); wiredSetting.setSpeed(m_widget->speed->value()); if (m_widget->duplex->currentIndex() == 0) { wiredSetting.setDuplexType(NetworkManager::WiredSetting::Full); } else { wiredSetting.setDuplexType(NetworkManager::WiredSetting::Half); } } return wiredSetting.toMap(); } void WiredConnectionWidget::generateRandomClonedMac() { QByteArray mac; mac.resize(6); for (int i = 0; i < 6; i++) { int random = qrand() % 255; mac[i] = random; } // Disable the multicast bit and enable the locally administered bit. mac[0] = mac[0] & ~0x1; mac[0] = mac[0] | 0x2; m_widget->clonedMacAddress->setText(NetworkManager::macAddressAsString(mac)); } bool WiredConnectionWidget::isValid() const { if (!m_widget->macAddress->isValid()) { return false; } if (m_widget->clonedMacAddress->text() != ":::::") { if (!NetworkManager::macAddressIsValid(m_widget->clonedMacAddress->text())) { return false; } } if (!m_widget->autonegotiate->isChecked()) { if (!m_widget->speed->value()) { return false; } } return true; }