feat: Merge permission/watermark into master #116
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
添加授权控制，解析命令行传入base64编码json格式字符串。 控制看图编辑、复制、打印权限，屏蔽删除、重命名设置。 设置看图阅读水印以及打印水印。 执行各项操作时上报操作信息。 Log: 添加授权控制及水印. Influence: 编辑 复制 打印 Change-Id: Ib69e34972b67d7982d3bc03b0bb296e9389782aa
修复一处构建错误 Log: 修复一处构建错误 Change-Id: Iaacf5a012961df011950cfa889e831e9fad95674
DTK中打印水印和阅读水印实现方式不同，调整设置的打印水印参数， 使得二者显示效果一致。无打印水印配置时不进行设置。 Log: 解决打印水印和阅读水印显示效果不一致问题 Task: https://pms.uniontech.com/story-view-27783.html Influence: 打印水印 Change-Id: Ia2806eec9490e1ab25f67e68acaa0ac63db6dd04
打印水印设置被包版本判断宏屏蔽，需在DTK5.4.4及以上剩下。 此版本通过libdtkcore5判断，测试及编译环境dtkcore版本为5.2.2， 导致功能被屏蔽。 修改水印设置，将其移除版本宏判断，定制分支一定存在水印功能。 Log: 修复无打印水印问题 Bug: https://pms.uniontech.com/bug-view-191587.html Influence: 打印水印 Change-Id: Ib6f39e314cb59f60faa0094860f248a72aac6a66
图片复制使用GNOME拷贝格式，在PGV系统剪贴板中未显示图片， 修改为同时拷贝图片源数据，以保留原始图片信息。 Log: 修复复制图片剪贴板显示空白图片的问题 Bug: https://pms.uniontech.com/bug-view-191601.html Influence: 图片复制 Change-Id: Id7360e9b33b54961e7ef58241a3835cdb5ffeb7d
1. 设置权限控制时屏蔽"设为壁纸"选项; 2. 为兼容性修改功能判断宏. Log: 设置权限控制时不允许设置壁纸 Task: https://pms.uniontech.com/story-view-30217.html Influence: PermissionConfig Change-Id: Ifc3f4cbb3d7a849d88cc19bda49e14a17330aca8
1. 更新权限控制处理,并允许通过DBus接口唤醒已启动进程; 2. 更新权限控制单元测试. Log: Update permission config and activate process with DBus. Task: https://pms.uniontech.com/story-view-30217.html Influence: PermissionConfig UnitTest Change-Id: Ibc5e8bd990bb910012cbab47bf596de5529348c2
使用PointSize替换PixelSize Log: Use point size replace pixel size. Influence: WaterMark Change-Id: I2940e62a948683bec845d4bfb1aef27a03ed7db7
打印水印预览流程和 dde-watermark-plugin 存在冲突， watermark-plugin 未配置时会过滤打开水印设置。 修改应用打印水印预览流程，检测到 watermark-plugin 时，将水印设置设置为环境变量(JSON配置)，使用 watermark-plugin 插件设置水印。 Log: 修复打印预览默认未打开水印问题. Bug: https://pms.uniontech.com/bug-view-216845.html Influence: WaterMark Change-Id: Ie037430109fb665a8925c2827b3a0f92278a86aa
1. 修复打印水印间距和设置值不同 2. 设置打印水印后屏蔽设置界面 Log: 修复打印水印设置问题 Bug: https://pms.uniontech.com/bug-view-224595.html Influence: PrintWaterMark Change-Id: I8b98a876e4b94ae24f2f21c84789404e672a76e2
DTK限制了打印水印间距，增加配置项以允许捕获 DTK水印设置，强制设置水印间距，默认false， 在需要时提供设置 `breakPrintSpacingLimit`。 Log: 修复打印水印间距问题 Influence: PrintWaterMark Change-Id: I3035a9735271f9a29b04023017744637c1ad76ea
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: rb-union The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
合并权限控制和水印需求到主线. 涉及提交 807a3b3 到 31bae04 * 新增权限控制功能, 允许配置功能开闭; * 新增水印功能, 允许通过配置定制阅读和打印水印; * 水印接口特殊, DTKWidget主线和定制线的接口不同. Log: 回合看图权限控制和水印需求 Task: https://pms.uniontech.com/story-view-27785.html Task: https://pms.uniontech.com/story-view-30217.html Influence: Print Permission
rb-union
force-pushed
the
merge_project
branch
from
d87dbfd to
209cd25
Compare
|
单独分支测试使用，直接合入 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
合并权限控制和水印需求到主线.
涉及提交 807a3b3
到 31bae04
Log: 回合看图权限控制和水印需求
Task: https://pms.uniontech.com/story-view-27785.html
Task: https://pms.uniontech.com/story-view-30217.html
Influence: Print Permission