18 Commits

Author SHA1 Message Date
tsic404
2f185bf3ce chore: resolve v23 merge conflicts
log:
2023-02-16 15:08:28 +08:00
范朋程
7b7f5c1f19 chore: 整理代码
整理代码缩进,减少代码量

Log: 无
Influence: 自动化标记功能
Task: https://pms.uniontech.com/task-view-124695.html
Change-Id: Icb22250683d5cd19ef328781e80cd5886da16c3c
2022-12-06 10:08:10 +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
Wang Yixue
2f12ecc228 fix: 修复一些小的拼写错误
trayTyep()函数更正为trayType()函数,Utils::ModuleSettingsPtr函数修正了部分注释

Log: 修复AbstractTrayWidget类和Utils::ModuleSettingsPtr函数的拼写错误
Influence: 对功能无影响
2022-07-29 09:15:42 +00:00
Liu Heng
0e30d5a2a5 fix: 修复程序注册两个不同图标时被拦截的问题
使用Set记录注册的PID会导致程序在同一协议上注册不同图标时,无法注册的问题。
更改使用Map来记录注册的PID和注册的协议映射,使用与之前相同的协议时,仍同意程序继续注册托盘。

Log: 程序需要注册两个不同的图标问题修复
Influence: 托盘
Bug: https://pms.uniontech.com/zentao/bug-view-105424.html
Change-Id: I99e51d4298f27359d6d27ed58cc0dfe95a75d4a7
2021-12-01 16:09:46 +08:00
Liu Heng
dc0b4b2bc4 fix: 修复托盘重复图标问题
当程序同时支持SNI和XEmbed协议时,错误地在两种协议上同时注册了两个托盘,
增加了一个QSet来记录注册托盘的PID,通过判断是否在set中来判断是否该程序是否已经注册

Log: 修复托盘重复图标问题
Influence: 托盘

Bug: https://pms.uniontech.com/zentao/bug-view-105424.html
Change-Id: I80bc60ab073ac3582f7a0c42d88f2c39a9095d75
2021-12-01 16:09:46 +08:00
FanPengCheng
b891a5565e chore: 清理cppcheck警告信息
清理cppcheck警告信息

Log:
Task: https://pms.uniontech.com/zentao/task-view-77871.html
Change-Id: I93e77403b3f3b656be4e7d442b81dcbe227c3150
2021-05-31 20:06:39 +08:00
Fan PengCheng
eaea57ea4f Revert "fix: 单指长按不能唤出右键菜单"
This reverts commit 24ece545b56847e15440218f2b93ee6be0df80d0.
2020-08-10 19:45:41 +08:00
xiechuan
24ece545b5 fix: 单指长按不能唤出右键菜单
单指长按时启用右键菜单进行处理,且关闭悬停提示

Log: 优化单指长按右键菜单
Bug: https://pms.uniontech.com/zentao/bug-view-41153.html
Change-Id: Id1ddd263a78220de4e6d437afdd80d9327a961d9
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1472
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: wangwei <wangwei@uniontech.com>
Reviewed-by: niecheng <niecheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-08-10 14:41:20 +08:00
范朋程
ee83bb1cba fix(cppcheck): cppcheck检查
静态代码检查,按照提示修改了所有合理的警告内容,部分内容为cppcheck误报,不处理

Log: 按照静态代码检查工具给出的结果进行修改
2020-06-16 13:54:23 +08:00
shaojun
bf41b1ebb6 fixed(tray):invalid windowid do not create trayicon
com.deepin.dde.TrayManager返回的windowid没有刷新导致任务栏有一个空托盘图标
2019-11-27 15:37:57 +08:00
shaojun
c112e33bef feat(plugin):plugin layout 2019-09-06 14:45:00 +08:00
listenerri
daed0fc57e refactor: the item key which can identify tray items
https://github.com/linuxdeepin/internal-discussion/issues/1072

https://github.com/linuxdeepin/developer-center/issues/885

Change-Id: Ica41815368bacbcc6a163687d329c2a3bda27b2d
2019-03-19 15:04:42 +08:00
listenerri
d55f56c055 refactor: indicator key parse
Change-Id: I9d35bf0211c2b320c0edebd457e897dbe5fa7899
2019-03-18 17:51:50 +08:00
listenerri
2d61405db9 fix: show dock menu when click on some area out of tray
https://github.com/linuxdeepin/internal-discussion/issues/853

Change-Id: Iaf0e76b7de4ce394c83ee40cd0685828d7dc77d0
2019-01-14 17:48:43 +08:00
listenerri
77570b609a fix: context menu invoke in touch screen
https://github.com/linuxdeepin/internal-discussion/issues/619

Change-Id: I21febec29c06eef80114f9082e6cc02d7468c2d3
2018-12-14 15:18:09 +08:00
listenerri
091b52bccd fix: dock hide problem and remove old imp
efficient dock still hide in auto/smart hide mode while applet of
plugins is showing and mouse leaved

https://github.com/linuxdeepin/developer-center/issues/707

Change-Id: I373ce94e802f79e1430a636d5019b24fdbaa650b
2018-12-04 09:28:12 +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