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

1443 Commits

Author SHA1 Message Date
jzxc95 3f0ce2a0b7 fix build error 2022-10-21 14:19:10 +08:00
jzxc95 72ca367c65 fix build error 2022-10-21 13:39:45 +08:00
jzxc95 264bf84b97 fix bug 143364 2022-10-21 11:12:04 +08:00
chenxuechao 4b8ad410a9 vpn merge 2022-10-20 20:22:42 +08:00
chenxuechao 8dfbacd5f6 开发需求109637,前端网络增加VPN托盘 2022-10-20 19:25:33 +08:00
zhaoshixu 68150b4c36 fix segament fault 2022-10-19 13:45:49 +08:00
zhaoshixu fadba3608f fix segament fault 2022-10-19 13:34:22 +08:00
zhaoshixu 9f584959e6 fix bug 143364 2022-10-19 10:38:16 +08:00
zhaoshixu a6dad2d75e 同步3.22需求 2022-10-19 10:04:47 +08:00
赵世旭 3af4488c9a Merge branch 'plugin-zdev' into 'dbus-interface' 
Task #107168: 控制面板网络状态显示 网络连接/断开/删除入口功能优化

See merge request kylin-desktop/kylin-nm!707
 2022-10-18 04:00:08 +00:00
zhangyuanyuan1 8b5fb65f50 DNS不完全输入 双击可编辑问题 2022-10-18 11:46:55 +08:00
zhangyuanyuan1 927282c5aa 合并冲突 2022-10-17 14:41:09 +08:00
zhangyuanyuan1 91c99a6e82 新建有线网络 必填提示 2022-10-17 11:42:17 +08:00
zhangyuanyuan1 766f920bc8 多DNS界面优化 2022-10-14 17:40:20 +08:00
zhangyuanyuan1 9496fb36c5 网络防火墙配置弹居中窗 2022-10-13 11:09:27 +08:00
zhangyuanyuan1 cb3fbb5eac ui间距调整 2022-10-13 09:47:44 +08:00
赵世旭 2b4f676117 Merge branch '1010' into 'dbus-interface' 
fix bug 143023

See merge request kylin-desktop/kylin-nm!723
 2022-10-10 03:12:22 +00:00
jzxc95 ff5fba7afd fix bug 143023 2022-10-10 09:48:40 +08:00
zhangyuanyuan1 0c893731c6 QGSettingsa判空 设置托盘内圆角半径 2022-10-09 16:12:28 +08:00
kylin 0ead844ae7 bug 132105 set ktabbar tooltip 2022-10-01 16:46:27 +08:00
赵世旭 e076b8be07 Merge branch '0926' into 'dbus-interface' 
fix bug:140403

See merge request kylin-desktop/kylin-nm!717
 2022-09-28 01:50:48 +00:00
zhangyuanyuan1 58316bed59 属性安全页TLS安全类型有遮挡问题 2022-09-26 16:34:52 +08:00
zhangyuanyuan1 05ab23d156 Fix bug 141661 2022-09-26 15:34:20 +08:00
jzxc95 600060210d fix bug:125714 2022-09-26 14:04:43 +08:00
jzxc95 10dacdcccd fix bug:140403 2022-09-26 13:45:36 +08:00
chenxuechao 7d1d403fd4 修改关键字，解决编译不过的问题 2022-09-26 09:29:11 +08:00
赵世旭 2428c19b66 Merge branch 'y2209bug' into 'dbus-interface' 
Fix bug 141204 网络项间距

See merge request kylin-desktop/kylin-nm!715
 2022-09-22 10:03:18 +00:00
zhangyuanyuan1 fcd2ef420a Fix bug 141204 网络项间距 2022-09-22 18:00:07 +08:00
jzxc95 937a891ff0 合并冲突 2022-09-22 17:25:16 +08:00
jzxc95 4c56fe9bdf 合并冲突，修改有线开关问题 2022-09-22 17:09:45 +08:00
zhangyuanyuan1 a6940cc826 IPv拼写修正 2022-09-22 16:24:11 +08:00
陈学超 28fa451a39 Merge branch 'kylin-nm-0913' into 'dbus-interface' 
bug 122742 wifi安全类型改变

See merge request kylin-desktop/kylin-nm!708
 2022-09-22 01:36:38 +00:00
陈学超 b907594389 Merge branch 'z2209bug' into 'dbus-interface' 
rc6 走查bug 140440 140441 140442 140438

See merge request kylin-desktop/kylin-nm!711
 2022-09-22 01:36:10 +00:00
陈学超 7d9820e838 Merge branch 'networkmode' into 'dbus-interface' 
Fix bug 140550  140401

See merge request kylin-desktop/kylin-nm!709
 2022-09-22 01:35:55 +00:00
chenxuechao 592507830b 解决BUG 103843，【网络】切换主题，添加网络或者网络详情左上角的网络图标没有变化 2022-09-21 09:58:40 +08:00
zhangyuanyuan1 aa0d1e7cca Fix bug 140440 左右间距不一致问题 2022-09-19 17:33:57 +08:00
zhangyuanyuan1 8f58d70121 Fix bug 140438 网络设置按钮-将SDK控件改回自定义控件 2022-09-16 16:24:02 +08:00
zhangyuanyuan1 db293c59ee Fix bug 140442 离任务栏间距8px 2022-09-16 15:02:06 +08:00
zhangyuanyuan1 438ff50362 Fix bug 140441 详情页tabbar居中 2022-09-16 09:12:45 +08:00
zhangyuanyuan1 c3b7aad39d Fix bug 140401 2022-09-15 14:00:55 +08:00
zhangyuanyuan1 cda4a0f6b1 Fix bug 140550 2022-09-15 10:34:16 +08:00
zhangyuanyuan1 3ae5abacd7 增加安全类型的数据转换方 法 2022-09-15 10:15:37 +08:00
zhangyuanyuan1 cf088d463f wifi安全类型改变 2022-09-13 17:14:12 +08:00
zhangyuanyuan1 b542af10ee 有线deleteConnect dbus接口 2022-09-09 14:52:13 +08:00
zhangyuanyuan1 763e2a530d fix bug 132182 调整弹窗内边距 2022-09-07 10:38:49 +08:00
赵世旭 ce5e20537d Merge branch 'dbus-interface-fork' into 'dbus-interface' 
解决BUG 103974 【反馈回归】【无线网络】使用ip link set down dev wlan0关闭无线设备后，无线开关仍然是打开状态，无无线列表。顺带修改无线开关逻辑

See merge request kylin-desktop/kylin-nm!699
 2022-08-26 03:42:41 +00:00
赵世旭 fe7e40408c Merge branch 'xc-bug' into 'dbus-interface' 
Fixbug 134326 【reopen】【任务栏】【网络】网络项长度不一致

See merge request kylin-desktop/kylin-nm!695
 2022-08-26 02:23:56 +00:00
jzxc95 89df54b188 fix 2022-08-23 15:14:27 +08:00
jzxc95 acf263ccfc 有线开关逻辑修改 2022-08-23 13:42:29 +08:00
chenxuechao c0f3e3320f 解决BUG 126700 【WIFI】在网络高级设置中连接无线网络后，断开该无线网络，任务栏无线列表该无线网络仍然处于断开加载状态 2022-08-19 17:39:01 +08:00
jzxc95 469b7c2d8e fix bug131075 2022-08-18 17:10:40 +08:00
chenxuechao b148c6e23d 解决BUG 103974 【反馈回归】【无线网络】使用ip link set down dev wlan0关闭无线设备后，无线开关仍然是打开状态，无无线列表。顺带修改无线开关逻辑 2022-08-18 15:35:40 +08:00
zhangyuanyuan1 6c2f2113ae Fixbug 122742 2022-08-16 16:57:30 +08:00
zhangyuanyuan1 238b9bed7c 无线网络 连接按钮变蓝文字需反白 2022-08-15 20:49:45 +08:00
zhangyuanyuan1 921fc4eb88 Fixbug 134326 2022-08-15 20:16:00 +08:00
zhangyuanyuan1 4fef15a3fb 安全页布局错位问题 2022-08-10 09:28:31 +08:00
zhangyuanyuan1 c2ef891419 解决冲突 2022-08-09 17:19:28 +08:00
赵世旭 7cc01a08d1 Merge branch 'optimize-notification' into 'dbus-interface' 
fix bug 125058  126830 133072

See merge request kylin-desktop/kylin-nm!683
 2022-08-09 09:03:16 +00:00
赵世旭 48ef36759e Merge branch 'networkmode' into 'dbus-interface' 
Fixbug 131910 首次连接网络弹窗重复问题

See merge request kylin-desktop/kylin-nm!684
 2022-08-09 09:02:45 +00:00
zhangyuanyuan1 9b1d007ea0 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into optimize-notification 2022-08-09 15:12:51 +08:00
赵世旭 9f4c1a40f0 Merge branch 'ukuibug' into 'dbus-interface' 
Fixbug 132105最大字体显示

See merge request kylin-desktop/kylin-nm!690
 2022-08-09 07:09:55 +00:00
zhangyuanyuan1 ef9365b0b8 修改方法执行顺序 2022-08-08 14:49:36 +08:00
zhangyuanyuan1 f15bce742f Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into networkmode 2022-08-08 14:45:31 +08:00
zhangyuanyuan1 5e7ed05c9a bug 132182最大字体显示规范处理 2022-08-08 14:23:10 +08:00
zhangyuanyuan1 a54b049b91 Fixbug 132105最大字体显示 2022-08-08 11:36:10 +08:00
zhangyuanyuan1 f0b951022b Fixbug 133311 2022-08-05 15:21:44 +08:00
zhangyuanyuan1 1fab334ba5 删除重复代码 2022-08-05 09:13:41 +08:00
zhangyuanyuan1 8e58fd7a82 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into optimize-notification 2022-08-04 17:40:40 +08:00
zhangyuanyuan1 20e855fa8e fix bug 132350 与加入隐藏网络安全页ui调整 2022-08-04 16:15:27 +08:00
赵世旭 b37de39bf2 Merge branch 'modify-color' into 'dbus-interface' 
bug 102232 ukui3.1走查

See merge request kylin-desktop/kylin-nm!674
 2022-08-04 02:44:30 +00:00
jzxc95 77e99382c3 fix bug:131247 2022-08-03 16:16:26 +08:00
zhangyuanyuan1 1441db34f5 bug 132228 修改文本与标题栏间隔 文本字重 2022-08-03 11:08:13 +08:00
zhangyuanyuan1 1783bdb86a Fixbug 131910 首次连接网络弹窗重复问题 2022-08-03 11:05:33 +08:00
zhangyuanyuan1 bafaa206e2 fix bug 126830 手动修改IP冲突提示优化 2022-08-02 17:27:57 +08:00
zhangyuanyuan1 7e4e90d371 修改翻译文本 2022-07-29 17:32:36 +08:00
张圆圆 2efac2110e Update src/frontend/mainwindow.cpp 2022-07-28 03:37:03 +00:00
zhangyuanyuan1 a1928f2343 WiFi连接受限时托盘显示无线图标 2022-07-27 15:41:58 +08:00
zhangyuanyuan1 1cfad63190 网络项三态 2022-07-26 11:44:19 +08:00
zhangyuanyuan1 dd72c3c9f2 fix bug 125703 2022-07-26 10:48:32 +08:00
zhangyuanyuan1 24a93b77ca 密码输入后连接按钮状态变化 2022-07-25 17:15:12 +08:00
chenxuechao 5b9437d035 恢复被覆盖的PR，解决网络代码编译不过的BUG 2022-07-25 11:23:49 +08:00
chenxuechao 87bea8b87a Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into dbus-interface-local 2022-07-22 17:57:22 +08:00
zhangyuanyuan1 c45ddd0ecb 接口调用判断 2022-07-22 16:32:24 +08:00
zhangyuanyuan1 1dffddcd3b 优化代码方法调用 2022-07-22 16:13:19 +08:00
zhangyuanyuan1 011c09a7f4 网络模式ui和方法 2022-07-22 16:11:04 +08:00
zhangyuanyuan1 786d3dbd1f global function 2022-07-22 13:52:31 +08:00
chenxuechao 4904c35580 解决开启移动热点时连接状态变化，弹出安全管控页面的BUG 2022-07-22 13:48:32 +08:00
zhangyuanyuan1 bafd51c0d5 静态方法调用 2022-07-22 11:00:29 +08:00
zhangyuanyuan1 dd9336b900 网络模式需求 2022-07-22 09:17:44 +08:00
陈学超 8684f425a3 Merge branch 'optimize-notification' into 'dbus-interface' 
fix bug 128339 127890

See merge request kylin-desktop/kylin-nm!665
 2022-07-21 12:41:03 +00:00
陈学超 ec60d278b2 Merge branch 'dbus-interface' into 'find-joinWiFi' 
# Conflicts:
#   src/frontend/mainwindow.h
 2022-07-21 12:40:08 +00:00
翟康宁 051cce7606 Update wlanpage.cpp 2022-07-21 11:21:46 +00:00
jzxc95 ec09da5530 修改代码编译报错问题 2022-07-19 14:26:10 +08:00
jzxc95 59d1b934fe fix bug #128339 #127890 2022-07-18 11:04:06 +08:00
zhangyuanyuan1 91d3c58c83 fix bug 128339 WiFi连接过程忘记密码后密码仍保留问题 2022-07-18 09:24:53 +08:00
赵世旭 6bcbaef4fb Merge branch '0705' into 'dbus-interface' 
0705

See merge request kylin-desktop/kylin-nm!664
 2022-07-15 05:48:47 +00:00
赵世旭 675ac0c5e3 Merge branch 'dbus-interface-fork' into 'dbus-interface' 
解决部分热点管控、无线网络BUG，热点管控代码增加宏开关

See merge request kylin-desktop/kylin-nm!663
 2022-07-15 05:48:41 +00:00
赵世旭 b0f98e637c Merge branch 'optimize-notification' into 'dbus-interface' 
fix bug 126739网络连接与断开提示优化

See merge request kylin-desktop/kylin-nm!658
 2022-07-15 05:47:27 +00:00
赵世旭 cb866cb372 Merge branch 'fit-theme-zx' into 'dbus-interface' 
fix bug127306 托盘按钮适配主题强调色

See merge request kylin-desktop/kylin-nm!657
 2022-07-15 05:46:25 +00:00
jzxc95 0b53b58d93 remove useless log 2022-07-15 11:09:05 +08:00
jzxc95 3fbfb6c7c9 sdk替换common包 2022-07-15 11:07:30 +08:00
chenxuechao fe36d99816 解决BUG 129623， 【网络连接】控制面板开启关闭无线网络开关，任务栏无线网络开关按钮显示置灰，且按钮功能异常 2022-07-14 20:30:06 +08:00
chenxuechao 0c3648d649 解决bug 121329， 【多网卡】多网卡开关打开关闭网络列表显示错误 2022-07-13 15:23:04 +08:00
jzxc95 8390e68724 fixlabel 2022-07-12 10:43:15 +08:00
zhangyuanyuan1 57606fbee4 fix bug 126739网络连接与断开提示优化 2022-07-08 09:21:10 +08:00
zhangyuanyuan1 76190c5ec7 托盘info按钮适配主题 2022-07-07 15:22:23 +08:00
zhangyuanyuan1 c30b0f9bbf 仅弹出一个加入WiFi界面 2022-07-07 09:58:52 +08:00
zhangyuanyuan1 04c008168b 补充开源协议 2022-07-07 09:10:18 +08:00
zhangyuanyuan1 d90154a93f 调整窗口滚动区域大小 2022-07-06 17:33:54 +08:00
zhangyuanyuan1 0354bf7d74 新增查找并加入WiFi页面-同步调整安全页ui 2022-07-06 16:36:50 +08:00
赵世旭 955a38b759 Merge branch '0629' into 'dbus-interface' 
fixlabel

See merge request kylin-desktop/kylin-nm!648
 2022-07-05 06:40:38 +00:00
赵世旭 7b1c78a22a Merge branch 'plugin-ui' into 'dbus-interface' 
删除无效日志代码

See merge request kylin-desktop/kylin-nm!650
 2022-07-05 06:40:32 +00:00
Yuanyuan Zhang 484e576ee8 删除无效日志代码 2022-07-05 06:40:32 +00:00
chenxuechao 248a055059 添加所有文件版权信息 2022-07-05 10:13:48 +08:00
jzxc95 98b5fffd04 fixlabel 2022-07-04 15:00:40 +08:00
chenxuechao fe9d7143a2 需求94645 前端界面支持热点管控 2022-07-04 14:06:06 +08:00
chenxuechao be767ce4fa 需求94645 前端界面支持热点管控 2022-07-04 13:45:35 +08:00
赵世旭 1fd5d96768 Merge branch 'dbusInter-bugfix' into 'dbus-interface' 
修改ipv4page/ipv6page手动输入提示的判断逻辑

See merge request kylin-desktop/kylin-nm!645
 2022-07-01 07:05:06 +00:00
zhangyuanyuan1 a1b138abbd 移动热点密码输入ui调整 2022-06-30 15:17:07 +08:00
zhangyuanyuan1 da56905e48 修改ipv4page/ipv6page手动输入提示判断逻辑 2022-06-30 13:42:32 +08:00
赵世旭 42a644109d Merge branch 'dbusInter-bugfix' into 'dbus-interface' 
Fix bug114765 modified ui - detailpage/ipv4/ipv6

See merge request kylin-desktop/kylin-nm!641
 2022-06-29 08:07:03 +00:00
zhangyuanyuan1 cea0579f43 删除调试debug信息 2022-06-28 14:49:52 +08:00
zhangyuanyuan1 09d56a4d46 无线开关状态 2022-06-28 13:58:04 +08:00
zhangyuanyuan1 d4cdaf772b tabpage圆角 2022-06-27 16:36:43 +08:00
zhangyuanyuan1 a4c9124ab8 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into dbusInter-bugfix 2022-06-27 15:13:23 +08:00
zhangyuanyuan1 7f9b8a796e modified ipv4 and ipv6 ui 2022-06-27 15:13:01 +08:00
zhangyuanyuan1 571f91a479 modified detailpage ui 2022-06-24 11:42:23 +08:00
赵世旭 b02c53439f Merge branch 'dbusInter-bugfix' into 'dbus-interface' 
Fix mobilehotspot segmentation fault and init wlanSwitchEnable status

See merge request kylin-desktop/kylin-nm!634
 2022-06-23 11:39:05 +00:00
jzxc95 0cae47b1ae init wlanSwitchEnable status 2022-06-22 09:43:36 +08:00
jzxc95 7126c47d80 增加无边框 2022-06-22 09:30:41 +08:00
zhangyuanyuan1 30d9871aa7 打开移动热点崩溃问题和无线开关初始化 2022-06-21 17:24:43 +08:00
jzxc95 d0f0fb709e set window frameless 2022-06-20 16:01:43 +08:00
zhaoshixu c28dc17deb !1 update 3.20 code && wayland 2022-06-17 10:48:59 +00:00
赵世旭 050b18ec58 Merge branch 'wayland-0615' into 'dbus-interface' 
Wayland 0615

See merge request kylin-desktop/kylin-nm!631
 2022-06-17 02:58:37 +00:00
jzxc95 f2dadaaf7a wayland适配 2022-06-16 19:18:36 +08:00
chenxuechao 646869b188 解决BUG 124417 【输入法】【PC/TM】连接无线网界面无法使用软键盘 2022-06-16 14:30:18 +08:00
KevinDuan 18de6e50c7 update 2022-06-14 15:33:48 +08:00
KevinDuan ccf4662486 fix build errors 2022-06-14 14:37:49 +08:00
KevinDuan dab6995a77 fix build depend 2022-06-14 13:56:54 +08:00
jzxc95 8a47757695 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into 3.20 2022-06-14 09:51:17 +08:00
jzxc95 8c4bdd2de4 wayland适配 2022-06-14 09:51:14 +08:00
zhangyuanyuan1 552820bd6e plugin无线新增加入其它网络功能 2022-06-10 17:11:14 +08:00
zhangyuanyuan1 70e0060642 删除无用qDebug 2022-06-08 11:12:14 +08:00
zhangyuanyuan1 cd285171fd Fix bug123287 2022-06-08 10:47:36 +08:00
谢炜 9e51c5bb15 Import Upstream version 3.14.0.0+0512 2022-06-02 16:27:45 +08:00
zhangyuanyuan1 f351c0fe8e 按设计稿修改有线无线图标为16*16 2022-06-02 11:01:30 +08:00
赵世旭 efb08d43c8 Merge branch 'zdbus-ui-bysdk' into 'dbus-interface' 
将目前实现的ui替换为sdk

See merge request kylin-desktop/kylin-nm!595
 2022-05-30 01:20:40 +00:00
chenxuechao 18c929e8dc 按要求删除多余注释， 并在使用容器前加入长度判断 2022-05-26 14:42:09 +08:00
chenxuechao 313fb91960 系统支持wifi6信号连接与区分，效仿panguw分支代码 2022-05-24 14:51:22 +08:00
zhangyuanyuan1 1c83d0aea3 删除已替换组件相关代码 2022-05-19 15:39:04 +08:00
zhangyuanyuan1 2d7da10991 securitypage/wlistitem密码输入框替换为SDK KPasswordEdit 2022-05-19 14:58:15 +08:00
zhangyuanyuan1 5c8ec0e200 tabpage网络设置按钮 替换为SDK KBorderlessButton 2022-05-18 16:19:47 +08:00
zhangyuanyuan1 7ee7420473 SDK替换switchbutton 2022-05-18 14:01:51 +08:00
zhangyuanyuan1 01ed3caba8 netdetail顶部按钮 替换为SDK KTabBar 2022-05-17 10:16:16 +08:00
zhangyuanyuan1 3fff640a41 修复WiFi界面名称字体显示不清晰 2022-05-16 15:39:12 +08:00
jzxc95 594c3fbf79 fix 2022-05-13 17:22:27 +08:00
jzxc95 9dfa1a24d1 声音效果适配 2022-05-13 10:44:45 +08:00
jzxc95 e4f19eab47 fix 2022-05-09 16:08:46 +08:00
jzxc95 3e17251057 三权分立开启式隐藏控制面板入口 2022-05-09 15:26:07 +08:00
zhangyuanyuan1 0d54752926 将KBallonTip初始化 2022-05-06 10:16:31 +08:00
zhangyuanyuan1 dc84210007 resolve conflict 2022-04-24 17:32:13 +08:00
赵 世旭 0eef6207e6 Merge branch '3.1-mavis' into 'dbus-interface' 
3.1 mavis

See merge request kylin-desktop/kylin-nm!573
 2022-04-18 06:59:38 +00:00
jzxc95 404e845fdd 平台适配 2022-04-18 09:41:22 +08:00
zhangyuanyuan1 ecd40aac9c Fixed Bug#113996 连接WIFI后手动配置IPV6地址网络设置详情页地址不变 2022-04-13 11:37:46 +08:00
zhangyuanyuan1 707b85ae80 修改内存泄露与命名 2022-04-12 15:49:44 +08:00
zhangyuanyuan1 e9fc2282f7 tip微调 2022-04-12 10:10:54 +08:00
zhangyuanyuan1 ec28ea765c 调整tip宽度 2022-04-11 17:31:18 +08:00
zhangyuanyuan1 c68ea5e31a 优化-在detailpage实现复制按钮 2022-04-11 16:51:33 +08:00
zhangyuanyuan1 31fb0e285a 优化类 2022-04-11 11:43:13 +08:00
jzxc95 05b20fa288 mavis适配 2022-04-11 10:06:16 +08:00
zhangyuanyuan1 71c3ff164c 修改变量 2022-04-08 17:52:46 +08:00
zhangyuanyuan1 57d9a14eb6 copyfinish 2022-04-08 16:21:24 +08:00
zhangyuanyuan1 5b19e942bb sdk-tooltips-UI 2022-04-08 15:10:21 +08:00
zhangyuanyuan1 ae64cbf5d7 sdkUI 2022-04-07 17:19:25 +08:00
zhangyuanyuan1 b297c28528 notheme 2022-04-06 16:21:16 +08:00
li 1d2c6020ac change code 2022-03-29 14:18:27 +08:00
赵 世旭 2d25456149 Merge branch '0316-log' into 'dbus-interface' 
使用统一日志库输出

See merge request kylin-desktop/kylin-nm!562
 2022-03-17 01:12:03 +00:00
jzxc95 c921548fcf 使用统一日志库输出 2022-03-16 14:33:18 +08:00
jzxc95 1b2ac8dae1 优化特殊情况 2022-03-16 11:42:28 +08:00
jzxc95 12a1ee1609 托盘图标交互 2022-03-15 14:42:50 +08:00
jzxc95 76cec152c9 优化代码 2022-03-15 14:35:44 +08:00
jzxc95 98e0ef5000 解决状态变化顺序异常导致的托盘图标加载状态停止 2022-03-15 14:29:06 +08:00
赵 世旭 cd931b2957 Merge branch '0117-dhcp' into 'dbus-interface' 
when set auto, clear iip info

See merge request kylin-desktop/kylin-nm!525
 2022-03-15 03:46:35 +00:00
赵 世旭 222a46d455 Merge branch '0117-main' into 'dbus-interface' 
fix bug 101649

See merge request kylin-desktop/kylin-nm!524
 2022-03-15 03:46:26 +00:00
jzxc95 ba4114e2bb 日志增加日期 2022-03-15 11:28:02 +08:00
jzxc95 33407f5a3a fix bug:103784 2022-03-15 11:16:55 +08:00
jzxc95 f39ee81f18 图标 2022-03-03 15:18:00 +08:00
jzxc95 0471f33b10 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into 0117-main 2022-03-03 14:33:53 +08:00
jzxc95 1c874506a3 列表异常+中文显示问题 2022-03-03 14:31:35 +08:00
jzxc95 15a22b06fa 中文转码还是有问题 2022-02-28 17:34:45 +08:00
jzxc95 2165176ad3 回退 2022-02-25 15:18:41 +08:00
jzxc95 ebb48e4a72 fix bug:107815 2022-02-25 14:25:02 +08:00
jzxc95 4722a53846 涉及NetworkManger服务重启导致的崩溃修复 2022-02-24 14:20:30 +08:00
renpeijia a13eb45f3a fix:WiFi's Chinese name shows garbled,and can not connect. 
bug link:https://172.17.50.104/biz/bug-view-104237.html
            https://172.17.50.104/biz/bug-view-104240.html
            https://172.17.50.104/biz/bug-view-104278.html
            https://172.17.50.104/biz/bug-view-104283.html
 2022-01-25 10:13:42 +08:00
jzxc95 dee5ed9168 连接时不指定ap 2022-01-24 15:21:28 +08:00
jzxc95 df9002cc5c type check 2022-01-24 14:55:22 +08:00
jzxc95 c1a30cc5f7 fix 103445 2022-01-24 11:09:28 +08:00
jzxc95 18a11bf491 fix bug 103784 2022-01-19 15:24:20 +08:00
jzxc95 954b1f484e when set auto, clear iip info 2022-01-17 15:53:04 +08:00
jzxc95 8fb0b84c52 fix bug 101649 2022-01-17 14:29:24 +08:00
kangshuning 452e6da8de bug#100825 2022-01-05 16:32:55 +08:00
kangshuning 6cc2e731eb 格式修改 2021-12-30 10:04:47 +08:00
kangshuning 5c65f62860 use define 2021-12-30 09:34:35 +08:00
kangshuning ca88d224dd 去除tabbar分割线 2021-12-29 16:48:43 +08:00
kangshuning 3ccad670cf 开关按钮三态&&bug#100740 2021-12-29 16:09:49 +08:00
赵 世旭 e4622eb543 Merge branch '1224-main' into 'dbus-interface' 
企业wifi界面适配主题

See merge request kylin-desktop/kylin-nm!504
 2021-12-28 09:16:25 +00:00
赵 世旭 4a3095458a Merge branch '1209' into 'dbus-interface' 
bug#100020图标底色

See merge request kylin-desktop/kylin-nm!508
 2021-12-28 09:04:22 +00:00
kangshuning 09bc4931d9 update() 2021-12-28 16:56:27 +08:00
ren peijia f7a54f71eb Merge branch '1228-main' into 'dbus-interface' 
1228 main

See merge request kylin-desktop/kylin-nm!507
 2021-12-28 08:47:56 +00:00
kangshuning af270b5aff remove useless 2021-12-28 15:35:13 +08:00
kangshuning fb882eedd5 bug#100020图标底色 2021-12-28 15:24:44 +08:00
赵 世旭 4cfc5f6b33 Merge branch '1209' into 'dbus-interface' 
分割线颜色&bug#99710密码显示按钮不清晰

See merge request kylin-desktop/kylin-nm!505
 2021-12-28 07:14:55 +00:00
jzxc95 eba9592504 混色 2021-12-28 15:02:54 +08:00
jzxc95 08b2854547 颜色修改 2021-12-28 14:24:47 +08:00
jzxc95 1e1044908c 网络设置三态 2021-12-28 10:01:09 +08:00
kangshuning 028859d5e2 分割线颜色&bug#99710 2021-12-27 17:55:11 +08:00
Jinxujie c456aa4e0f Bug#99942去掉连接企业wifi密码框眼睛图案边框 2021-12-27 14:49:56 +08:00
jzxc95 0d96fbf5f0 企业wifi界面适配主题 2021-12-24 10:18:13 +08:00
kangshuning 024c27875c 适配浅色主题 2021-12-22 15:24:20 +08:00
kangshuning d869664426 标题颜色随主题变化 2021-12-21 11:09:35 +08:00
kangshuning 9108664ee8 remove disabled 2021-12-21 09:47:35 +08:00
kangshuning 571bdf085a bug#98908字体颜色 2021-12-21 09:37:06 +08:00
赵 世旭 f53573124f Merge branch 'jxj-01' into 'dbus-interface' 
Bug#97419 详情页修改ip回车pushbutton出现黑框

See merge request kylin-desktop/kylin-nm!493
 2021-12-20 07:37:44 +00:00
Jinxujie e4da028226 Bug#97419 详情页修改ip回车pushbutton出现黑框 2021-12-20 14:36:57 +08:00
赵 世旭 434da3d11c Merge branch '1209' into 'dbus-interface' 
bug#97962布局问题 切主题显示更新

See merge request kylin-desktop/kylin-nm!490
 2021-12-20 06:31:47 +00:00
Jinxujie 4c8504df85 Bug#97419 详情页修改ip回车pushbutton出现黑框 2021-12-20 09:24:15 +08:00
kangshuning ab17cbad74 fix 2021-12-17 17:19:11 +08:00
kangshuning 31dcfd9808 bug#97962布局问题 切主题显示更新 2021-12-17 17:16:11 +08:00
赵 世旭 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
赵 世旭 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 2c9ac22657 lineedit 右键菜单适配亮主题 2021-12-16 15:04:46 +08:00
kangshuning 6973961dbd remove fixheight 2021-12-16 12:01:55 +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
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