Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 09:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,559 Commits 3 Branches 655 Tags
Commit Graph

69 Commits

Author SHA1 Message Date
tsic404
2f185bf3ce chore: resolve v23 merge conflicts 
log:
 2023-02-16 15:08:28 +08:00
范朋程
7ac4592ebb fix: 修复部分托盘服务对应进程状态异常时导致任务栏卡死问题 
fcitx进程异常时，其statusnotifieritem服务被任务栏调用会导致任务栏卡死

Log: 解决部分情况下任务栏卡死问题
Influence: 托盘服务
Bug: https://pms.uniontech.com/bug-view-121947.html
Change-Id: Ia7bc9cf077b3b707677a5fe5388b483600ba0de8
 2022-09-19 13:42:42 +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
donghualin
322623427d feat: 高效模式下加载快捷插件 
高效模式下增加读取快捷插件并显示

Log: 高效模式显示快捷插件
Influence: 高效模式显示快捷设置插件
Task: https://pms.uniontech.com/task-view-110311.html
Change-Id: I308e963b4816737b3f596bc9d4b93db06851f447
 2022-06-10 16:18:24 +00:00
Your Name
576807f431 fix: 修复部分托盘服务对应进程状态异常时导致任务栏卡死问题 
fcitx进程异常时，其statusnotifieritem服务被任务栏调用会导致任务栏卡死

Log: 解决部分情况下任务栏卡死问题
Influence: 托盘服务
Bug: https://pms.uniontech.com/bug-view-126671.html
Change-Id: Icdf906577623a100ddc473690bbbc82277a1797c
 2022-04-26 15:01:59 +08:00
YinJie
cab22dc6c1 fix: 切换输入法导致内存泄露 
多线程没有处理好同步关系，导致概率性创建对象后没有删除

Log: 修复切换输入法导致内存泄露的问题
Bug: https://pms.uniontech.com/bug-view-126381.html
Influence: 切换输入法的场景

Change-Id: I2a2587d22592d23e1671e47902cc037f44ff6ec1
 2022-04-22 17:39:20 +08:00
范朋程
4b0166f59b chore: 清除编译警告 
清除编译警告和cppcheck检查出的警告信息

Log:
Influence: 无
Task: https://pms.uniontech.com/zentao/task-view-96546.html
Change-Id: I8b32b02c9d3a284029a39826516ab7b41132f236
 2022-01-05 09:21:48 +08: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
范朋程
c8bdbd8cb1 fix: wayland中不显示QT4托盘图标 
wayland回合主线master分支,原始提交: https://gerrit.uniontech.com/c/dde-dock/+/1286

Log: 社区版适配wayland
Influence: wayland适配
Task: https://pms.uniontech.com/zentao/task-view-81916.html
Change-Id: If1d79ce06f08d2625432271a348dc94d052108b2
 2021-11-05 22:39:14 +08:00
songwentao
6c9492d971 chore: 给任务栏托盘插件添加部分注释 
给托盘插件添加注释

Log:
Influence: 添加代码注释
Change-Id: Ie069bd3e9ce3215744f29fea39018b6fa7426fc0
 2021-10-22 18:02:31 +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
yanghongwei
4277b4a852 chore: 添加注释 
添加部分注释，方便代码阅读

Log: 添加部分注释
Change-Id: I7cdb5bc80aa8bbd94ae0601fbae7760e55b6b119
 2021-05-14 17:18:42 +08:00
Fan PengCheng
e2e9211d1c feat: 修改部分函数命名和注释 
函数命名变更，部分注释转移到源文件中，方便阅读头文件,去除mock的部分代码文件

Log:
Change-Id: I9cbb7d5a21a60c4643efbf78da7c599d85bd0829
 2021-03-23 17:17:02 +08:00
Zhang, DingYuan
fe81d638a5 fix: wrong dbus path 
sni的QDbusInterface使用了错误的path

Log: 错误使用了dbus path
Change-Id: Iaa28ebb7eb854163997ab0314efbc8c21057442e
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/4162
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-09-10 09:35:04 +08:00
Zhang, DingYuan
48b5458eec fix: sni tray not show 
Use the qdbus program in trayplugin to check dbus is working, and if qdbus is not exist, all sni trays will not be displayed.

Issue: Fixes #296
Log: Fixes #296
Change-Id: I5e8dabf6ef2bbb271b459c47441e7218d981c2f7
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/4093
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
 2020-09-09 15:35:47 +08:00
范朋程
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
fengshaoxiong
43d3e50aad fix: 解决代码中告警信息 
记录打印信息的文本中不能有告警信息

Log：将打印的告警信息转为调试信息
Bug：https://pms.uniontech.com/zentao/bug-view-20977.html
 2020-06-30 09:54:12 +08:00
范朋程
5a15ae7f17 fix: 修复符号冲突导致的概率性崩溃问题 
语音助手中使用的类TipsWidget与任务栏项目中的同名类的实现不一样，导致符号冲突
解决方法是在任务栏的代码中加上命名空间，

Log: 修复符号冲突导致的概率性崩溃问题
Bug: https://pms.uniontech.com/zentao/bug-view-35037.html
 2020-06-30 09:26:59 +08:00
范朋程
ee83bb1cba fix(cppcheck): cppcheck检查 
静态代码检查，按照提示修改了所有合理的警告内容，部分内容为cppcheck误报，不处理

Log: 按照静态代码检查工具给出的结果进行修改
 2020-06-16 13:54:23 +08:00
shaojun
f3c24fb5ce fixed(tray): add dbus wait time 2020-03-03 10:43:56 +08:00
王少君
ee2f4a7de0 Revert "feat:get trayItem info in thread" 
This reverts commit eadca66a77ffe3253e0237acc68720c5f6cc62c0
 2020-02-28 19:11:00 +08:00
fanpengcheng_cm
eadca66a77 feat:get trayItem info in thread 
解决安全中心图标无法显示问题：BUG11229
 2020-02-28 18:36:24 +08:00
shaojun
086aca92cc fixed(tray):dbus error to dock block 
安装 uos-chineseime ，右键重启会导致dbus错误，导致任务栏卡死
 2020-01-11 20:03:21 +08:00
wangxuwen
c841e462fd fixed(dde-dock): change the plugins sort for bug 10319 2020-01-11 10:35:29 +08:00
shaojun
0356c5ca54 fixed(sni):invalid plugin not insert to tray 
无效插件不添加到托盘区域，避免托盘出现空图标
 2019-12-14 13:54:50 +08:00
shaojun
d4702c748c fixed:dock default value 
dde-session-daemon比dock晚启动，导致dock获取的默认值错误
 2019-12-02 15:01:38 +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
e6a106fe24 fixed:tray error 
托盘加载插件时，插件对应的dbus服务有时候还没启动，这时会绑定一个QDBusConnectionInterface::serviceOwnerChanged，当事件触发时，调用插件的init方法。托盘里每次init都会重新创建所有widget，导致托盘内的插件图标全部消失。
 2019-11-22 13:09:58 +08:00
shaojun
552a61f4ea refactor:delete invalid code 2019-10-17 19:52:55 +08:00
shaojun
59aebcaa8b feat(trayplugin):set display mode always fashion 2019-08-27 19:31:49 +08:00
justforlxz
ef232eea04 feat(gsettings): control all module visible 2019-08-09 16:13:26 +08:00
justforlxz.com
c37ea37404 refactor: plugin init is done in other threads 
加载插件是按队列进行的，但是插件初始化是不需要按队列来的
 2019-07-02 19:58:24 +08:00
justforlxz.com
d7b3b4a59a refactor: remove load plugins timer 2019-07-02 19:58:24 +08:00
流年匆忙
42e1cf492a
chore(tray): disable tray for local config (#224) 2019-07-02 14:42:10 +08:00
listenerri
f4cbe1d2c8 Merge branch 'dev/daemon-plugin-settings' into daemon-plugin-settings 2019-04-04 17:42:37 +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
4cd74405ce fix: added multiple indicator tray of one indicator provider 
https://github.com/linuxdeepin/internal-discussion/issues/1071

Change-Id: Id76eafc4914ab06f7e3d6045b4c5d58560fa81da
 2019-03-12 14:24:24 +08: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
aef1fb7f0b fix some merge error 
Change-Id: I14d057555c7a1d359e0d1e2526e1800ab88a6832
 2019-01-30 15:55:25 +08:00
listenerri
2bc2f2e831 refactor: make MainWindow to register sni host instead of tray plugin 
Change-Id: I8f6b05ed69ced2d937aac8828a1adb3e77e79b07
 2019-01-15 19:54:13 +08:00
listenerri
e96971aecd refactor: delay load XEmbed and SNI trays 
Change-Id: Ia9d5684410a57192b228de9478bb3b87025e5b27
 2019-01-15 18:14:53 +08:00
listenerri
05babb8d52 fix: xembed tray click response 
some tray will create and disappear vary fast, for example fcitx-sogou
that will cause dock only hold the disappeared tray's winid

https://tower.im/teams/9487/todos/227205/
https://github.com/linuxdeepin/internal-discussion/issues/793

Change-Id: I14643e1d16a3ed1dfeb10fc89da6ee00e8d4edc5
 2019-01-09 15:19:43 +08:00
listenerri
8ed1aa962f fix: dock crash and sni tray status property process 
https://github.com/linuxdeepin/internal-discussion/issues/804

Change-Id: Ib288e1248d64f4ed034fbfa876c2f508eb84e2f8
 2019-01-08 14:21:18 +08:00
listenerri
8bc429af27 Merge branch 'dev/drag-and-hold-tray' into merge-dev/drag-and-hold-tray 
Change-Id: I9ca2e4cbdd7579d65667e78f611cd5400ca851c2
 2019-01-07 11:07:45 +08:00
listenerri
6c7498a7a7 feat: support SNI tray status property 
https://github.com/linuxdeepin/internal-discussion/issues/746

Change-Id: Ie036abe71858a74d500487cd434c69cc1ac26e45
 2019-01-04 09:48:39 +08:00
listenerri
f7699e3596 fix: tray item identify 
https://github.com/linuxdeepin/internal-discussion/issues/616

Change-Id: I6fc26d153e82643720ac21111d52cac26fbcff06
 2019-01-03 19:00:33 +08:00
listenerri
fea60742c5 feat: add hold container 
wrappers can be drop into hold container from normal container,
of course, wrappers in hold container can also be drop into normal container

Change-Id: I21013beede7661507a9c389af21c35692b777dd4
 2018-12-28 17:00:29 +08:00