35 Commits

Author SHA1 Message Date
dengbo
4ebedb53d2
fix: 控制中心设置的电源选项任务栏未生效 (#779)
任务栏电源配置原来管理gsetting配置替换成dconfig配置

Log: 修复控制中心设置的电源选项任务栏未生效的问题
Bug: https://github.com/linuxdeepin/developer-center/issues/3768
Influence: 任务栏电池信息显示
2023-02-21 15:57:42 +08:00
tsic404
2f185bf3ce chore: resolve v23 merge conflicts
log:
2023-02-16 15:08:28 +08:00
donghualin
5652e2a49a fix: 修复系统主题变化后快捷面板电池颜色显示错误的问题
1、电池图标响应主题变化来重新设置图标
2、修改控制中心电池名称的文案

Log: 修改系统主题变化后快捷面板电池颜色显示错误的问题
Influence: 打开快捷面板,在控制中心更改系统颜色,观察快捷面板中系统电池图标是否跟随系统颜色变化
Bug: https://pms.uniontech.com/bug-view-184085.html
Change-Id: If02b8800b4d90696c2dc74ac43ebc230233f0f58
2023-02-01 13:29:58 +08:00
caixiangrong
50dad25442 fix: 修改插件区域出现重复的电池图标问题
1.修改电池图标状态刷新处理
2.将电池插件改到快捷面板内
3.快捷面板组合图标改为默认图标

Log: 修改插件区域出现重复的电池图标问题
Bug: https://pms.uniontech.com/bug-view-184085.html
Influence: 任务栏-电池图标状态刷新
Change-Id: I8af36acfd9a42efa186338c115f33255af5c1fa6
2023-01-31 11:26:09 +08:00
范朋程
2d958dd670 chore: V23接口改造适配
V23接口改造适配

Log: V23接口改造适配
Influence: 无
Task: https://pms.uniontech.com/task-view-207483.html
Change-Id: Ide530c023ea41f86fad2e8001ec67f1afaa897ab
2022-12-06 14:40:35 +08:00
donghualin
b698b07dde fix: 修改插件接口
1、icon接口中增加主题参数默认值
2、删除以前的不带主题的icon接口
3、PluginStatus改为PluginMode
4、插件接口类中增加eventHandler虚函数

Log:
Influence: 无
Task: https://pms.uniontech.com/task-view-222025.html
Change-Id: I03c8ec09b96faf12f5ab15c8223da8dacae3e4ff
2022-12-02 15:59:35 +08:00
donghualin
4c4d06310b fix: 去掉插件中读取禁用当前插件的配置
需求:在新的需求中,通过从控制中心中勾选或者取消勾选插件的显示功能,不再从系统中移除插件,插件中无需通过配置的功能来决定是否加载插件,而变成在插件内部根据当前插件是否需要加载来决定是否加载,例如蓝牙,只要系统中存在蓝牙,就始终加载蓝牙插件

Log: 插件始终都要加载
Influence: 插入蓝牙观察是否有蓝牙图标
Bug: https://pms.uniontech.com/bug-view-175085.html
Change-Id: I1a07ce0d6bd658a03e349e94283768082794684d
2022-12-02 13:51:58 +08:00
donghualin
7b11668d04 fix: 插件适配不同主题图标
实现根据主题返回不同图标的接口

Log:
Influence: 切换主题,观察任务栏的图标和控制中心个性化中的图标是否发生了变化
Task: https://pms.uniontech.com/task-view-222025.html
Change-Id: Ib5420a963da4d5f6b4ed7c3e4927890bd80118e4
2022-12-02 13:51:58 +08:00
donghualin
c7df15ce0e feat: 插件增加标记
插件接口类中增加flag接口,用于返回不同的插件的属性,在各插件的实现中实现这个接口

Log:
Influence: 任务栏插件
Task: https://pms.uniontech.com/task-view-220099.html
Change-Id: I9e8b8e0f5f9818856b70a76bbda9eb31dc4ebf65
2022-11-28 14:40:55 +08:00
donghualin
04756c8f38 fix: 去掉电池的右键菜单
删除电池右键菜单接口

Log:
Influence: 右键电池插件,观察是否存在菜单
Bug: https://pms.uniontech.com/bug-view-171753.html
Change-Id: I305fd4b48c4b89d8fbf92f109eb401a6d6223a41
2022-11-23 17:12:01 +08:00
donghualin
c7826edd46 fix: 删除任务栏对libdframeworkdbus-dev库的依赖
1、删除项目中对libdframeworkdbus-dev库的依赖,通过使用xml2cpp的工具来自动生成dbus接口文件,在使用到dbus库的项目中包含生成文件的目录
2、修改相关服务中v20的接口(com.deepin...)为v23的接口(org.deepin...)

Log:
Influence: 打开控制中心,鼠标移动唤醒任务栏、加载插件等,观察相关功能是否正常
Task: https://pms.uniontech.com/task-view-182009.html
Change-Id: I960c849d06ed271ebbb9f8e479d9879967523581
2022-09-19 11:41:31 +00:00
Robert
0427e19b72
chore: adapt license and copyright (#680)
Modify project to pass the REUSE check

Log: Modify project to pass the REUSE check
Task: https://pms.uniontech.com/task-view-185215.html
Change-Id: Ie954cf985f16c1a243bfc912aa7458c6e85ce9de
2022-09-06 11:36:55 +08:00
donghualin
0bdc1eb1a2 refactor: 调整插件接口,删除指针引用
去掉插件的指针接口,同时插件根据任务栏图标类别返回不同类型的图标,修改所有已实现的插件接口

Log:
Influence: 任务栏-查看快捷设置图标、快捷区域可点击的图标、系统电源图标是否显示正常
Task: https://pms.uniontech.com/task-view-110309.html
Change-Id: I9ffc42189471bb6183f264b366434d9be77275a4
2022-06-01 11:34:34 +08:00
donghualin
751fef14be feat: 电池插件适配任务栏最新接口
增加icon接口,外部收到该接口后会进行展示

Log:
Influence: 任务栏-快捷设置区域电池插件图标
Task: https://pms.uniontech.com/task-view-110309.html
Change-Id: Ibf6f482a54266aaf48c70c0849133da7af49945c
2022-05-25 13:10:33 +08:00
FanPengCheng
331cf7c749 chore: 修复内存泄露问题
修复内存泄露

Log:
Bug: https://pms.uniontech.com/zentao/bug-view-80694.html
Bug: https://pms.uniontech.com/zentao/bug-view-80695.html
Change-Id: I7410c84aa0a4d6f277ba7a887614814374ef683d
2021-05-25 21:42:38 +08:00
范朋程
5a15ae7f17 fix: 修复符号冲突导致的概率性崩溃问题
语音助手中使用的类TipsWidget与任务栏项目中的同名类的实现不一样,导致符号冲突
解决方法是在任务栏的代码中加上命名空间,

Log: 修复符号冲突导致的概率性崩溃问题
Bug: https://pms.uniontech.com/zentao/bug-view-35037.html
2020-06-30 09:26:59 +08:00
范朋程
d0b1e3550d fix(power): 电池图标需求变更
按照新需求确定一下电池电量每个阶段对应的图标,增加一个满电时电源插入时的电量图标

Log: 电池图标需求变更
Bug: https://pms.uniontech.com/zentao/bug-view-34462.html
2020-06-23 16:39:26 +08:00
范朋程
ee83bb1cba fix(cppcheck): cppcheck检查
静态代码检查,按照提示修改了所有合理的警告内容,部分内容为cppcheck误报,不处理

Log: 按照静态代码检查工具给出的结果进行修改
2020-06-16 13:54:23 +08:00
fanpengcheng_cm
8811826c0c fix(power): (自测)电池在刚插入电源时,20秒内算作预充电时间,只显示电量...
属于未发现问题,开发代码逻辑错误

Log: 增加电池预充电时间,确保剩余充电时间计算不准确
Bug: https://pms.uniontech.com/zentao/bug-view-27119.html
2020-06-11 10:55:00 +08:00
范朋程
903778bc83 Merge tag '5.1.0.14' into uos
# Conflicts:
#	frame/window/mainwindow.cpp
#	plugins/network/item/wirelessitem.cpp
#	plugins/power/powerplugin.cpp
#	translations/dde-dock.ts
#	translations/dde-dock_ar.ts
#	translations/dde-dock_ca.ts
#	translations/dde-dock_cs.ts
#	translations/dde-dock_da.ts
#	translations/dde-dock_de.ts
#	translations/dde-dock_es.ts
#	translations/dde-dock_fi.ts
#	translations/dde-dock_fr.ts
#	translations/dde-dock_hr.ts
#	translations/dde-dock_hu.ts
#	translations/dde-dock_it.ts
#	translations/dde-dock_ko.ts
#	translations/dde-dock_lt.ts
#	translations/dde-dock_ms.ts
#	translations/dde-dock_pl.ts
#	translations/dde-dock_pt.ts
#	translations/dde-dock_pt_BR.ts
#	translations/dde-dock_ro.ts
#	translations/dde-dock_ru.ts
#	translations/dde-dock_si.ts
#	translations/dde-dock_sk.ts
#	translations/dde-dock_sq.ts
#	translations/dde-dock_sr.ts
#	translations/dde-dock_tr.ts
#	translations/dde-dock_uk.ts
#	translations/dde-dock_vi.ts
#	translations/dde-dock_zh_CN.ts
#	translations/dde-dock_zh_HK.ts
#	translations/dde-dock_zh_TW.ts
2020-06-10 13:31:20 +08:00
范朋程
ac6a590b37 Merge tag '5.1.0.12' into uos
# Conflicts:
#	frame/util/docksettings.cpp
#	frame/util/docksettings.h
#	frame/window/mainwindow.cpp
2020-06-05 17:17:36 +08:00
zhaolong
346ba0c81b fix(power): 刚充电时电池tooltips显示
刚接入电源时电池预充,电量计算不准,此时只显示电量充电计算中的tooltips,延迟20s后再进行一般情况状态判断

Log: 修复刚连接电源适配器给电池充电时,电池图标上方显示的需要充电的时间变化异常
Bug: https://pms.uniontech.com/zentao/bug-view-27119.html
2020-06-04 10:43:28 +08:00
fpc_diesel
7a731315ab feat:gsettings control power display 2020-05-26 14:40:11 +08:00
fpc_diesel
39aa633787 feat:add battery display 2020-05-18 16:05:13 +08:00
wangxuwen
7fece61e31 feat(dde-dock): power display error for bug 2040 2019-12-16 15:34:10 +08:00
Hualet Wang
c94a4d69a5 fix: typos 2019-05-19 20:22:32 +08:00
justforlxz
4ff0cfba0d
refactor(power): use systemDaemon replace upower dbus interface 2019-05-17 16:18:20 +08:00
justforlxz
6725976464
update ts add add refresh tips data 2019-05-17 16:18:20 +08:00
Carlo Alberto Barbano
b6fa4335eb Add remaining time to battery indicator
Add a QDBusConnection to org.freedesktop.UPower to DBusPower in
dbuspower.cpp.

Add a QDBusInterface (m_uPowerInter) to PowerPlugin in powerplugin.h to
retrieve the correct battery device (calling 'EnumerateDevices'). Add a
QDBusInterface (m_uBatteryDeviceInter) to PowerPlugin in powerplugin.h
to gather battery time to empty and to fully recharged, and display it
in the power widget tip.

Add BatteryState enum in powerplugin.h to replace BATTERY_DISCHARED and
BATTERY_FULL macros, and add support for all the battery states provided
by UPower.

Change-Id: Ia4677298a1d13cab1e1a03035dbe4a2e660f994b
2019-05-06 12:19:28 +02:00
listenerri
8ae30ec2d1 feat: update all plugins to support take effect in time for Deepin-Sync
Change-Id: I6fec9ab494eede8a4b0f35e62ccd6f4c749ded09
2019-01-30 18:02:18 +08:00
listenerri
7a5501e53d feat: update plugin API version
Note:

1. add a new function in PluginProxyInterface for set applet widget
visible from  a plugin.

2. remove requestContextMenu function from PluginProxyInterface,
cause's the context menu should be handled in Dock, it is enough for
a plugin to simply provide menu data and handle callbacks with
functions itemContextMenu and invokedMenuItem in PluginsItemInterface

https://github.com/linuxdeepin/internal-discussion/issues/646

Change-Id: Ic4af4eee138e87911ff5b18ccbbb0c3f7187ac4d
2018-12-18 11:28:36 +08:00
listenerri
16f10b665c fix: tray icon do not change after system icon theme has changed
https://tower.im/projects/e4ae1ad0b5d5497fb4b7c14fe2d2efbf/todos/d9725c7eddce0c87e5ef5f1939d1964a/

Change-Id: Id094f51c7426f321a1628fdd5e3128d6356c9353
2018-12-07 16:59:06 +08:00
listenerri
61197b9d3d fix: build warning
Change-Id: I57b1e5a68f699fface1ed542813791013020691e
2018-12-05 11:55:26 +08:00
listenerri
8105f8b9f3 refactor: plugins default sort order
Change-Id: I5ab49d88c970bd66c63a6fe6d82cab08d2f4606a
2018-11-21 18:22:22 +08:00
listenerri
b689dbece2 refactor: tray plugin
- tray plugin support load dock plugin as system trays
- move network,sound,power plugins out of tray plugin, keepin them still be plugins

Change-Id: I03463ef55a9abc9823c1b9f7d9c95b00158e63ed
2018-11-15 17:37:05 +08:00