Commit Graph

874 Commits

Author SHA1 Message Date
jzxc95 fcdf87bb11 fix:每次连接或断开连接会多出新增或减少wifi的信号 2021-09-24 09:38:14 +08:00
jzxc95 034a1d93fa merge 2021-09-22 15:04:30 +08:00
Zhang Jiaping 08f2e86d1a Merge branch 'up-dbus' into 'dbus-interface'
Up dbus

See merge request kylin-desktop/kylin-nm!261
2021-09-22 07:03:13 +00: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
ren peijia 27e493e81b Merge branch '0908' into 'dbus-interface'
0908

See merge request kylin-desktop/kylin-nm!259
2021-09-18 09:12:07 +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
ren peijia 9b2cb3709f Merge branch '0916-new' into 'dbus-interface'
Feature:Add loading animation.

See merge request kylin-desktop/kylin-nm!257
2021-09-17 03:49:37 +00: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
Zhang Jiaping 97c2bb24a1 Merge branch 'up-dbus' into 'dbus-interface'
Up dbus

See merge request kylin-desktop/kylin-nm!258
2021-09-17 02:22:39 +00: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
Zhang Jiaping 444d87029b Merge branch '0914-new' into 'dbus-interface'
Feature:Add Ui details & fit theme.

See merge request kylin-desktop/kylin-nm!254
2021-09-16 02:36:45 +00: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
Kang Shuning 8bfcb43dd0 Merge branch '0908' into '0908'
feature:function of wired switch is finished.

See merge request kangshuning/kylin-nm!5
2021-09-15 03:30:50 +00: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 d9ca0f4875 Merge branch '0908' into 'dbus-interface'
有线界面多网卡显示

See merge request kylin-desktop/kylin-nm!247
2021-09-10 10:08:14 +00: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
Zhang Jiaping 76f94d1086 Merge branch '0910-jxj' into 'dbus-interface'
Update wlan page.

See merge request kylin-desktop/kylin-nm!248
2021-09-10 10:06:22 +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
jzxc95 0615ca5209 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into up-dbus 2021-09-10 15:32:08 +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
ren peijia ba6c9658ef Merge branch '0908' into 'dbus-interface'
fix:解决连接不能连接的网络时,有时不能发出lisupdate的信号

See merge request kylin-desktop/kylin-nm!241
2021-09-09 10:51:19 +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