From d7e1f932ddf78e7dd2c1dbc3e04042b112ed8dbe Mon Sep 17 00:00:00 2001
From: gongheng <gongheng@uniontech.com>
Date: Tue, 31 Mar 2026 14:29:15 +0800
Subject: [PATCH] Feat: Add group setting to show screen size.

-- Add group setting to show screen size.

Log: add feature
Task: https://pms.uniontech.com/task-view-387965.html
---
 .../src/DeviceManager/DeviceMonitor.cpp       | 24 +++++++++----------
 deepin-devicemanager/src/commonfunction.cpp   | 12 ++++++++++
 deepin-devicemanager/src/commonfunction.h     |  2 ++
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp b/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp
index ede99445..d194a562 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp
@@ -356,11 +356,18 @@ const QString DeviceMonitor::getOverviewInfo()
 {
     qCDebug(appLog) << "Getting monitor overview information";
     QString ov;
-
-    if (Common::specialComType == 6 || Common::specialComType == 7) {
-        ov = QString("(%1)").arg(m_ScreenSize);
+    if (Common::isShowScreenSize()) {
+        if (Common::specialComType == 6 || Common::specialComType == 7) {
+            ov = QString("(%1)").arg(m_ScreenSize);
+        } else {
+            ov = QString("%1(%2)").arg(m_Name).arg(m_ScreenSize);
+        }
     } else {
-        ov = QString("%1(%2)").arg(m_Name).arg(m_ScreenSize);
+        if (Common::specialComType == 6 || Common::specialComType == 7) {
+            ov = "";
+        } else {
+            ov = QString("%1").arg(m_Name);
+        }
     }
     qCDebug(appLog) << "Monitor overview:" << ov;
     return ov;
@@ -403,14 +410,7 @@ void DeviceMonitor::loadOtherDeviceInfo()
         }
     }
     addOtherDeviceInfo("Primary Monitor", m_MainScreen);
-    bool showScreenSize { true };
-#ifdef DTKCORE_CLASS_DConfigFile
-    DConfig *dconfig = DConfig::create("org.deepin.devicemanager","org.deepin.devicemanager");
-    if(dconfig && dconfig->isValid() && dconfig->keyList().contains("showScreenSize")){
-        showScreenSize = dconfig->value("showScreenSize").toBool();
-    }
-#endif
-    if (showScreenSize)
+    if (Common::isShowScreenSize())
         addOtherDeviceInfo("Size", m_ScreenSize);
     addOtherDeviceInfo("Serial Number", m_SerialNumber);
 //    addOtherDeviceInfo("Product Date", m_ProductionWeek);
diff --git a/deepin-devicemanager/src/commonfunction.cpp b/deepin-devicemanager/src/commonfunction.cpp
index 8cdd24e4..c63d15de 100644
--- a/deepin-devicemanager/src/commonfunction.cpp
+++ b/deepin-devicemanager/src/commonfunction.cpp
@@ -299,3 +299,15 @@ QByteArray Common::executeClientCmd(const QString &cmd, const QStringList &args,
     }
     return outPut;
 }
+
+bool Common::isShowScreenSize()
+{
+    bool showScreenSize { true };
+#ifdef DTKCORE_CLASS_DConfigFile
+    DConfig *dconfig = DConfig::create("org.deepin.devicemanager","org.deepin.devicemanager");
+    if(dconfig && dconfig->isValid() && dconfig->keyList().contains("showScreenSize")){
+        showScreenSize = dconfig->value("showScreenSize").toBool();
+    }
+#endif
+    return showScreenSize;
+}
diff --git a/deepin-devicemanager/src/commonfunction.h b/deepin-devicemanager/src/commonfunction.h
index c0df2adc..7efd2301 100644
--- a/deepin-devicemanager/src/commonfunction.h
+++ b/deepin-devicemanager/src/commonfunction.h
@@ -47,5 +47,7 @@ class Common
     static int specialComType;
 
     static QByteArray executeClientCmd(const QString& cmd, const QStringList& args = QStringList(), const QString& workPath = QString(), int msecsWaiting = 30000, bool useEnv = true);
+
+    static bool isShowScreenSize();
 };
 #endif // COMMONFUNCTION_H