From 26824712fa9bb19f51bfeab3cdb0fa0f79284dbb Mon Sep 17 00:00:00 2001 From: chenjun Date: Thu, 23 Jul 2020 14:00:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=A0=8F=E5=85=B3=E6=9C=BA=E5=92=8C=E6=97=A5=E6=9C=9F=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 按照设计需求，任务栏插件的顺序为屏幕键盘、桌面智能助手（仅桌面版）、关机、时间、回收站、通知中心，重新调整机和时间的顺序，关机在前，时间在后。 Log: 修复插件区域预装顺序有误的问题(bug:37234) Bug: https://pms.uniontech.com/zentao/bug-view-37234.html Change-Id: Id6cb6732ca7367ff78eefe211ed72dc79487603c Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/407 Reviewed-by: lizhongming Tested-by: lizhongming --- plugins/datetime/datetimeplugin.cpp | 4 ++-- plugins/shutdown/shutdownplugin.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/datetime/datetimeplugin.cpp b/plugins/datetime/datetimeplugin.cpp index e17a96a71..4183293db 100644 --- a/plugins/datetime/datetimeplugin.cpp +++ b/plugins/datetime/datetimeplugin.cpp @@ -60,7 +60,7 @@ void DatetimePlugin::init(PluginProxyInterface *proxyInter) if (QFile::exists(settings.fileName())) { Dock::DisplayMode mode = displayMode(); const QString key = QString("pos_%1_%2").arg(pluginName()).arg(mode); - proxyInter->saveValue(this, key, settings.value(key, mode == Dock::DisplayMode::Fashion ? 5 : -1)); + proxyInter->saveValue(this, key, settings.value(key, mode == Dock::DisplayMode::Fashion ? 6 : -1)); QFile::remove(settings.fileName()); } @@ -111,7 +111,7 @@ int DatetimePlugin::itemSortKey(const QString &itemKey) Q_UNUSED(itemKey); const QString key = QString("pos_%1_%2").arg(itemKey).arg(Dock::Efficient); - return m_proxyInter->getValue(this, key, 5).toInt(); + return m_proxyInter->getValue(this, key, 6).toInt(); } void DatetimePlugin::setSortKey(const QString &itemKey, const int order) diff --git a/plugins/shutdown/shutdownplugin.cpp b/plugins/shutdown/shutdownplugin.cpp index 8d3d3a965..38371f911 100644 --- a/plugins/shutdown/shutdownplugin.cpp +++ b/plugins/shutdown/shutdownplugin.cpp @@ -216,7 +216,7 @@ void ShutdownPlugin::displayModeChanged(const Dock::DisplayMode displayMode) int ShutdownPlugin::itemSortKey(const QString &itemKey) { const QString key = QString("pos_%1_%2").arg(itemKey).arg(Dock::Efficient); - return m_proxyInter->getValue(this, key, 6).toInt(); + return m_proxyInter->getValue(this, key, 5).toInt(); } void ShutdownPlugin::setSortKey(const QString &itemKey, const int order)