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 @@
DateTimeDisplayer
-
- 12-hour time
- 12-hour time
-
-
- 24-hour time
- 24-hour time
-
Time settings
Time settings
-
- DevCollaborationWidget
-
- PC collaboration
- PC collaboration
-
-
DialogManager
@@ -200,8 +185,8 @@
DisplaySettingWidget
- Multi-Screen Collaboration
- Multi-Screen Collaboration
+ Display Settings
+
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 @@
-
-
-
+
AbstractPluginsController
@@ -151,26 +149,11 @@
DateTimeDisplayer
-
- 12-hour time
- 12小时制
-
-
- 24-hour time
- 24小时制
-
Time settings
时间设置
-
- DevCollaborationWidget
-
- PC collaboration
- 电脑协同
-
-
DialogManager
@@ -200,15 +183,15 @@
DisplaySettingWidget
- Multi-Screen Collaboration
- 电脑协同设置
+ Display Settings
+ 显示设置
DockPluginController
The plugin %1 is not compatible with the system.
- The plugin %1 is not compatible with the system.
+ 插件%1和系统版本不兼容。