156 Commits

Author SHA1 Message Date
Fan PengCheng
ed5ae88ae2 feat: 修复应用升级后任务栏驻留的图标可能显示异常的问题
应用升级后,其desktop文件中对应的Icon字段可能发生变更,任务栏会重新获取当前的Icon,
当这个Icon对应的图片还没有放到指定的位置时,此时获取的图标就是异常的,且后续再获取时,及时图标已经正常,
但因为qt的缓存机制,也会导致获取的图标仍然是第一次获取的异常图标

Log: 修复应用升级后任务栏驻留的图标可能显示异常的问题
Task: https://pms.uniontech.com/zentao/task-view-64795.html
Change-Id: I955108d04af65b2ca9cc1e6347a4c390b9ec9d77
2021-04-22 17:10:55 +08:00
Fan PengCheng
f46de5761e fix: 修复应用获取配置某些情况下可能失败的问题
条件判断写的有问题,少了括号

Log: 修复应用获取配置某些情况下可能失败的问题
Change-Id: I0e9f447e4d904cba2aaea83fa77ce7c2f87cae08
2021-03-25 14:21:57 +08:00
Fan PengCheng
e2e9211d1c feat: 修改部分函数命名和注释
函数命名变更,部分注释转移到源文件中,方便阅读头文件,去除mock的部分代码文件

Log:
Change-Id: I9cbb7d5a21a60c4643efbf78da7c599d85bd0829
2021-03-23 17:17:02 +08:00
范朋程
11b0707114 feat: 添加单元测试代码
添加单元测试代码

Log:
Change-Id: Icd61b9d7edb67c94234199bc2438bfc10e2b8692
2021-03-15 09:25:22 +08:00
范朋程
82f71facef feat: 添加单元测试代码
添加单元测试代码,修改几处测试出的问题

Log:
Change-Id: I6aef0f137873044db1b7997ef6974dc7ed7c63aa
2021-03-11 09:16:35 +08:00
范朋程
7ba28a270c feat: 添加Mock
添加Mock依赖

Log:
Change-Id: I9625b67a9ac0155fafd60aca3ec27b996c6005e8
2021-03-10 16:48:31 +08:00
范朋程
a586140cb2 feat: 添加单元测试代码
添加单元测试代码

Log:
Change-Id: Ie8c8a970bc81968528c7130e91e30920efb7411b
2021-03-08 15:53:10 +08:00
范朋程
8b07039f5e fix: 修复可能出现的应用名称前后含有空格问题
后端的接口传递过来的数据可能有部分空白信息,这里提前做一下处理,防止出异常

Log: 修复可能出现的应用名称前后含有空格问题
Task: https://pms.uniontech.com/zentao/task-view-64795.html
Change-Id: Ia2dea4a4d24b7ef152cb8ad3123cf1a94c8e5220
2021-03-08 10:16:33 +08:00
范朋程
7e97570fc6 feat: 整理单元测试代码
整理单元测试代码,方便测试AppItem类

Log:
Change-Id: Iff41154f8f9e968742c9f30c09f2f7a6b5aabde4
2021-03-06 19:45:02 +08:00
范朋程
147fed9107 feat: 修改拼写错误
拼写错误,已纠正

Log:
Change-Id: Ieb8c831196be5d3bb1ca87eb10ec13497525248c
2021-03-06 18:43:29 +08:00
范朋程
29082f5f01 Merge branch 'maintain/5.2'
Change-Id: Ibf45f76bffd88100a2de4ec13b5da539ea843db6

# Conflicts:
#	debian/control
#	frame/item/components/previewcontainer.cpp
#	translations/dde-dock_az.ts
2021-02-26 09:48:26 +08:00
范朋程
1d99b3e5da feat: 允许锁定任务栏上的图标防止被拖拽删除
需要通过命令设置gsettings set com.deepin.dde.dock.module.app removeable false

Log:
Task: https://pms.uniontech.com/zentao/task-view-60374.html
Issue: Fixes #338
Change-Id: Idb76a8e28bbd4fae7db5870d07d3432fe4029029
2021-02-04 15:54:55 +08:00
Zhang Qipeng
10b36aed8a fix: 应用图标状态显示异常
1.应用图标状态不对;
2.打开wine应用时显示了几个多余的图标。

Log: 修复任务栏应用图标显示异常的问题。
Bug: https://pms.uniontech.com/zentao/bug-view-61394.html
Change-Id: Ib3ad2b4115ce90d58e82809e6075a6e398a6af5a
2021-02-01 10:32:38 +08:00
chenjun
2ef1176873 fix: 添加针对源代码的单元测试,添加触发自动测试代码
因为单元测试需要直接测试源代码,而主程序代码中include的单元使用了相对路径
单元测试的CMakeLists和主程序的CMakeLists路径不同,编译单元测试时会提示找不到文件
因此设置搜索路径,并修改各单元引用头文件的路径。在单元测试的CMakeLists中添加需要依赖

Log: 添加针对源代码的单元测试,添加触发自动测试代码
Change-Id: I0e0bc92c28d6cee42fc52064fc360c58f7c02826
2020-12-22 10:10:20 +08:00
chengbo
db0c0039d4 fix: 任务栏位置调整左边,摩灯窗口还是从底部出来
删除定时器,使用监听Dock的FrontendWindowRect change信号,重新更新IconGeometries

Log: 魔灯效果下,窗口效果跟随任务栏位置
Bug: https://pms.uniontech.com/zentao/bug-view-44736.html
Change-Id: I5e6caf7872dc37c34d8e5fb99676d7b35940dff3
2020-11-05 21:34:21 +08:00
chengbo
5f36df4430 fix: 任务栏位置调整左边,摩灯窗口还是从底部出来
删除定时器,使用监听Dock的FrontendWindowRect change信号,重新更新IconGeometries

Log: 魔灯效果下,窗口效果跟随任务栏位置
Bug: https://pms.uniontech.com/zentao/bug-view-44736.html
Change-Id: I5e6caf7872dc37c34d8e5fb99676d7b35940dff3
2020-10-30 17:30:49 +08:00
范朋程
755190472c fix: 修复自动化测试出现的任务栏不显示问题
com.deepin.daemon.Display服务启动比任务栏启动要晚,导致获取的数据异常

Log: 修复自动化测试出现的任务栏不显示问题
Change-Id: Ida4b6986dfec4bf212cfc1e28c4ebf4dfcb63198
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/4064
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Reviewed-by: wangwei <wangwei@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-09-09 21:00:51 +08:00
fpc_diesel
eecce9d618 feat(accessible):update accessible on uos branch 2020-06-04 14:01:08 +08:00
fpc_diesel
871b5f0edf feat:format code 2020-05-22 13:11:48 +08:00
fpc_diesel
f7cc0e4625 fix:The dock calendar is dynamically displayed icon by current date
dock日历根据日期动态显示图标(task:18543)
2020-05-22 13:11:05 +08:00
fpc_diesel
06ac0b986a feat(accessible):Unified naming && set overlaywarningwidget accessible
统一命名方式,所有的控件均以统一,添加overlaywarningwidget的accessible代码
2020-05-06 17:28:20 +08:00
fanpengcheng_cm
684ed7cf0b feat:set control accessible 2020-03-13 13:39:01 +08:00
王少君
9c6be185e5 Revert "feat:set cotrol accessible"
This reverts commit 5be2ade0b13a0d47cf58a27e19caf06b9f9ed377
2020-03-13 12:07:59 +08:00
fanpengcheng_cm
5be2ade0b1 feat:set cotrol accessible 2020-03-12 20:23:53 +08:00
chenzhe
ff7c85919c fix(dock):fix middle clicked open many instance 2019-12-23 17:56:51 +08:00
chenzhe
c3d1629ff8 fix(dock):fix appicon repeat open many instance 2019-12-23 15:53:48 +08:00
shaojun
bb9d58096f feat:efficient mode app active status 2019-11-14 10:34:50 +08:00
wangxuwen
f71146b1fa feat(dde-dock): for task 11525 2019-11-08 09:29:56 +08:00
wangxuwen
eced298591 feat(dock): delete invalid code for set icon size logic 2019-09-03 13:57:02 +08:00
shaojun
4692406d63 feat(appItem):appItem open drag file 2019-08-29 17:21:02 +08:00
shaojun
d0fdde7a50 feat(panel):MainPanelControl add drag and drop for app and plugin 2019-08-21 12:52:53 +08:00
justforlxz
ef232eea04 feat(gsettings): control all module visible 2019-08-09 16:13:26 +08:00
zccrs
f3c94c85ac fix: crash at AppDragWidget
mark m_drag to nullptr when the app drag widget destroyed

https://github.com/linuxdeepin/internal-discussion/issues/1936
2019-07-15 16:50:56 +08:00
justforlxz
55c4c74a82
refactor: use QWidget::devicePixelRatio to replace QApplication::devicePixelRatio
插入新屏幕后,新屏幕的缩放是1,切换为复制模式后如果继续使用QApplication::devicePixelRatio会导致
显示错误,统一换成QWidget::devicePixelRatio或QScreen::devicePixelRatio。
2019-04-23 18:27:40 +08:00
listenerri
f4d6ba1076 fix: preview window can not be raised after clicked preview snapshot
https://github.com/linuxdeepin/internal-discussion/issues/1321
2019-04-12 17:36:41 +08:00
listenerri
bc4608b858 feat: add cancel animation for drag to undock operation
https://github.com/linuxdeepin/internal-discussion/issues/663

Change-Id: I92daa3835fb6c5add9fcd5d1619e3a99d92d0b1f
2019-01-17 14:44:46 +08:00
listenerri
fcb2c8563e Merge branch 'dev/refactor-plugins-mouse' into merge-dev/refactor-plugins-mouse
Change-Id: I03089593b793de20d8400449812bfdc9e4e83ecb
2019-01-07 09:47:51 +08:00
listenerri
c10a6e9eb2 fix: there is an empty AppItem in dock
https://github.com/linuxdeepin/internal-discussion/issues/653

Change-Id: If2da95238240c2726b9395267ba0bfebb7f6ca28
2018-12-25 16:32:45 +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
c45df0263d fix: threshold of wheel on app item
https://github.com/linuxdeepin/internal-discussion/issues/667

Change-Id: I544eb3de96214eb8c2f8095ebac4cecab2066269
2018-12-17 14:41:54 +08:00
listenerri
5e9886fa97 fix: click item is ignored
Change-Id: I7ef7f440d59bb7a75ad50d5a9c85f6084c4704bf
2018-11-30 18:17:08 +08:00
listenerri
fd3f502529 fix: play swing effect when open app with mouse middle button
Change-Id: I20869436ff498f6d2a4fdd62f220dcc8f0aae9b8
2018-11-30 14:57:11 +08:00
Hualet Wang
ca08567861 feat: touchscreen support
Change-Id: Ica912c5e672d0e02f6e9540fd95d12d916dd5d74
2018-11-16 09:58:46 +08:00
listenerri
725891a6b1 fix: place holder item still display in dock after drag leave
Change-Id: Ibc21b1f984a4ecc1bff466012c2afe05c5df1285
2018-11-05 11:26:20 +08:00
listenerri
8b084117f8 add(preview): support identify window closeable
There is no close button when previewing a window that cannot be closed

Change-Id: Ic97f1fdd287fad1c06578e1745d526da61d0088e
2018-10-08 11:43:03 +08:00
listenerri
01e1e68136 add: accept dock app from all droped desktop files
Change-Id: I4d18f7a9cdff2339c715f0910f067b06492e1303
2018-09-28 15:37:10 +08:00
listenerri
43214b60da add debug info about app item
name, id, icon

Change-Id: If9c686eb41ca30ee55a0ef938665a9cab24c2de1
2018-08-31 16:06:34 +08:00
listenerri
da407f77db fix(app): icon is null
Change-Id: I1fb4415d97bf35572bf4f5e7ea8fd4291e62a83f
2018-08-31 15:15:16 +08:00
listenerri
ef2dc365da fix(preview): refresh preview snapshot
assign nullptr when preview window is not visible

Change-Id: I544184549e00f5aeb7c0eeda2fe4d5a18702bab6
2018-07-30 15:48:58 +08:00
listenerri
97c9d45c16 fix: close preview window
fix preview snapshot do not close after close button clicked

Change-Id: Ibb88dc19af0c6e0824da94fe7e17720d01d975de
2018-07-26 16:44:36 +08:00