From ad79b5be69ce494cfd751705430508efe0a23264 Mon Sep 17 00:00:00 2001
From: chenhongtao <chenhongtao@deepin.org>
Date: Tue, 23 Jan 2024 14:24:14 +0800
Subject: [PATCH] chore: bring back display setting button

Log:
---
 plugins/display/displaysettingwidget.cpp | 12 +++++++++++-
 plugins/display/displaysettingwidget.h   |  1 +
 translations/dde-dock.ts                 | 19 ++----------------
 translations/dde-dock_zh_CN.ts           | 25 ++++--------------------
 4 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/plugins/display/displaysettingwidget.cpp b/plugins/display/displaysettingwidget.cpp
index f0ffcffe0..32d15078b 100644
--- a/plugins/display/displaysettingwidget.cpp
+++ b/plugins/display/displaysettingwidget.cpp
@@ -15,8 +15,16 @@ const int ItemSpacing = 10;
 DisplaySettingWidget::DisplaySettingWidget(BrightnessModel *model, QWidget *parent)
     : QWidget(parent)
     , m_brightnessAdjWidget(new BrightnessAdjWidget(model, this))
+    , m_settingBtn(new QPushButton(tr("Display Settings"), this))
 {
     initUI();
+        connect(m_settingBtn, &QPushButton::clicked, this, [ this ](){
+        DDBusSender().service("org.deepin.dde.ControlCenter1")
+                .path("/org/deepin/dde/ControlCenter1")
+                .interface("org.deepin.dde.ControlCenter1")
+                .method("ShowPage").arg(QString("display")).call();
+        Q_EMIT requestHide();
+    });
 }
 
 void DisplaySettingWidget::initUI()
@@ -27,6 +35,7 @@ void DisplaySettingWidget::initUI()
     mainLayout->setSpacing(ItemSpacing);
 
     mainLayout->addWidget(m_brightnessAdjWidget);
+    mainLayout->addWidget(m_settingBtn);
     mainLayout->addStretch();
 
     setLayout(mainLayout);
@@ -39,5 +48,6 @@ void DisplaySettingWidget::initUI()
 void DisplaySettingWidget::resizeWidgetHeight()
 {
     QMargins margins = this->contentsMargins();
-    setFixedHeight(margins.top() + margins.bottom() + m_brightnessAdjWidget->height());
+    setFixedHeight(margins.top() + margins.bottom() + m_brightnessAdjWidget->height() +
+                   m_settingBtn->height() + ItemSpacing);
 }
diff --git a/plugins/display/displaysettingwidget.h b/plugins/display/displaysettingwidget.h
index 144e0dacd..8425f32a3 100644
--- a/plugins/display/displaysettingwidget.h
+++ b/plugins/display/displaysettingwidget.h
@@ -33,6 +33,7 @@ class DisplaySettingWidget : public QWidget
 
 private:
     BrightnessAdjWidget *m_brightnessAdjWidget;     // 亮度调整
+    QPushButton *m_settingBtn;                      // 设置按钮
 };
 
 
diff --git a/translations/dde-dock.ts b/translations/dde-dock.ts
index a1dec3002..6ab999137 100644
--- a/translations/dde-dock.ts
+++ b/translations/dde-dock.ts
@@ -151,26 +151,11 @@
 </context>
 <context>
     <name>DateTimeDisplayer</name>
-    <message>
-        <source>12-hour time</source>
-        <translation>12-hour time</translation>
-    </message>
-    <message>
-        <source>24-hour time</source>
-        <translation>24-hour time</translation>
-    </message>
     <message>
         <source>Time settings</source>
         <translation>Time settings</translation>
     </message>
 </context>
-<context>
-    <name>DevCollaborationWidget</name>
-    <message>
-        <source>PC collaboration</source>
-        <translation>PC collaboration</translation>
-    </message>
-</context>
 <context>
     <name>DialogManager</name>
     <message>
@@ -200,8 +185,8 @@
 <context>
     <name>DisplaySettingWidget</name>
     <message>
-        <source>Multi-Screen Collaboration</source>
-        <translation>Multi-Screen Collaboration</translation>
+        <source>Display Settings</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
diff --git a/translations/dde-dock_zh_CN.ts b/translations/dde-dock_zh_CN.ts
index d9555a78e..8d461223a 100644
--- a/translations/dde-dock_zh_CN.ts
+++ b/translations/dde-dock_zh_CN.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="zh_CN">
+<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="zh_CN">
 <context>
     <name>AbstractPluginsController</name>
     <message>
@@ -151,26 +149,11 @@
 </context>
 <context>
     <name>DateTimeDisplayer</name>
-    <message>
-        <source>12-hour time</source>
-        <translation>12小时制</translation>
-    </message>
-    <message>
-        <source>24-hour time</source>
-        <translation>24小时制</translation>
-    </message>
     <message>
         <source>Time settings</source>
         <translation>时间设置</translation>
     </message>
 </context>
-<context>
-    <name>DevCollaborationWidget</name>
-    <message>
-        <source>PC collaboration</source>
-        <translation>电脑协同</translation>
-    </message>
-</context>
 <context>
     <name>DialogManager</name>
     <message>
@@ -200,15 +183,15 @@
 <context>
     <name>DisplaySettingWidget</name>
     <message>
-        <source>Multi-Screen Collaboration</source>
-        <translation>电脑协同设置</translation>
+        <source>Display Settings</source>
+        <translation>显示设置</translation>
     </message>
 </context>
 <context>
     <name>DockPluginController</name>
     <message>
         <source>The plugin %1 is not compatible with the system.</source>
-        <translation>The plugin %1 is not compatible with the system.</translation>
+        <translation>插件%1和系统版本不兼容。</translation>
     </message>
 </context>
 <context>