Commit Graph

1054 Commits

Author SHA1 Message Date
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
zhangjiaping ff1d61317b Feature: Scan WiFi list periodically. 2021-09-08 16:38:07 +08:00
Zhang Jiaping f613c9c45e Merge branch '0907-new' into 'dbus-interface'
Feature:Add device comboBox.

See merge request kylin-desktop/kylin-nm!237
2021-09-08 07:32:41 +00: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
jzxc95 786f7db1b6 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into up-dbus 2021-09-06 14:10:56 +08: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
ren peijia 03cbc44537 Merge branch '0902' into 'dbus-interface'
界面布局调整

See merge request kylin-desktop/kylin-nm!224
2021-09-03 09:29:14 +00: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
Zhang Jiaping 265af0251a Merge branch '0901-new' into 'dbus-interface'
Adjust UI according to blueprint.

See merge request kylin-desktop/kylin-nm!222
2021-09-03 01:55:47 +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