Commit Graph

1204 Commits

Author SHA1 Message Date
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
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 7126c47d80 增加无边框 2022-06-22 09:30:41 +08:00
zhangyuanyuan1 30d9871aa7 打开移动热点崩溃问题和无线开关初始化 2022-06-21 17:24:43 +08: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
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
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