Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: merge recent changes from master to release/eagle #340

Open
wants to merge 5 commits into
base: release/eagle
Choose a base branch
from
Open

chore: merge recent changes from master to release/eagle #340

wants to merge 5 commits into from
+152 −11

Conversation

rb-union
Copy link
Contributor

@rb-union rb-union commented Dec 5, 2024

Merge from 88bd74e
to 2dd2fad

  • we ignore treeland commits

rb-union and others added 5 commits December 5, 2024 17:28
@rb-union
fix: out-of-bounds access error
89d11c7 
As title.

Log: Fix out-of-bounds access error
@add-uos @rb-union
feat: [translation]add transifex config
f220f02 
add transifex config

Log: add transifex config
Task: https://pms.uniontech.com/task-view-361363.html
@BLumia @rb-union
fix: invalid YAML syntax in transifex.yaml
0584d12 
Log:
@starhcq @rb-union
fix: adapt compact mode
7806e75 
  adapt compact mode

Log: adpat compact mode
Bug: https://pms.uniontech.com/bug-view-279779.html
@starhcq @rb-union
chore: adapt compact mode
93310b7 
Adjust content select row height to 24px.

Log: Adapt compact mode.
@deepin-ci-robot
Copy link

deepin pr auto review

代码审查意见：

  1. 在logauththread.cpp文件中，handleCoredump函数中新增了一个变量isOk来检查tmpList[7].toInt()的转换是否成功。这是一个好的做法，可以避免潜在的运行时错误。

  2. 在logcollectormain.cpp和loglistview.cpp文件中，新增了updateSizeMode函数来处理紧凑模式下的界面布局更新。这个函数通过检查DGuiApplicationHelper::isCompactMode()的返回值来决定使用哪种按钮大小或行高。这是一个合理的做法，但需要确保所有相关的UI元素都正确地响应这个信号。

  3. 在logviewheaderview.cpp文件中，sizeHint函数被修改为根据紧凑模式动态计算行高。这是一个好的做法，可以提供更好的用户体验。

  4. 在logviewitemdelegate.cpp文件中，sizeHint函数也被修改为根据紧凑模式动态计算行高。同样，这是一个好的做法。

  5. 在.tx/transifex.yaml文件中，settings部分新增了一个pr_branch_name配置项。这个配置项的值使用了<br_unique_id>占位符，这可能是为了在提交时动态生成分支名称。这是一个好的做法，可以避免硬编码分支名称。

  6. 在filtercontent.cpp文件中，cbx_status和typeCbx的setMinimumSize函数被注释掉了，而setMinimumWidth函数被使用了。这可能会导致在紧凑模式下，这些控件的高度不够，从而影响布局。建议统一使用setMinimumSize函数，并确保高度和宽度都符合设计要求。

  7. 在filtercontent.h文件中，FilterContent类新增了一个空函数声明void setChangedcomboxstate(bool value);。这个函数没有在代码中实现，可能会导致编译错误。如果这个函数是必要的，应该提供相应的实现。

  8. 在logauththread.cpp文件中，handleCoredump函数中使用了tmpList[7].toInt(&isOk);来检查转换是否成功。这是一个好的做法，可以避免潜在的运行时错误。

总体来说，代码的修改是合理的，但需要注意确保所有新增的函数和配置项都有相应的实现和文档说明。此外，应该确保所有修改都通过了单元测试，以验证功能的正确性和稳定性。

myk1343
myk1343 reviewed Dec 5, 2024
View reviewed changes
Copy link
Contributor

@myk1343 myk1343 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[是否满足兼容性要求] Y
[是否满足commit提交规范] Y
[是否满足编码规范] Y
[Review结论] Pass
[Fail原因] N/A

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: pengfeixx, 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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

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

@myk1343 myk1343 myk1343 left review comments

@pengfeixx pengfeixx pengfeixx approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@rb-union @deepin-ci-robot @pengfeixx @myk1343 @add-uos @BLumia @starhcq