Commit Graph

1446 Commits

Author SHA1 Message Date
赵 世旭 8227f7c317 Merge branch 'jxj-1' into 'dbus-interface'
Bug#97818企业wifi界面有两行关闭按钮

See merge request kylin-desktop/kylin-nm!487
2021-12-17 06:47:27 +00:00
赵 世旭 c479ea479e Merge branch '1216-main' into 'dbus-interface'
lineedit 右键菜单适配亮主题

See merge request kylin-desktop/kylin-nm!486
2021-12-17 05:38:08 +00:00
赵 世旭 96dcf631b8 Merge branch '1214-main' into 'dbus-interface'
use theme icon

See merge request kylin-desktop/kylin-nm!476
2021-12-17 02:49:59 +00:00
赵 世旭 289b3c7a2d Merge branch 'kylin-nm-core' into 'dbus-interface'
切换有线和无线的标签,鼠标悬浮于详情页按钮,kylin-nm崩溃的问题

See merge request kylin-desktop/kylin-nm!480
2021-12-17 02:49:48 +00:00
赵 世旭 7a025cba16 Merge branch '1209' into 'dbus-interface'
bug#97721去掉qss bug#97315label加tooltip

See merge request kylin-desktop/kylin-nm!482
2021-12-17 02:49:40 +00:00
Jinxujie c3a0610b41 Bug#97818企业wifi有两行关闭按钮 2021-12-17 10:11:48 +08:00
jzxc95 1b3ff3675b 依赖版本 2021-12-16 15:51:02 +08:00
赵 世旭 b3482dc05e Merge branch '1215-main' into 'dbus-interface'
keyring开关接口

See merge request kylin-desktop/kylin-nm!484
2021-12-16 07:40:50 +00:00
jzxc95 26af2a46b6 使用控制面板的switchbutton 2021-12-16 15:39:31 +08:00
jzxc95 2c9ac22657 lineedit 右键菜单适配亮主题 2021-12-16 15:04:46 +08:00
kangshuning 6973961dbd remove fixheight 2021-12-16 12:01:55 +08:00
赵 世旭 b4b36d8bfd Merge branch '1216-main' into 'dbus-interface'
双击事件仍会触发mousepressevent???

See merge request kylin-desktop/kylin-nm!483
2021-12-16 03:47:28 +00:00
jzxc95 69c18e523e icon size change to 16,16 2021-12-16 11:45:42 +08:00
jzxc95 956ccec3ab 双击事件仍会触发mousepressevent??? 2021-12-16 10:59:13 +08:00
kangshuning 5166319590 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into 1209 2021-12-16 10:34:30 +08:00
ren peijia 96f812411d Merge branch 'jxj-1' into 'dbus-interface'
bug#96163详情页密码框禁止汉字

See merge request kylin-desktop/kylin-nm!481
2021-12-16 02:28:07 +00:00
ren peijia 8a0e466901 Merge branch '1209' into 'dbus-interface'
bug#96758 Esc关闭窗口 #97277翻译

See merge request kylin-desktop/kylin-nm!475
2021-12-16 02:27:35 +00:00
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
赵 世旭 b8b3d7b7a5 Merge branch '1213-main' into 'dbus-interface'
亮调色板更新为3.1

See merge request kylin-desktop/kylin-nm!472
2021-12-13 08:01:35 +00: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
ren peijia 368720d4c6 Merge branch '1210' into 'dbus-interface'
bug#90711 devicecomboBox color

See merge request kylin-desktop/kylin-nm!468
2021-12-10 09:15:45 +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