Commit Graph

727 Commits

Author SHA1 Message Date
jzxc95 6d7e721972 dbus - active && deactive 2021-09-14 10:40:38 +08:00
ksn d30ce7b3dd 有线开关及网卡插拔 2021-09-14 10:17:37 +08:00
jzxc95 325f9dd634 netdetail connect method 2021-09-13 15:56:15 +08:00
ren peijia 89c7b4f524 Merge branch 'kylin-nm-dbus-renpj' into 'dbus-interface'
修改代码中的一些错误地方

See merge request kylin-desktop/kylin-nm!244
2021-09-13 05:33:37 +00:00
jzxc95 a70d86ebb0 merge upstream 2021-09-13 09:45:42 +08:00
jzxc95 80ba5945fe netdetail page 2021-09-13 09:26:53 +08:00
zhangjiaping 4a72ace8aa Resolve conflicts. 2021-09-10 18:14:34 +08:00
Zhang Jiaping e3ed056f6e Merge branch 'dbus-interface' into '0908'
# Conflicts:
#   src/backend/dbus-interface/kylinnetworkresourcemanager.cpp
#   src/frontend/tools/radioitembutton.cpp
2021-09-10 10:08:10 +00:00
jinxujie 4186076f61 Update wlan page. 2021-09-10 18:05:08 +08:00
ksn 9d64f11b8c 有线界面多网卡显示 2021-09-10 15:49:14 +08:00
renpeijia 25fdf0b516 fix:modify some coding errors. 2021-09-10 14:36:37 +08:00
Zhang Jiaping ab23eb4183 Merge branch '0908-new' into 'dbus-interface'
Feature: Scan WiFi list periodically.

See merge request kylin-desktop/kylin-nm!240
2021-09-10 06:27:09 +00:00
zhouxiali 790753f99f fix:解决连接不能连接的网络时,有时不能发出lisupdate的信号 2021-09-09 15:22:03 +08:00
zhangjiaping 8412fea1db Feature:Add wireless card selection. 2021-09-09 14:52:11 +08:00
zhangjiaping ff1d61317b Feature: Scan WiFi list periodically. 2021-09-08 16:38:07 +08:00
zhangjiaping bfd337d4a6 Feature:Add device comboBox. 2021-09-08 09:46:19 +08:00
Zhang Jiaping 568eb6f60f Merge branch 'up-dbus' into 'dbus-interface'
add dbus interface

See merge request kylin-desktop/kylin-nm!220
2021-09-07 01:12:36 +00:00
ren peijia e278f6b568 Merge branch '0903' into 'dbus-interface'
网络详情页部分功能

See merge request kylin-desktop/kylin-nm!230
2021-09-06 06:06:03 +00:00
zhouxiali 597a2111a5 格式修改 2021-09-06 14:01:07 +08:00
zhouxiali efc853119a 格式修改 2021-09-06 13:51:54 +08:00
zhouxiali 344d87be08 网络详情页部分功能 2021-09-03 17:49:47 +08:00
jzxc95 ddea801445 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into up-dbus 2021-09-03 17:40:27 +08:00
jzxc95 d1d8c7781e delay connect hotspot 2021-09-03 15:48:19 +08:00
jzxc95 52576c13dd 去除魔鬼数字 2021-09-03 11:52:24 +08:00
jzxc95 4d2eda8529 modify hotspot 2021-09-03 11:47:11 +08:00
Zhang Jiaping 07f2d467c0 Merge branch 'dbus-interface' into '0902'
# Conflicts:
#   src/frontend/tools/radioitembutton.cpp
2021-09-03 01:59:36 +00:00
ksn 4ab98f7cda 界面布局调整 2021-09-02 19:30:08 +08:00
jzxc95 2f8f8a9e4a Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into up-dbus 2021-09-02 15:41:18 +08:00
jzxc95 b0e51ef5af wifi channel 2021-09-02 12:14:56 +08:00
jzxc95 e9d917c90d get hotpot info 2021-09-02 12:11:28 +08:00
jzxc95 6b972e007d hotpot connect && disconnect signal 2021-09-01 17:59:50 +08:00
zhangjiaping 84683f59ae Adjust UI according to blueprint. 2021-09-01 17:46:43 +08:00
jzxc95 22bf3af64b add dbus interface 2021-09-01 15:54:00 +08:00
zhangjiaping 16643e8d2a Optimize code. 2021-09-01 14:51:02 +08:00
Zhang Jiaping aa15b6d7c7 Update radioitembutton.cpp 2021-09-01 06:47:12 +00:00
jinxujie f919fd6d00 Add radioitembutton feature 2021-08-31 11:16:02 +08:00
Kang Shuning 619e370a54 Merge branch '0827-new' into 'dbus-interface'
Feature:Add wlan switch function.

See merge request kylin-desktop/kylin-nm!200
2021-08-30 02:23:16 +00:00
ksn d8de4ffb01 解决获取无线列表时,数组越界问题 2021-08-27 17:23:38 +08:00
zhangjiaping 8b27a51583 Feature:Add wlan switch function. 2021-08-27 15:48:07 +08:00
zhouxiali d3cf1a49a1 无线按钮触发事件 2021-08-27 15:39:12 +08:00
ksn 9e196acd99 修改冲突文件 2021-08-27 15:15:49 +08:00
ksn db93d2c498 格式修改 2021-08-27 14:54:28 +08:00
jinxujie d98122b677 Optimize code. 2021-08-27 11:39:36 +08:00
jinxujie e54c6465cc Feature: Function of connecting/disconnecting wlan. 2021-08-27 10:54:37 +08:00
jzxc95 7786c3cab3 merge 2021-08-26 14:43:27 +08:00
jzxc95 a700ca7ee5 网线插拔对默认网卡的设置 2021-08-26 14:19:18 +08:00
zhouxiali 5a565f5705 后端代码同步更新 2021-08-26 13:47:48 +08:00
jzxc95 fefc33372d update default device && add getssid method 2021-08-26 12:16:38 +08:00
ksn 8ad37e4a43 feature: 支持有线连接连接、断开、新增、删除功能 2021-08-26 11:26:41 +08:00
ren peijia d372242deb Merge branch 'new-dbus' into 'dbus-interface'
fix segmentation fault

See merge request kylin-desktop/kylin-nm!192
2021-08-26 02:58:06 +00:00
Zhang Jiaping 7785665d67 Merge branch 'dbus-interface' into '0825-jxj'
# Conflicts:
#   src/frontend/tab-pages/wlanpage.cpp
#   src/frontend/tab-pages/wlanpage.h
2021-08-26 02:53:05 +00:00
jzxc95 80a0f29235 fix segmentation fault 2021-08-26 10:37:18 +08:00
jzxc95 acfc47b604 fix when ap remove segament fault & can not remove a item 2021-08-25 17:35:57 +08:00
jzxc95 efa79349c8 xml file modify 2021-08-25 17:07:34 +08:00
jinxujie 3f3d839857 Feat:Get wlan device. 2021-08-25 17:02:48 +08:00
jzxc95 eb00cb444e gsetting file 2021-08-25 16:19:15 +08:00
jzxc95 e46719ec30 default device select 2021-08-25 15:46:10 +08:00
jinxujie 366ca11334 Feature: Add inactivce wlan item & watch activated wlan changed. 2021-08-25 14:33:36 +08:00
jzxc95 27c12dec74 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into new-dbus 2021-08-25 13:42:46 +08:00
jzxc95 15cb85b512 add signal 2021-08-25 13:41:50 +08:00
zhangjiaping fc45183146 Optimize code. 2021-08-25 13:34:49 +08:00
zhangjiaping 6f523698e5 Feature: Add activated wlan item. 2021-08-25 09:03:21 +08:00
zhangjiaping 1f14ffb8c5 Feature:Add wlan page items. 2021-08-23 21:00:55 +08:00
jzxc95 25c3793118 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into new-dbus 2021-08-23 20:06:42 +08:00
jzxc95 5329b7ec69 add wifi list sort && dbus interface 2021-08-23 20:04:46 +08:00
zhangjiaping 69c6b1144e Feature: Abstract class - TabPage. 2021-08-23 10:01:24 +08:00
ren peijia 0ec4d431ac Merge branch 'kylin-nm-dbus-renpj' into 'dbus-interface'
添加Ipv地址冲突检测的功能,以及修改获取网络设备的函数接口

See merge request kylin-desktop/kylin-nm!178
2021-08-20 09:02:24 +00:00
renpeijia bcad10d46f feature:add ipv6 conflict check function 2021-08-20 14:09:23 +08:00
ren peijia 1e22ae3a42 Merge branch 'new-dbus' into 'dbus-interface'
modify connection property

See merge request kylin-desktop/kylin-nm!175
2021-08-20 06:06:11 +00:00
zhangjiaping c473e3b9ed Feat: Add some interfaces for list item. 2021-08-20 10:35:43 +08:00
jzxc95 c3b54fafaf add connectionUpdate signal && getWirelessActiveConnection 2021-08-20 10:12:10 +08:00
renpeijia c2a1efa633 modify:change parameters of network device function. 2021-08-19 14:58:25 +08:00
renpeijia 2ca22019a8 feature: add ipv4 conflict check function 2021-08-19 14:57:28 +08:00
jzxc95 c8fb25edee modify connection property 2021-08-19 10:21:34 +08:00
ren peijia bf15d59efd Merge branch 'kylin-nm-dbus-renpj' into 'dbus-interface'
添加创建wifi  ap的功能

See merge request kylin-desktop/kylin-nm!167
2021-08-17 07:37:41 +00:00
zhangjiaping c299e43cda Optimize code. 2021-08-17 15:04:51 +08:00
zhangjiaping c2a3b603b1 Add list item class. 2021-08-17 14:56:24 +08:00
renpeijia 1033455505 Merge branch 'dbus-terface' into kylin-nm-dbus-renpj 2021-08-17 13:53:39 +08:00
renpeijia 57b712af97 feature: Develop wireless network AP function. 2021-08-17 10:48:22 +08:00
ren peijia f04dff6299 Merge branch '0809-new-frontend' into 'dbus-interface'
Create new mainwindow.

See merge request kylin-desktop/kylin-nm!153
2021-08-16 09:02:10 +00:00
zhangjiaping 06b0e4c513 Optimize code. 2021-08-16 16:54:12 +08:00
renpeijia 66851bb601 modify:Correct code format and parameters 2021-08-16 16:38:45 +08:00
jzxc95 54cd2ca9e6 method update 2021-08-13 15:09:56 +08:00
zhangjiaping df6d30e66f Add some tools. 2021-08-13 11:15:48 +08:00
zhangjiaping 81f4a0100d Update new frontend. 2021-08-12 14:05:52 +08:00
jzxc95 cd5de86c3c merge upstream 2021-08-11 15:56:13 +08:00
jzxc95 f04143660c update wireless method 2021-08-11 15:18:34 +08:00
renpeijia 785cff5d14 feature: add function of agent for wireless 2021-08-11 10:42:48 +08:00
zhangjiaping 6a0b69ab08 Create new mainwindow. 2021-08-10 15:57:30 +08:00
zhangjiaping 5be5846a79 Delete useless files. 2021-08-09 17:37:44 +08:00
zhangjiaping f25569f10e Adjust documents' struct. 2021-08-09 17:13:04 +08:00
renpeijia d194144fd2 modify:move files of dbus-interface to src/backend/dbus-interface/ 2021-08-09 16:18:35 +08:00
renpeijia 9b61802ff1 feature:Remove redundant code and modify inheritance relationship. 2021-08-09 15:45:57 +08:00
renpeijia b207493157 featrue:add function of Ethernet enable and disable. 2021-08-09 11:09:43 +08:00
renpeijia 4104afe60a Merge branch 'kylin-nm-qt' into wireless-dbus 2021-08-06 19:28:06 +08:00
jzxc95 95880c5161 add wireless class 2021-08-06 14:00:14 +08:00
renpeijia 3c4ece50a0 feature:add function of get one connect item. 2021-08-06 11:33:28 +08:00
renpeijia c44aa9b8d5 feature: modify the function of wired according to the design documentation. 2021-08-06 08:56:50 +08:00
renpeijia 48b297b1c8 feature:develop wired 、pptp and bluetooth function. 2021-08-02 14:37:31 +08:00
ren peijia c41e070e53 Merge branch 'kylin-nm-dbus-renpj' into 'dbus-interface'
feature:1、add create connect、update connect and delete connect function with wired。

See merge request kylin-desktop/kylin-nm!99
2021-07-09 02:42:09 +00:00
jzxc95 167375b794 fix error 2021-07-09 09:38:40 +08:00
jzxc95 3d82cfb811 wireless connect/disconnect 2021-07-09 09:16:49 +08:00
renpeijia 1eef4e2e72 feature:1、add create connect、update connect and delete connect function with wired。
2、add library in control file of debian
2021-07-09 09:10:26 +08:00
renpeijia 38c052912e feature:1、add networkmanager-qt library with dbus
2、add collect networkresource class with connect 、activate connect、device and wifinetwork
            3、add network connect and disconnect function.
2021-07-06 13:46:15 +08:00
chen lelin bd14d55d15 Merge branch '0630-main' into 'main'
fix:#61356

See merge request kylin-desktop/kylin-nm!74
2021-06-30 13:19:42 +00:00
zhangjiaping 5b37b741fb fix:#61356 2021-06-30 15:40:07 +08:00
chenlelin 3f40d4b48c Change name of kylin-nm in desktop-notify 2021-06-30 14:54:47 +08:00
zhouxiali 7d7fff8c16 fix(icon):When wired and wireless are connected at the same time, the taskbar displays the wired network icon
log:有线和无线同时连接时,任务栏显示有线网络图标
bug:63121
2021-06-28 16:29:40 +08:00
chenlelin 7de77f2551 Fix bug-57502 show wrong bluetooth information in wired user interface 2021-06-26 14:58:51 +08:00
chen lelin a1d4f7ab55 Merge branch 'sp1-0710' into 'main'
Merge 0710 to main.

See merge request kylin-desktop/kylin-nm!55
2021-06-25 06:13:50 +00:00
chen lelin f8f87faf2f Merge branch 'main' into '0622-main'
# Conflicts:
#   src/mainwindow.cpp
2021-06-23 02:38:55 +00:00
chen lelin 883e2165c8 Merge branch '0622-1-main' into 'main'
Fix bug-61628 wifi输入错误密码连接失败后,删除密码重新输入后点击连接无反应

See merge request kylin-desktop/kylin-nm!54
2021-06-23 02:31:29 +00:00
chen lelin 74d4e56051 Merge branch '0621-dev' into 'main'
fix bugs

See merge request kylin-desktop/kylin-nm!49
2021-06-23 02:26:39 +00:00
Xiaoshuo Shi f16babfcbd Merge branch 'main' into '0622-1-main'
# Conflicts:
#   src/main.cpp
2021-06-23 02:23:58 +00:00
zhangjiaping d5bd6d7e49 Fix: 修复远程连接用户桌面无kylin-nm问题 2021-06-22 21:41:42 +08:00
chenlelin 6c2e40b94d Fix bug-61628 wifi输入错误密码连接失败后,删除密码重新输入后点击连接无反应 2021-06-22 21:09:47 +08:00
zhangjiaping 40a5d40d6b Fix:#58755 Wifi signal changed after connected. 2021-06-22 15:04:42 +08:00
chenlelin 0fd8171d3f ix bug-58766 show zero value of wifi signal strength 2021-06-22 10:52:43 +08:00
zhangjiaping a10cf938b8 Fix: peap wifi will connect failed when just created. 2021-06-21 17:50:02 +08:00
zhangjiaping b7331e626b Fix:#61924 Button should be pressed to show password. 2021-06-21 17:49:28 +08:00
zhangjiaping 11866c0fb8 Fix:#61509 Lan icon is not white. 2021-06-21 11:12:33 +08:00
zhangjiaping e66b06b49e Fix: Password lineedit disappeared when inputing password. 2021-06-19 20:24:51 +08:00
Zhai Kangning 78260f9a92 Update mainwindow.cpp 2021-06-18 11:16:26 +00:00
fensite cb496bf670 Fixed: The problem of being blocked in English mode of 'Hide WLAN'
解决'加入网络'英文模式下文字被遮挡的问题
bug:61783
2021-06-18 19:00:46 +08:00
zhangjiaping 00e1642cc8 Optimize code. 2021-06-09 19:50:29 +08:00
zhangjiaping 27ee03bdfa Fix: kylin-nm will request to input password when key.mgmt is none some times.
Fix:#47071 WPA3 reconnect failed on pc with two wireless card.
2021-06-09 19:16:27 +08:00
huanchuang 51ab47b2e4 添加DBUS接口,可以直接到输入密码框 2021-06-08 20:05:47 +08:00
Xiaoshuo Shi acfe6287b4 Merge branch 'fix-refresh' into 'main'
Fix: Wifi list will not be refreshed some times.

See merge request kylin-desktop/kylin-nm!22
2021-06-08 11:37:53 +00:00
Xiaoshuo Shi 0b0b3f787b Merge branch '0608-dev' into 'main'
Start progress in two stage.

See merge request kylin-desktop/kylin-nm!20
2021-06-08 11:36:46 +00:00
Zhang Jiaping e0e1f37b44 Merge branch '0607-dev' into 'main'
Fix bug-58306 can show wifi 6 and 6+ icons in Huawei Kilin 990 computer

See merge request kylin-desktop/kylin-nm!16
2021-06-08 11:33:53 +00:00
Zhang Jiaping 9d8b0fe7c6 Merge branch 'main' into 'fix-refresh'
# Conflicts:
#   debian/changelog
2021-06-08 09:16:35 +00:00
zhangjiaping 6370c0281c Fix: Wifi list will not be refreshed some times.
修复页面停留在有线时9*0控制面板获取WiFi列表失败问题
2021-06-08 16:16:39 +08:00
zhangjiaping 0fdeb9d068 Start progress in two stage.
两段式启动应用
2021-06-08 16:14:53 +08:00
chenlelin a4410a3de8 Remove redundant sentences 2021-06-08 11:37:42 +08:00
chenlelin 2c33bbcfa4 Change time limit of waiting animation 2021-06-08 11:20:11 +08:00
chen lelin a467000ff4 Merge branch 'main' into '0607-dev'
# Conflicts:
#   src/mainwindow.cpp
2021-06-08 03:09:37 +00:00
chenlelin 4620339ff0 Fix bug-58306 can show wifi 6 and 6+ icons in Huawei Kilin 990 computer 2021-06-07 21:54:42 +08:00
zhangjiaping ae3b8a7d94 Optimize code. 2021-06-07 21:22:24 +08:00
chenlelin 9e29c4f3f0 Modify 'wifi' to 'WLAN' on user interface 2021-06-07 17:45:39 +08:00
chenlelin 7b03848f64 Optimize reconnect-time after turn on wifi switch 2021-06-07 17:26:25 +08:00
zhangjiaping 2d259abcfc Feature: Replace icons for lan item.
替换有线网图标
Link:http://172.17.66.192/biz/task-view-33960.html
2021-06-07 16:13:02 +08:00
zhangjiaping 2cec6f8dbc Feature: Write config file when wifi/lan switch status changed.
当有线/无线网开关状态改变时,存储配置,以便重启后校准网络设备开关状态
Link: http://172.17.66.192/biz/task-view-33373.html
2021-06-07 15:52:48 +08:00
zhangjiaping 55c16c5654 Feat: Add lan switch button.
添加有线网开关
Link:http://172.17.66.192/biz/task-view-33309.html
2021-06-07 11:40:14 +08:00
Zhang Jiaping f0bcd31287 Merge branch '0604-dev' into 'main'
Add operation and maintenance log

See merge request kylin-desktop/kylin-nm!10
2021-06-05 06:38:59 +00:00
huanchuang 969be18d10 change Wi-Fi/Wifi/WiFi to WLAN 2021-06-04 19:40:13 +08:00
Andrew Pit f53585000b Add operation and maintenance log 2021-06-04 17:38:15 +08:00
Xiaoshuo Shi 7850c8aa93 Merge branch '0602-opt' into 'main'
Optimize code & update changelog.

See merge request kylin-desktop/kylin-nm!7
2021-06-04 08:58:19 +00:00
zhangjiaping d922f8f6a8 Show pwd incorrect tips on reconneted failed.
优化回连失败流程,回连失败显示一个小标签提示密码错误。
2021-06-04 15:11:38 +08:00
Andrew Pit d7cdfd3ea9 change switch status 2021-06-03 21:36:32 +08:00
zhangjiaping 0da6bc7bcc Fix: #56269 CA file end with .pfx could be choosen to connect 802.1x wifi. 2021-06-03 19:15:09 +08:00