Commit Graph

787 Commits

Author SHA1 Message Date
ksn 9e196acd99 修改冲突文件 2021-08-27 15:15:49 +08:00
ksn db93d2c498 格式修改 2021-08-27 14:54:28 +08:00
ren peijia 145b8e2102 Merge branch '0826-jxj' into 'dbus-interface'
Feature: Function of connecting/disconnecting wlan.

See merge request kylin-desktop/kylin-nm!197
2021-08-27 06:33:00 +00: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
Zhang Jiaping 9ab5539561 Merge branch 'new-dbus' into 'dbus-interface'
update default device && add getssid method

See merge request kylin-desktop/kylin-nm!194
2021-08-27 01:02:55 +00:00
jzxc95 7786c3cab3 merge 2021-08-26 14:43:27 +08:00
jzxc95 a700ca7ee5 网线插拔对默认网卡的设置 2021-08-26 14:19:18 +08:00
zhou xiali fe64ffca4a Merge branch '3.1-0826' into '0826'
后端代码同步更新

See merge request kangshuning/kylin-nm!1
2021-08-26 05:50:23 +00: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 96860d5850 Merge branch '0825-jxj' into 'dbus-interface'
Feature: Add inactivce wlan item & watch activated wlan changed.

See merge request kylin-desktop/kylin-nm!190
2021-08-26 02:53:41 +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
ren peijia c3ecbd5f22 Merge branch 'new-dbus' into 'dbus-interface'
fix when ap remove segament fault & can not remove a item

See merge request kylin-desktop/kylin-nm!191
2021-08-26 02:29:54 +00:00
jzxc95 acfc47b604 fix when ap remove segament fault & can not remove a item 2021-08-25 17:35:57 +08:00
ren peijia 0d23cc614a Merge branch 'new-dbus' into 'dbus-interface'
add wifi list sort && dbus interface

See merge request kylin-desktop/kylin-nm!188
2021-08-25 09:29:34 +00: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
ren peijia 8482baf418 Merge branch '0823-new' into 'dbus-interface'
Feature:Add wlan page items.

See merge request kylin-desktop/kylin-nm!189
2021-08-25 05:36:01 +00: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
ren peijia 18090fc803 Merge branch '0823-new-fe' into 'dbus-interface'
Feature: Abstract class - TabPage.

See merge request kylin-desktop/kylin-nm!183
2021-08-23 02:45:21 +00: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
ren peijia 202169c435 Merge branch '0819-new-fe' into 'dbus-interface'
Feat: Add some interfaces for list item.

See merge request kylin-desktop/kylin-nm!180
2021-08-20 06:03:22 +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
ren peijia 7e1ada1dc5 Merge branch '0816-new-frontend' into 'dbus-interface'
Add list item class.

See merge request kylin-desktop/kylin-nm!164
2021-08-17 07:27:13 +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