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

727 Commits

Author SHA1 Message Date
ksn 41df272c7e modify 2021-09-24 13:44:01 +08:00
ksn 7c2ecb35ed fix 2021-09-24 11:39:32 +08:00
Zhang Jiaping 17e604db2a Merge branch 'kylin-nm-dbus-renpj' into 'dbus-interface' 
解决检查ip地址冲突的时候，需要root权限的问题

See merge request kylin-desktop/kylin-nm!272
 2021-09-24 03:36:00 +00:00
Zhang Jiaping a5ea09a489 Merge branch 'kylin-nm-lan-switch' into 'dbus-interface' 
fix:wired switch failed.

See merge request kylin-desktop/kylin-nm!276
 2021-09-24 03:35:54 +00:00
ksn b546365fee new pull0924 
Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into 0922
 2021-09-24 11:35:27 +08:00
ksn 07f672c2cc 避免网卡插拔时下拉框索引变化引起崩溃 2021-09-24 11:33:20 +08:00
renpeijia dfe4e23f34 fix: delete reduplicate code 2021-09-24 11:23:59 +08:00
赵 世旭 a8bd98679d Merge branch 'dbus-interface' into 'up-dbus' 
# Conflicts:
#   src/frontend/tab-pages/wlanpage.cpp
 2021-09-24 03:04:08 +00:00
renpeijia c6cb607a8c Merge branch 'kylin-nm-temp' into kylin-nm-lan-switch 2021-09-24 10:28:24 +08:00
Zhang Jiaping ad2d2b1e5b Merge branch 'dbus-interface' into '0922' 
# Conflicts:
#   src/frontend/tab-pages/lanpage.cpp
 2021-09-24 01:54:20 +00:00
Zhang Jiaping 36fef6beb3 Merge branch 'dbus-interface' into 'dbus-interface' 
wlanpage changed

See merge request kylin-desktop/kylin-nm!273
 2021-09-24 01:52:35 +00:00
jzxc95 fcdf87bb11 fix:每次连接或断开连接会多出新增或减少wifi的信号 2021-09-24 09:38:14 +08:00
jinxujie ad013540f4 0923-jxj-3 2021-09-23 20:19:01 +08:00
renpeijia f2d2f401a9 fix:wired switch failed. 
bug link:http://172.17.66.192/biz/bug-view-81530.html
             http://172.17.66.192/biz/bug-view-80919.html
 2021-09-23 20:10:17 +08:00
ksn 9a49f2bd3a 增加网线插拔 2021-09-23 18:41:41 +08:00
ren peijia 0b22f57104 Merge branch '0922' into 'dbus-interface' 
0922

See merge request kylin-desktop/kylin-nm!270
 2021-09-23 06:28:18 +00:00
jinxujie 0184986b92 0923-jxj-2 2021-09-23 14:23:43 +08:00
ksn 6306683d00 只检测连接name和path的改变 2021-09-23 11:17:31 +08:00
jinxujie 7f8b8ad266 0923-1-jxj 2021-09-23 10:31:01 +08:00
jinxujie 0c739884a6 wlanpage changed 2021-09-23 09:56:23 +08:00
renpeijia 3aa478e3e8 feature:it will get root permission through libcap, when check ip conflict. 2021-09-23 09:26:49 +08:00
jinxujie c20a9a94c6 1 2021-09-22 18:03:06 +08:00
ksn 0c517f952e show None when switch button closed 2021-09-22 16:31:02 +08:00
ksn 3a276a7dee Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into 0922 
0922 pull
 2021-09-22 15:45:07 +08:00
ksn 58a23f9cbb show when lan connection data changed 2021-09-22 15:44:22 +08:00
jzxc95 034a1d93fa merge 2021-09-22 15:04:30 +08:00
jzxc95 0b7e5e2a40 modify 2021-09-22 15:02:40 +08:00
jzxc95 e288e0b305 merge 2021-09-22 15:02:01 +08:00
赵 世旭 2027d02685 Merge branch 'dbus-interface' into 'up-dbus' 
# Conflicts:
#   src/frontend/tab-pages/lanpage.cpp
 2021-09-22 06:57:58 +00:00
ksn 7afd99b5e3 响应控制面板的单网卡开关 2021-09-18 15:34:27 +08:00
jzxc95 6ac510db84 dbus interface 2021-09-17 17:53:50 +08:00
ksn 015e5e350c fix 2021-09-17 14:12:05 +08:00
ksn 825b41422e add LanConnection loading 2021-09-17 14:04:14 +08:00
zhangjiaping 0c030f31b8 Resolve conflicts. 2021-09-17 11:42:26 +08:00
jzxc95 f6bdf25c7f dns set 2021-09-17 10:47:54 +08:00
zhangjiaping e5cf2f7d35 Optimize code. 2021-09-17 10:22:11 +08:00
jzxc95 184366de8f modify 2021-09-17 10:03:17 +08:00
ksn 2334cccda7 0915 2021-09-16 15:58:44 +08:00
ksn 22dfb151f9 fix 2021-09-16 15:53:28 +08:00
jzxc95 0e00edd768 fix code 2021-09-16 14:22:09 +08:00
zhangjiaping e5aae2bbcc Optimize code. 2021-09-16 14:14:53 +08:00
jzxc95 4936fa953e 判断激活信号需要设备匹配 2021-09-16 14:13:49 +08:00
jzxc95 879835e547 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into up-dbus 2021-09-16 13:49:38 +08:00
jzxc95 2a2d2fbf29 modify get channel method 2021-09-16 11:24:48 +08:00
Zhang Jiaping 636ec6af4c Merge branch 'up-dbus' into 'dbus-interface' 
Up dbus

See merge request kylin-desktop/kylin-nm!251
 2021-09-16 03:12:20 +00:00
zhangjiaping 63a55ddb92 Feature:Add loading animation. 2021-09-16 10:52:02 +08:00
zhangjiaping 6b41e3ed86 Feature:Add Ui details & fit theme. 2021-09-15 16:36:33 +08:00
jzxc95 6697722d4a fix fault 2021-09-15 11:46:12 +08:00
jzxc95 84429a703b add method and dbus signal 2021-09-15 11:42:06 +08:00
renpeijia ed82533377 feature:function of wired switch is finished. 2021-09-15 11:18:41 +08:00
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