dde-dock/plugins/keyboard-layout/keyboardplugin.cpp
chenjun cc9af0844c fix: 声音、网络、键盘布局等图标排序时不再区分是否系统图标,同时将排序字段统一成pos_%1_%2格式
在图标排序时,对于系统图标,会自动全部排在其他图标后面,而声音图标正好是属于系统图标,在切换Dock显示模式时,会将声音图标显示在网络图标后面

Log: 修复调整声音插件顺序,切换任务栏模式之后,声音插件顺序改变问题(bug:38862)
Bug: https://pms.uniontech.com/zentao/bug-view-38862.html
Change-Id: Ib080d6eed3a361974142911ff81e9fa0003ae01f
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/343
Reviewed-by: lizhongming <lizhongming@uniontech.com>
Tested-by: lizhongming <lizhongming@uniontech.com>
2020-07-23 08:43:03 +00:00

94 lines
2.7 KiB
C++

/*
* Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd.
*
* Author: rekols <rekols@foxmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "keyboardplugin.h"
KeyboardPlugin::KeyboardPlugin(QObject *parent)
: QObject(parent)
{
}
KeyboardPlugin::~KeyboardPlugin()
{
}
const QString KeyboardPlugin::pluginName() const
{
return "keyboard";
}
const QString KeyboardPlugin::pluginDisplayName() const
{
return "Keyboard";
}
void KeyboardPlugin::init(PluginProxyInterface *proxyInter)
{
m_proxyInter = proxyInter;
if (!m_dbusAdaptors) {
QString serverName = "com.deepin.daemon.InputDevices";
QDBusConnectionInterface *ifc = QDBusConnection::sessionBus().interface();
if (!ifc->isServiceRegistered(serverName)) {
connect(QDBusConnection::sessionBus().interface(), &QDBusConnectionInterface::serviceOwnerChanged, this,
[ = ](const QString & name, const QString & oldOwner, const QString & newOwner) {
Q_UNUSED(oldOwner);
if (name == serverName && !newOwner.isEmpty()) {
m_dbusAdaptors = new DBusAdaptors(this);
disconnect(ifc);
}
});
} else {
m_dbusAdaptors = new DBusAdaptors(this);
}
QDBusConnection::sessionBus().registerService("com.deepin.dde.Keyboard");
QDBusConnection::sessionBus().registerObject("/com/deepin/dde/Keyboard", "com.deepin.dde.Keyboard", this);
}
}
QWidget *KeyboardPlugin::itemWidget(const QString &itemKey)
{
Q_UNUSED(itemKey);
return nullptr;
}
QWidget *KeyboardPlugin::itemTipsWidget(const QString &itemKey)
{
Q_UNUSED(itemKey);
return nullptr;
}
int KeyboardPlugin::itemSortKey(const QString &itemKey)
{
const QString key = QString("pos_%1_%2").arg(itemKey).arg(Dock::Efficient);
return m_proxyInter->getValue(this, key, 2).toInt();
}
void KeyboardPlugin::setSortKey(const QString &itemKey, const int order)
{
const QString key = QString("pos_%1_%2").arg(itemKey).arg(Dock::Efficient);
m_proxyInter->saveValue(this, key, order);
}