openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,717 Commits 29 Branches 46 Tags 44 MiB
Commit Graph

1204 Commits

Author SHA1 Message Date
kangshuning 774840a126 bug#97721去掉qss bug#97315label加tooltip 2021-12-16 09:50:44 +08:00
Jinxujie 80c524b46d bug#96163详情页密码框禁止汉字 2021-12-16 09:35:52 +08:00
renpeijia 2a5f082ff3 fix:it will crash,when switch wlan and lan label. 
bug link:https://172.17.50.104/biz/bug-view-86820.html
            https://172.17.50.104/biz/bug-view-91150.html
 2021-12-16 09:29:10 +08:00
jzxc95 4b2a557a05 keyring开关接口 2021-12-15 15:18:16 +08:00
kangshuning 9bd7487b89 remove useless 2021-12-15 09:29:52 +08:00
jzxc95 07c9377675 use theme icon 2021-12-14 14:48:20 +08:00
kangshuning 86841dc919 bug#96758 Esc关闭窗口 #97277翻译 2021-12-14 14:40:13 +08:00
赵 世旭 40f08e7fe0 Merge branch '1213-main' into 'dbus-interface' 
ui

See merge request kylin-desktop/kylin-nm!474
 2021-12-13 08:58:23 +00:00
赵 世旭 74941188e0 Merge branch '1209' into 'dbus-interface' 
#bug92160毛玻璃

See merge request kylin-desktop/kylin-nm!473
 2021-12-13 08:58:11 +00:00
jzxc95 d717795978 ui 2021-12-13 16:29:11 +08:00
kangshuning 0f9e667882 fix width 2021-12-13 16:23:42 +08:00
kangshuning ef851b2937 remove useless 2021-12-13 15:26:15 +08:00
kangshuning fee0a5cca1 毛玻璃 2021-12-13 15:17:44 +08:00
jzxc95 b897a20f15 亮调色板更新为3.1 2021-12-13 14:22:43 +08:00
ren peijia d6a881615b Merge branch '1209' into 'dbus-interface' 
bug#93043插入网线切换当前网卡

See merge request kylin-desktop/kylin-nm!471
 2021-12-13 05:50:23 +00:00
赵 世旭 f60f581046 Merge branch '1207-main' into 'dbus-interface' 
1207 main

See merge request kylin-desktop/kylin-nm!458
 2021-12-13 05:39:30 +00:00
赵 世旭 08cfa6dab2 Merge branch '1208-main' into 'dbus-interface' 
ui字体颜色

See merge request kylin-desktop/kylin-nm!463
 2021-12-13 05:39:14 +00:00
赵 世旭 0ecb5e14bd Merge branch 'jxj-01' into 'dbus-interface' 
wifi密码输入框禁止中文的复制粘贴

See merge request kylin-desktop/kylin-nm!464
 2021-12-13 05:38:54 +00:00
赵 世旭 6ca653a358 Merge branch 'jxj-1' into 'dbus-interface' 
在点击详情页和企业wifi在任务栏显示相应图标

See merge request kylin-desktop/kylin-nm!465
 2021-12-13 05:38:38 +00:00
kangshuning 71d82b8c44 bug#93043 2021-12-13 11:15:30 +08:00
赵 世旭 1e6c7f3790 Merge branch 'kylin-nm-start' into 'dbus-interface' 
解决有线网络总开关的问题

See merge request kylin-desktop/kylin-nm!466
 2021-12-13 02:36:46 +00:00
kangshuning 9691a5eca9 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into 1209 2021-12-10 17:39:16 +08:00
ren peijia 1ea7a6843b Merge branch 'kylin-nm-p2p' into 'dbus-interface' 
当关闭wifi投屏的时候，会弹出有线网络已断开的通知

See merge request kylin-desktop/kylin-nm!469
 2021-12-10 09:15:58 +00:00
jzxc95 536a832f29 use const qstring 2021-12-10 11:02:31 +08:00
kangshuning 7edde71542 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into 1209 2021-12-10 11:00:24 +08:00
renpeijia a0d4d98df6 fix:it will report that the lan is closed, when close wifi-p2p. 
bug link:https://172.17.50.104/biz/bug-view-91118.html
 2021-12-10 10:32:17 +08:00
renpeijia 8794ff00c8 bug#90711 devicecomboBox color 2021-12-10 09:51:44 +08:00
renpeijia e78d4aa53b bug#90711 2021-12-09 11:16:59 +08:00
renpeijia 7c1b6cdf9b fix:the lan is open, when close lan switch and reboot 
bug link:https://172.17.50.104/biz/bug-view-93825.html

    fix: the wired connection will be activeted, when close wired network.
    bug link:http://172.17.50.104/biz/bug-view-92578.html (reopen)
 2021-12-09 10:48:52 +08:00
Jinxujie 31d0c1ac41 在点击详情页和企业wifi在任务栏显示相应图标 2021-12-09 10:48:19 +08:00
Jinxujie 21fb6ede7c wifi密码输入框禁止中文的复制粘贴 2021-12-09 10:07:55 +08:00
jzxc95 9cda9bc7df ui字体颜色 2021-12-08 11:13:56 +08:00
ren peijia c9bb7bf66e Merge branch 'jxj' into 'dbus-interface' 
FixBug:用户只输入ip和子网掩码可以保存进配置 BUGLINK：https://172.17.50.104/biz/bug-view-93906.html

See merge request kylin-desktop/kylin-nm!448
 2021-12-07 07:45:11 +00:00
jzxc95 ac115201b0 fix 2021-12-07 14:58:29 +08:00
jzxc95 f9c2b12b1d fix 2021-12-07 09:41:59 +08:00
jzxc95 e8211f4a68 加载qtbase翻译文件 2021-12-07 09:25:30 +08:00
renpeijia eea3d45d07 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into 1206 2021-12-07 09:18:39 +08:00
renpeijia 61e48a3a01 show device whose connection is activated 2021-12-06 18:44:59 +08:00
ren peijia 3c65386012 Merge branch '1201' into 'dbus-interface' 
bug#92751未连接图标反白#94291滚动条去除右键菜单

See merge request kylin-desktop/kylin-nm!447
 2021-12-06 06:59:20 +00:00
jzxc95 ea753d25f5 增加热点图标显示 2021-12-06 14:53:24 +08:00
renpeijia 728ddafd7c show wired which carried 2021-12-06 14:39:56 +08:00
Jinxujie e03c45b479 FixBug:用户只输入ip和子网掩码可以保存进配置 BUGLINK：https://172.17.50.104/biz/bug-view-93906.html 2021-12-06 09:41:35 +08:00
kangshuning 47ae2e1851 modify 2021-12-03 15:40:50 +08:00
Jinxujie 9ce3ca215f 判空处理 2021-12-03 10:48:47 +08:00
Jinxujie 0faf6a57cb 详情页UI 2021-12-03 10:31:33 +08:00
kangshuning defca57240 bug#92751 2021-12-03 10:13:59 +08:00
kangshuning c762d39b8c Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into 1201 2021-12-02 14:10:16 +08:00
kangshuning 9c79dbf24c remove menu of scrollbar 2021-12-02 13:09:51 +08:00
ren peijia f33088d217 Merge branch '1201-main' into 'dbus-interface' 
相同信号强度和配置 根据ssid排序

See merge request kylin-desktop/kylin-nm!439
 2021-12-01 08:18:44 +00:00
ren peijia 2407a089a8 Merge branch 'jxj' into 'dbus-interface' 
FixBug: The same enterprise WiFi can open multiple connection Windows at the...

See merge request kylin-desktop/kylin-nm!440
 2021-12-01 08:18:38 +00:00
ren peijia cbd0ee4cc2 Merge branch 'jxj-01' into 'dbus-interface' 
解决KyNetworkResourceManager未完成初始化KyNetworkDeviceResourse获取设备列表失败无法初始化kylin-nm

See merge request kylin-desktop/kylin-nm!441
 2021-12-01 08:18:31 +00:00
jzxc95 fde588b6dc 文案颜色和设计稿一致 2021-12-01 16:13:22 +08:00
Jinxujie 4341aad5ea 解决KyNetworkResourceManager未完成初始化KyNetworkDeviceResourse获取设备列表失败无法初始化kylin-nm 2021-12-01 16:03:25 +08:00
Jinxujie a252fb6fcf FixBug: The same enterprise WiFi can open multiple connection Windows at the same time BUGLINK:https://172.17.50.104/biz/bug-view-94123.html 2021-12-01 15:58:23 +08:00
jzxc95 6cc774ec4e Modify format 2021-12-01 15:56:03 +08:00
jzxc95 4a53df57c0 相同信号强度和配置 根据ssid排序 2021-12-01 15:54:41 +08:00
renpeijia 527640b937 fix:the wired connection will connect, when the device is not carrierd. 
bug link:https://172.17.50.104/biz/bug-view-93798.html
 2021-12-01 15:34:02 +08:00
jzxc95 5966e0299e 无用代码 2021-12-01 15:18:03 +08:00
jzxc95 849b683d7c 去除空行 2021-12-01 15:16:38 +08:00
jzxc95 af95b47360 取消lineedit右键菜单 2021-12-01 15:15:16 +08:00
jzxc95 3bf830e597 fix:bug87430 89405 93779 2021-12-01 14:30:23 +08:00
Jinxujie 897e2f06d6 FixBug: The same enterprise WiFi can open multiple connection Windows at the same time BUGLINK:https://172.17.50.104/biz/bug-view-94123.html 2021-12-01 10:23:04 +08:00
kangshuning 14d1d130d2 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into 1115 2021-11-30 18:14:13 +08:00
kangshuning 78b653c46d bug#93787 2021-11-30 18:14:03 +08:00
Jinxujie 5e6fe74264 FixBug: The same enterprise WiFi can open multiple connection Windows at the same time BUGLINK:https://172.17.50.104/biz/bug-view-94123.html 2021-11-30 16:20:38 +08:00
ren peijia 62b99acdbe Merge branch '93818' into 'dbus-interface' 
93818

See merge request kylin-desktop/kylin-nm!432
 2021-11-30 06:55:38 +00:00
ren peijia 595f36d687 Merge branch '1129' into 'dbus-interface' 
新建有线网界面单例化

See merge request kylin-desktop/kylin-nm!431
 2021-11-29 08:46:17 +00:00
ren peijia 9d1e619a68 Merge branch 'dbus-interface' into 'dbus-interface' 
Fix:bug https://172.17.50.104/biz/bug-view-92675.html...

See merge request kylin-desktop/kylin-nm!430
 2021-11-29 08:15:21 +00:00
jzxc95 7d94ddb68e fix 2021-11-29 14:47:35 +08:00
jzxc95 c85eb1f353 fix 2021-11-29 11:44:16 +08:00
jzxc95 0fd4ca08df fix:bug#93818 2021-11-29 10:20:53 +08:00
fensite faccb69ae7 delete redundant comments and modify the format of qtsingleapplication class member variables 
删除多余的注释，修改QtSingleApplication类成员变量的格式
 2021-11-29 10:13:34 +08:00
jzxc95 4867fc4974 新建有线网界面单例化 2021-11-29 09:22:31 +08:00
Jinxujie ad8131164f Fix:bug https://172.17.50.104/biz/bug-view-92675.html https://172.17.50.104/biz/bug-view-92309.html https://172.17.50.104/biz/bug-view-92235.html 2021-11-28 14:54:21 +08:00
fensite 87375e43fc add function of calling up the mainWindow from the command line 
添加命令行拉起单例进程主窗口的功能
BugId: 90875
 2021-11-26 21:05:06 +08:00
ren peijia 86ef3190fd Merge branch 'kylin-nm-switch' into 'dbus-interface' 
关闭有线开关，拔掉网线，重启机器，插入网线，有线连接被激活

See merge request kylin-desktop/kylin-nm!425
 2021-11-25 03:39:06 +00:00
ren peijia 1d426f1f11 Merge branch 'kylin-nm-thread-block' into 'dbus-interface' 
解决线程阻塞的问题

See merge request kylin-desktop/kylin-nm!415
 2021-11-25 03:24:47 +00:00
renpeijia 67c7ce891a fix:resolve core, when click wireless connection. 2021-11-25 11:20:54 +08:00
renpeijia 773d2c78ea fix: the wired connection will be activeted, when close wired network. 
bug link:http://172.17.50.104/biz/bug-view-92578.html
 2021-11-24 16:17:29 +08:00
ren peijia 2efe92634f Merge branch 'dbus-interface' into 'dbus-interface' 
Fix:bug about UI http://172.17.50.104/biz/bug-view-92246.html...

See merge request kylin-desktop/kylin-nm!422
 2021-11-24 06:11:03 +00:00
kangshuning e09dc1b11b isActiveDevice 2021-11-23 17:42:14 +08:00
Jinxujie c2e8734ff7 Fix:bug about UI http://172.17.50.104/biz/bug-view-92246.html http://172.17.50.104/biz/bug-view-92242.html http://172.17.50.104/biz/bug-view-92118.html http://172.17.50.104/biz/bug-view-92028.html 2021-11-23 15:13:22 +08:00
kangshuning 8bbf88fba1 bug#91322#91800#91818 2021-11-23 14:50:41 +08:00
renpeijia 1e845d537d modify:change the trigger method of thread 2021-11-19 19:56:46 +08:00
zhaikangning 6c90b69e51 use the hotspot icon when the connection is a hotspot 
当连接热点时使用热点图标
BugId 86306(该commit仅修复任务栏网络部分)
 2021-11-18 11:51:54 +08:00
renpeijia d85185b635 Merge branch 'kylin-nm-new' into kylin-nm-thread-block 2021-11-17 16:30:03 +08:00
renpeijia ad1ca9917e fix: solve the problem of thread blocking. 
bug link:http://172.17.50.104/biz/bug-view-90268.html
            http://172.17.50.104/biz/bug-view-86473.html
            http://172.17.50.104/biz/bug-view-81153.html
 2021-11-17 15:34:38 +08:00
ren peijia 9fbf1798e4 Merge branch 'kylin-nm-vpn-core' into 'dbus-interface' 
解决连接vpn失败后，会产生core的问题

See merge request kylin-desktop/kylin-nm!413
 2021-11-17 07:15:28 +00:00
ren peijia f5ef8eabc0 Merge branch '1116' into 'dbus-interface' 
1116

See merge request kylin-desktop/kylin-nm!410
 2021-11-17 02:37:29 +00:00
ren peijia ed7ddeb778 Merge branch 'icon' into 'dbus-interface' 
fix bug 91068 && 90704

See merge request kylin-desktop/kylin-nm!411
 2021-11-17 02:37:09 +00:00
renpeijia 4633f0fcbc fix:it will core,when vpn connects failed. 
bug link:http://172.17.50.104/biz/bug-view-91112.html
 2021-11-16 15:53:20 +08:00
jzxc95 917b2408a6 fix bug90701 2021-11-16 10:14:27 +08:00
jzxc95 479666c93c 有线区域滚动 2021-11-16 09:47:23 +08:00
jzxc95 b1bffdd3fc fix bug 91068 && 90704 2021-11-16 09:36:27 +08:00
ren peijia 566a0519e8 Merge branch 'dbus-interface' into 'dbus-interface' 
Fix:bug#90703 Click on details page when the password input box is...

See merge request kylin-desktop/kylin-nm!407
 2021-11-15 09:36:47 +00:00
zhouxiali cdc10ba553 Fix:bug#90703 Click on details page when the password input box is displayed,the password input box does not close 2021-11-15 09:36:16 +08:00
jzxc95 99612d8dbe WPA1 WPA2 类型检测 2021-11-12 13:40:10 +08:00
ren peijia d47102fe1a Merge branch '1111-scroll' into 'dbus-interface' 
设置滚动步长

See merge request kylin-desktop/kylin-nm!404
 2021-11-12 01:37:22 +00:00
ren peijia f55a5e6153 Merge branch 'kylin-nm-core' into 'dbus-interface' 
1）增加对空指针的判断；2）为vpn增加keyring功能

See merge request kylin-desktop/kylin-nm!401
 2021-11-12 01:17:50 +00:00
renpeijia 8b9c855528 fix:it changes private function from slot's function. 2021-11-11 20:23:58 +08:00
jzxc95 0e26f520c4 设置滚动步长 2021-11-11 19:47:46 +08:00
jzxc95 193a84a119 连接隐藏WiFi不需要判断安全类型限制 2021-11-11 17:31:06 +08:00
renpeijia 1b3c813692 fix:1)increase the judgment of the empty pointer. 
2)increase the keyring for vpn connection
   bug link:http://172.17.66.192/biz/bug-view-89707.html
 2021-11-11 14:35:53 +08:00
ren peijia cbbe33a665 Merge branch '1110' into 'dbus-interface' 
详情页安全类型判断

See merge request kylin-desktop/kylin-nm!395
 2021-11-10 05:47:45 +00:00
jzxc95 40b3543059 当安全类型为空，默认为None 2021-11-10 10:43:20 +08:00
jzxc95 218399639e 默认返回true 2021-11-10 10:35:35 +08:00
jzxc95 aafe56dfa0 抽成函数 2021-11-10 10:34:11 +08:00
jzxc95 2bb5bbd283 详情页安全类型判断 2021-11-10 09:59:29 +08:00
zhouxiali fa27eba973 Fix:bug http://172.17.66.192/biz/bug-view-87476.html The wireless connection was interrupted while being loaded by the wired connection 2021-11-10 09:50:32 +08:00
zhouxiali ffa8b382a4 Fix:Bug#http://172.17.66.192/biz/bug-view-89591.html Overdistance or disconnect the signal source,but the WiFi delete late 4-5s than the control panel 2021-11-09 16:09:40 +08:00
ren peijia 7cacee68a7 Merge branch 'dbus-interface' into 'dbus-interface' 
Fix:bug  Wlanlistitem fold problem when click other component...

See merge request kylin-desktop/kylin-nm!391
 2021-11-09 05:55:58 +00:00
kangshuning 2b4ef7e1fc 抽取函数 2021-11-09 10:31:29 +08:00
zhouxiali 36a8740e52 Fix:bug Wlanlistitem fold problem when click other component http://172.17.66.192/biz/bug-view-89399.html 2021-11-08 16:45:21 +08:00
kangshuning 6d2f420dc3 bug#89592 2021-11-08 14:48:34 +08:00
ren peijia b3e6aa8777 Merge branch '1029' into 'dbus-interface' 
bug#87649 && 毛玻璃效果

See merge request kylin-desktop/kylin-nm!378
 2021-11-05 09:41:57 +00:00
kangshuning 70e141f217 bug#89001 2021-11-05 17:39:34 +08:00
ren peijia 3bd1d09215 Merge branch 'kylin-nm-tip' into 'dbus-interface' 
当虚拟网络连接的时候，托盘图标旋转的问题

See merge request kylin-desktop/kylin-nm!384
 2021-11-05 03:31:05 +00:00
ren peijia 4a11358e07 Merge branch 'dbus-interface' into 'dbus-interface' 
Fix:bug#88982 WiFi icon tri-state display error, does not show blue ...

See merge request kylin-desktop/kylin-nm!386
 2021-11-05 03:10:09 +00:00
zhouxiali cdd4068567 Fix:bug#88982 WiFi icon tri-state display error, does not show blue http://172.17.66.192/biz/bug-view-88982.html 2021-11-05 10:49:43 +08:00
ren peijia 33d00c23d7 Merge branch '1104' into 'dbus-interface' 
fix:bug #89143

See merge request kylin-desktop/kylin-nm!383
 2021-11-05 02:30:34 +00:00
zhouxiali 38da7da176 Fix:bug#88982 WiFi icon tri-state display error, does not show blue http://172.17.66.192/biz/bug-view-88982.html 2021-11-05 10:07:26 +08:00
renpeijia 73aa5e4405 fix:The tray icon will rotate when the virtual network is connected. 
bug link:http://172.17.66.192/biz/bug-view-88652.html
 2021-11-04 16:37:46 +08:00
jzxc95 1a210817f6 fix:bug #89143 2021-11-04 16:06:03 +08:00
renpeijia a2a5afadf3 fix:it will filter venth in the Ethernet. 
bug link:http://172.17.66.192/biz/bug-view-88441.html
 2021-11-04 13:53:32 +08:00
kangshuning 5d43e78c62 remove extra include 2021-11-03 15:33:02 +08:00
kangshuning 0a00e0535c bug#87649 && 毛玻璃效果 2021-11-03 15:11:26 +08:00
king 5f7d9ea641 Fixbug#86107 when clicked the connectbutton the enterprisepage closed http://172.17.66.192/biz/bug-view-86107.html 2021-11-03 13:57:40 +08:00
ren peijia f0af8dc67d Merge branch 'dbus-interface' into 'dbus-interface' 
FixBug:Resolve the trayicon display problem when have double...

See merge request kylin-desktop/kylin-nm!374
 2021-11-02 07:34:51 +00:00
king 3f995e2f4c FixBug:Resolve the trayicon display problem when have double cards.http://172.17.66.192/biz/bug-view-87727.html http://172.17.66.192/biz/bug-view-87711.html http://172.17.66.192/biz/bug-view-87476.html 2021-11-02 14:07:47 +08:00
king 9d7f4fb70f FixBug:Resolve the trayicon display problem when have double cards.http://172.17.66.192/biz/bug-view-87727.html http://172.17.66.192/biz/bug-view-87711.html http://172.17.66.192/biz/bug-view-87476.html 2021-11-02 13:53:54 +08:00
ren peijia 5e9ded9c15 Merge branch '1027-cc' into 'dbus-interface' 
update changelog && control

See merge request kylin-desktop/kylin-nm!370
 2021-11-02 05:51:11 +00:00
ren peijia a6385eb788 Merge branch '1029' into 'dbus-interface' 
bug#86526

See merge request kylin-desktop/kylin-nm!372
 2021-11-02 05:50:46 +00:00
jzxc95 199dafc23a fix:bug #87742 87734 &&普通wifi密码存储策略不为默认时的获取时间过长问题 2021-11-02 11:15:35 +08:00
kangshuning ef175497dc bug#86526 2021-10-29 17:38:14 +08:00
kangshuning 2cd7efccae Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into 1025 2021-10-29 15:58:49 +08:00
kangshuning 312df79418 modify 2021-10-29 14:54:36 +08:00
kangshuning 1f507d16cb adjust widgets 2021-10-29 14:42:49 +08:00
king 68d6c0223b Fix:Solve the problem of abnormal display of activated list after failed to connect to enterprise WiFi 2021-10-29 09:52:53 +08:00
w x f92b3d10d5 Merge branch 'kylin-wlan-sort' into 'dbus-interface' 
当同一个热点创建了两个连接的时候，会出现断开连接失败的情况，原因是因为获取的uuid不正确

See merge request kylin-desktop/kylin-nm!368
 2021-10-28 12:35:30 +00:00
w x 05323e4953 Merge branch '1025' into 'dbus-interface' 
未插入有线网卡消息提示&无线忘记网络后状态更新

See merge request kylin-desktop/kylin-nm!367
 2021-10-28 12:35:22 +00:00
w x dd40b9b94e Merge branch '1027-cc' into 'dbus-interface' 
1027 cc

See merge request kylin-desktop/kylin-nm!366
 2021-10-28 12:35:01 +00:00
kangshuning 1874320f75 mainwindow ChangeTrayIcon 2021-10-28 14:05:39 +08:00
renpeijia 16d7051cf1 fix:it can not disconnect connection sometime. 
bug link:http://172.17.66.192/biz/bug-view-87465.html
 2021-10-28 13:45:40 +08:00
jzxc95 fc555b6ea5 resort by signal && control center switch status change 2021-10-28 12:50:05 +08:00
kangshuning f6e55a1818 未插入有线网卡消息提示&无线忘记网络后状态更新 2021-10-28 12:44:48 +08:00
jzxc95 0d5a335f3e add when clicked control center wifi list ,jump to kylin-nm and show item 2021-10-28 10:19:09 +08:00
ren peijia 1d9daf0110 Merge branch '1025' into 'dbus-interface' 
deactive wired or wireless connection through right button #bug86527

See merge request kylin-desktop/kylin-nm!364
 2021-10-28 01:27:03 +00:00
ren peijia c7c0242760 Merge branch '1027-cc' into 'dbus-interface' 
call ukui-control-center method change

See merge request kylin-desktop/kylin-nm!365
 2021-10-28 01:26:00 +00:00
kangshuning a7d8d2f28f free pointer 2021-10-27 17:36:20 +08:00
jzxc95 9ccf3d947b call ukui-control-center method change 2021-10-27 16:35:39 +08:00
kangshuning 22e3fcc575 deactive wired or wireless connection through right button #bug86527 2021-10-27 16:25:15 +08:00
renpeijia daa335e29a fix: it is not sorted, when add one wlan or disconnected on connection. 
bug link:http://172.17.66.192/biz/bug-view-86854.html
 2021-10-27 15:55:11 +08:00
ren peijia 4cf887375b Merge branch 'dbus-interface' into 'dbus-interface' 
add check Wireless network card notify

See merge request kylin-desktop/kylin-nm!358
 2021-10-26 09:50:54 +00:00
ren peijia bda9da0968 Merge branch '1025' into 'dbus-interface' 
bug#86797

See merge request kylin-desktop/kylin-nm!360
 2021-10-26 09:50:45 +00:00
ren peijia 63c34bf611 Merge branch 'dev3.1' into 'dbus-interface' 
Adjust the layout of wireless unconnected area; Adjust the display of 'more'...

See merge request kylin-desktop/kylin-nm!359
 2021-10-26 09:50:32 +00:00
zhaikangning d5cde738b7 update wlan more item while update wireless net area;modified according to pr suggestions 2021-10-26 15:59:37 +08:00
kangshuning c07e7b09d1 bug#86797 2021-10-26 15:21:21 +08:00
ren peijia b3e3f3501d Merge branch 'kylin-nm-wlan-dev' into 'dbus-interface' 
通过nm-connect-editor激活一个新的wifi连接的时候，kylin-nm的界面不显示已激活的连接

See merge request kylin-desktop/kylin-nm!357
 2021-10-26 06:57:49 +00:00
zhaikangning 36ae78280f Adjust the layout of wireless unconnected area; Adjust the display of 'more' items; Add automatic display of all functions after expansion 
调整无线未连接区域布局；调整'更多'条目显示；增加展开后自动显示全部功能
 2021-10-26 14:12:59 +08:00
renpeijia 9036ea16de fix:modify error which is found, when review 2021-10-26 11:14:22 +08:00
king 7382c320b6 add check Wireless network card notify 2021-10-26 10:53:30 +08:00
ren peijia a42b981567 Merge branch 'up-dbus' into 'dbus-interface' 
signal add parameter

See merge request kylin-desktop/kylin-nm!354
 2021-10-26 01:54:48 +00:00
renpeijia 62e675ff23 fix:kylin-nm can not show activated connection, when active one 
connection through nm-connection-editor
    bug link:http://172.17.66.192/biz/bug-view-86831.html
 2021-10-26 09:48:28 +08:00
kangshuning 36876bb139 wiredSwitch 2021-10-25 17:07:38 +08:00
jzxc95 8242bcfeef signal add parameter 2021-10-25 16:40:18 +08:00
ren peijia a79b70edf0 Merge branch 'kylin-nm-lan' into 'dbus-interface' 
增加有线排序功能和优化指针的相关操作

See merge request kylin-desktop/kylin-nm!352
 2021-10-25 07:56:00 +00:00
jzxc95 ba0b3557ae wlanpage show ssid 2021-10-25 11:51:24 +08:00
jzxc95 d8fa28223a add netmask 1~32 support && fixed create wifi connection failed by dbus 2021-10-25 10:57:18 +08:00
renpeijia 228a9f2ddb modify:1)add sort function for lan 
2)Optimize pointer operation
 2021-10-25 09:53:16 +08:00
jzxc95 72b12fd377 change kylin-network-manager to kylin-nm 2021-10-22 14:37:04 +08:00
ren peijia c26f6ef676 Merge branch 'up-dbus' into 'dbus-interface' 
Up dbus

See merge request kylin-desktop/kylin-nm!349
 2021-10-22 05:46:53 +00:00
ren peijia 7802e33cae Merge branch 'kylin-ap-fix' into 'dbus-interface' 
修改无线ap的问题

See merge request kylin-desktop/kylin-nm!345
 2021-10-22 05:45:58 +00:00
jzxc95 62bcafc227 check pwdflag is change 2021-10-22 11:44:16 +08:00
kangshuning 75b124fa07 bug#86521 2021-10-22 11:32:30 +08:00
jzxc95 8c4595ced4 fix enterprise property page 2021-10-22 11:14:35 +08:00
jzxc95 b2411b918b change sleep to qeventloop 2021-10-21 16:36:58 +08:00
renpeijia b97f0ba007 fix:it can not connect successfull, when connect ap with not 
password.
    bug link:http://172.17.66.192/biz/bug-view-81343.html
 2021-10-21 15:04:10 +08:00
renpeijia 3b03be5fcc fix:delete invalde message notify. 
bug link:http://172.17.66.192/biz/bug-view-85837.html
 2021-10-21 14:52:07 +08:00
jzxc95 3b786d9131 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into up-dbus 2021-10-21 14:46:49 +08:00
jzxc95 348054f4e7 remove useless method && fix enterprise wifi connect && get ap info method && can not save wifi security 2021-10-21 14:46:00 +08:00
renpeijia b318af3e92 fix:kylin-nm can not disconnect ap connection, when close ap mode. 
bug link:http://172.17.66.192/biz/bug-view-86427.html
 2021-10-21 14:45:42 +08:00
king de524980bb Resolve the conflict 2021-10-21 14:31:18 +08:00
king c0371b4066 Merge remote-tracking branch 'refs/remotes/upstream/dbus-interface' into d-interface 2021-10-21 14:24:38 +08:00
kangshuning 282c372c77 adjust ui 2021-10-20 17:36:14 +08:00
king 28793b319f Fix:bug #86143#85706#85134 2021-10-20 16:54:17 +08:00
kangshuning 3838b49dcd Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into 1015-build 
pull
 2021-10-19 20:11:11 +08:00
kangshuning f2b41b4f65 bug#85102 2021-10-19 20:11:00 +08:00
ren peijia ba40157b5f Merge branch 'kylin-nm-wlan' into 'dbus-interface' 
modify:1)delete invalide files.

See merge request kylin-desktop/kylin-nm!337
 2021-10-19 12:04:15 +00:00
renpeijia 29ac3765f3 fix:kylin can not send signal to control center, when connection state change 2021-10-19 19:52:05 +08:00
renpeijia 4c1c01861e fix:control can not start up, when kylin process control center. 2021-10-19 19:00:53 +08:00
kangshuning 6fa59f1766 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into 1015-build 
pull
 2021-10-19 18:47:44 +08:00
kangshuning 7eaaa47fe3 bug#85839 2021-10-19 18:46:13 +08:00
ren peijia b434f1b484 Merge branch 'up-dbus' into 'dbus-interface' 
add wpa3 connect support

See merge request kylin-desktop/kylin-nm!329
 2021-10-19 07:49:28 +00:00
renpeijia 80ed0ffdf1 fix:the control center is core, when get wilreless list 2021-10-19 15:09:35 +08:00
renpeijia 801b403973 modify:1)delete invalide files. 
2) update wlan item state failed.
           3) the ui show failed, when wireless device is empty.
 2021-10-19 14:56:50 +08:00
jzxc95 939d0001c2 fix ttls connect fail 2021-10-19 14:44:14 +08:00
jzxc95 7efdb2e797 fix error 2021-10-19 10:47:06 +08:00
jzxc95 417ca74a80 fix 2021-10-19 10:39:51 +08:00
jzxc95 76c50dba47 add ipv4 1~128 support && fix some bug 2021-10-19 10:35:18 +08:00
kangshuning 0b97de1752 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into 1015-build 
1019 pull
 2021-10-19 09:24:58 +08:00
kangshuning 3f9079cd95 lan switchbutton not enable without device 2021-10-19 09:16:44 +08:00
renpeijia ef51c826f5 Merge branch 'ukui-dbus-interface' into kylin-nm-wlan 2021-10-18 16:21:16 +08:00
jzxc95 150bbd4489 支持ipv4 0~32格式输入 2021-10-18 14:49:17 +08:00
zhaikangning 1ae555a179 add NET::SkipTaskbar|NET::SkipPager propoty to block display on taskbar 
添加跳过任务栏分页器属性以防止显示到任务栏视图任务
BugId:83202
 2021-10-18 11:47:55 +08:00
jzxc95 3343ed0446 add wpa3 connect 2021-10-18 10:55:55 +08:00
renpeijia d02b55db67 modify:Optimize code logic for wireless networks. 2021-10-18 10:36:08 +08:00
jzxc95 400999f1b1 modify setWirelessEnable && when property change reactive connection 2021-10-18 10:02:46 +08:00
jzxc95 2e09adefdb fix conflict && debian error 2021-10-15 20:29:12 +08:00
Zhai Kangning cd2d88e793 Merge branch 'dbus-interface' into 'dbus-interface' 
# Conflicts:
#   src/frontend/netdetails/netdetail.h
#   src/frontend/tab-pages/lanpage.cpp
 2021-10-15 11:41:34 +00:00
Zhai Kangning 10b337c349 Merge branch 'up-dbus' into 'dbus-interface' 
Up dbus

See merge request kylin-desktop/kylin-nm!322
 2021-10-15 11:22:01 +00:00
king ea1b89434a Fix 2021-10-15 17:48:44 +08:00
jzxc95 d834893eb1 add getApinfoBySsid 2021-10-15 15:18:55 +08:00
jzxc95 d84c97cbc7 漏传 2021-10-15 14:42:20 +08:00
jzxc95 e2d0c9ea30 src/backend/dbus-interface/kylinnetworkdeviceresource.cpp 2021-10-15 14:41:18 +08:00
kangshuning 600555fef6 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into 1012 
1015 pull
 2021-10-15 11:51:50 +08:00
kangshuning 957cad7653 bug#83296 2021-10-15 11:50:41 +08:00
jzxc95 9af122ceaf Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into up-dbus 2021-10-15 10:48:56 +08:00
jzxc95 6a0806dae0 out arg 2021-10-15 09:21:52 +08:00
king 10ae024e48 Merge remote-tracking branch 'refs/remotes/upstream/dbus-interface' into d-interface 2021-10-15 09:14:20 +08:00
ren peijia 24fa8f1fe9 Merge branch '1012' into 'dbus-interface' 
add delay

See merge request kylin-desktop/kylin-nm!320
 2021-10-15 01:10:00 +00:00
king 1705488d60 Fix:the wlanitem show bug 10-14 2021-10-14 20:53:14 +08:00
jzxc95 808613285c remove useless code 2021-10-14 20:33:09 +08:00
jzxc95 92efbe52c3 add device name when actvating or deactivating && lan list sort 2021-10-14 20:30:53 +08:00
kangshuning 7aa0c68525 update icon 2021-10-14 09:56:27 +08:00
fensite 1b1ac4a0b1 simplify translation methods； Ignore dependent details to prevent compilation errors 
简化翻译加载方式；忽略依赖的详情以防止编译报错
 2021-10-14 09:03:05 +08:00
king d2e035ed8a trayIcon and itemshow bug 2021-10-13 21:05:32 +08:00
kangshuning 26bf3bf216 bug#81259:delay 2021-10-13 13:54:57 +08:00
kangshuning 35cbd19864 update translation 2021-10-13 08:53:37 +08:00
ren peijia 23c6004659 Merge branch 'up-dbus' into 'dbus-interface' 
Up dbus

See merge request kylin-desktop/kylin-nm!310
 2021-10-12 12:49:13 +00:00
jzxc95 ac5ed03294 add scan dbus 2021-10-12 19:01:31 +08:00
jxj 0161531376 Fix:bug#84473 2021-10-12 17:30:58 +08:00
jzxc95 205bd5b3c5 解决控制面板调用属性页的问题和直接删除配置控制面板不断连问题 2021-10-11 15:24:42 +08:00
ren peijia 0e19d97a88 Merge branch '0930-new' into 'dbus-interface' 
Delete useless files.

See merge request kylin-desktop/kylin-nm!298
 2021-10-11 02:11:41 +00:00
Zhang Jiaping 9c9a65759d Merge branch 'dbus-interface' into '1008-new' 
# Conflicts:
#   src/frontend/list-items/wlanlistitem.cpp
 2021-10-11 01:44:08 +00:00
zhangjiaping d4fb9b05b6 resolv conflict. 2021-10-11 09:41:09 +08:00
ren peijia 88c313a801 Merge branch 'dbus-interface' into 'dbus-interface' 
bug#83877#83495#83487#83312 10-08

See merge request kylin-desktop/kylin-nm!303
 2021-10-11 01:25:16 +00:00
jinxujie 0b2d010bb8 bug#83877#83495#83487#83312 10-08 2021-10-08 21:01:15 +08:00
zhangjiaping bbae955f1c Fix:#83887 2021-10-08 14:32:03 +08:00
zhangjiaping 97b650dc0c Fix:#83636 2021-10-08 13:55:59 +08:00
renpeijia 9b313a2272 Merge branch 'ukui-dbus-interface' into kylin-nm-lan-switch 2021-10-08 13:52:40 +08:00
zhangjiaping c0d2a259c2 Fix:#83378 #84147 2021-10-08 11:38:58 +08:00
kangshuning 87f205b31b connection change to currentDevice 2021-10-08 11:17:49 +08:00
Zhang Jiaping 45f4817cfb Merge branch 'dbus-interface' into 'dbus-interface' 
Fix:wlanpage refresh and close wifiswitchbutton

See merge request kylin-desktop/kylin-nm!299
 2021-10-08 01:24:35 +00:00
Zhang Jiaping 333272daed Merge branch 'dbus-interface' into 'dbus-interface' 
Fix:#83335 #83336 #83709

See merge request kylin-desktop/kylin-nm!294
 2021-10-08 01:21:30 +00:00
Zhang Jiaping 1a7927e53d Merge branch '0929-new' into 'dbus-interface' 
bug#83002#83284

See merge request kylin-desktop/kylin-nm!293
 2021-10-08 01:07:28 +00:00
renpeijia 360ee2a96e fix:the lan area show error list, when change name of activate connection and disactivate the connection. 2021-09-30 19:32:03 +08:00
jinxujie e497f99c1b Fix:wlanpage refresh and close wifiswitchbutton 2021-09-30 17:23:37 +08:00
renpeijia 9e5a79fcf3 fix:1)it will crash,when it's name is changed. 
2)it will not change name, when it's name is cahnged.
 2021-09-30 14:48:42 +08:00
zhangjiaping b7c93803e1 Delete useless files. 2021-09-30 11:09:56 +08:00
renpeijia 112572cc4d modify: it can not show connection list, when add wired device. 2021-09-30 08:59:22 +08:00
ren peijia d6b43dfddd Merge branch 'up-dbus' into 'dbus-interface' 
Up dbus

See merge request kylin-desktop/kylin-nm!296
 2021-09-29 09:16:48 +00:00
jzxc95 b0e6c79906 格式修改 2021-09-29 16:56:57 +08:00
jzxc95 d3c0ac06a6 fixed:control center show detail page info wrong && add key-ring 2021-09-29 16:40:09 +08:00
zhangjiaping ea55b6735e Fix:#83335 #83336 #83709 2021-09-29 15:19:10 +08:00
kangshuning b883cb5896 bug#83002#83284 2021-09-29 15:13:47 +08:00
jzxc95 f483d7c5b2 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into up-dbus 2021-09-29 14:46:59 +08:00
jzxc95 2326bb2fab 限制新建名称最长32位 2021-09-29 14:46:48 +08:00
jinxujie bb1740e747 Fix Bug #83125#83143#81343 2021-09-29 14:21:56 +08:00
renpeijia 24d5a98ff9 modify: modify wired network switch logic 2021-09-29 13:43:35 +08:00
赵 世旭 97745e3e4f Merge branch 'dbus-interface' into 'up-dbus' 
# Conflicts:
#   src/frontend/tab-pages/lanpage.cpp
 2021-09-28 09:20:47 +00:00
jzxc95 4c371d749a hotpot should not reconnnect 2021-09-28 17:12:03 +08:00
zhangjiaping 0af291831c Feat:Add wifi sort. 2021-09-28 16:37:31 +08:00
jzxc95 61140448e2 fix:when get netdetail of active wifi show active apinfo not reference apinfo 2021-09-28 16:26:16 +08:00
jzxc95 b9c838b29d fix:deactive failed && add icon of netdetail 2021-09-28 15:36:14 +08:00
ksn ef365fa6bc wlan signalstrength 2021-09-28 13:31:13 +08:00
renpeijia ee8485915d Merge branch 'kylin-nm-new' into kylin-nm-lan-switch 2021-09-27 17:46:25 +08:00
renpeijia 2157b29004 modify: Optimize code structure and process logic 2021-09-27 17:10:35 +08:00
ksn 0d994d021c modify 2021-09-26 16:11:52 +08:00
jinxujie ef212b5090 Feat:Add wifi signal refreshing. 2021-09-26 13:58:38 +08:00
zhangjiaping 26a6c112ca Update app name. 2021-09-26 09:38:59 +08:00
Zhang Jiaping 9292060929 Merge branch 'dbus-interface' into '0922' 
# Conflicts:
#   src/frontend/tab-pages/lanpage.cpp
 2021-09-24 09:46:45 +00:00
ksn 6a9e90601e fix 2021-09-24 17:44:13 +08:00
Zhang Jiaping 0f45ed8ad6 Merge branch 'up-dbus' into 'dbus-interface' 
add  DesktopNotify

See merge request kylin-desktop/kylin-nm!280
 2021-09-24 09:32:39 +00:00
ksn 797fd98d7c add lanpage desktopnotify 2021-09-24 16:46:36 +08:00
zhangjiaping 7ab299477b Optimize code. 2021-09-24 16:10:41 +08:00
jzxc95 4d30f2e2a8 add DesktopNotify 2021-09-24 16:07:24 +08:00
zhangjiaping a25a87275c Feature:Add enterprise wlan connection. 2021-09-24 15:52:51 +08:00
ksn 41df272c7e modify 2021-09-24 13:44:01 +08:00
ksn 7c2ecb35ed fix 2021-09-24 11:39:32 +08:00
Zhang Jiaping 17e604db2a Merge branch 'kylin-nm-dbus-renpj' into 'dbus-interface' 
解决检查ip地址冲突的时候，需要root权限的问题

See merge request kylin-desktop/kylin-nm!272
 2021-09-24 03:36:00 +00:00
Zhang Jiaping a5ea09a489 Merge branch 'kylin-nm-lan-switch' into 'dbus-interface' 
fix:wired switch failed.

See merge request kylin-desktop/kylin-nm!276
 2021-09-24 03:35:54 +00:00
ksn b546365fee new pull0924 
Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into 0922
 2021-09-24 11:35:27 +08:00
ksn 07f672c2cc 避免网卡插拔时下拉框索引变化引起崩溃 2021-09-24 11:33:20 +08:00
renpeijia dfe4e23f34 fix: delete reduplicate code 2021-09-24 11:23:59 +08:00
赵 世旭 a8bd98679d Merge branch 'dbus-interface' into 'up-dbus' 
# Conflicts:
#   src/frontend/tab-pages/wlanpage.cpp
 2021-09-24 03:04:08 +00:00
renpeijia c6cb607a8c Merge branch 'kylin-nm-temp' into kylin-nm-lan-switch 2021-09-24 10:28:24 +08:00
Zhang Jiaping ad2d2b1e5b Merge branch 'dbus-interface' into '0922' 
# Conflicts:
#   src/frontend/tab-pages/lanpage.cpp
 2021-09-24 01:54:20 +00:00
Zhang Jiaping 36fef6beb3 Merge branch 'dbus-interface' into 'dbus-interface' 
wlanpage changed

See merge request kylin-desktop/kylin-nm!273
 2021-09-24 01:52:35 +00:00
jzxc95 fcdf87bb11 fix:每次连接或断开连接会多出新增或减少wifi的信号 2021-09-24 09:38:14 +08:00
jinxujie ad013540f4 0923-jxj-3 2021-09-23 20:19:01 +08:00
renpeijia f2d2f401a9 fix:wired switch failed. 
bug link:http://172.17.66.192/biz/bug-view-81530.html
             http://172.17.66.192/biz/bug-view-80919.html
 2021-09-23 20:10:17 +08:00
ksn 9a49f2bd3a 增加网线插拔 2021-09-23 18:41:41 +08:00
ren peijia 0b22f57104 Merge branch '0922' into 'dbus-interface' 
0922

See merge request kylin-desktop/kylin-nm!270
 2021-09-23 06:28:18 +00:00
jinxujie 0184986b92 0923-jxj-2 2021-09-23 14:23:43 +08:00
ksn 6306683d00 只检测连接name和path的改变 2021-09-23 11:17:31 +08:00
jinxujie 7f8b8ad266 0923-1-jxj 2021-09-23 10:31:01 +08:00
jinxujie 0c739884a6 wlanpage changed 2021-09-23 09:56:23 +08:00
renpeijia 3aa478e3e8 feature:it will get root permission through libcap, when check ip conflict. 2021-09-23 09:26:49 +08:00
jinxujie c20a9a94c6 1 2021-09-22 18:03:06 +08:00
ksn 0c517f952e show None when switch button closed 2021-09-22 16:31:02 +08:00