From ad2f984273b0ee06f2f865750c7efc14ef1b8bfb Mon Sep 17 00:00:00 2001 From: Fangxun Zhao Date: Thu, 16 Jul 2026 11:43:04 +0800 Subject: [PATCH] feat(net-view): add disconnect button for connected items MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Added NetCommonButton, a custom QAbstractButton with rounded background and hover/press states 2. Replaced hover icon on connect button with a dedicated disconnect button for wireless and wired items 3. Implemented hover behavior: shows disconnect button and hides connect button when hovered 4. Added overrides for setHover in NetWirelessWidget and NetWiredWidget 5. Updated translations across all supported languages for the "Disconnect" string Log: Add a hover-revealed disconnect button for connected network items Influence: Changes hover UX for connected network items feat(net-view): 添加已连接网络项的断开按钮 1. 新增 NetCommonButton 自定义按钮控件，支持圆角背景和悬停/按压状态 2. 将无线和有线已连接项的断开功能从悬停图标改为独立断开按钮 3. 实现悬停交互：悬停时显示断开按钮，隐藏连接按钮 4. 在 NetWirelessWidget 和 NetWiredWidget 中重写 setHover 方法 5. 更新所有支持语言的翻译，添加"断开连接"文本 Log: 为已连接的网络项添加悬停显示的断开按钮 PMS: STORY-41277 Influence: 改变已连接网络项的悬停交互方式 --- .../translations/dock-network-plugin.ts | 14 +++ .../translations/dock-network-plugin_ar.ts | 21 +++++ .../translations/dock-network-plugin_az.ts | 61 +++++++++---- .../translations/dock-network-plugin_bo.ts | 43 +++++++-- .../translations/dock-network-plugin_ca.ts | 27 +++++- .../translations/dock-network-plugin_cs.ts | 21 +++++ .../translations/dock-network-plugin_da.ts | 21 +++++ .../translations/dock-network-plugin_de.ts | 87 +++++++++++------- .../translations/dock-network-plugin_el.ts | 21 +++++ .../translations/dock-network-plugin_en_AU.ts | 21 +++++ .../translations/dock-network-plugin_en_US.ts | 21 +++++ .../translations/dock-network-plugin_es.ts | 29 +++++- .../translations/dock-network-plugin_fa.ts | 21 +++++ .../translations/dock-network-plugin_fi.ts | 27 +++++- .../translations/dock-network-plugin_fr.ts | 27 +++++- .../translations/dock-network-plugin_gl_ES.ts | 21 +++++ .../translations/dock-network-plugin_hi_IN.ts | 21 +++++ .../translations/dock-network-plugin_hr.ts | 21 +++++ .../translations/dock-network-plugin_hu.ts | 43 +++++++-- .../translations/dock-network-plugin_it.ts | 79 ++++++++++------ .../translations/dock-network-plugin_ja.ts | 27 +++++- .../translations/dock-network-plugin_ko.ts | 21 +++++ .../translations/dock-network-plugin_lo.ts | 27 +++++- .../translations/dock-network-plugin_lt.ts | 91 ++++++++++++------- .../translations/dock-network-plugin_ms.ts | 21 +++++ .../translations/dock-network-plugin_nl.ts | 27 +++++- .../translations/dock-network-plugin_pl.ts | 27 +++++- .../translations/dock-network-plugin_pt.ts | 21 +++++ .../translations/dock-network-plugin_pt_BR.ts | 27 +++++- .../translations/dock-network-plugin_ro.ts | 21 +++++ .../translations/dock-network-plugin_ru.ts | 27 +++++- .../translations/dock-network-plugin_si.ts | 21 +++++ .../translations/dock-network-plugin_sk.ts | 21 +++++ .../translations/dock-network-plugin_sl.ts | 21 +++++ .../translations/dock-network-plugin_sq.ts | 27 +++++- .../translations/dock-network-plugin_sr.ts | 21 +++++ .../translations/dock-network-plugin_tr.ts | 27 +++++- .../translations/dock-network-plugin_ug.ts | 43 +++++++-- .../translations/dock-network-plugin_uk.ts | 27 +++++- .../translations/dock-network-plugin_vi.ts | 21 +++++ .../translations/dock-network-plugin_zh_CN.ts | 20 +++- .../translations/dock-network-plugin_zh_HK.ts | 20 +++- .../translations/dock-network-plugin_zh_TW.ts | 20 +++- .../translations/dss-network-plugin.ts | 14 +++ .../translations/dss-network-plugin_az.ts | 61 +++++++++---- .../translations/dss-network-plugin_bo.ts | 45 ++++++--- .../translations/dss-network-plugin_ca.ts | 27 +++++- .../translations/dss-network-plugin_cs.ts | 21 +++++ .../translations/dss-network-plugin_de.ts | 83 +++++++++++------ .../translations/dss-network-plugin_el.ts | 21 +++++ .../translations/dss-network-plugin_en_AU.ts | 21 +++++ .../translations/dss-network-plugin_en_US.ts | 21 +++++ .../translations/dss-network-plugin_es.ts | 29 +++++- .../translations/dss-network-plugin_fi.ts | 27 +++++- .../translations/dss-network-plugin_fr.ts | 27 +++++- .../translations/dss-network-plugin_gl_ES.ts | 21 +++++ .../translations/dss-network-plugin_hi_IN.ts | 21 +++++ .../translations/dss-network-plugin_hr.ts | 21 +++++ .../translations/dss-network-plugin_hu.ts | 43 +++++++-- .../translations/dss-network-plugin_it.ts | 79 ++++++++++------ .../translations/dss-network-plugin_ja.ts | 27 +++++- .../translations/dss-network-plugin_ko.ts | 21 +++++ .../translations/dss-network-plugin_lo.ts | 27 +++++- .../translations/dss-network-plugin_lt.ts | 91 ++++++++++++------- .../translations/dss-network-plugin_ms.ts | 21 +++++ .../translations/dss-network-plugin_nl.ts | 27 +++++- .../translations/dss-network-plugin_pl.ts | 27 +++++- .../translations/dss-network-plugin_pt.ts | 21 +++++ .../translations/dss-network-plugin_pt_BR.ts | 27 +++++- .../translations/dss-network-plugin_ro.ts | 21 +++++ .../translations/dss-network-plugin_ru.ts | 27 +++++- .../translations/dss-network-plugin_si.ts | 21 +++++ .../translations/dss-network-plugin_sl.ts | 21 +++++ .../translations/dss-network-plugin_sq.ts | 27 +++++- .../translations/dss-network-plugin_sr.ts | 21 +++++ .../translations/dss-network-plugin_tr.ts | 27 +++++- .../translations/dss-network-plugin_ug.ts | 43 +++++++-- .../translations/dss-network-plugin_uk.ts | 27 +++++- .../translations/dss-network-plugin_vi.ts | 21 +++++ .../translations/dss-network-plugin_zh_CN.ts | 20 +++- .../translations/dss-network-plugin_zh_HK.ts | 20 +++- .../translations/dss-network-plugin_zh_TW.ts | 20 +++- net-view/window/private/netcommonbutton.cpp | 57 ++++++++++++ net-view/window/private/netcommonbutton.h | 27 ++++++ net-view/window/private/netdelegate.cpp | 43 ++++++++- net-view/window/private/netdelegate.h | 7 +- 86 files changed, 2238 insertions(+), 356 deletions(-) create mode 100644 net-view/window/private/netcommonbutton.cpp create mode 100644 net-view/window/private/netcommonbutton.h diff --git a/dock-network-plugin/translations/dock-network-plugin.ts b/dock-network-plugin/translations/dock-network-plugin.ts index c6ff036f..2cec34fd 100644 --- a/dock-network-plugin/translations/dock-network-plugin.ts +++ b/dock-network-plugin/translations/dock-network-plugin.ts @@ -281,6 +281,13 @@ + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -309,6 +316,13 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin diff --git a/dock-network-plugin/translations/dock-network-plugin_ar.ts b/dock-network-plugin/translations/dock-network-plugin_ar.ts index 4e2b35a0..47d73172 100644 --- a/dock-network-plugin/translations/dock-network-plugin_ar.ts +++ b/dock-network-plugin/translations/dock-network-plugin_ar.ts @@ -19,6 +19,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -274,6 +281,13 @@ شبكة سلكية + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -302,6 +316,13 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin diff --git a/dock-network-plugin/translations/dock-network-plugin_az.ts b/dock-network-plugin/translations/dock-network-plugin_az.ts index 6f895f40..72c516bb 100644 --- a/dock-network-plugin/translations/dock-network-plugin_az.ts +++ b/dock-network-plugin/translations/dock-network-plugin_az.ts @@ -1,4 +1,6 @@ - + + + dde::network::DockContentWidget @@ -17,6 +19,13 @@ Simsiz şəbəkəyə qoşulmaq istəyirsinizsə öncə <a style="text-decoration: none;" href="Airplane Mode">Uçuş rejimi</a>ni söndürün + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -32,35 +41,35 @@ dde::network::NetManagerThreadPrivate Wired Connection %1 - + VPN L2TP %1 - + VPN PPTP %1 - + VPN VPNC %1 - + VPN OpenVPN %1 - + VPN StrongSwan %1 - + VPN OpenConnect %1 - + PPPoE Connection %1 - + Connecting "%1" @@ -168,19 +177,19 @@ Disable VPN - + Enable VPN - + Disable system proxy - + Enable system proxy - + Network settings @@ -188,15 +197,15 @@ Multiple services started - + Connected to: %1 - + System proxy enabled - + Connected @@ -255,14 +264,14 @@ dde::network::NetSystemProxyControlItem System Proxy - + dde::network::NetVPNTipsItem VPN configuration is not connected or failed to connect. Please <a style="text-decoration: none;" href="go to the control center">go to the control center</a> for inspection. - + @@ -272,6 +281,13 @@ Simli şəbəkə + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -300,6 +316,13 @@ Başqa şəbəkələr + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -307,4 +330,4 @@ Şəbəkə - \ No newline at end of file + diff --git a/dock-network-plugin/translations/dock-network-plugin_bo.ts b/dock-network-plugin/translations/dock-network-plugin_bo.ts index a9afcd4b..72f37efa 100644 --- a/dock-network-plugin/translations/dock-network-plugin_bo.ts +++ b/dock-network-plugin/translations/dock-network-plugin_bo.ts @@ -1,4 +1,6 @@ - + + + dde::network::DockContentWidget @@ -17,6 +19,13 @@ སོ་སྔོན་བེད་སྤྱོད་གཏོང་དགོས་ན། ཐོག་མར་<a style="text-decoration: none;" href="Airplane Mode">འཕུར་སྐྱོད་དཔེ་རྣམ་</a>སྒོ་རྒྱོབ། + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -32,35 +41,35 @@ dde::network::NetManagerThreadPrivate Wired Connection %1 - + VPN L2TP %1 - + VPN PPTP %1 - + VPN VPNC %1 - + VPN OpenVPN %1 - + VPN StrongSwan %1 - + VPN OpenConnect %1 - + PPPoE Connection %1 - + Connecting "%1" @@ -272,6 +281,13 @@ སྐུད་ཡོད་དྲ་རྒྱ། + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -300,6 +316,13 @@ དྲྭ་རྒྱ་གཞན། + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -307,4 +330,4 @@ དྲ་རྒྱ། - \ No newline at end of file + diff --git a/dock-network-plugin/translations/dock-network-plugin_ca.ts b/dock-network-plugin/translations/dock-network-plugin_ca.ts index 43ccfd3b..52f8b2cd 100644 --- a/dock-network-plugin/translations/dock-network-plugin_ca.ts +++ b/dock-network-plugin/translations/dock-network-plugin_ca.ts @@ -1,4 +1,6 @@ - + + + dde::network::DockContentWidget @@ -17,6 +19,13 @@ Desactiveu primer el <a style="text-decoration: none;" href="Airplane Mode">mode d'avió</a> si voleu fer una connexió amb una xarxa sense fil. + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -272,6 +281,13 @@ Xarxa amb fil + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -300,6 +316,13 @@ Altres xarxes + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -307,4 +330,4 @@ Xarxa - \ No newline at end of file + diff --git a/dock-network-plugin/translations/dock-network-plugin_cs.ts b/dock-network-plugin/translations/dock-network-plugin_cs.ts index 10e73f84..786b1ca7 100644 --- a/dock-network-plugin/translations/dock-network-plugin_cs.ts +++ b/dock-network-plugin/translations/dock-network-plugin_cs.ts @@ -19,6 +19,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -274,6 +281,13 @@ Drátová síť + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -302,6 +316,13 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin diff --git a/dock-network-plugin/translations/dock-network-plugin_da.ts b/dock-network-plugin/translations/dock-network-plugin_da.ts index 9615343c..5258d1b2 100644 --- a/dock-network-plugin/translations/dock-network-plugin_da.ts +++ b/dock-network-plugin/translations/dock-network-plugin_da.ts @@ -19,6 +19,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -274,6 +281,13 @@ Kablet netværk + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -302,6 +316,13 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin diff --git a/dock-network-plugin/translations/dock-network-plugin_de.ts b/dock-network-plugin/translations/dock-network-plugin_de.ts index a8bd95d5..af85c31c 100644 --- a/dock-network-plugin/translations/dock-network-plugin_de.ts +++ b/dock-network-plugin/translations/dock-network-plugin_de.ts @@ -1,20 +1,29 @@ - + + + dde::network::DockContentWidget Network settings - + Netzwerkeinstellungen Network Detection - + dde::network::NetAirplaneModeTipsItem Disable <a style="text-decoration: none;" href="Airplane Mode">Airplane Mode</a> first if you want to connect to a wireless network - + + + + + dde::network::NetItemWidget + + Open a browser to authenticate + @@ -32,71 +41,71 @@ dde::network::NetManagerThreadPrivate Wired Connection %1 - + VPN L2TP %1 - + VPN PPTP %1 - + VPN VPNC %1 - + VPN OpenVPN %1 - + VPN StrongSwan %1 - + VPN OpenConnect %1 - + PPPoE Connection %1 - + Connecting "%1" - + "%1" connected - + "%1" disconnected - + Unable to connect "%1", please check your router or net cable. - + Unable to connect "%1", please keep closer to the wireless router - + Connection failed, unable to connect "%1", wrong password - + Password is required to connect "%1" - + The "%1" 802.11 WLAN network could not be found - + To connect "%1", please set up your authentication info after logging in - + @@ -107,7 +116,7 @@ Private Pwd - + key @@ -168,19 +177,19 @@ Disable VPN - + Enable VPN - + Disable system proxy - + Enable system proxy - + Network settings @@ -188,15 +197,15 @@ Multiple services started - + Connected to: %1 - + System proxy enabled - + Connected @@ -255,14 +264,14 @@ dde::network::NetSystemProxyControlItem System Proxy - + dde::network::NetVPNTipsItem VPN configuration is not connected or failed to connect. Please <a style="text-decoration: none;" href="go to the control center">go to the control center</a> for inspection. - + @@ -272,6 +281,13 @@ Kabelgebundenes Netzwerk + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -300,6 +316,13 @@ Andere Netzwerke + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -307,4 +330,4 @@ Netzwerk - \ No newline at end of file + diff --git a/dock-network-plugin/translations/dock-network-plugin_el.ts b/dock-network-plugin/translations/dock-network-plugin_el.ts index 56f7a191..b809e4ca 100644 --- a/dock-network-plugin/translations/dock-network-plugin_el.ts +++ b/dock-network-plugin/translations/dock-network-plugin_el.ts @@ -19,6 +19,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -274,6 +281,13 @@ Ενσύρματο Δίκτυο + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -302,6 +316,13 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin diff --git a/dock-network-plugin/translations/dock-network-plugin_en_AU.ts b/dock-network-plugin/translations/dock-network-plugin_en_AU.ts index aa81fa06..57bdbdd7 100644 --- a/dock-network-plugin/translations/dock-network-plugin_en_AU.ts +++ b/dock-network-plugin/translations/dock-network-plugin_en_AU.ts @@ -19,6 +19,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -274,6 +281,13 @@ Wired Network + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -302,6 +316,13 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin diff --git a/dock-network-plugin/translations/dock-network-plugin_en_US.ts b/dock-network-plugin/translations/dock-network-plugin_en_US.ts index 0c2aaa7c..c9c41772 100644 --- a/dock-network-plugin/translations/dock-network-plugin_en_US.ts +++ b/dock-network-plugin/translations/dock-network-plugin_en_US.ts @@ -19,6 +19,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -274,6 +281,13 @@ Wired Network + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -302,6 +316,13 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin diff --git a/dock-network-plugin/translations/dock-network-plugin_es.ts b/dock-network-plugin/translations/dock-network-plugin_es.ts index c1a86ded..a282c644 100644 --- a/dock-network-plugin/translations/dock-network-plugin_es.ts +++ b/dock-network-plugin/translations/dock-network-plugin_es.ts @@ -1,4 +1,6 @@ - + + + dde::network::DockContentWidget @@ -17,6 +19,13 @@ Si desea conectarse a una red inalámbrica, primero desactive el <a style="text-decoration: none;" href="Airplane Mode">modo avión</a> + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -92,7 +101,7 @@ The "%1" 802.11 WLAN network could not be found - No se puede encontrar la red WLAN 802.11 "%1"  + No se puede encontrar la red WLAN 802.11 "%1"  To connect "%1", please set up your authentication info after logging in @@ -272,6 +281,13 @@ Red cableada + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -300,6 +316,13 @@ Otras redes + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -307,4 +330,4 @@ Red - \ No newline at end of file + diff --git a/dock-network-plugin/translations/dock-network-plugin_fa.ts b/dock-network-plugin/translations/dock-network-plugin_fa.ts index 36cd6d56..27e7935d 100644 --- a/dock-network-plugin/translations/dock-network-plugin_fa.ts +++ b/dock-network-plugin/translations/dock-network-plugin_fa.ts @@ -19,6 +19,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -274,6 +281,13 @@ شبکه کابلی + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -302,6 +316,13 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin diff --git a/dock-network-plugin/translations/dock-network-plugin_fi.ts b/dock-network-plugin/translations/dock-network-plugin_fi.ts index aa2c01c3..f3312ae9 100644 --- a/dock-network-plugin/translations/dock-network-plugin_fi.ts +++ b/dock-network-plugin/translations/dock-network-plugin_fi.ts @@ -1,4 +1,6 @@ - + + + dde::network::DockContentWidget @@ -17,6 +19,13 @@ Poista ensin <a style="text-decoration: none;" href="Airplane Mode">Lentotila</a> käytöstä, jos haluat muodostaa yhteyden langattomaan verkkoon + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -272,6 +281,13 @@ Kiinteä verkko + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -300,6 +316,13 @@ Muut verkot + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -307,4 +330,4 @@ Verkko - \ No newline at end of file + diff --git a/dock-network-plugin/translations/dock-network-plugin_fr.ts b/dock-network-plugin/translations/dock-network-plugin_fr.ts index fc4012f7..2b9a6e72 100644 --- a/dock-network-plugin/translations/dock-network-plugin_fr.ts +++ b/dock-network-plugin/translations/dock-network-plugin_fr.ts @@ -1,4 +1,6 @@ - + + + dde::network::DockContentWidget @@ -17,6 +19,13 @@ Désactivez d'abord le <a style="text-decoration: none;" href="Airplane Mode">Mode avion</a> si vous souhaitez vous connecter à un réseau sans fil. + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -272,6 +281,13 @@ Réseau filaire + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -300,6 +316,13 @@ Autres réseaux + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -307,4 +330,4 @@ Réseau - \ No newline at end of file + diff --git a/dock-network-plugin/translations/dock-network-plugin_gl_ES.ts b/dock-network-plugin/translations/dock-network-plugin_gl_ES.ts index d9618d71..3d904dd3 100644 --- a/dock-network-plugin/translations/dock-network-plugin_gl_ES.ts +++ b/dock-network-plugin/translations/dock-network-plugin_gl_ES.ts @@ -19,6 +19,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -274,6 +281,13 @@ Rede con fíos + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -302,6 +316,13 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin diff --git a/dock-network-plugin/translations/dock-network-plugin_hi_IN.ts b/dock-network-plugin/translations/dock-network-plugin_hi_IN.ts index 696931c6..b1941aed 100644 --- a/dock-network-plugin/translations/dock-network-plugin_hi_IN.ts +++ b/dock-network-plugin/translations/dock-network-plugin_hi_IN.ts @@ -19,6 +19,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -274,6 +281,13 @@ केबल नेटवर्क + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -302,6 +316,13 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin diff --git a/dock-network-plugin/translations/dock-network-plugin_hr.ts b/dock-network-plugin/translations/dock-network-plugin_hr.ts index 0d4df773..35a9d67f 100644 --- a/dock-network-plugin/translations/dock-network-plugin_hr.ts +++ b/dock-network-plugin/translations/dock-network-plugin_hr.ts @@ -19,6 +19,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -274,6 +281,13 @@ Žična mreža + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -302,6 +316,13 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin diff --git a/dock-network-plugin/translations/dock-network-plugin_hu.ts b/dock-network-plugin/translations/dock-network-plugin_hu.ts index e09f8d1b..abe39085 100644 --- a/dock-network-plugin/translations/dock-network-plugin_hu.ts +++ b/dock-network-plugin/translations/dock-network-plugin_hu.ts @@ -1,4 +1,6 @@ - + + + dde::network::DockContentWidget @@ -17,6 +19,13 @@ Tiltsa le a <a style="text-decoration: none;" href="Airplane Mode">Repülőgép üzemmódot</a> először, ha vezeték nélküli hálózathoz szeretne kapcsolódni + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -32,35 +41,35 @@ dde::network::NetManagerThreadPrivate Wired Connection %1 - + VPN L2TP %1 - + VPN PPTP %1 - + VPN VPNC %1 - + VPN OpenVPN %1 - + VPN StrongSwan %1 - + VPN OpenConnect %1 - + PPPoE Connection %1 - + Connecting "%1" @@ -272,6 +281,13 @@ Vezetékes hálózat + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -300,6 +316,13 @@ Egyéb Hálózatok + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -307,4 +330,4 @@ Hálózat - \ No newline at end of file + diff --git a/dock-network-plugin/translations/dock-network-plugin_it.ts b/dock-network-plugin/translations/dock-network-plugin_it.ts index 04059116..0265db94 100644 --- a/dock-network-plugin/translations/dock-network-plugin_it.ts +++ b/dock-network-plugin/translations/dock-network-plugin_it.ts @@ -1,4 +1,6 @@ - + + + dde::network::DockContentWidget @@ -17,6 +19,13 @@ Disattiva <a style="text-decoration: none;" href="Airplane Mode">la modalità aereo</a> se desideri collegarti ad una rete wireless + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -32,71 +41,71 @@ dde::network::NetManagerThreadPrivate Wired Connection %1 - + VPN L2TP %1 - + VPN PPTP %1 - + VPN VPNC %1 - + VPN OpenVPN %1 - + VPN StrongSwan %1 - + VPN OpenConnect %1 - + PPPoE Connection %1 - + Connecting "%1" - + "%1" connected - + "%1" disconnected - + Unable to connect "%1", please check your router or net cable. - + Unable to connect "%1", please keep closer to the wireless router - + Connection failed, unable to connect "%1", wrong password - + Password is required to connect "%1" - + The "%1" 802.11 WLAN network could not be found - + To connect "%1", please set up your authentication info after logging in - + @@ -168,19 +177,19 @@ Disable VPN - + Enable VPN - + Disable system proxy - + Enable system proxy - + Network settings @@ -188,15 +197,15 @@ Multiple services started - + Connected to: %1 - + System proxy enabled - + Connected @@ -255,14 +264,14 @@ dde::network::NetSystemProxyControlItem System Proxy - + dde::network::NetVPNTipsItem VPN configuration is not connected or failed to connect. Please <a style="text-decoration: none;" href="go to the control center">go to the control center</a> for inspection. - + @@ -272,6 +281,13 @@ Connessione cablata + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -300,6 +316,13 @@ Altre Reti + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -307,4 +330,4 @@ Rete - \ No newline at end of file + diff --git a/dock-network-plugin/translations/dock-network-plugin_ja.ts b/dock-network-plugin/translations/dock-network-plugin_ja.ts index 29da6b7e..837ee2df 100644 --- a/dock-network-plugin/translations/dock-network-plugin_ja.ts +++ b/dock-network-plugin/translations/dock-network-plugin_ja.ts @@ -1,4 +1,6 @@ - + + + dde::network::DockContentWidget @@ -17,6 +19,13 @@ ワイヤレスネットワークに接続するには、<a style="text-decoration: none;" href="Airplane Mode">機内モード</a>を無効化してください。 + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -272,6 +281,13 @@ 有線ネットワーク + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -300,6 +316,13 @@ その他のネットワーク + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -307,4 +330,4 @@ ネットワーク - \ No newline at end of file + diff --git a/dock-network-plugin/translations/dock-network-plugin_ko.ts b/dock-network-plugin/translations/dock-network-plugin_ko.ts index 3b388031..cb8d82ab 100644 --- a/dock-network-plugin/translations/dock-network-plugin_ko.ts +++ b/dock-network-plugin/translations/dock-network-plugin_ko.ts @@ -19,6 +19,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -274,6 +281,13 @@ 유선 네트워크 + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -302,6 +316,13 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin diff --git a/dock-network-plugin/translations/dock-network-plugin_lo.ts b/dock-network-plugin/translations/dock-network-plugin_lo.ts index 3a4c0a5c..36af08fe 100644 --- a/dock-network-plugin/translations/dock-network-plugin_lo.ts +++ b/dock-network-plugin/translations/dock-network-plugin_lo.ts @@ -1,4 +1,6 @@ - + + + dde::network::DockContentWidget @@ -17,6 +19,13 @@ ປິດ <a style="text-decoration: none;" href="Airplane Mode">ໂໝດຍົນ</a> ກ່ອນຖ້າທ່ານຕ້ອງການເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍໄຮ້ສາຍ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -272,6 +281,13 @@ ສະຖານະການເຊື່ອມຕໍ່ລາງ + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -300,6 +316,13 @@ ສະຖານະການເຊື່ອມຕໍ່ອື່ນ + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -307,4 +330,4 @@ ສະຖານະການເຊື່ອມຕໍ່ - \ No newline at end of file + diff --git a/dock-network-plugin/translations/dock-network-plugin_lt.ts b/dock-network-plugin/translations/dock-network-plugin_lt.ts index d359634a..a7ce1408 100644 --- a/dock-network-plugin/translations/dock-network-plugin_lt.ts +++ b/dock-network-plugin/translations/dock-network-plugin_lt.ts @@ -1,4 +1,6 @@ - + + + dde::network::DockContentWidget @@ -17,6 +19,13 @@ Norėdami prisijungti prie belaidžio tinklo, pirmiausia, išjunkite <a style="text-decoration: none;" href="Airplane Mode">Lėktuvo veikseną</a> + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -32,71 +41,71 @@ dde::network::NetManagerThreadPrivate Wired Connection %1 - + VPN L2TP %1 - + VPN PPTP %1 - + VPN VPNC %1 - + VPN OpenVPN %1 - + VPN StrongSwan %1 - + VPN OpenConnect %1 - + PPPoE Connection %1 - + Connecting "%1" - + "%1" connected - + "%1" disconnected - + Unable to connect "%1", please check your router or net cable. - + Unable to connect "%1", please keep closer to the wireless router - + Connection failed, unable to connect "%1", wrong password - + Password is required to connect "%1" - + The "%1" 802.11 WLAN network could not be found - + To connect "%1", please set up your authentication info after logging in - + @@ -107,19 +116,19 @@ Private Pwd - + key - + Proxy Password - + Group Password - + Username @@ -176,11 +185,11 @@ Disable system proxy - + Enable system proxy - + Network settings @@ -188,7 +197,7 @@ Multiple services started - + Connected to: %1 @@ -196,7 +205,7 @@ System proxy enabled - + Connected @@ -208,7 +217,7 @@ Network cable unplugged - + Not connected @@ -216,7 +225,7 @@ Connecting - + Connected but no Internet access @@ -224,7 +233,7 @@ Connection failed - + IP conflict @@ -236,11 +245,11 @@ Connected %1 - + Off - + Wired Network @@ -255,14 +264,14 @@ dde::network::NetSystemProxyControlItem System Proxy - + dde::network::NetVPNTipsItem VPN configuration is not connected or failed to connect. Please <a style="text-decoration: none;" href="go to the control center">go to the control center</a> for inspection. - + @@ -272,6 +281,13 @@ Laidinis tinklas + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -300,6 +316,13 @@ Kiti tinklai + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -307,4 +330,4 @@ Tinklas - \ No newline at end of file + diff --git a/dock-network-plugin/translations/dock-network-plugin_ms.ts b/dock-network-plugin/translations/dock-network-plugin_ms.ts index 0a887c98..9be53a21 100644 --- a/dock-network-plugin/translations/dock-network-plugin_ms.ts +++ b/dock-network-plugin/translations/dock-network-plugin_ms.ts @@ -19,6 +19,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -274,6 +281,13 @@ Rangkaian Berwayar + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -302,6 +316,13 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin diff --git a/dock-network-plugin/translations/dock-network-plugin_nl.ts b/dock-network-plugin/translations/dock-network-plugin_nl.ts index cc2dd62e..617b2f90 100644 --- a/dock-network-plugin/translations/dock-network-plugin_nl.ts +++ b/dock-network-plugin/translations/dock-network-plugin_nl.ts @@ -1,4 +1,6 @@ - + + + dde::network::DockContentWidget @@ -17,6 +19,13 @@ Schakel de <a style="text-decoration: none;" href="Airplane Mode">vliegtuigstand</a> uit als je verbinding wilt maken via bluetooth + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -272,6 +281,13 @@ Bekabeld netwerk + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -300,6 +316,13 @@ Overige netwerken + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -307,4 +330,4 @@ Netwerk - \ No newline at end of file + diff --git a/dock-network-plugin/translations/dock-network-plugin_pl.ts b/dock-network-plugin/translations/dock-network-plugin_pl.ts index 3a1bda48..ebbb2930 100644 --- a/dock-network-plugin/translations/dock-network-plugin_pl.ts +++ b/dock-network-plugin/translations/dock-network-plugin_pl.ts @@ -1,4 +1,6 @@ - + + + dde::network::DockContentWidget @@ -17,6 +19,13 @@ Najpierw wyłącz <a style="text-decoration: none;" href="Airplane Mode">Tryb samolotowy</a>, aby połączyć się z siecią bezprzewodową + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -272,6 +281,13 @@ Sieć przewodowa + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -300,6 +316,13 @@ Inne sieci + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -307,4 +330,4 @@ Sieć - \ No newline at end of file + diff --git a/dock-network-plugin/translations/dock-network-plugin_pt.ts b/dock-network-plugin/translations/dock-network-plugin_pt.ts index f18da841..afc1d34e 100644 --- a/dock-network-plugin/translations/dock-network-plugin_pt.ts +++ b/dock-network-plugin/translations/dock-network-plugin_pt.ts @@ -19,6 +19,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -274,6 +281,13 @@ Rede por cabo + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -302,6 +316,13 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin diff --git a/dock-network-plugin/translations/dock-network-plugin_pt_BR.ts b/dock-network-plugin/translations/dock-network-plugin_pt_BR.ts index 4aca5aaf..efcc79e1 100644 --- a/dock-network-plugin/translations/dock-network-plugin_pt_BR.ts +++ b/dock-network-plugin/translations/dock-network-plugin_pt_BR.ts @@ -1,4 +1,6 @@ - + + + dde::network::DockContentWidget @@ -17,6 +19,13 @@ Primeiro, desative o <a style="text-decoration: none;" href="Airplane Mode">Modo Avião</a> para conectar-se a uma rede Wi-Fi + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -272,6 +281,13 @@ Rede cabeada + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -300,6 +316,13 @@ Outras redes + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -307,4 +330,4 @@ Rede - \ No newline at end of file + diff --git a/dock-network-plugin/translations/dock-network-plugin_ro.ts b/dock-network-plugin/translations/dock-network-plugin_ro.ts index e227238f..f810f03f 100644 --- a/dock-network-plugin/translations/dock-network-plugin_ro.ts +++ b/dock-network-plugin/translations/dock-network-plugin_ro.ts @@ -19,6 +19,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -274,6 +281,13 @@ Rețea conectată + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -302,6 +316,13 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin diff --git a/dock-network-plugin/translations/dock-network-plugin_ru.ts b/dock-network-plugin/translations/dock-network-plugin_ru.ts index 505b3f71..bd0a3e4c 100644 --- a/dock-network-plugin/translations/dock-network-plugin_ru.ts +++ b/dock-network-plugin/translations/dock-network-plugin_ru.ts @@ -1,4 +1,6 @@ - + + + dde::network::DockContentWidget @@ -17,6 +19,13 @@ Если вы хотите подключиться к беспроводной сети, сначала отключите <a style="text-decoration: none;" href="Airplane Mode">Режим полета</a> + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -272,6 +281,13 @@ Проводная сеть + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -300,6 +316,13 @@ Прочие сети + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -307,4 +330,4 @@ Сеть - \ No newline at end of file + diff --git a/dock-network-plugin/translations/dock-network-plugin_si.ts b/dock-network-plugin/translations/dock-network-plugin_si.ts index 08cbb63c..806c2b43 100644 --- a/dock-network-plugin/translations/dock-network-plugin_si.ts +++ b/dock-network-plugin/translations/dock-network-plugin_si.ts @@ -19,6 +19,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -274,6 +281,13 @@ රැහැන්ගත ජාලය + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -302,6 +316,13 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin diff --git a/dock-network-plugin/translations/dock-network-plugin_sk.ts b/dock-network-plugin/translations/dock-network-plugin_sk.ts index 031844fc..ddde5f3e 100644 --- a/dock-network-plugin/translations/dock-network-plugin_sk.ts +++ b/dock-network-plugin/translations/dock-network-plugin_sk.ts @@ -19,6 +19,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -274,6 +281,13 @@ Drôtová sieť + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -302,6 +316,13 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin diff --git a/dock-network-plugin/translations/dock-network-plugin_sl.ts b/dock-network-plugin/translations/dock-network-plugin_sl.ts index e29e0ce5..800a72da 100644 --- a/dock-network-plugin/translations/dock-network-plugin_sl.ts +++ b/dock-network-plugin/translations/dock-network-plugin_sl.ts @@ -19,6 +19,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -274,6 +281,13 @@ Ožičeno omrežje + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -302,6 +316,13 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin diff --git a/dock-network-plugin/translations/dock-network-plugin_sq.ts b/dock-network-plugin/translations/dock-network-plugin_sq.ts index cc9400c9..cfd03b69 100644 --- a/dock-network-plugin/translations/dock-network-plugin_sq.ts +++ b/dock-network-plugin/translations/dock-network-plugin_sq.ts @@ -1,4 +1,6 @@ - + + + dde::network::DockContentWidget @@ -17,6 +19,13 @@ Nëse doni të lidheni me një rrjet pa fill, së pari çaktivizoni <a href="Airplane Mode">Mënyrën Aeroplan</a> + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -272,6 +281,13 @@ Rrjet Me Fill + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -300,6 +316,13 @@ Rrjete të Tjerë + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -307,4 +330,4 @@ Rrjet - \ No newline at end of file + diff --git a/dock-network-plugin/translations/dock-network-plugin_sr.ts b/dock-network-plugin/translations/dock-network-plugin_sr.ts index 638983aa..91f40039 100644 --- a/dock-network-plugin/translations/dock-network-plugin_sr.ts +++ b/dock-network-plugin/translations/dock-network-plugin_sr.ts @@ -19,6 +19,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -274,6 +281,13 @@ Жична мрежа + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -302,6 +316,13 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin diff --git a/dock-network-plugin/translations/dock-network-plugin_tr.ts b/dock-network-plugin/translations/dock-network-plugin_tr.ts index 8e187db6..b6556800 100644 --- a/dock-network-plugin/translations/dock-network-plugin_tr.ts +++ b/dock-network-plugin/translations/dock-network-plugin_tr.ts @@ -1,4 +1,6 @@ - + + + dde::network::DockContentWidget @@ -17,6 +19,13 @@ Kablosuz bir ağa bağlanmak istiyorsanız öncelikle <a style="text-decoration: none;" href="Airplane Mode">Uçak Modunu</a> devre dışı bırakın + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -272,6 +281,13 @@ Kablolu Ağ + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -300,6 +316,13 @@ Diğer Ağlar + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -307,4 +330,4 @@ Ağ - \ No newline at end of file + diff --git a/dock-network-plugin/translations/dock-network-plugin_ug.ts b/dock-network-plugin/translations/dock-network-plugin_ug.ts index bdcad7b1..3117f125 100644 --- a/dock-network-plugin/translations/dock-network-plugin_ug.ts +++ b/dock-network-plugin/translations/dock-network-plugin_ug.ts @@ -1,4 +1,6 @@ - + + + dde::network::DockContentWidget @@ -17,6 +19,13 @@ كۆكچىش ئىقتىدارىنى ئىشلەتمەكچى بولسىڭىز، ئاۋۋال <a style="text-decoration: none;" href="Airplane Mode">ئۇچۇش ھالىتى</a> نى تاقاڭ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -32,35 +41,35 @@ dde::network::NetManagerThreadPrivate Wired Connection %1 - + VPN L2TP %1 - + VPN PPTP %1 - + VPN VPNC %1 - + VPN OpenVPN %1 - + VPN StrongSwan %1 - + VPN OpenConnect %1 - + PPPoE Connection %1 - + Connecting "%1" @@ -272,6 +281,13 @@ سىملىق تور + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -300,6 +316,13 @@ باشقا تور + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -307,4 +330,4 @@ تور - \ No newline at end of file + diff --git a/dock-network-plugin/translations/dock-network-plugin_uk.ts b/dock-network-plugin/translations/dock-network-plugin_uk.ts index 2821a148..11337a36 100644 --- a/dock-network-plugin/translations/dock-network-plugin_uk.ts +++ b/dock-network-plugin/translations/dock-network-plugin_uk.ts @@ -1,4 +1,6 @@ - + + + dde::network::DockContentWidget @@ -17,6 +19,13 @@ Якщо ви хочете встановити з'єднання з бездротовою мережею, спочатку вимкніть <a style="text-decoration: none;" href="Airplane Mode">Режим польоту</a> + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -272,6 +281,13 @@ Дротова мережа + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -300,6 +316,13 @@ Інші мережі + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -307,4 +330,4 @@ Мережа - \ No newline at end of file + diff --git a/dock-network-plugin/translations/dock-network-plugin_vi.ts b/dock-network-plugin/translations/dock-network-plugin_vi.ts index df4d3dc2..1e955d14 100644 --- a/dock-network-plugin/translations/dock-network-plugin_vi.ts +++ b/dock-network-plugin/translations/dock-network-plugin_vi.ts @@ -19,6 +19,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -274,6 +281,13 @@ Mạng kết nối dây + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -302,6 +316,13 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin diff --git a/dock-network-plugin/translations/dock-network-plugin_zh_CN.ts b/dock-network-plugin/translations/dock-network-plugin_zh_CN.ts index 9549c705..2afbbf55 100644 --- a/dock-network-plugin/translations/dock-network-plugin_zh_CN.ts +++ b/dock-network-plugin/translations/dock-network-plugin_zh_CN.ts @@ -1,4 +1,6 @@ - + + + dde::network::DockContentWidget @@ -279,6 +281,13 @@ 有线网络 + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -307,6 +316,13 @@ 其他网络 + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -314,4 +330,4 @@ 网络 - \ No newline at end of file + diff --git a/dock-network-plugin/translations/dock-network-plugin_zh_HK.ts b/dock-network-plugin/translations/dock-network-plugin_zh_HK.ts index 879a22d8..02122dd0 100644 --- a/dock-network-plugin/translations/dock-network-plugin_zh_HK.ts +++ b/dock-network-plugin/translations/dock-network-plugin_zh_HK.ts @@ -1,4 +1,6 @@ - + + + dde::network::DockContentWidget @@ -279,6 +281,13 @@ 有線網絡 + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -307,6 +316,13 @@ 其他網絡 + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -314,4 +330,4 @@ 網絡 - \ No newline at end of file + diff --git a/dock-network-plugin/translations/dock-network-plugin_zh_TW.ts b/dock-network-plugin/translations/dock-network-plugin_zh_TW.ts index 58acc485..88e1ab89 100644 --- a/dock-network-plugin/translations/dock-network-plugin_zh_TW.ts +++ b/dock-network-plugin/translations/dock-network-plugin_zh_TW.ts @@ -1,4 +1,6 @@ - + + + dde::network::DockContentWidget @@ -279,6 +281,13 @@ 有線網路 + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -307,6 +316,13 @@ 其他網路 + + dde::network::NetWirelessWidget + + Disconnect + + + dde::network::NetworkPlugin @@ -314,4 +330,4 @@ 網路 - \ No newline at end of file + diff --git a/dss-network-plugin/translations/dss-network-plugin.ts b/dss-network-plugin/translations/dss-network-plugin.ts index a599175f..efd02621 100644 --- a/dss-network-plugin/translations/dss-network-plugin.ts +++ b/dss-network-plugin/translations/dss-network-plugin.ts @@ -277,6 +277,13 @@ + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -305,4 +312,11 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_az.ts b/dss-network-plugin/translations/dss-network-plugin_az.ts index a5eb8e0e..9775210b 100644 --- a/dss-network-plugin/translations/dss-network-plugin_az.ts +++ b/dss-network-plugin/translations/dss-network-plugin_az.ts @@ -1,4 +1,6 @@ - + + + Bubble @@ -13,6 +15,13 @@ Simsiz şəbəkəyə qoşulmaq istəyirsinizsə öncə <a style="text-decoration: none;" href="Airplane Mode">Uçuş rejimi</a>ni söndürün + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -28,35 +37,35 @@ dde::network::NetManagerThreadPrivate Wired Connection %1 - + VPN L2TP %1 - + VPN PPTP %1 - + VPN VPNC %1 - + VPN OpenVPN %1 - + VPN StrongSwan %1 - + VPN OpenConnect %1 - + PPPoE Connection %1 - + Connecting "%1" @@ -164,19 +173,19 @@ Disable VPN - + Enable VPN - + Disable system proxy - + Enable system proxy - + Network settings @@ -184,15 +193,15 @@ Multiple services started - + Connected to: %1 - + System proxy enabled - + Connected @@ -251,14 +260,14 @@ dde::network::NetSystemProxyControlItem System Proxy - + dde::network::NetVPNTipsItem VPN configuration is not connected or failed to connect. Please <a style="text-decoration: none;" href="go to the control center">go to the control center</a> for inspection. - + @@ -268,6 +277,13 @@ Simli şəbəkə + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -296,4 +312,11 @@ Başqa şəbəkələr - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_bo.ts b/dss-network-plugin/translations/dss-network-plugin_bo.ts index 9b2e9905..60b71c0f 100644 --- a/dss-network-plugin/translations/dss-network-plugin_bo.ts +++ b/dss-network-plugin/translations/dss-network-plugin_bo.ts @@ -1,9 +1,11 @@ - + + + Bubble 1 new message - འཕྲིན་གསར་1  + འཕྲིན་གསར་1  @@ -13,6 +15,13 @@ སོ་སྔོན་བེད་སྤྱོད་གཏོང་དགོས་ན། ཐོག་མར་<a style="text-decoration: none;" href="Airplane Mode">འཕུར་སྐྱོད་དཔེ་རྣམ་</a>སྒོ་རྒྱོབ། + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -28,35 +37,35 @@ dde::network::NetManagerThreadPrivate Wired Connection %1 - + VPN L2TP %1 - + VPN PPTP %1 - + VPN VPNC %1 - + VPN OpenVPN %1 - + VPN StrongSwan %1 - + VPN OpenConnect %1 - + PPPoE Connection %1 - + Connecting "%1" @@ -268,6 +277,13 @@ སྐུད་ཡོད་དྲ་རྒྱ། + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -296,4 +312,11 @@ དྲྭ་རྒྱ་གཞན། - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_ca.ts b/dss-network-plugin/translations/dss-network-plugin_ca.ts index 152fd3ff..5470f535 100644 --- a/dss-network-plugin/translations/dss-network-plugin_ca.ts +++ b/dss-network-plugin/translations/dss-network-plugin_ca.ts @@ -1,4 +1,6 @@ - + + + Bubble @@ -13,6 +15,13 @@ Desactiveu primer el <a style="text-decoration: none;" href="Airplane Mode">mode d'avió</a> si voleu fer una connexió amb una xarxa sense fil. + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -268,6 +277,13 @@ Xarxa amb fil + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -296,4 +312,11 @@ Altres xarxes - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_cs.ts b/dss-network-plugin/translations/dss-network-plugin_cs.ts index bb8bcb61..98b9b81d 100644 --- a/dss-network-plugin/translations/dss-network-plugin_cs.ts +++ b/dss-network-plugin/translations/dss-network-plugin_cs.ts @@ -15,6 +15,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -270,6 +277,13 @@ Drátová síť + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -298,4 +312,11 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_de.ts b/dss-network-plugin/translations/dss-network-plugin_de.ts index 25286ba6..f3ee98aa 100644 --- a/dss-network-plugin/translations/dss-network-plugin_de.ts +++ b/dss-network-plugin/translations/dss-network-plugin_de.ts @@ -1,4 +1,6 @@ - + + + Bubble @@ -10,7 +12,14 @@ dde::network::NetAirplaneModeTipsItem Disable <a style="text-decoration: none;" href="Airplane Mode">Airplane Mode</a> first if you want to connect to a wireless network - + + + + + dde::network::NetItemWidget + + Open a browser to authenticate + @@ -28,71 +37,71 @@ dde::network::NetManagerThreadPrivate Wired Connection %1 - + VPN L2TP %1 - + VPN PPTP %1 - + VPN VPNC %1 - + VPN OpenVPN %1 - + VPN StrongSwan %1 - + VPN OpenConnect %1 - + PPPoE Connection %1 - + Connecting "%1" - + "%1" connected - + "%1" disconnected - + Unable to connect "%1", please check your router or net cable. - + Unable to connect "%1", please keep closer to the wireless router - + Connection failed, unable to connect "%1", wrong password - + Password is required to connect "%1" - + The "%1" 802.11 WLAN network could not be found - + To connect "%1", please set up your authentication info after logging in - + @@ -103,7 +112,7 @@ Private Pwd - + key @@ -164,19 +173,19 @@ Disable VPN - + Enable VPN - + Disable system proxy - + Enable system proxy - + Network settings @@ -184,15 +193,15 @@ Multiple services started - + Connected to: %1 - + System proxy enabled - + Connected @@ -251,14 +260,14 @@ dde::network::NetSystemProxyControlItem System Proxy - + dde::network::NetVPNTipsItem VPN configuration is not connected or failed to connect. Please <a style="text-decoration: none;" href="go to the control center">go to the control center</a> for inspection. - + @@ -268,6 +277,13 @@ Kabelgebundenes Netzwerk + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -296,4 +312,11 @@ Andere Netzwerke - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_el.ts b/dss-network-plugin/translations/dss-network-plugin_el.ts index c8a7b0cb..1d9feb71 100644 --- a/dss-network-plugin/translations/dss-network-plugin_el.ts +++ b/dss-network-plugin/translations/dss-network-plugin_el.ts @@ -15,6 +15,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -270,6 +277,13 @@ Ενσύρματο Δίκτυο + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -298,4 +312,11 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_en_AU.ts b/dss-network-plugin/translations/dss-network-plugin_en_AU.ts index d755ff60..e50b1aa8 100644 --- a/dss-network-plugin/translations/dss-network-plugin_en_AU.ts +++ b/dss-network-plugin/translations/dss-network-plugin_en_AU.ts @@ -15,6 +15,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -270,6 +277,13 @@ Wired Network + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -298,4 +312,11 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_en_US.ts b/dss-network-plugin/translations/dss-network-plugin_en_US.ts index 34f49613..c9562e5a 100644 --- a/dss-network-plugin/translations/dss-network-plugin_en_US.ts +++ b/dss-network-plugin/translations/dss-network-plugin_en_US.ts @@ -15,6 +15,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -270,6 +277,13 @@ Wired Network + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -298,4 +312,11 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_es.ts b/dss-network-plugin/translations/dss-network-plugin_es.ts index af3d3f69..bfb85c2b 100644 --- a/dss-network-plugin/translations/dss-network-plugin_es.ts +++ b/dss-network-plugin/translations/dss-network-plugin_es.ts @@ -1,4 +1,6 @@ - + + + Bubble @@ -13,6 +15,13 @@ Si desea conectarse a una red inalámbrica, primero desactive el <a style="text-decoration: none;" href="Airplane Mode">modo avión</a> + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -88,7 +97,7 @@ The "%1" 802.11 WLAN network could not be found - No se puede encontrar la red WLAN 802.11 "%1"  + No se puede encontrar la red WLAN 802.11 "%1"  To connect "%1", please set up your authentication info after logging in @@ -268,6 +277,13 @@ Red cableada + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -296,4 +312,11 @@ Otras redes - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_fi.ts b/dss-network-plugin/translations/dss-network-plugin_fi.ts index 03166c73..f72e31ae 100644 --- a/dss-network-plugin/translations/dss-network-plugin_fi.ts +++ b/dss-network-plugin/translations/dss-network-plugin_fi.ts @@ -1,4 +1,6 @@ - + + + Bubble @@ -13,6 +15,13 @@ Poista ensin <a style="text-decoration: none;" href="Airplane Mode">Lentotila</a> käytöstä, jos haluat muodostaa yhteyden langattomaan verkkoon + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -268,6 +277,13 @@ Kiinteä verkko + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -296,4 +312,11 @@ Muut verkot - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_fr.ts b/dss-network-plugin/translations/dss-network-plugin_fr.ts index 4fe56148..0091ba3d 100644 --- a/dss-network-plugin/translations/dss-network-plugin_fr.ts +++ b/dss-network-plugin/translations/dss-network-plugin_fr.ts @@ -1,4 +1,6 @@ - + + + Bubble @@ -13,6 +15,13 @@ Désactivez d'abord le <a style="text-decoration: none;" href="Airplane Mode">Mode avion</a> si vous souhaitez vous connecter à un réseau sans fil. + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -268,6 +277,13 @@ Réseau filaire + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -296,4 +312,11 @@ Autres réseaux - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_gl_ES.ts b/dss-network-plugin/translations/dss-network-plugin_gl_ES.ts index 9b075444..bdf5079f 100644 --- a/dss-network-plugin/translations/dss-network-plugin_gl_ES.ts +++ b/dss-network-plugin/translations/dss-network-plugin_gl_ES.ts @@ -15,6 +15,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -270,6 +277,13 @@ Rede con fíos + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -298,4 +312,11 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_hi_IN.ts b/dss-network-plugin/translations/dss-network-plugin_hi_IN.ts index 24555bb8..87c76b02 100644 --- a/dss-network-plugin/translations/dss-network-plugin_hi_IN.ts +++ b/dss-network-plugin/translations/dss-network-plugin_hi_IN.ts @@ -15,6 +15,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -270,6 +277,13 @@ केबल नेटवर्क + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -298,4 +312,11 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_hr.ts b/dss-network-plugin/translations/dss-network-plugin_hr.ts index dab173c7..09a6a03b 100644 --- a/dss-network-plugin/translations/dss-network-plugin_hr.ts +++ b/dss-network-plugin/translations/dss-network-plugin_hr.ts @@ -15,6 +15,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -270,6 +277,13 @@ Žična mreža + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -298,4 +312,11 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_hu.ts b/dss-network-plugin/translations/dss-network-plugin_hu.ts index 918cfea8..5f9e32cb 100644 --- a/dss-network-plugin/translations/dss-network-plugin_hu.ts +++ b/dss-network-plugin/translations/dss-network-plugin_hu.ts @@ -1,4 +1,6 @@ - + + + Bubble @@ -13,6 +15,13 @@ Tiltsa le a <a style="text-decoration: none;" href="Airplane Mode">Repülőgép üzemmódot</a> először, ha vezeték nélküli hálózathoz szeretne kapcsolódni + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -28,35 +37,35 @@ dde::network::NetManagerThreadPrivate Wired Connection %1 - + VPN L2TP %1 - + VPN PPTP %1 - + VPN VPNC %1 - + VPN OpenVPN %1 - + VPN StrongSwan %1 - + VPN OpenConnect %1 - + PPPoE Connection %1 - + Connecting "%1" @@ -268,6 +277,13 @@ Vezetékes hálózat + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -296,4 +312,11 @@ Egyéb Hálózatok - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_it.ts b/dss-network-plugin/translations/dss-network-plugin_it.ts index 40441fdd..c627c183 100644 --- a/dss-network-plugin/translations/dss-network-plugin_it.ts +++ b/dss-network-plugin/translations/dss-network-plugin_it.ts @@ -1,4 +1,6 @@ - + + + Bubble @@ -13,6 +15,13 @@ Disattiva <a style="text-decoration: none;" href="Airplane Mode">la modalità aereo</a> se desideri collegarti ad una rete wireless + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -28,71 +37,71 @@ dde::network::NetManagerThreadPrivate Wired Connection %1 - + VPN L2TP %1 - + VPN PPTP %1 - + VPN VPNC %1 - + VPN OpenVPN %1 - + VPN StrongSwan %1 - + VPN OpenConnect %1 - + PPPoE Connection %1 - + Connecting "%1" - + "%1" connected - + "%1" disconnected - + Unable to connect "%1", please check your router or net cable. - + Unable to connect "%1", please keep closer to the wireless router - + Connection failed, unable to connect "%1", wrong password - + Password is required to connect "%1" - + The "%1" 802.11 WLAN network could not be found - + To connect "%1", please set up your authentication info after logging in - + @@ -164,19 +173,19 @@ Disable VPN - + Enable VPN - + Disable system proxy - + Enable system proxy - + Network settings @@ -184,15 +193,15 @@ Multiple services started - + Connected to: %1 - + System proxy enabled - + Connected @@ -251,14 +260,14 @@ dde::network::NetSystemProxyControlItem System Proxy - + dde::network::NetVPNTipsItem VPN configuration is not connected or failed to connect. Please <a style="text-decoration: none;" href="go to the control center">go to the control center</a> for inspection. - + @@ -268,6 +277,13 @@ Connessione cablata + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -296,4 +312,11 @@ Altre Reti - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_ja.ts b/dss-network-plugin/translations/dss-network-plugin_ja.ts index 87b36268..78bb81c7 100644 --- a/dss-network-plugin/translations/dss-network-plugin_ja.ts +++ b/dss-network-plugin/translations/dss-network-plugin_ja.ts @@ -1,4 +1,6 @@ - + + + Bubble @@ -13,6 +15,13 @@ ワイヤレスネットワークに接続するには、<a style="text-decoration: none;" href="Airplane Mode">機内モード</a>を無効化してください。 + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -268,6 +277,13 @@ 有線ネットワーク + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -296,4 +312,11 @@ その他のネットワーク - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_ko.ts b/dss-network-plugin/translations/dss-network-plugin_ko.ts index 3cd2a61e..1c7e3684 100644 --- a/dss-network-plugin/translations/dss-network-plugin_ko.ts +++ b/dss-network-plugin/translations/dss-network-plugin_ko.ts @@ -15,6 +15,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -270,6 +277,13 @@ 유선 네트워크 + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -298,4 +312,11 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_lo.ts b/dss-network-plugin/translations/dss-network-plugin_lo.ts index 57aacb7a..ab683e2f 100644 --- a/dss-network-plugin/translations/dss-network-plugin_lo.ts +++ b/dss-network-plugin/translations/dss-network-plugin_lo.ts @@ -1,4 +1,6 @@ - + + + Bubble @@ -13,6 +15,13 @@ ປິດ <a style="text-decoration: none;" href="Airplane Mode">ໂໝດຍົນ</a> ກ່ອນຖ້າທ່ານຕ້ອງການເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍໄຮ້ສາຍ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -268,6 +277,13 @@ ເຄືອຂ່າຍສາຍ + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -296,4 +312,11 @@ ເຄືອຂ່າຍອື່ນໆ - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_lt.ts b/dss-network-plugin/translations/dss-network-plugin_lt.ts index d1fd05fd..f13dad6a 100644 --- a/dss-network-plugin/translations/dss-network-plugin_lt.ts +++ b/dss-network-plugin/translations/dss-network-plugin_lt.ts @@ -1,4 +1,6 @@ - + + + Bubble @@ -13,6 +15,13 @@ Norėdami prisijungti prie belaidžio tinklo, pirmiausia, išjunkite <a style="text-decoration: none;" href="Airplane Mode">Lėktuvo veikseną</a> + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -28,71 +37,71 @@ dde::network::NetManagerThreadPrivate Wired Connection %1 - + VPN L2TP %1 - + VPN PPTP %1 - + VPN VPNC %1 - + VPN OpenVPN %1 - + VPN StrongSwan %1 - + VPN OpenConnect %1 - + PPPoE Connection %1 - + Connecting "%1" - + "%1" connected - + "%1" disconnected - + Unable to connect "%1", please check your router or net cable. - + Unable to connect "%1", please keep closer to the wireless router - + Connection failed, unable to connect "%1", wrong password - + Password is required to connect "%1" - + The "%1" 802.11 WLAN network could not be found - + To connect "%1", please set up your authentication info after logging in - + @@ -103,19 +112,19 @@ Private Pwd - + key - + Proxy Password - + Group Password - + Username @@ -172,11 +181,11 @@ Disable system proxy - + Enable system proxy - + Network settings @@ -184,7 +193,7 @@ Multiple services started - + Connected to: %1 @@ -192,7 +201,7 @@ System proxy enabled - + Connected @@ -204,7 +213,7 @@ Network cable unplugged - + Not connected @@ -212,7 +221,7 @@ Connecting - + Connected but no Internet access @@ -220,7 +229,7 @@ Connection failed - + IP conflict @@ -232,11 +241,11 @@ Connected %1 - + Off - + Wired Network @@ -251,14 +260,14 @@ dde::network::NetSystemProxyControlItem System Proxy - + dde::network::NetVPNTipsItem VPN configuration is not connected or failed to connect. Please <a style="text-decoration: none;" href="go to the control center">go to the control center</a> for inspection. - + @@ -268,6 +277,13 @@ Laidinis tinklas + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -296,4 +312,11 @@ Kiti tinklai - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_ms.ts b/dss-network-plugin/translations/dss-network-plugin_ms.ts index 9120e4e5..0441c64a 100644 --- a/dss-network-plugin/translations/dss-network-plugin_ms.ts +++ b/dss-network-plugin/translations/dss-network-plugin_ms.ts @@ -15,6 +15,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -270,6 +277,13 @@ Rangkaian Berwayar + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -298,4 +312,11 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_nl.ts b/dss-network-plugin/translations/dss-network-plugin_nl.ts index 4c13fdff..a25d3cff 100644 --- a/dss-network-plugin/translations/dss-network-plugin_nl.ts +++ b/dss-network-plugin/translations/dss-network-plugin_nl.ts @@ -1,4 +1,6 @@ - + + + Bubble @@ -13,6 +15,13 @@ Schakel de <a style="text-decoration: none;" href="Airplane Mode">vliegtuigstand</a> uit als je verbinding wilt maken via bluetooth + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -268,6 +277,13 @@ Bekabeld netwerk + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -296,4 +312,11 @@ Overige netwerken - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_pl.ts b/dss-network-plugin/translations/dss-network-plugin_pl.ts index 6073934f..b2eeb0b1 100644 --- a/dss-network-plugin/translations/dss-network-plugin_pl.ts +++ b/dss-network-plugin/translations/dss-network-plugin_pl.ts @@ -1,4 +1,6 @@ - + + + Bubble @@ -13,6 +15,13 @@ Najpierw wyłącz <a style="text-decoration: none;" href="Airplane Mode">Tryb samolotowy</a>, aby połączyć się z siecią bezprzewodową + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -268,6 +277,13 @@ Sieć przewodowa + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -296,4 +312,11 @@ Inne sieci - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_pt.ts b/dss-network-plugin/translations/dss-network-plugin_pt.ts index bc4756f0..9ac4e496 100644 --- a/dss-network-plugin/translations/dss-network-plugin_pt.ts +++ b/dss-network-plugin/translations/dss-network-plugin_pt.ts @@ -15,6 +15,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -270,6 +277,13 @@ Rede por cabo + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -298,4 +312,11 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_pt_BR.ts b/dss-network-plugin/translations/dss-network-plugin_pt_BR.ts index 5ba2ac05..4dfe71f7 100644 --- a/dss-network-plugin/translations/dss-network-plugin_pt_BR.ts +++ b/dss-network-plugin/translations/dss-network-plugin_pt_BR.ts @@ -1,4 +1,6 @@ - + + + Bubble @@ -13,6 +15,13 @@ Primeiro, desative o <a style="text-decoration: none;" href="Airplane Mode">Modo Avião</a> para conectar-se a uma rede Wi-Fi + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -268,6 +277,13 @@ Rede cabeada + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -296,4 +312,11 @@ Outras redes - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_ro.ts b/dss-network-plugin/translations/dss-network-plugin_ro.ts index 8952c492..9ca86e28 100644 --- a/dss-network-plugin/translations/dss-network-plugin_ro.ts +++ b/dss-network-plugin/translations/dss-network-plugin_ro.ts @@ -15,6 +15,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -270,6 +277,13 @@ Rețea conectată + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -298,4 +312,11 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_ru.ts b/dss-network-plugin/translations/dss-network-plugin_ru.ts index 3670cca9..8effe46c 100644 --- a/dss-network-plugin/translations/dss-network-plugin_ru.ts +++ b/dss-network-plugin/translations/dss-network-plugin_ru.ts @@ -1,4 +1,6 @@ - + + + Bubble @@ -13,6 +15,13 @@ Если вы хотите подключиться к беспроводной сети, сначала отключите <a style="text-decoration: none;" href="Airplane Mode">Режим полета</a> + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -268,6 +277,13 @@ Проводная сеть + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -296,4 +312,11 @@ Прочие сети - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_si.ts b/dss-network-plugin/translations/dss-network-plugin_si.ts index 21801b29..e3434706 100644 --- a/dss-network-plugin/translations/dss-network-plugin_si.ts +++ b/dss-network-plugin/translations/dss-network-plugin_si.ts @@ -15,6 +15,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -270,6 +277,13 @@ රැහැන්ගත ජාලය + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -298,4 +312,11 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_sl.ts b/dss-network-plugin/translations/dss-network-plugin_sl.ts index 35b3120f..29457689 100644 --- a/dss-network-plugin/translations/dss-network-plugin_sl.ts +++ b/dss-network-plugin/translations/dss-network-plugin_sl.ts @@ -15,6 +15,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -270,6 +277,13 @@ Ožičeno omrežje + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -298,4 +312,11 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_sq.ts b/dss-network-plugin/translations/dss-network-plugin_sq.ts index 1947ad03..6b65748b 100644 --- a/dss-network-plugin/translations/dss-network-plugin_sq.ts +++ b/dss-network-plugin/translations/dss-network-plugin_sq.ts @@ -1,4 +1,6 @@ - + + + Bubble @@ -13,6 +15,13 @@ Nëse doni të lidheni me një rrjet pa fill, së pari çaktivizoni <a href="Airplane Mode">Mënyrën Aeroplan</a> + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -268,6 +277,13 @@ Rrjet Me Fill + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -296,4 +312,11 @@ Rrjete të Tjerë - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_sr.ts b/dss-network-plugin/translations/dss-network-plugin_sr.ts index f392edb8..3d2fc0be 100644 --- a/dss-network-plugin/translations/dss-network-plugin_sr.ts +++ b/dss-network-plugin/translations/dss-network-plugin_sr.ts @@ -15,6 +15,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -270,6 +277,13 @@ Жична мрежа + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -298,4 +312,11 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_tr.ts b/dss-network-plugin/translations/dss-network-plugin_tr.ts index cb3bd67a..aa3453c0 100644 --- a/dss-network-plugin/translations/dss-network-plugin_tr.ts +++ b/dss-network-plugin/translations/dss-network-plugin_tr.ts @@ -1,4 +1,6 @@ - + + + Bubble @@ -13,6 +15,13 @@ Kablosuz bir ağa bağlanmak istiyorsanız öncelikle <a style="text-decoration: none;" href="Airplane Mode">Uçak Modunu</a> devre dışı bırakın + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -268,6 +277,13 @@ Kablolu Ağ + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -296,4 +312,11 @@ Diğer Ağlar - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_ug.ts b/dss-network-plugin/translations/dss-network-plugin_ug.ts index 323fe618..5bcb0929 100644 --- a/dss-network-plugin/translations/dss-network-plugin_ug.ts +++ b/dss-network-plugin/translations/dss-network-plugin_ug.ts @@ -1,4 +1,6 @@ - + + + Bubble @@ -13,6 +15,13 @@ كۆكچىش ئىقتىدارىنى ئىشلەتمەكچى بولسىڭىز، ئاۋۋال <a style="text-decoration: none;" href="Airplane Mode">ئۇچۇش ھالىتى</a> نى تاقاڭ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -28,35 +37,35 @@ dde::network::NetManagerThreadPrivate Wired Connection %1 - + VPN L2TP %1 - + VPN PPTP %1 - + VPN VPNC %1 - + VPN OpenVPN %1 - + VPN StrongSwan %1 - + VPN OpenConnect %1 - + PPPoE Connection %1 - + Connecting "%1" @@ -268,6 +277,13 @@ سىملىق تور + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -296,4 +312,11 @@ باشقا تور - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_uk.ts b/dss-network-plugin/translations/dss-network-plugin_uk.ts index a6358a27..47612851 100644 --- a/dss-network-plugin/translations/dss-network-plugin_uk.ts +++ b/dss-network-plugin/translations/dss-network-plugin_uk.ts @@ -1,4 +1,6 @@ - + + + Bubble @@ -13,6 +15,13 @@ Якщо ви хочете встановити з'єднання з бездротовою мережею, спочатку вимкніть <a style="text-decoration: none;" href="Airplane Mode">Режим польоту</a> + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -268,6 +277,13 @@ Дротова мережа + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -296,4 +312,11 @@ Інші мережі - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_vi.ts b/dss-network-plugin/translations/dss-network-plugin_vi.ts index d3f2efc0..f9014a92 100644 --- a/dss-network-plugin/translations/dss-network-plugin_vi.ts +++ b/dss-network-plugin/translations/dss-network-plugin_vi.ts @@ -15,6 +15,13 @@ + + dde::network::NetItemWidget + + Open a browser to authenticate + + + dde::network::NetManagerPrivate @@ -270,6 +277,13 @@ Mạng kết nối dây + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -298,4 +312,11 @@ + + dde::network::NetWirelessWidget + + Disconnect + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_zh_CN.ts b/dss-network-plugin/translations/dss-network-plugin_zh_CN.ts index c3d365d2..29d12be9 100644 --- a/dss-network-plugin/translations/dss-network-plugin_zh_CN.ts +++ b/dss-network-plugin/translations/dss-network-plugin_zh_CN.ts @@ -1,4 +1,6 @@ - + + + Bubble @@ -275,6 +277,13 @@ 有线网络 + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -303,4 +312,11 @@ 其他网络 - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_zh_HK.ts b/dss-network-plugin/translations/dss-network-plugin_zh_HK.ts index d503ca90..e074eaa0 100644 --- a/dss-network-plugin/translations/dss-network-plugin_zh_HK.ts +++ b/dss-network-plugin/translations/dss-network-plugin_zh_HK.ts @@ -1,4 +1,6 @@ - + + + Bubble @@ -275,6 +277,13 @@ 有線網絡 + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -303,4 +312,11 @@ 其他網絡 - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/dss-network-plugin/translations/dss-network-plugin_zh_TW.ts b/dss-network-plugin/translations/dss-network-plugin_zh_TW.ts index c0a3406e..2ec86822 100644 --- a/dss-network-plugin/translations/dss-network-plugin_zh_TW.ts +++ b/dss-network-plugin/translations/dss-network-plugin_zh_TW.ts @@ -1,4 +1,6 @@ - + + + Bubble @@ -275,6 +277,13 @@ 有線網路 + + dde::network::NetWiredWidget + + Disconnect + + + dde::network::NetWirelessControlItem @@ -303,4 +312,11 @@ 其他網路 - \ No newline at end of file + + dde::network::NetWirelessWidget + + Disconnect + + + + diff --git a/net-view/window/private/netcommonbutton.cpp b/net-view/window/private/netcommonbutton.cpp new file mode 100644 index 00000000..268eb02a --- /dev/null +++ b/net-view/window/private/netcommonbutton.cpp @@ -0,0 +1,57 @@ +// SPDX-FileCopyrightText: 2026 UnionTech Software Technology Co., Ltd. +// +// SPDX-License-Identifier: LGPL-3.0-or-later + +#include "netcommonbutton.h" + +#include +#include + +namespace dde { +namespace network { + +NetCommonButton::NetCommonButton(QWidget *parent, const QString &text) +: QAbstractButton(parent) +{ + setCursor(Qt::PointingHandCursor); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + Dtk::Widget::DFontSizeManager::instance()->bind(this, Dtk::Widget::DFontSizeManager::T8); +} + +void NetCommonButton::paintEvent(QPaintEvent *event) +{ + Q_UNUSED(event); + + QPainter p(this); + p.setRenderHint(QPainter::Antialiasing); + + QRectF rect = this->rect(); + + if (isDown()) { + p.setBrush(QColor(0,0,0,255 * 0.2)); + } else if (underMouse()) { + p.setBrush(QColor(0, 0, 0, 255 * 0.15)); + } else { + p.setBrush(QColor(0, 0, 0, 255 * 0.1)); + } + + p.setPen(Qt::NoPen); + p.drawRoundedRect(rect, 8, 8); + + p.setPen(QColor(255, 255, 255, 255)); + p.drawText(rect, Qt::AlignCenter, text()); +} + +QSize NetCommonButton::sizeHint() const +{ + const QFontMetrics metrics(font()); + return QSize(metrics.horizontalAdvance(text()) + 24, metrics.height() + 6); +} + +QSize NetCommonButton::minimumSizeHint() const +{ + return sizeHint(); +} + +} // namespace network +} // namespace dde diff --git a/net-view/window/private/netcommonbutton.h b/net-view/window/private/netcommonbutton.h new file mode 100644 index 00000000..3308b73c --- /dev/null +++ b/net-view/window/private/netcommonbutton.h @@ -0,0 +1,27 @@ +// SPDX-FileCopyrightText: 2026 UnionTech Software Technology Co., Ltd. +// +// SPDX-License-Identifier: LGPL-3.0-or-later + +#ifndef NETCOMMONBUTTON_H +#define NETCOMMONBUTTON_H + +#include + +namespace dde { +namespace network { + +class NetCommonButton : public QAbstractButton +{ +public: + explicit NetCommonButton(QWidget *parent = nullptr, const QString &text = ""); + QSize sizeHint() const override; + QSize minimumSizeHint() const override; + +protected: + void paintEvent(QPaintEvent *event) override; +}; + +} // namespace network +} // namespace dde + +#endif //NETCOMMONBUTTON_H diff --git a/net-view/window/private/netdelegate.cpp b/net-view/window/private/netdelegate.cpp index 82c4ac42..bfad37ef 100644 --- a/net-view/window/private/netdelegate.cpp +++ b/net-view/window/private/netdelegate.cpp @@ -10,6 +10,7 @@ #include "netsecretwidget.h" #include "networkconst.h" #include "nettype.h" +#include "netcommonbutton.h" #include #include @@ -623,6 +624,7 @@ NetWirelessWidget::NetWirelessWidget(NetWirelessItem *item, QWidget *parent) , m_isWifi6(item->flags()) , m_iconBut(new NetIconButton(this)) , m_connBut(new NetIconButton(this)) + , m_disconnectBtn(new NetCommonButton(this)) , m_loading(new DSpinner(this)) , m_status(dde::network::NetType::NetConnectionStatus::CS_UnConnected) { @@ -643,11 +645,15 @@ NetWirelessWidget::NetWirelessWidget(NetWirelessItem *item, QWidget *parent) layout->addStretch(); m_connBut->setIcon(QIcon::fromTheme("select")); - m_connBut->setHoverIcon(QIcon::fromTheme("disconnect")); m_connBut->setFixedSize(16, 16); m_connBut->setClickable(true); layout->addWidget(m_connBut); + m_disconnectBtn->setText(tr("Disconnect")); + m_disconnectBtn->setFixedHeight(24); + m_disconnectBtn->setVisible(false); + layout->addWidget(m_disconnectBtn); + m_loading->setFixedSize(16, 16); layout->addWidget(m_loading); setCentralWidget(widget); @@ -659,7 +665,7 @@ NetWirelessWidget::NetWirelessWidget(NetWirelessItem *item, QWidget *parent) connect(item, &NetWirelessItem::portalUrlChanged, this, &NetWirelessWidget::onPortalUrlChanged); connect(item, &NetWirelessItem::strengthLevelChanged, this, &NetWirelessWidget::updateIcon); connect(item, &NetWirelessItem::statusChanged, this, &NetWirelessWidget::onStatusChanged); - connect(m_connBut, &NetIconButton::clicked, this, &NetWirelessWidget::onDisconnectClicked); + connect(m_disconnectBtn, &NetCommonButton::clicked, this, &NetWirelessWidget::onDisconnectClicked); } NetWirelessWidget::~NetWirelessWidget() { } @@ -676,16 +682,19 @@ void NetWirelessWidget::onStatusChanged(NetType::NetConnectionStatus status) switch (status) { case NetType::CS_Connected: m_connBut->setVisible(true); + m_disconnectBtn->setVisible(false); m_loading->stop(); m_loading->setVisible(false); break; case NetType::CS_Connecting: m_connBut->setVisible(false); + m_disconnectBtn->setVisible(false); m_loading->start(); m_loading->setVisible(true); break; default: m_connBut->setVisible(false); + m_disconnectBtn->setVisible(false); m_loading->stop(); m_loading->setVisible(false); break; @@ -697,6 +706,15 @@ void NetWirelessWidget::onDisconnectClicked() sendRequest(NetManager::Disconnect, item()->id()); } +void NetWirelessWidget::setHover(bool isHover) +{ + if (m_status == NetType::CS_Connected) { + m_connBut->setVisible(!isHover); + m_disconnectBtn->setVisible(isHover); + }; + NetItemWidget::setHover(isHover); +} + bool NetWirelessWidget::isConnected() const { // 连接状态按钮可见并且加载按钮隐藏，此时认为当前状态是已连接 @@ -785,6 +803,7 @@ NetWiredWidget::NetWiredWidget(NetWiredItem *item, QWidget *parent) : NetItemWidget(item, parent) , m_iconBut(new NetIconButton(this)) , m_connBut(new NetIconButton(this)) + , m_disconnectBtn(new NetCommonButton(this)) , m_loading(new DSpinner(this)) { QWidget *widget = new QWidget(this); @@ -801,11 +820,15 @@ NetWiredWidget::NetWiredWidget(NetWiredItem *item, QWidget *parent) layout->addStretch(); m_connBut->setIcon(QIcon::fromTheme("select")); - m_connBut->setHoverIcon(QIcon::fromTheme("disconnect")); m_connBut->setFixedSize(16, 16); m_connBut->setClickable(true); layout->addWidget(m_connBut); + m_disconnectBtn->setText(tr("Disconnect")); + m_disconnectBtn->setFixedHeight(24); + m_disconnectBtn->setVisible(false); + layout->addWidget(m_disconnectBtn); + m_loading->setFixedSize(16, 16); layout->addWidget(m_loading); setCentralWidget(widget); @@ -814,7 +837,7 @@ NetWiredWidget::NetWiredWidget(NetWiredItem *item, QWidget *parent) connect(item, &NetWiredItem::statusChanged, this, &NetWiredWidget::onStatusChanged); connect(item, &NetWiredItem::portalUrlChanged, this, &NetWiredWidget::onPortalUrlChanged); - connect(m_connBut, &NetIconButton::clicked, this, &NetWiredWidget::onDisconnectClicked); + connect(m_disconnectBtn, &NetCommonButton::clicked, this, &NetWiredWidget::onDisconnectClicked); } NetWiredWidget::~NetWiredWidget() { } @@ -825,16 +848,19 @@ void NetWiredWidget::onStatusChanged(NetType::NetConnectionStatus status) switch (status) { case NetType::CS_Connected: m_connBut->setVisible(true); + m_disconnectBtn->setVisible(false); m_loading->stop(); m_loading->setVisible(false); break; case NetType::CS_Connecting: m_connBut->setVisible(false); + m_disconnectBtn->setVisible(false); m_loading->start(); m_loading->setVisible(true); break; default: m_connBut->setVisible(false); + m_disconnectBtn->setVisible(false); m_loading->stop(); m_loading->setVisible(false); break; @@ -846,6 +872,15 @@ void NetWiredWidget::onDisconnectClicked() sendRequest(NetManager::Disconnect, item()->id()); } +void NetWiredWidget::setHover(bool isHover) +{ + if (m_status == NetType::CS_Connected) { + m_connBut->setVisible(!isHover); + m_disconnectBtn->setVisible(isHover); + }; + NetItemWidget::setHover(isHover); +} + bool NetWiredWidget::isConnected() const { return m_status == dde::network::NetType::NetConnectionStatus::CS_Connected; diff --git a/net-view/window/private/netdelegate.h b/net-view/window/private/netdelegate.h index 4a19c168..9551b953 100644 --- a/net-view/window/private/netdelegate.h +++ b/net-view/window/private/netdelegate.h @@ -26,6 +26,7 @@ namespace dde { namespace network { class NetIconButton; +class NetCommonButton; class NetItem; class NetDeviceItem; class NetWiredDeviceItem; @@ -160,7 +161,7 @@ class NetItemWidget : public NetWidget public: NetItemWidget(NetItem *item, QWidget *parent = nullptr); void removePasswordWidget() override; - void setHover(bool isHover); + virtual void setHover(bool isHover); void setFlag(NetType::NetManagerFlags flag); protected: @@ -194,6 +195,7 @@ public Q_SLOTS: void updateIcon(); void onStatusChanged(NetType::NetConnectionStatus status); void onDisconnectClicked(); + void setHover(bool isHover) override; protected: bool isConnected() const Q_DECL_OVERRIDE; @@ -203,6 +205,7 @@ public Q_SLOTS: bool m_isWifi6; NetIconButton *m_iconBut; NetIconButton *m_connBut; + NetCommonButton *m_disconnectBtn; Dtk::Widget::DSpinner *m_loading; dde::network::NetType::NetConnectionStatus m_status; }; @@ -257,6 +260,7 @@ class NetWiredWidget : public NetItemWidget public Q_SLOTS: void onStatusChanged(NetType::NetConnectionStatus status); void onDisconnectClicked(); + void setHover(bool isHover) override; protected: bool isConnected() const Q_DECL_OVERRIDE; @@ -265,6 +269,7 @@ public Q_SLOTS: private: NetIconButton *m_iconBut; NetIconButton *m_connBut; + NetCommonButton *m_disconnectBtn; Dtk::Widget::DSpinner *m_loading; dde::network::NetType::NetConnectionStatus m_status; };