范朋程 3fa69b4201 Merge branch 'maintain/5.0' into uos ...

# Conflicts:
#	frame/util/docksettings.cpp
#	frame/util/docksettings.h
#	frame/window/mainwindow.cpp
#	frame/window/mainwindow.h
#	plugins/power/power.qrc

2020-07-06 14:16:29 +08:00

..

actions

fix(power): 不同电量图标显示异常

2020-06-15 21:02:27 +08:00

dbus

Add remaining time to battery indicator

2019-05-06 12:19:28 +02:00

resources

fix(power): 电池图标显示异常问题

2020-06-27 17:53:36 +08:00

CMakeLists.txt

feat:gsettings control power display

2020-05-26 14:40:11 +08:00

power.json

feat: update plugin API version

2018-12-18 11:28:36 +08:00

power.qrc

fix(power): 电池图标显示异常问题

2020-06-27 17:53:36 +08:00

powerplugin.cpp

fix: 修复符号冲突导致的概率性崩溃问题

2020-06-30 09:26:59 +08:00

powerplugin.h

fix: 修复符号冲突导致的概率性崩溃问题

2020-06-30 09:26:59 +08:00

powerstatuswidget.cpp

fix(power): 电池图标显示异常问题

2020-06-27 17:53:36 +08:00

powerstatuswidget.h

fix(power): 电池图标需求变更

2020-06-23 16:39:26 +08:00