fix: DSL should not be displayed without wired network devices

DSL should not be displayed without wired network devices

pms: BUG-311983

Author: caixr23

dcc-network/qml/PageDSL.qml

@@ -18,7 +18,7 @@ DccObject {
     displayName: qsTr("DSL")
     description: qsTr("Set up a dial-up network connection")
     icon: "dcc_dsl"
-    visible: item
+    visible: item.enabledable
     page: DccSettingsView {}
 
     DccObject {

net-view/operation/private/netmanagerthreadprivate.cpp

@@ -548,18 +548,16 @@ void NetManagerThreadPrivate::doInit()
     }
     // DSL
     if (m_flags.testFlags(NetType::NetManagerFlag::Net_DSL)) {
-        NetDSLControlItemPrivate *vpnControlItem = NetItemNew(DSLControlItem, "NetDSLControlItem");
-        vpnControlItem->updatename("DSL");
-        vpnControlItem->updateenabled(networkController->vpnController()->enabled());
-        vpnControlItem->item()->moveToThread(m_parentThread);
-        Q_EMIT itemAdded("Root", vpnControlItem);
+        NetDSLControlItemPrivate *dslControlItem = NetItemNew(DSLControlItem, "NetDSLControlItem");
+        dslControlItem->updatename("DSL");
+        dslControlItem->item()->moveToThread(m_parentThread);
+        Q_EMIT itemAdded("Root", dslControlItem);
 
         networkController->dslController()->connectItem("");
-        // connect(networkController->dslController(), &DSLController::enableChanged, this, &NetManagerThreadPrivate::onVPNEnableChanged);
-        // connect(networkController->vpnController(), &VPNController::itemChanged, this, vpnItemChanged);
         connect(networkController->dslController(), &DSLController::itemAdded, this, &NetManagerThreadPrivate::onDSLAdded);
         connect(networkController->dslController(), &DSLController::itemRemoved, this, &NetManagerThreadPrivate::onDSLRemoved);
         connect(networkController->dslController(), &DSLController::activeConnectionChanged, this, &NetManagerThreadPrivate::onDslActiveConnectionChanged);
+        updateDSLEnabledable();
         onDSLAdded(networkController->dslController()->items());
     }
     // Details
@@ -1847,6 +1845,7 @@ void NetManagerThreadPrivate::onDeviceAdded(QList<NetworkDeviceBase *> devices)
             break;
         }
     }
+    updateDSLEnabledable();
 }
 
 void NetManagerThreadPrivate::onDeviceRemoved(QList<NetworkDeviceBase *> devices)
@@ -1858,6 +1857,7 @@ void NetManagerThreadPrivate::onDeviceRemoved(QList<NetworkDeviceBase *> devices
     if (m_flags.testFlags(NetType::Net_Details)) {
         updateDetails();
     }
+    updateDSLEnabledable();
 }
 
 void NetManagerThreadPrivate::onConnectivityChanged()
@@ -1866,6 +1866,20 @@ void NetManagerThreadPrivate::onConnectivityChanged()
         Q_EMIT dataChanged(DataChanged::DeviceStatusChanged, dev->path(), QVariant::fromValue(deviceStatus(dev)));
 }
 
+void NetManagerThreadPrivate::updateDSLEnabledable()
+{
+    if (!m_flags.testFlags(NetType::NetManagerFlag::Net_DSL)) {
+        return;
+    }
+    for (auto &&dev : NetworkController::instance()->devices()) {
+        if (dev->deviceType() == DeviceType::Wired) {
+            Q_EMIT dataChanged(DataChanged::DeviceAvailableChanged, "NetDSLControlItem", QVariant::fromValue(true));
+            return;
+        }
+    }
+    Q_EMIT dataChanged(DataChanged::DeviceAvailableChanged, "NetDSLControlItem", QVariant::fromValue(false));
+}
+
 void NetManagerThreadPrivate::onConnectionAdded(const QList<WiredConnection *> &conns)
 {
     NetworkDeviceBase *dev = qobject_cast<NetworkDeviceBase *>(sender());

net-view/operation/private/netmanagerthreadprivate.h

@@ -178,6 +178,7 @@ protected Q_SLOTS:
     void onDeviceAdded(QList<NetworkDeviceBase *> devices);
     void onDeviceRemoved(QList<NetworkDeviceBase *> devices);
     void onConnectivityChanged();
+    void updateDSLEnabledable();
     // Wired
     void onConnectionAdded(const QList<WiredConnection *> &conns);
     void onConnectionRemoved(const QList<WiredConnection *> &conns);