diff --git a/dcc-network/operation/dccnetwork.cpp b/dcc-network/operation/dccnetwork.cpp index 1713f746f..9ec5c3437 100644 --- a/dcc-network/operation/dccnetwork.cpp +++ b/dcc-network/operation/dccnetwork.cpp @@ -29,7 +29,7 @@ DccNetwork::DccNetwork(QObject *parent) , m_manager(nullptr) { qRegisterMetaType>("NMVariantMapList"); - qmlRegisterType("org.deepin.dcc.network", 1, 0, "NetType"); + qmlRegisterType("org.deepin.dcc.network", 1, 0, "netType"); qmlRegisterType("org.deepin.dcc.network", 1, 0, "NetItemModel"); qmlRegisterType("org.deepin.dcc.network", 1, 0, "NetManager"); init(); diff --git a/dcc-network/qml/DeviceStatusItem.qml b/dcc-network/qml/DeviceStatusItem.qml index de32f8b02..d4da9c73d 100644 --- a/dcc-network/qml/DeviceStatusItem.qml +++ b/dcc-network/qml/DeviceStatusItem.qml @@ -15,25 +15,25 @@ RowLayout { function getStatusName(status) { switch (status) { - case NetType.DS_Disabled: + case netType.DS_Disabled: return qsTr("Off") - case NetType.DS_Connected: - case NetType.DS_ConnectNoInternet: + case netType.DS_Connected: + case netType.DS_ConnectNoInternet: return qsTr("Connected") - case NetType.DS_IpConflicted: + case netType.DS_IpConflicted: return qsTr("IP conflict") - case NetType.DS_Connecting: + case netType.DS_Connecting: return qsTr("Connecting") - case NetType.DS_ObtainingIP: + case netType.DS_ObtainingIP: return qsTr("Obtaining address") - case NetType.DS_Authenticating: + case netType.DS_Authenticating: return qsTr("Authenticating") - case NetType.DS_ObtainIpFailed: - case NetType.DS_ConnectFailed: - case NetType.DS_Unknown: - case NetType.DS_Enabled: - case NetType.DS_NoCable: - case NetType.DS_Disconnected: + case netType.DS_ObtainIpFailed: + case netType.DS_ConnectFailed: + case netType.DS_Unknown: + case netType.DS_Enabled: + case netType.DS_NoCable: + case netType.DS_Disconnected: default: return qsTr("Disconnected") } @@ -44,12 +44,12 @@ RowLayout { text: { if (connectedNameVisible) { switch (netItem.status) { - case NetType.DS_Connected: - case NetType.DS_ConnectNoInternet: + case netType.DS_Connected: + case netType.DS_ConnectNoInternet: var childrenItem = [netItem] while (childrenItem.length > 0) { var childItem = childrenItem.pop() - if (childItem.status === NetType.CS_Connected) { + if (childItem.status === netType.CS_Connected) { return childItem.name } for (let i in childItem.children) { diff --git a/dcc-network/qml/NetworkMain.qml b/dcc-network/qml/NetworkMain.qml index 452a37fb1..76b9a43ed 100644 --- a/dcc-network/qml/NetworkMain.qml +++ b/dcc-network/qml/NetworkMain.qml @@ -54,19 +54,19 @@ DccObject { delegate: DelegateChooser { role: "type" DelegateChoice { - roleValue: NetType.WiredDeviceItem + roleValue: netType.WiredDeviceItem delegate: PageWiredDevice { netItem: model.item } } DelegateChoice { - roleValue: NetType.WirelessDeviceItem + roleValue: netType.WirelessDeviceItem delegate: PageWirelessDevice { netItem: model.item } } DelegateChoice { - roleValue: NetType.VPNControlItem + roleValue: netType.VPNControlItem delegate: PageVPN { name: "networkVpn" parentName: "network" @@ -75,7 +75,7 @@ DccObject { } } DelegateChoice { - roleValue: NetType.DSLControlItem + roleValue: netType.DSLControlItem delegate: PageDSL { name: "dsl" parentName: "network" @@ -84,7 +84,7 @@ DccObject { } } DelegateChoice { - roleValue: NetType.HotspotControlItem + roleValue: netType.HotspotControlItem delegate: PageHotspot { name: "personalHotspot" parentName: "network" @@ -94,7 +94,7 @@ DccObject { } } DelegateChoice { - roleValue: NetType.SystemProxyControlItem + roleValue: netType.SystemProxyControlItem delegate: PageSystemProxy { name: "systemProxy" parentName: "network" @@ -103,7 +103,7 @@ DccObject { } } DelegateChoice { - roleValue: NetType.AppProxyControlItem + roleValue: netType.AppProxyControlItem delegate: PageAppProxy { name: "applicationProxy" parentName: "network" @@ -112,7 +112,7 @@ DccObject { } } DelegateChoice { - roleValue: NetType.DetailsItem + roleValue: netType.DetailsItem delegate: PageDetails { name: "networkDetails" parentName: "network" diff --git a/dcc-network/qml/PageDSL.qml b/dcc-network/qml/PageDSL.qml index 98e6be4f2..5168415d9 100644 --- a/dcc-network/qml/PageDSL.qml +++ b/dcc-network/qml/PageDSL.qml @@ -52,21 +52,21 @@ DccObject { Layout.fillWidth: true content: RowLayout { BusyIndicator { - running: model.item.status === NetType.CS_Connecting + running: model.item.status === netType.CS_Connecting visible: running } DccCheckIcon { - visible: model.item.status === NetType.CS_Connected && !itemDelegate.hovered + visible: model.item.status === netType.CS_Connected && !itemDelegate.hovered } NetButton { implicitHeight: implicitContentHeight - 4 topInset: -4 bottomInset: -4 - visible: model.item.status !== NetType.CS_Connecting && itemDelegate.hovered - text: model.item.status === NetType.CS_Connected ? qsTr("Disconnect") : qsTr("Connect") + visible: model.item.status !== netType.CS_Connecting && itemDelegate.hovered + text: model.item.status === netType.CS_Connected ? qsTr("Disconnect") : qsTr("Connect") Layout.alignment: Qt.AlignCenter onClicked: { - dccData.exec(model.item.status === NetType.CS_Connected ? NetManager.Disconnect : NetManager.ConnectOrInfo, model.item.id, {}) + dccData.exec(model.item.status === netType.CS_Connected ? NetManager.Disconnect : NetManager.ConnectOrInfo, model.item.id, {}) } } D.IconLabel { @@ -84,7 +84,7 @@ DccObject { } } onDoubleClicked: { - if (model.item.status === NetType.CS_UnConnected) { + if (model.item.status === netType.CS_UnConnected) { dccData.exec(NetManager.ConnectOrInfo, model.item.id, {}) } } @@ -100,7 +100,7 @@ DccObject { name: "dslSettings" parentName: root.name + "/body/networkList" onFinished: DccApp.showPage(root) - type: NetType.WiredItem + type: netType.WiredItem Connections { target: dccData function onRequest(cmd, id, param) { @@ -111,7 +111,7 @@ DccObject { while (items.length !== 0) { let tmpItem = items[0] if (tmpItem.id === id) { - if (tmpItem.itemType === NetType.DSLControlItem) { + if (tmpItem.itemType === netType.DSLControlItem) { dslSettings.displayName = qsTr("Add PPPoE connection") } else { dslSettings.displayName = tmpItem.name diff --git a/dcc-network/qml/PageDSLSettings.qml b/dcc-network/qml/PageDSLSettings.qml index 5340ede26..c8e837460 100644 --- a/dcc-network/qml/PageDSLSettings.qml +++ b/dcc-network/qml/PageDSLSettings.qml @@ -13,7 +13,7 @@ DccObject { id: root property var config: null property var netItem: null - property int type: NetType.WiredItem + property int type: netType.WiredItem property bool modified: false signal finished readonly property string parentUrl: parentName + "/" + name diff --git a/dcc-network/qml/PageSettings.qml b/dcc-network/qml/PageSettings.qml index 676435050..a04686905 100644 --- a/dcc-network/qml/PageSettings.qml +++ b/dcc-network/qml/PageSettings.qml @@ -13,7 +13,7 @@ DccObject { id: root property var config: null property var netItem: null - property int type: NetType.WiredItem + property int type: netType.WiredItem property bool modified: false readonly property string parentUrl: parentName + "/" + name signal finished diff --git a/dcc-network/qml/PageSystemProxy.qml b/dcc-network/qml/PageSystemProxy.qml index 15128c1d9..7ff263bae 100644 --- a/dcc-network/qml/PageSystemProxy.qml +++ b/dcc-network/qml/PageSystemProxy.qml @@ -14,7 +14,7 @@ import org.deepin.dcc.network 1.0 DccObject { id: root property var netItem: null - property int method: NetType.None + property int method: netType.None property bool autoUrlAlert: false property int inputItem: 0 @@ -69,13 +69,13 @@ DccObject { backgroundType: DccObject.Normal pageType: DccObject.Editor page: D.Switch { - checked: root.method !== NetType.None + checked: root.method !== netType.None enabled: netItem.enabledable onClicked: { if (checked) { root.method = netItem.lastMethod } else { - root.method = NetType.None + root.method = netType.None dccData.exec(NetManager.SetConnectInfo, netItem.id, { "method": method }) @@ -97,7 +97,7 @@ DccObject { displayName: qsTr("Proxy Type") weight: 20 backgroundType: DccObject.Normal - visible: method !== NetType.None + visible: method !== netType.None pageType: DccObject.Editor page: ComboBox { flat: true @@ -108,10 +108,10 @@ DccObject { method = currentValue } model: [{ - "value": NetType.Auto, + "value": netType.Auto, "text": qsTr("Auto") }, { - "value": NetType.Manual, + "value": netType.Manual, "text": qsTr("Manual") }] Component.onCompleted: { @@ -134,7 +134,7 @@ DccObject { weight: 30 backgroundType: DccObject.Normal pageType: DccObject.Editor - visible: method === NetType.Auto + visible: method === netType.Auto page: D.LineEdit { topInset: 4 bottomInset: 4 @@ -166,7 +166,7 @@ DccObject { name: "http" parentName: root.name + "/menu/body" displayName: qsTr("HTTP Proxy") - visible: method === NetType.Manual + visible: method === netType.Manual weight: 40 config: root.netItem.manualProxy.http onHasUrlChanged: { @@ -182,7 +182,7 @@ DccObject { name: "https" parentName: root.name + "/menu/body" displayName: qsTr("HTTPS Proxy") - visible: method === NetType.Manual + visible: method === netType.Manual weight: 50 config: root.netItem.manualProxy.https onHasUrlChanged: { @@ -198,7 +198,7 @@ DccObject { name: "ftp" parentName: root.name + "/menu/body" displayName: qsTr("FTP Proxy") - visible: method === NetType.Manual + visible: method === netType.Manual weight: 60 config: root.netItem.manualProxy.ftp onHasUrlChanged: { @@ -214,7 +214,7 @@ DccObject { name: "socks" parentName: root.name + "/menu/body" displayName: qsTr("SOCKS Proxy") - visible: method === NetType.Manual + visible: method === netType.Manual weight: 70 config: root.netItem.manualProxy.socks onHasUrlChanged: { @@ -231,7 +231,7 @@ DccObject { name: "ignoreHosts" parentName: root.name + "/menu/body" - visible: method === NetType.Manual + visible: method === netType.Manual weight: 80 pageType: DccObject.Item page: TextArea { @@ -264,7 +264,7 @@ DccObject { DccObject { name: "spacer" parentName: root.name + "/menu/footer" - visible: method !== NetType.None + visible: method !== netType.None weight: 20 pageType: DccObject.Item page: Item { @@ -274,7 +274,7 @@ DccObject { DccObject { name: "cancel" parentName: root.name + "/menu/footer" - visible: method !== NetType.None + visible: method !== netType.None displayName: qsTr("Cancel") weight: 30 pageType: DccObject.Item @@ -295,7 +295,7 @@ DccObject { name: "Save" parentName: root.name + "/menu/footer" displayName: qsTr("Save") - visible: method !== NetType.None + visible: method !== netType.None weight: 40 pageType: DccObject.Item page: Button { @@ -306,7 +306,7 @@ DccObject { leftPadding: 0 rightPadding: 0 spacing: 0 - enabled: (method === NetType.Auto && (inputItem & 0xf0)) || (method === NetType.Manual && (inputItem & 0x0f)) + enabled: (method === netType.Auto && (inputItem & 0xf0)) || (method === netType.Manual && (inputItem & 0x0f)) text: dccObj.displayName Layout.alignment: Qt.AlignRight function printfObj(obj) { @@ -329,9 +329,9 @@ DccObject { console.log("ignoreHosts.config:", ignoreHosts.config) let config = {} switch (method) { - case NetType.None: + case netType.None: break - case NetType.Auto: + case netType.Auto: autoUrlAlert = false if (autoUrl.config.length === 0) { autoUrlAlert = true @@ -340,7 +340,7 @@ DccObject { config["autoUrl"] = autoUrl.config break - case NetType.Manual: + case netType.Manual: if (!http.checkInput() || !https.checkInput() || !ftp.checkInput() || !socks.checkInput()) { return } diff --git a/dcc-network/qml/PageVPN.qml b/dcc-network/qml/PageVPN.qml index 9720c94ed..7f0635780 100644 --- a/dcc-network/qml/PageVPN.qml +++ b/dcc-network/qml/PageVPN.qml @@ -76,21 +76,21 @@ DccObject { Layout.fillWidth: true content: RowLayout { BusyIndicator { - running: model.item.status === NetType.CS_Connecting + running: model.item.status === netType.CS_Connecting visible: running } DccCheckIcon { - visible: model.item.status === NetType.CS_Connected && !itemDelegate.hovered + visible: model.item.status === netType.CS_Connected && !itemDelegate.hovered } NetButton { implicitHeight: implicitContentHeight - 4 topInset: -4 bottomInset: -4 - visible: model.item.status !== NetType.CS_Connecting && itemDelegate.hovered - text: model.item.status === NetType.CS_Connected ? qsTr("Disconnect") : qsTr("Connect") + visible: model.item.status !== netType.CS_Connecting && itemDelegate.hovered + text: model.item.status === netType.CS_Connected ? qsTr("Disconnect") : qsTr("Connect") Layout.alignment: Qt.AlignCenter onClicked: { - dccData.exec(model.item.status === NetType.CS_Connected ? NetManager.Disconnect : NetManager.ConnectOrInfo, model.item.id, {}) + dccData.exec(model.item.status === netType.CS_Connected ? NetManager.Disconnect : NetManager.ConnectOrInfo, model.item.id, {}) } } D.IconLabel { @@ -108,7 +108,7 @@ DccObject { } } onDoubleClicked: { - if (model.item.status === NetType.CS_UnConnected) { + if (model.item.status === netType.CS_UnConnected) { dccData.exec(NetManager.ConnectOrInfo, model.item.id, {}) } } @@ -133,7 +133,7 @@ DccObject { while (items.length !== 0) { let tmpItem = items[0] if (tmpItem.id === id) { - if (tmpItem.itemType === NetType.VPNControlItem) { + if (tmpItem.itemType === netType.VPNControlItem) { vpnSettings.displayName = qsTr("Add VPN") } else { vpnSettings.displayName = tmpItem.name diff --git a/dcc-network/qml/PageVPNSettings.qml b/dcc-network/qml/PageVPNSettings.qml index 77344486e..b9cc2fd59 100644 --- a/dcc-network/qml/PageVPNSettings.qml +++ b/dcc-network/qml/PageVPNSettings.qml @@ -129,7 +129,7 @@ DccObject { } SectionIPv4 { id: sectionIPv4 - type: NetType.VPNControlItem + type: netType.VPNControlItem parentName: root.parentUrl + "/body" weight: 1000 resolvedAvailable: dccData ? dccData.resolvedAvailable : false @@ -137,7 +137,7 @@ DccObject { } SectionIPv6 { id: sectionIPv6 - type: NetType.VPNControlItem + type: netType.VPNControlItem parentName: root.parentUrl + "/body" visible: vpnType & (NetUtils.VpnTypeEnum["openvpn"] | NetUtils.VpnTypeEnum["openconnect"]) weight: 1100 diff --git a/dcc-network/qml/PageWiredDevice.qml b/dcc-network/qml/PageWiredDevice.qml index db5b4e6e7..dde53467a 100644 --- a/dcc-network/qml/PageWiredDevice.qml +++ b/dcc-network/qml/PageWiredDevice.qml @@ -59,7 +59,7 @@ DccObject { weight: 20 backgroundType: DccObject.Normal pageType: DccObject.Item - visible: netItem.status === NetType.DS_NoCable + visible: netItem.status === netType.DS_NoCable page: Item { implicitHeight: 80 Label { @@ -123,25 +123,25 @@ DccObject { itemDelegate.D.DciIcon) } BusyIndicator { - running: model.item.status === NetType.CS_Connecting + running: model.item.status === netType.CS_Connecting visible: running } DccCheckIcon { - visible: model.item.status === NetType.CS_Connected + visible: model.item.status === netType.CS_Connected && !itemDelegate.hovered } NetButton { implicitHeight: implicitContentHeight - 4 topInset: -4 bottomInset: -4 - visible: model.item.status !== NetType.CS_Connecting + visible: model.item.status !== netType.CS_Connecting && itemDelegate.hovered text: model.item.status - === NetType.CS_Connected ? qsTr("Disconnect") : qsTr( + === netType.CS_Connected ? qsTr("Disconnect") : qsTr( "Connect") Layout.alignment: Qt.AlignVCenter onClicked: { - dccData.exec(model.item.status === NetType.CS_Connected ? NetManager.Disconnect : NetManager.ConnectOrInfo, + dccData.exec(model.item.status === netType.CS_Connected ? NetManager.Disconnect : NetManager.ConnectOrInfo, model.item.id, {}) } } @@ -268,7 +268,7 @@ DccObject { } } onDoubleClicked: { - if (model.item.status === NetType.CS_UnConnected) { + if (model.item.status === netType.CS_UnConnected) { dccData.exec(NetManager.ConnectOrInfo, model.item.id, {}) } } @@ -284,7 +284,7 @@ DccObject { name: "wiredSettings" parentName: root.name + "/page/body/networkList" onFinished: DccApp.showPage(root) - type: NetType.WiredItem + type: netType.WiredItem Connections { target: dccData function onRequest(cmd, id, param) { @@ -296,7 +296,7 @@ DccObject { let tmpItem = items[0] if (tmpItem.id === id) { if ((wiredSettings.netItem !== tmpItem) || (DccApp.activeObject !== wiredSettings)) { - if (tmpItem.itemType !== NetType.WiredItem) { + if (tmpItem.itemType !== netType.WiredItem) { wiredSettings.displayName = qsTr("Add Network Connection") } else { wiredSettings.displayName = tmpItem.name diff --git a/dcc-network/qml/PageWirelessDevice.qml b/dcc-network/qml/PageWirelessDevice.qml index 9706e8ed5..fc9ffaa5b 100644 --- a/dcc-network/qml/PageWirelessDevice.qml +++ b/dcc-network/qml/PageWirelessDevice.qml @@ -47,7 +47,7 @@ DccObject { delegate: DelegateChooser { role: "type" DelegateChoice { - roleValue: NetType.WirelessItem + roleValue: netType.WirelessItem delegate: ItemDelegate { id: itemDelegate height: 36 @@ -87,25 +87,25 @@ DccObject { // Layout.fillWidth: !itemDelegate.contentFlow } BusyIndicator { - running: model.item.status === NetType.CS_Connecting + running: model.item.status === netType.CS_Connecting visible: running } DccCheckIcon { - visible: model.item.status === NetType.CS_Connected + visible: model.item.status === netType.CS_Connected && !itemDelegate.hovered } NetButton { implicitHeight: implicitContentHeight - 4 topInset: -4 bottomInset: -4 - visible: model.item.status !== NetType.CS_Connecting + visible: model.item.status !== netType.CS_Connecting && itemDelegate.hovered text: model.item.status - === NetType.CS_Connected ? qsTr("Disconnect") : qsTr( + === netType.CS_Connected ? qsTr("Disconnect") : qsTr( "Connect") Layout.alignment: Qt.AlignVCenter onClicked: { - dccData.exec(model.item.status === NetType.CS_Connected ? NetManager.Disconnect : NetManager.ConnectOrInfo, + dccData.exec(model.item.status === netType.CS_Connected ? NetManager.Disconnect : NetManager.ConnectOrInfo, model.item.id, {}) } } @@ -234,7 +234,7 @@ DccObject { } onDoubleClicked: { - if (model.item.status === NetType.CS_UnConnected) { + if (model.item.status === netType.CS_UnConnected) { dccData.exec(NetManager.ConnectOrInfo, model.item.id, {}) } } @@ -244,7 +244,7 @@ DccObject { } } DelegateChoice { - roleValue: NetType.WirelessHiddenItem + roleValue: netType.WirelessHiddenItem delegate: ItemDelegate { implicitHeight: 36 checked: true @@ -411,7 +411,7 @@ DccObject { name: "wirelessSettings" parentName: root.name + "/page/otherNetwork" onFinished: DccApp.showPage(root) - type: NetType.WirelessItem + type: netType.WirelessItem Connections { target: dccData function onRequest(cmd, id, param) { @@ -448,13 +448,13 @@ DccObject { for (let i in root.netItem.children) { const child = root.netItem.children[i] switch (child.itemType) { - case NetType.WirelessMineItem: + case netType.WirelessMineItem: if (mineNetwork.netItem !== child) { mineNetwork.netItem = child } hasNet |= 1 break - case NetType.WirelessOtherItem: + case netType.WirelessOtherItem: if (otherNetwork.netItem !== child) { otherNetwork.netItem = child } diff --git a/dcc-network/qml/SectionDevice.qml b/dcc-network/qml/SectionDevice.qml index a0a6b4798..4db3c2e3c 100644 --- a/dcc-network/qml/SectionDevice.qml +++ b/dcc-network/qml/SectionDevice.qml @@ -14,7 +14,7 @@ import "NetUtils.js" as NetUtils DccTitleObject { id: root property var config: new Object - property int type: NetType.WiredItem + property int type: netType.WiredItem property bool canNotBind: true property var devItems: [] property var devData: [] @@ -90,7 +90,7 @@ DccTitleObject { } } name: "devTitle" - displayName: (type === NetType.WirelessItem || type === NetType.WirelessHiddenItem) ? qsTr("WLAN") : qsTr("Ethernet") + displayName: (type === netType.WirelessItem || type === netType.WirelessHiddenItem) ? qsTr("WLAN") : qsTr("Ethernet") canSearch: false DccObject { name: "devGroup" @@ -133,7 +133,7 @@ DccTitleObject { weight: 30 displayName: qsTr("Cloned MAC Addr") canSearch: false - visible: type === NetType.WiredItem + visible: type === netType.WiredItem pageType: DccObject.Editor page: D.LineEdit { text: root.config.hasOwnProperty("cloned-mac-address") ? root.config["cloned-mac-address"] : "" diff --git a/dcc-network/qml/SectionGeneric.qml b/dcc-network/qml/SectionGeneric.qml index d470b8fda..6a5e54e41 100644 --- a/dcc-network/qml/SectionGeneric.qml +++ b/dcc-network/qml/SectionGeneric.qml @@ -13,7 +13,7 @@ DccTitleObject { property var config: new Object() property string settingsID: "" property var band - property int type: NetType.WiredItem + property int type: netType.WiredItem property string errorKey: "" signal editClicked @@ -98,7 +98,7 @@ DccTitleObject { displayName: qsTr("Band") canSearch: false weight: 30 - visible: type === NetType.WirelessItem + visible: type === netType.WirelessItem pageType: DccObject.Editor page: ComboBox { flat: true diff --git a/dcc-network/qml/SectionIPv4.qml b/dcc-network/qml/SectionIPv4.qml index 390f8bb4a..27030bcd5 100644 --- a/dcc-network/qml/SectionIPv4.qml +++ b/dcc-network/qml/SectionIPv4.qml @@ -14,7 +14,7 @@ import "NetUtils.js" as NetUtils DccObject { id: root property var config: null - property int type: NetType.WiredItem + property int type: netType.WiredItem property var ipItems: [] property var addressData: [] property bool isEdit: false @@ -234,7 +234,7 @@ DccObject { resetAddressData() root.editClicked() } - model: type === NetType.VPNControlItem ? vpnModel : allModel + model: type === netType.VPNControlItem ? vpnModel : allModel Component.onCompleted: { currentIndex = indexOfValue(method) isEdit = false @@ -252,7 +252,7 @@ DccObject { name: "ipv4Never" parentName: root.parentName weight: root.weight + 90 - visible: type === NetType.VPNControlItem + visible: type === netType.VPNControlItem displayName: qsTr("Only applied in corresponding resources") description: qsTr("When enabled, only traffic to the target network is routed through the VPN. Other traffic continues to use the local network connection.") canSearch: false @@ -276,7 +276,7 @@ DccObject { name: "ipv4DnsMode" parentName: root.parentName weight: root.weight + 95 - visible: type === NetType.VPNControlItem && root.neverDefault && root.resolvedAvailable + visible: type === netType.VPNControlItem && root.neverDefault && root.resolvedAvailable displayName: qsTr("VPN DNS Mode") description: { switch (dnsPriority) { diff --git a/dcc-network/qml/SectionIPv6.qml b/dcc-network/qml/SectionIPv6.qml index 8424be977..8503edef0 100644 --- a/dcc-network/qml/SectionIPv6.qml +++ b/dcc-network/qml/SectionIPv6.qml @@ -14,7 +14,7 @@ import "NetUtils.js" as NetUtils DccObject { id: root property var config: null - property int type: NetType.WiredItem + property int type: netType.WiredItem property var ipItems: [] property var addressData: [] property bool isEdit: false @@ -237,7 +237,7 @@ DccObject { resetAddressData() root.editClicked() } - model: type === NetType.VPNControlItem ? vpnModel : allModel + model: type === netType.VPNControlItem ? vpnModel : allModel Component.onCompleted: { currentIndex = indexOfValue(method) isEdit = false @@ -255,7 +255,7 @@ DccObject { name: "ipv6Never" parentName: root.parentName weight: root.weight + 90 - visible: root.visible && type === NetType.VPNControlItem + visible: root.visible && type === netType.VPNControlItem displayName: qsTr("Only applied in corresponding resources") description: qsTr("When enabled, only traffic to the target network is routed through the VPN. Other traffic continues to use the local network connection.") canSearch: false diff --git a/dcc-network/qml/SectionSecret.qml b/dcc-network/qml/SectionSecret.qml index 2047670bf..6343c8ac4 100644 --- a/dcc-network/qml/SectionSecret.qml +++ b/dcc-network/qml/SectionSecret.qml @@ -16,7 +16,7 @@ DccTitleObject { id: root property var configWSecurity property var config802_1x - property int type: NetType.WiredItem + property int type: netType.WiredItem property string eapType: "peap" property int pwdFlays: 0 property string pwdStr: "" @@ -334,7 +334,7 @@ DccTitleObject { displayName: qsTr("Security") canSearch: false weight: 10 - visible: root.type === NetType.WirelessItem || root.type === NetType.WirelessHiddenItem + visible: root.type === netType.WirelessItem || root.type === netType.WirelessHiddenItem pageType: DccObject.Editor page: D.ComboBox { flat: true @@ -372,7 +372,7 @@ DccTitleObject { displayName: qsTr("Security") canSearch: false weight: 20 - visible: root.type === NetType.WiredItem + visible: root.type === netType.WiredItem pageType: DccObject.Editor page: D.Switch { checked: root.keyMgmt === "wpa-eap" @@ -401,7 +401,7 @@ DccTitleObject { root.eapType = currentValue root.editClicked() } - model: root.type === NetType.WiredItem ? eapModelWired : eapModelWireless + model: root.type === netType.WiredItem ? eapModelWired : eapModelWireless Component.onCompleted: { currentIndex = indexOfValue(root.eapType) }