feat: mandatory watermark required for security level 4 by luojiahao11 · Pull Request #673 · linuxdeepin/dtkwidget

luojiahao11 · 2025-07-28T02:52:16Z

add mandatory watermark about user info, time and user usec_smodel label

feat: 等保4级要求必须存在包含用户信息，时间和用户安全标签的水印

deepin-ci-robot · 2025-07-28T02:52:25Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: luojiahao11

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

debian/deepin/OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

github-actions · 2025-07-28T02:52:29Z

CLA Assistant Lite bot:
提交邮箱中包含我们的合作伙伴，但您似乎并非合作伙伴的成员或对接人，请联系相关对接人将您添加至组织之中，或由其重新发起 Pull Request。
The commit email domain belongs to one of our partners, but it seems you are not yet a member of the current organization, please contact the contact person to add you to the organization or let them submit the Pull Request.

_{You can retrigger this bot by commenting recheck in this Pull Request}

deepin-ci-robot · 2025-07-28T02:52:29Z

Hi @luojiahao11. Thanks for your PR. 😃

Synchronize source files from linuxdeepin/dtkwidget. Source-pull-request: linuxdeepin/dtkwidget#673

deepin-ci-robot · 2025-07-28T02:52:34Z

Hi @luojiahao11. Thanks for your PR.

I'm waiting for a linuxdeepin member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

18202781743 · 2025-07-28T03:26:14Z

src/widgets/private/dprintpreviewwidget_p.h

+public:
+    BaseWatermarkItem(QGraphicsItem *parent = nullptr) : QGraphicsItem(parent) {
+        m_font.setFamily("SourceHanSansSC");
+        m_font.setPointSize(12);


这里的字体需要跟随系统么，颜色需要适配暗亮色主题么？

不需要，此水印字体设置成固定即可

18202781743 · 2025-07-28T03:26:49Z

src/widgets/private/dprintpreviewwidget_p.h

 };

+// 基底水印图元类
+class BaseWatermarkItem : public QGraphicsItem


能共用WaterMark这个类来实现默认水印么？

18202781743 · 2025-07-28T05:04:55Z

src/widgets/dprintpreviewwidget.cpp

+    QString userId = getUserId();
+    QPair<int,int> securityLabel = getUserSecurityLabel();
+    QString timeStr = QDateTime::currentDateTime().toString(DATE_TIME_FORMAT);
+    QString waterMarkText = QString("时间: %1\n"


需要翻译吧，

“用户”这种汉字，不需要翻译么，应该要吧，

18202781743 · 2025-07-28T05:06:08Z

src/widgets/dprintpreviewwidget.cpp

+    QString userName = getUserName();
+    QString userId = getUserId();
+    QPair<int,int> securityLabel = getUserSecurityLabel();
+    QString timeStr = QDateTime::currentDateTime().toString(DATE_TIME_FORMAT);


水印时间需要一直动态更新么，

需要准确时间，需要动态更新

18202781743 · 2025-07-28T05:28:56Z

src/widgets/dprintpreviewwidget.cpp

+
+    bool ok = false;
+    quint32 hexValue = 0;
+    if (!hexString.isEmpty() && hexString.startsWith("0x")) {


qt中的字符串转数字，应该能够识别0x,自动转为16进制的值，

Synchronize source files from linuxdeepin/dtkwidget. Source-pull-request: linuxdeepin/dtkwidget#673

18202781743 · 2025-07-30T02:50:05Z

src/widgets/dprintpreviewwidget.cpp

    return d_ptr->previewPages();
 }

+void WaterMark::setBaseWatermark()


是不是可以不在watermark里添加这个方法么，它只是text类型的水印而已，业务逻辑可以放在设置的地方，

Synchronize source files from linuxdeepin/dtkwidget. Source-pull-request: linuxdeepin/dtkwidget#673

add mandatory watermark about user info, time and user usec_smodel label feat: 等保4级要求必须存在包含用户信息，时间和用户安全标签的水印

Synchronize source files from linuxdeepin/dtkwidget. Source-pull-request: linuxdeepin/dtkwidget#673

18202781743 · 2025-07-31T02:05:06Z

src/widgets/dprintpreviewwidget.cpp

 #include <cups/ppd.h>
-
+#include <pwd.h>
+#include <selinux/selinux.h>


这个加个debian/control的依赖，

deepin-bot · 2025-07-31T12:31:27Z

TAG Bot

New tag: 5.7.20
DISTRIBUTION: unstable
Suggest: synchronizing this PR through rebase #674

deepin-bot · 2025-08-14T12:28:48Z

TAG Bot

New tag: 5.7.21
DISTRIBUTION: unstable
Suggest: synchronizing this PR through rebase #680

deepin-bot · 2025-09-04T12:06:42Z

TAG Bot

New tag: 5.7.22
DISTRIBUTION: unstable
Suggest: synchronizing this PR through rebase #683

18202781743 · 2025-09-23T12:06:14Z

问题太久没处理，先关闭，

deepin-ci-robot added a commit to linuxdeepin/dtk6widget that referenced this pull request Jul 28, 2025

sync: from linuxdeepin/dtkwidget

82b15e9

Synchronize source files from linuxdeepin/dtkwidget. Source-pull-request: linuxdeepin/dtkwidget#673

deepin-ci-robot added the needs-ok-to-test label Jul 28, 2025

deepin-ci-robot mentioned this pull request Jul 28, 2025

sync: from linuxdeepin/dtkwidget linuxdeepin/dtk6widget#157

Closed

18202781743 reviewed Jul 28, 2025

View reviewed changes

luojiahao11 force-pushed the master branch from c39e6ab to d4d4cc1 Compare July 30, 2025 01:30

deepin-ci-robot added a commit to linuxdeepin/dtk6widget that referenced this pull request Jul 30, 2025

sync: from linuxdeepin/dtkwidget

8459d5b

Synchronize source files from linuxdeepin/dtkwidget. Source-pull-request: linuxdeepin/dtkwidget#673

18202781743 reviewed Jul 30, 2025

View reviewed changes

luojiahao11 force-pushed the master branch from d4d4cc1 to 2489f64 Compare July 30, 2025 05:33

deepin-ci-robot added a commit to linuxdeepin/dtk6widget that referenced this pull request Jul 30, 2025

sync: from linuxdeepin/dtkwidget

ec913e6

Synchronize source files from linuxdeepin/dtkwidget. Source-pull-request: linuxdeepin/dtkwidget#673

feat: mandatory watermark required for security level 4

99ffc87

add mandatory watermark about user info, time and user usec_smodel label feat: 等保4级要求必须存在包含用户信息，时间和用户安全标签的水印

luojiahao11 force-pushed the master branch from 2489f64 to 99ffc87 Compare July 30, 2025 08:19

deepin-ci-robot added a commit to linuxdeepin/dtk6widget that referenced this pull request Jul 30, 2025

sync: from linuxdeepin/dtkwidget

05a989c

Synchronize source files from linuxdeepin/dtkwidget. Source-pull-request: linuxdeepin/dtkwidget#673

18202781743 reviewed Jul 31, 2025

View reviewed changes

18202781743 closed this Sep 23, 2025

Conversation

luojiahao11 commented Jul 28, 2025

Uh oh!

deepin-ci-robot commented Jul 28, 2025

Uh oh!

github-actions bot commented Jul 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

deepin-ci-robot commented Jul 28, 2025

Uh oh!

deepin-ci-robot commented Jul 28, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

deepin-bot bot commented Jul 31, 2025

Uh oh!

deepin-bot bot commented Aug 14, 2025

Uh oh!

deepin-bot bot commented Sep 4, 2025

Uh oh!

18202781743 commented Sep 23, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

github-actions bot commented Jul 28, 2025 •

edited

Loading