Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-02 15:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 调整任务栏关机和日期插件的顺序

Browse Source 
按照设计需求，任务栏插件的顺序为屏幕键盘、桌面智能助手（仅桌面版）、关机、时间、回收站、通知中心，重新调整机和时间的顺序，关机在前，时间在后。

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 <lizhongming@uniontech.com>
Tested-by: lizhongming <lizhongming@uniontech.com>
This commit is contained in:
chenjun 2020-07-23 14:00:44 +08:00 committed by lizhongming
parent cc9af0844c
commit 26824712fa
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/datetime/datetimeplugin.cpp
View File

@ -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)

2
plugins/shutdown/shutdownplugin.cpp
View File

@ -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)