240 Commits

Author SHA1 Message Date
chenjun
ee2e60bbb7 fix: 点击任务栏插件时,只有点击图标区域时才有效点击
点击任务栏插件时,根据图标大小,计算点击区域是否为有效区域

Log: 修复任务栏中的图标的可点击范围超出图标显示区域
Bug: https://pms.uniontech.com/zentao/bug-view-43531.html
Change-Id: I7345171a6cc97d45d3d2c1dcb7e5ff4f3178757d
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/2833
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: lizhongming <lizhongming@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-08-28 17:23:05 +08:00
曹威
b342f6f884 feat: 增加集中管控相关功能,所有功能可通过全局一个配置启用或禁用。
1. 模块可配置显示隐藏,能打开控制中心的右键菜单全屏蔽。
2. gsettings最终生效的设置在各个用户之间是互相隔离的,而且root用户读取不到普通用户的gsettings配置。
3. 集中管控版本右下解关机按钮右菜菜单的锁定功能改为调用SwitchTTYAndShow

Log: 引用头文件分类规范化
Task: https://pms.uniontech.com/zentao/task-view-30817.html
Change-Id: I5ae833f61864ba1874c8ceb75351d569614ab235
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/2377
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: niecheng <niecheng@uniontech.com>
Reviewed-by: wangwei <wangwei@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-08-28 14:20:32 +08:00
chenjun
cface16a58 fix: Merge branch 'maintain/5.1' into uos
将maintain/5.1合并到uos

Log: 合并分支代码
Change-Id: I72eb946ceecb80db492e8e582cbb64290dc606d0
2020-08-26 18:53:34 +08:00
xiechuan
a93d8a0368 fix: 声音插件设备名颜色异常
当主题改变时,收到信号后同步修改设备名颜色

Log: 修复声音插件设备名颜色异常问题
Bug: https://pms.uniontech.com/zentao/bug-view-44531.html
Change-Id: I4e5e51c97c69bbe3d464f8116b498ae821e8826a
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/2746
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Reviewed-by: niecheng <niecheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-08-26 17:52:30 +08:00
wangwei
6b04b788e0 fix: 任务栏声音区域显示设备与控制中心不一致
和产品商议,任务栏和控制中心保持一致,添加cardName

Log: 任务栏声音区域显示设备与控制中心一致
Bug: https://pms.uniontech.com/zentao/bug-view-42988.html
Change-Id: Id1dbf55f6ee8614afd8f7cbc17f19f4a7e2a0506
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/2415
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Reviewed-by: niecheng <niecheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-08-20 19:15:06 +08:00
wangwei
b2c10e4631 fix(sound): 音量为增强模式下,声音图标在50和100处时,显示的图标和需求不符
边界条件不满足需求

Log: 音量为增强模式下,声音图标在50和100处时,显示的图标和需求不符
Bug: https://pms.uniontech.com/zentao/bug-view-42088.html
Change-Id: I0b4f638d20c9fe9a562fbaa6f93a5879a2168545
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1496
Reviewed-by: wangwei <wangwei@uniontech.com>
Reviewed-by: niecheng <niecheng@uniontech.com>
Reviewed-by: <mailman@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-08-10 19:26:55 +08:00
chenjun
5221be1141 fix: 按需求文档调整托盘区域插件默认排序
根据需求文档https://shimo.im/sheets/8YQY9vyC9VRWCDC6/MODOC 重新调整托盘区域插件默认排序

Log: 修复托盘区域的挂载图标和插件区域的电源,时间图标顺序与需求不符问题
Bug: https://pms.uniontech.com/zentao/bug-view-40690.html
Change-Id: I6962228101de5497e910c4053c1b7e942bec87f7
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1123
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: lizhongming <lizhongming@uniontech.com>
Reviewed-by: pengwenhao <pengwenhao@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-08-06 16:01:37 +08:00
xiechuan
6560e767a6 feat: 声音悬停提示优化
设备静音时提示改为静音

Log: 修改声音插件悬停提示
Bug: https://pms.uniontech.com/zentao/bug-view-41252.html
Change-Id: Ifed55d8f0b6b92000f5e2c9009390f1320297277
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1344
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-08-05 20:53:56 +08:00
chenjun
a68b828c7e Merge remote-tracking branch 'upstream/maintain/5.1' into uos
Change-Id: I9379a941c0ff0dc99e1868e85eb7208c13ad4a40
2020-08-03 19:14:26 +08:00
xiechuan
478ee38d53 feat: 删除声音插件中dus目录,添加任务栏-声音滚动显示设备,手动选择设备
对设备数进行判断后显示设备列表,用户更新控制中心声音设备,获取设备后同时获取当前设备信息

Log: 优化声音列表显示与选择方式
Task: https://pms.uniontech.com/zentao/task-view-30922.html
Change-Id: I243e0dfd8d351f6bf394351c8771ee36824980be
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/927
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: niecheng <niecheng@uniontech.com>
Reviewed-by: wangwei <wangwei@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-07-30 13:31:19 +08:00
Fan PengCheng
0103f4165c fix(accessible): 部分标记控件重命名
取出部分控件标记命名中的sni:文字,
解决托盘图标的tips控件标记名会变化的问题

Log: 控件标记的名称稍微修改了下
Change-Id: I68d9a18154e985d974af0d6c7971d86729bb7099
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/578
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-07-24 08:47:57 +00:00
chenjun
40af8358d5 fix: 改变音量时不再改变静音状态
在设置静音后,点击滑动条时,改变了音量的同时会取消静音状态,不符合设计需求

Log: 修复托盘区域音量显示问题(bug:6382)
Bug: https://pms.uniontech.com/zentao/bug-view-6382.html
Change-Id: Ib65f22af4bb5de07cdb6c9df90627d2d9c8f22c1
2020-07-22 13:18:13 +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
范朋程
a99e12ee48 fix(compilewarning): 解决DImageButton类的编译告警
DImageButton已经将被弃用,使用DIconButton类进行替换

Log: 解决DImageButton打来的编译警告信息
2020-06-13 11:39:32 +08:00
范朋程
e87294f77e fix(compilewarning): 解决部分编译告警
编译过程中会由告警信息,目前绝大部分已修复,但DImageButton类因为暂无完全替代的类,还未处理

Log: 解决部分编译告警
2020-06-12 21:04:22 +08:00
范朋程
daebecd93b fix(sound): (自测)修复音量在115时,实际任务栏tips提示114%的问题
属于未发现问题,double类型转int精度丢失导致

Log: 任务栏音量tips提示与实际音量不符
Bug: https://pms.uniontech.com/zentao/bug-view-16696.html
2020-06-11 10:47:27 +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
范朋程
01d7a23d02 Merge tag '5.1.0.11' into uos
dde 5.0.0.3

# Conflicts:
#	frame/util/docksettings.cpp
#	frame/util/docksettings.h
#	frame/window/mainwindow.cpp
#	gschema/com.deepin.dde.dock.module.gschema.xml
2020-06-05 16:15:42 +08:00
范朋程
e7dacb6723 Merge tag '5.1.0.9' into uos 2020-06-05 15:26:46 +08:00
fpc_diesel
eecce9d618 feat(accessible):update accessible on uos branch 2020-06-04 14:01:08 +08:00
zhaolong
b7134d1faf docs(translation):update translation files 2020-05-27 12:24:01 +08:00
fpc_diesel
e857328823 feat:remove note 2020-05-26 15:27:29 +08:00
fpc_diesel
9530b870ca feat(sound):sound icon display error
BUG6382 【任务栏】托盘区域音量显示问题
2020-05-26 15:16:13 +08:00
fpc_diesel
6077bf9c82 feat(sound):sound icon display error
BUG6382 【任务栏】托盘区域音量显示问题
2020-05-25 17:51:06 +08:00
fpc_diesel
d3a38445a5 feat(sound):sound icon display error
19080 【TR4】【KLU-KK】【KelvinU-WDU0A 5.7.0.10(C233) + BIOS 1.00+ EC 1.00】【HUAWEI】【Audio】【OSKK】【V3试制】调节系统音量,任务栏声音图标显示错误,一直显示小音量图标,但无功能影响(一般+必现+常用功能)---此分支问题也存在,故合入

(cherry picked from commit 5a355b22010bd279b7f1a027ea9ee506d23e6912)

BUG6382 【任务栏】托盘区域音量显示问题

(cherry picked from commit 8ad0eecba4c0ff3c91cebc1d3dd878ee52d1aeb4)
2020-05-20 10:42:52 +08:00
zhaolong
b0035198b4 fix(sound):volume display problem
声音增强模式下,调节任务栏声音图标的值,控制中心输出音量的值不同步,bug:24541
2020-05-15 18:38:26 +08:00
chenwei
19aaa77ce5 fix:Turn on the volume enhancement and adjust the volume output to 150% in the taskbar
开启音量增强,调节任务栏中音量输出为150%与设置声音扬声器输出音量没有保持一致
bug:16696
2020-05-14 18:58:42 +08:00
wangxuwen
2d5aebdb50 fixed(dde-dock):when sound plugin volume is mute,the app icon shouldn't display mute icon for bug 22897
当app插件音量为静音时,app图标应该显示app的图片。bug22897
2020-04-28 13:27:40 +08:00
“fanpengcheng_cm”
f1abf06d1a FIX:VLC music player, taskbar click volume, VLC show truncated
下载VLC音乐播放器,任务栏点击音量,VLC显示截断
BUG:11662

(cherry picked from commit e539cfd6fa22be53fca7c6c10a032cbe34af2c88)
(cherry picked from commit 54e09b1f0025957a2c5f1101542f422bcc3aba6d)

(cherry picked from commit cb2929bbef44c07b73b0418c01c13cc2f5d73840)
2020-04-27 11:47:08 +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
yangyuin
5f41aba0ef fix: 应用音量调节提示音修改成静音时,修改错误,现更正 2020-03-10 21:13:02 +08:00
yangyuin
26aac7425b fix: 任务栏设置应用音量提示音不提示,只有系统设备提示音提示
task: 15454
2020-03-10 19:17:48 +08:00
wangxuwen
219440d593 fixed(dde-dock):the volume is error for bug 14958 2020-03-05 15:13:23 +08:00
wangxuwen
5436246e5c fixed(14558): add app volume tips in sound plugin for bug 14558 2020-03-02 17:33:24 +08:00
chenzhe
d7616992fe feat:Add increasevolume
添加 increasevolume task:13301

# Conflicts:
#	plugins/sound/soundapplet.cpp
2020-01-19 15:05:14 +08:00
chenzhe
499c3281cf feat:Sound tray, increase volume percentage display
声音的托盘,增加音量百分比显示 task:13618

# Conflicts:
#	plugins/sound/soundapplet.cpp
2020-01-19 15:03:54 +08:00
chenzhe
0e17b20122 fix(dock):Fix VLC font description truncation,too long use ellipsis instead
修复VLC字体描述截断,过长使用省略号代替 (bug:11662)
2020-01-17 14:05:38 +08:00
wangxuwen
c841e462fd fixed(dde-dock): change the plugins sort for bug 10319 2020-01-11 10:35:29 +08:00
shaojun
6ffbf9e39f fixed(tray):tray pos error
偶尔会出现托盘图标错位的问题
2019-12-14 20:12:18 +08:00
shaojun
f95fe5bb8b feat(dock icon):default icon zoom 2019-11-05 21:04:07 +08:00
shaojun
d8c0188dfc fixed(sound):icon name error 2019-10-26 10:41:52 +08:00
shaojun
2b0f6300eb fixed:change sound icon 2019-10-24 20:26:39 +08:00
柴兵
daf628ec35 feat(plugin):add network and sound icon 2019-10-24 15:55:41 +08:00
柴兵
0b86ba1c52 feat():add sound and wired icon 2019-10-22 14:53:30 +08:00
shaojun
0f7e8a736d fixed:pixmap setDevicePixelRatio 2019-10-18 09:52:50 +08:00
shaojun
398b0484f2 feat(tray):dock mini size change dark icon 2019-10-11 10:08:24 +08:00
shaojun
197391e81d feat(sound):sound plugin ui changed by theme 2019-10-09 14:29:40 +08:00