Skip to content

chore: Update dman's resources#421

Closed
dengzhongyuan365-dev wants to merge 53 commits into
linuxdeepin:masterfrom
dengzhongyuan365-dev:develop/snipe
Closed

chore: Update dman's resources#421
dengzhongyuan365-dev wants to merge 53 commits into
linuxdeepin:masterfrom
dengzhongyuan365-dev:develop/snipe

Conversation

@dengzhongyuan365-dev

Copy link
Copy Markdown
Member

chore: Update dman's resources

- Update dman's resources

log: Update dman's resources.

hundundadi and others added 30 commits April 4, 2023 11:42
Description: 将Gb18030编码适配的代码合并到github realease/eagle

Log: 将Gb18030编码适配的代码合并到github realease/eagle
changlog 5.9.42

Log: changlog 5.9.42
sync by github workflow

Log: none
Influence: none
Description: 扩展主题初始化时未从读取配置文件

Log: 修复终端无法记忆保存好的主题

Bug: https://pms.uniontech.com/bug-view-201145.html
New version 5.9.43

Log: New version 5.9.43
Description: 补充部分2字符宽度的字符集,以前的字符集覆盖量较少

Log: 补充部分2字符宽度的字符集
sync by github workflow

Log: none
Influence: none
Description: 终端日志规范改造

Log: 终端日志规范改造
界面适配紧凑模式切换,涉及:
标签栏 侧边弹窗 查找控件 设置界面 设置弹窗
切换紧凑模式,变更字体大小动态适应.
通过宏 DTKWIDGET_CLASS_DSizeMode 切换是否编译,
兼容低版本 DTK(<5.6.4)

Log: 界面适配紧凑模式切换
Task: https://pms.uniontech.com/task-view-292067.html
Influence: UI
修复兼容编译宏判断错误

Log: 修复兼容编译宏判断错误
Description: replace qDebug()/qInfo()/qWarning()/qCritical() width
qCDebug()/qCInfo()/qCWarning/QCCritical

Log: add app log category
Description: Modify the log configuration file

Log: Modify the log configuration file
Description: The application name is incorrectly written

Log: The application name is incorrectly written
适配紧凑模式引入问题.
修复在低版本DTK下编译的终端标签栏高度不固定问题.

Log: 修复低版本DTK下终端标签栏高度错误.
Bump version to 5.9.45
PR:
* linuxdeepin#310

Log: Bump version to 5.9.45
Description: iconv底层适配GB18030-2022标准,回退上层应用GB18030修改。当处于2005标准时
仍会强制使用上层修改补丁以适配2022标准。

Log: Roll back gb18030 midification
Bump version to 5.9.46
PR:
* linuxdeepin#313

Log: Bump version to 5.9.46
Description: 修复图标闪烁CPU占用较高的问题

Log: 修复图标闪烁CPU占用较高的问题

Bug: https://pms.uniontech.com/bug-view-231445.html
This reverts commit 9a95340.

终端用于等宽字体的展示,对部分制表符等字符映射了宽度.
部分字符等宽字体未设置字形将fallback到其它字体,
切换系统字体(例如Unifont)后可区分显示字符.
GB18030的字体在GB18030编码下可正常展示.

Bug: https://pms.uniontech.com/task-view-272385.html
Bump version to 5.9.47
PR:
* linuxdeepin#317
* linuxdeepin#321

Log: Bump version to 5.9.47
Description: 适配调试模式

Log: Debug mode log adaptation

Task: https://pms.uniontech.com/task-view-310055.html
设置弹窗在构造时设置了父控件,而父控件(终端窗口)销毁
时同时销毁设置弹窗.导致关闭后在其它终端窗口打开设置
弹窗时,访问已销毁的弹窗对象,程序崩溃.
调整设置弹窗生命周期由 Service 维护,不过仍需要设置
父窗口以实现正常的显示坐标计算.

Log: 修复在多个窗口上切换显示设置弹窗崩溃的问题.
Bug: https://pms.uniontech.com/bug-view-28636.html
Influence: SettingDialog
Description: 修改调试模式配置文件的默认值

Log: 修改调试模式配置文件的默认值

Bug: https://pms.uniontech.com/bug-view-238907.html
Description: update changelog(5.9.48),取消部分日志打印

Log: update changelog(5.9.48)
Description: 修改日志调试模式适配配置文件,将脚本的绝对路径修改成相对路径

Log: 修改日志调试模式适配配置文件

Bug: https://pms.uniontech.com/bug-view-239503.html
Description: update changelog(5.9.49).

Log: update changelog(5.9.49).
Fix compile error: header file not included.

Log: fix compile error
Fixed the default path issue
Bug: https://pms.uniontech.com/bug-view-272475.html
Log: Fixed the default path issue
Update changelog

Log: Update changelog
pengfeixx and others added 22 commits December 14, 2024 06:32
Update changelog

Log: Update changelog
remove invalid  url

Log: remove invalid  url
Enable build with Qt6.8 and compat Qt5.

Log: Enable Qt6 build.
Fix the troubleshoot issues that are not functioning properly when build with Qt6.

Log: Fix the troubleshoot issues that are not functioning properly.
v6.5.0 release after Qt6 support.

Log: v6.5.0 release.
Access random string out of bounds.

Log: fix a crash issue.
Bug: https://pms.uniontech.com/bug-view-303369.html
Bump version to 6.5.1

Log: Bump version to 6.5.1
…eepin#392) (linuxdeepin#400)

- Add log_rules configuration in org.deepin.terminal.json
- Add QLoggingCategory for better log categorization
- Update logging messages to use qCInfo/qCWarning/qCDebug
- Add DConfig support for log rules management

Log: add log rules configuration and improve logging system

Co-authored-by: wyu <97944796+wyu71@users.noreply.github.com>
Bump version to 6.5.2

Log: Bump version to 6.5.2
- Update Qt compatibility:
  - Add Qt6 support for regular expressions and events
  - Improve character encoding with uchardet/chardet/ICU
  - Add GB18030 encoding detection and handling

- Modernize DTK usage:
  - Replace DApplicationHelper with DGuiApplicationHelper/DPaletteHelper
  - Add support for compact layout mode
  - Update theme handling

- Improve logging system with QLoggingCategory
Bump version to 6.5.3

Log: Bump version to 6.5.3
/root/rpmbuild/BUILD/deepin-terminal-6.5.2/src/views/customthemesettingdialog.cpp: In member function 'virtual void ColorPushButton::paintEvent(QPaintEvent*)':
/root/rpmbuild/BUILD/deepin-terminal-6.5.2/src/views/customthemesettingdialog.cpp:81:9: error: 'DGuiApplicationHelper' has not been declared
   81 |     if (DGuiApplicationHelper::LightType == DGuiApplicationHelper::instance()->themeType())
      |         ^~~~~~~~~~~~~~~~~~~~~
/root/rpmbuild/BUILD/deepin-terminal-6.5.2/src/views/customthemesettingdialog.cpp:81:45: error: 'DGuiApplicationHelper' has not been declared
   81 |     if (DGuiApplicationHelper::LightType == DGuiApplicationHelper::instance()->themeType())
      |                                             ^~~~~~~~~~~~~~~~~~~~~
/root/rpmbuild/BUILD/deepin-terminal-6.5.2/src/views/customthemesettingdialog.cpp: In constructor 'CustomThemeSettingDialog::CustomThemeSettingDialog(QWidget*)':
/root/rpmbuild/BUILD/deepin-terminal-6.5.2/src/views/customthemesettingdialog.cpp:169:13: error: 'DGuiApplicationHelper' has not been declared
  169 |     connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::sizeModeChanged, this, &CustomThemeSettingDialog::updateSizeMode);
      |             ^~~~~~~~~~~~~~~~~~~~~
/root/rpmbuild/BUILD/deepin-terminal-6.5.2/src/views/customthemesettingdialog.cpp:169:49: error: 'DGuiApplicationHelper' has not been declared
  169 |     connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::sizeModeChanged, this, &CustomThemeSettingDialog::updateSizeMode);
      |                                                 ^~~~~~~~~~~~~~~~~~~~~
/root/rpmbuild/BUILD/deepin-terminal-6.5.2/src/views/customthemesettingdialog.cpp:170:13: error: 'DGuiApplicationHelper' has not been declared
  170 |     connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::fontChanged, this, [this](){
      |             ^~~~~~~~~~~~~~~~~~~~~
/root/rpmbuild/BUILD/deepin-terminal-6.5.2/src/views/customthemesettingdialog.cpp:170:49: error: 'DGuiApplicationHelper' has not been declared
  170 |     connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::fontChanged, this, [this](){
      |                                                 ^~~~~~~~~~~~~~~~~~~~~
/root/rpmbuild/BUILD/deepin-terminal-6.5.2/src/views/customthemesettingdialog.cpp: In member function 'void CustomThemeSettingDialog::initUITitle()':
/root/rpmbuild/BUILD/deepin-terminal-6.5.2/src/views/customthemesettingdialog.cpp:214:9: error: 'DGuiApplicationHelper' has not been declared
  214 |     if (DGuiApplicationHelper::DarkType == DGuiApplicationHelper::instance()->themeType())
      |         ^~~~~~~~~~~~~~~~~~~~~
/root/rpmbuild/BUILD/deepin-terminal-6.5.2/src/views/customthemesettingdialog.cpp:214:44: error: 'DGuiApplicationHelper' has not been declared
  214 |     if (DGuiApplicationHelper::DarkType == DGuiApplicationHelper::instance()->themeType())
      |                                            ^~~~~~~~~~~~~~~~~~~~~
/root/rpmbuild/BUILD/deepin-terminal-6.5.2/src/views/customthemesettingdialog.cpp: In member function 'void CustomThemeSettingDialog::initTitleConnections()':
/root/rpmbuild/BUILD/deepin-terminal-6.5.2/src/views/customthemesettingdialog.cpp:401:13: error: 'DGuiApplicationHelper' has not been declared
  401 |     connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, m_titleText, [ = ](DGuiApplicationHelper::ColorType themeType) {
      |             ^~~~~~~~~~~~~~~~~~~~~
/root/rpmbuild/BUILD/deepin-terminal-6.5.2/src/views/customthemesettingdialog.cpp:401:49: error: 'DGuiApplicationHelper' has not been declared
  401 |     connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, m_titleText, [ = ](DGuiApplicationHelper::ColorType themeType) {
      |                                                 ^~~~~~~~~~~~~~~~~~~~~
/root/rpmbuild/BUILD/deepin-terminal-6.5.2/src/views/customthemesettingdialog.cpp:401:109: error: 'DGuiApplicationHelper' has not been declared
  401 |     connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, m_titleText, [ = ](DGuiApplicationHelper::ColorType themeType) {
      |                                                                                                             ^~~~~~~~~~~~~~~~~~~~~
/root/rpmbuild/BUILD/deepin-terminal-6.5.2/src/views/customthemesettingdialog.cpp:401:142: error: expected ',' or '...' before 'themeType'
  401 |     connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, m_titleText, [ = ](DGuiApplicationHelper::ColorType themeType) {
      |                                                                                                                                              ^~~~~~~~~
/root/rpmbuild/BUILD/deepin-terminal-6.5.2/src/views/customthemesettingdialog.cpp: In lambda function:
/root/rpmbuild/BUILD/deepin-terminal-6.5.2/src/views/customthemesettingdialog.cpp:404:13: error: 'DGuiApplicationHelper' has not been declared
  404 |         if (DGuiApplicationHelper::DarkType == themeType)
      |             ^~~~~~~~~~~~~~~~~~~~~
/root/rpmbuild/BUILD/deepin-terminal-6.5.2/src/views/customthemesettingdialog.cpp:404:48: error: 'themeType' was not declared in this scope
  404 |         if (DGuiApplicationHelper::DarkType == themeType)
      |                                                ^~~~~~~~~
/root/rpmbuild/BUILD/deepin-terminal-6.5.2/src/views/customthemesettingdialog.cpp: In member function 'void CustomThemeSettingDialog::updateSizeMode()':
/root/rpmbuild/BUILD/deepin-terminal-6.5.2/src/views/customthemesettingdialog.cpp:538:9: error: 'DGuiApplicationHelper' has not been declared
  538 |     if (DGuiApplicationHelper::isCompactMode()) {
      |         ^~~~~~~~~~~~~~~~~~~~~
make[2]: *** [CMakeFiles/deepin-terminal.dir/build.make:751: CMakeFiles/deepin-terminal.dir/src/views/customthemesettingdialog.cpp.o] Error 1
make[2]: Leaving directory '/root/rpmbuild/BUILD/deepin-terminal-6.5.2/build'
make[2]: *** Waiting for unfinished jobs....
make[2]: Entering directory '/root/rpmbuild/BUILD/deepin-terminal-6.5.2/build'
remove dframeworkdbus dependency

Log: remove dframeworkdbus dependency
Bump version to 6.5.4

Log: Bump version to 6.5.4
替换远程管理hover编辑图标

Bug: https://pms.uniontech.com/bug-view-279839.html
Log: 替换远程管理hover编辑图标
Bump version to 6.5.5

Log: Bump version to 6.5.5
替换图标大小12*12

Bug: https://pms.uniontech.com/bug-view-279839.html
Log: 替换图标大小12*12
Bump version to 6.5.6

Log: Bump version to 6.5.6
Add more logs for log coverage.

Log: Add more logs.
As title.

Log: Adapt to V23 dde dbus interface
- Update dman's resources

log: Update dman's resources.
@deepin-ci-robot

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: dengzhongyuan365-dev

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

Details Needs approval from an approver in each of these files:

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

@github-actions

Copy link
Copy Markdown
  • 检测到debian目录文件有变更: debian/control,debian/rules

@github-actions

github-actions Bot commented Jun 21, 2025

Copy link
Copy Markdown

CLA Assistant Lite bot:

如果你是以企业贡献者的身份进行提交,请联系我们签署企业贡献者许可协议
If you submit as corporate contributor, please contact us to sign our Corporate Contributor License Agreement

感谢您的提交,我们非常感谢。 像许多开源项目一样,在接受您的贡献之前,我们要求您签署我们的个人贡献者许可协议。 您只需发布与以下格式相同的评论即可签署个人贡献者许可协议
Thank you for your submission, we really appreciate it. Like many open-source projects, we ask that you all sign our Individual Contributor License Agreement before we can accept your contribution. You can sign the Individual Contributor License Agreement by just posting a Pull Request Comment same as the below format.


I have read the CLA Document and I hereby sign the CLA.

3 out of 6 committers have signed the CLA.
@rb-union
@pengfeixx
✅ @Qurango
@hundundadi
@lzwind
@wyu71
deepin-admin-bot seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You can retrigger this bot by commenting recheck in this Pull Request

@github-actions

Copy link
Copy Markdown

TAG Bot

TAG: 6.5.7
EXISTED: no
DISTRIBUTION: unstable

@github-actions

Copy link
Copy Markdown
  • 敏感词检查失败, 检测到3个文件存在敏感词
详情
{
    "3rdparty/terminalwidget/lib/TerminalDisplay.cpp": [
        {
            "line": "                                                \"<a href=\\"http://en.wikipedia.org/wiki/Flow_control\\">suspended</a>\"",
            "line_number": 3615,
            "rule": "S35",
            "reason": "Url link | 4c5b21a1de"
        }
    ],
    "debian/control": [
        {
            "line": "Homepage: https://www.deepin.com/",
            "line_number": 25,
            "rule": "S35",
            "reason": "Url link | 9095b9e112"
        }
    ],
    "src/views/termwidget.cpp": [
        {
            "line": "    QString strUrl = \"https://cn.bing.com/search?q=\" + selectedText();",
            "line_number": 624,
            "rule": "S35",
            "reason": "Url link | fd576f862d"
        },
        {
            "line": "    QString strUrl = \"https://www.baidu.com/s?wd=\" + selectedText();",
            "line_number": 630,
            "rule": "S35",
            "reason": "Url link | 6f8d292d20"
        },
        {
            "line": "    QString strUrl = \"https://github.com/search?q=\" + selectedText();",
            "line_number": 636,
            "rule": "S35",
            "reason": "Url link | e1ba2d7c70"
        },
        {
            "line": "    QString strUrl = \"https://stackoverflow.com/search?q=\" + selectedText();",
            "line_number": 642,
            "rule": "S35",
            "reason": "Url link | bd659725f2"
        }
    ]
}

@deepin-ci-robot

Copy link
Copy Markdown

deepin pr auto review

Based on the code in the project repository provided by the user and the user's requirements, generate new code or modify existing code. The output format is:
###PATH:{PATH}
{CODE}
Question:
请将所有文件中的qInfo()替换为qCInfo(mainprocess, ...), qCWarning(mainprocess, ...)qCDebug(mainprocess, ...)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.