Skip to content

Fix: The screen size show error.#628

Merged
deepin-bot[bot] merged 1 commit intolinuxdeepin:masterfrom
GongHeng2017:202603301023-master-fix
Mar 30, 2026
Merged

Fix: The screen size show error.#628
deepin-bot[bot] merged 1 commit intolinuxdeepin:masterfrom
GongHeng2017:202603301023-master-fix

Conversation

@GongHeng2017
Copy link
Copy Markdown
Contributor

@GongHeng2017 GongHeng2017 commented Mar 30, 2026

-- Add Group Policy item to control whether to display screen size.

Log: fix issue
Bug: https://pms.uniontech.com/bug-view-354275.html

Summary by Sourcery

Make screen size display in Device Manager conditional on a configurable setting to address incorrect screen size display.

New Features:

  • Introduce a configuration option to control whether the screen size is shown in the device information view.

Bug Fixes:

  • Resolve incorrect or undesired screen size display by allowing it to be hidden via configuration.

-- Add Group Policy item to control whether to display screen size.

Log: fix issue
Bug: https://pms.uniontech.com/bug-view-354275.html
@sourcery-ai
Copy link
Copy Markdown

sourcery-ai bot commented Mar 30, 2026

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Adds a configurable option (via DConfig Group Policy) to control whether the monitor screen size is displayed in the device manager, and updates the file copyright years.

Sequence diagram for conditional display of monitor screen size

sequenceDiagram
    participant DeviceMonitor
    participant DConfig

    DeviceMonitor->>DeviceMonitor: loadOtherDeviceInfo()
    DeviceMonitor->>DeviceMonitor: addOtherDeviceInfo(Primary_Monitor, m_MainScreen)
    DeviceMonitor->>DeviceMonitor: showScreenSize = true

    alt DConfig_available
        DeviceMonitor->>DConfig: create(org.deepin.devicemanager, org.deepin.devicemanager)
        DConfig-->>DeviceMonitor: dconfig
        DeviceMonitor->>DConfig: isValid()
        DConfig-->>DeviceMonitor: bool
        alt dconfig_is_valid
            DeviceMonitor->>DConfig: keyList()
            DConfig-->>DeviceMonitor: keys
            alt keys_contains_showScreenSize
                DeviceMonitor->>DConfig: value(showScreenSize)
                DConfig-->>DeviceMonitor: QVariant
                DeviceMonitor->>DeviceMonitor: showScreenSize = value.toBool()
            end
        end
    end

    alt showScreenSize_is_true
        DeviceMonitor->>DeviceMonitor: addOtherDeviceInfo(Size, m_ScreenSize)
    end

    DeviceMonitor->>DeviceMonitor: addOtherDeviceInfo(Serial_Number, m_SerialNumber)
Loading

Class diagram for DeviceMonitor loadOtherDeviceInfo screen size policy

classDiagram
    class DeviceMonitor {
        - QString m_MainScreen
        - QString m_ScreenSize
        - QString m_SerialNumber
        + void loadOtherDeviceInfo()
        + void addOtherDeviceInfo(QString key, QString value)
    }

    class DConfig {
        + static DConfig* create(QString name, QString path)
        + bool isValid()
        + QStringList keyList()
        + QVariant value(QString key)
    }

    DeviceMonitor ..> DConfig : uses
Loading

File-Level Changes

Change Details Files
Gate display of monitor screen size behind a DConfig/Group Policy setting.
  • Introduce a local boolean flag defaulting to true to control whether screen size info should be shown.
  • Read the showScreenSize key from the org.deepin.devicemanager DConfig if available and valid, updating the flag based on its boolean value.
  • Only call the method that records the screen size in the device info list when the flag is true.
deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp
Support the DConfig schema and update metadata.
  • Update the SPDX file copyright year range to 2022–2026 in the device monitor source file.
  • (Implicit from PR description/diff header) Adjust or define the org.deepin.devicemanager DConfig JSON asset to include the showScreenSize key used by the new logic.
deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp
deepin-devicemanager/assets/org.deepin.devicemanager.json

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link
Copy Markdown

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey - I've left some high level feedback:

  • Consider ensuring the DConfig instance is properly destroyed (e.g., via RAII or an appropriate deleter) to avoid leaking the object created with DConfig::create.
  • The config lookup can be simplified and made more robust by using a default value instead of manually checking keyList().contains(...), e.g. showScreenSize = dconfig->value("showScreenSize", true).toBool();.
  • Align the new code with existing style conventions (spacing around if conditions and braces) to keep the file formatting consistent.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- Consider ensuring the DConfig instance is properly destroyed (e.g., via RAII or an appropriate deleter) to avoid leaking the object created with `DConfig::create`.
- The config lookup can be simplified and made more robust by using a default value instead of manually checking `keyList().contains(...)`, e.g. `showScreenSize = dconfig->value("showScreenSize", true).toBool();`.
- Align the new code with existing style conventions (spacing around `if` conditions and braces) to keep the file formatting consistent.

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@deepin-ci-robot
Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: GongHeng2017, lzwind

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

@GongHeng2017
Copy link
Copy Markdown
Contributor Author

/merge

@deepin-bot deepin-bot bot merged commit 0b99531 into linuxdeepin:master Mar 30, 2026
22 checks passed
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.

3 participants