Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 09:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(plugins): keep order

Browse Source 
Change-Id: Iaa9dd11750999fca6faf2d3b1d3bbb60f6ba740b
This commit is contained in:
rekols 2018-03-06 15:18:53 +08:00 committed by 石博文
parent 0d2c94fe11
commit e281f088ac
Notes: gerrit 2018-03-08 03:45:26 +00:00 
Verified+1: Anonymous Coward #1000004
Verified+1: <zhaofangfang@linuxdeepin.com>
Code-Review+2: 石博文 <sbw@sbw.so>
Submitted-by: Rekols <rekols@foxmail.com>
Submitted-at: Thu, 08 Mar 2018 03:45:26 +0000
Reviewed-on: https://cr.deepin.io/32259
Project: dde/dde-dock
Branch: refs/heads/master
12 changed files with 79 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frame/controller/dockitemcontroller.cpp
View File

@ -308,15 +308,15 @@ void DockItemController::pluginItemInserted(PluginsItem *item)
else
{
insertIndex = m_itemList.size();
for (int i(firstPluginPosition); i != m_itemList.size(); ++i)
for (int i(firstPluginPosition + 1); i != m_itemList.size() + 1; ++i)
{
PluginsItem *pItem = static_cast<PluginsItem *>(m_itemList[i]);
PluginsItem *pItem = static_cast<PluginsItem *>(m_itemList[i - 1]);
Q_ASSERT(pItem);
const int sortKey = pItem->itemSortKey();
if (sortKey != -1 && itemSortKey > sortKey)
continue;
insertIndex = i;
insertIndex = i - 1;
break;
}
}

15
plugins/datetime/datetimeplugin.cpp
View File

@ -22,13 +22,15 @@
#include "datetimeplugin.h"
#include <QLabel>
#include <QDebug>
DatetimePlugin::DatetimePlugin(QObject *parent)
: QObject(parent),
m_dateTipsLabel(new QLabel),
m_refershTimer(new QTimer(this))
m_refershTimer(new QTimer(this)),
m_settings("deepin", "dde-dock-datetime")
{
m_dateTipsLabel->setObjectName("datetime");
m_dateTipsLabel->setStyleSheet("color:white;"
@ -82,7 +84,16 @@ int DatetimePlugin::itemSortKey(const QString &itemKey)
{
Q_UNUSED(itemKey);
return -1;
const QString key = QString("pos_%1").arg(displayMode());
return m_settings.value(key, 0).toInt();
}
void DatetimePlugin::setSortKey(const QString &itemKey, const int order)
{
Q_UNUSED(itemKey);
const QString key = QString("pos_%1").arg(displayMode());
m_settings.setValue(key, order);
}
QWidget *DatetimePlugin::itemWidget(const QString &itemKey)

5
plugins/datetime/datetimeplugin.h
View File

@ -27,6 +27,7 @@
#include <QTimer>
#include <QLabel>
#include <QSettings>
class DatetimePlugin : public QObject, PluginsItemInterface
{
@ -45,7 +46,8 @@ public:
bool pluginIsAllowDisable() override { return true; }
bool pluginIsDisable() override;
int itemSortKey(const QString &itemKey) override;
int itemSortKey(const QString &itemKey);
void setSortKey(const QString &itemKey, const int order);
QWidget *itemWidget(const QString &itemKey) override;
QWidget *itemTipsWidget(const QString &itemKey) override;
@ -65,6 +67,7 @@ private:
QTimer *m_refershTimer;
QString m_currentTimeString;
QSettings m_settings;
};
#endif // DATETIMEPLUGIN_H

2
plugins/keyboard-layout/keyboardplugin.h
View File

@ -37,7 +37,7 @@ public:
const QString pluginDisplayName() const override;
void init(PluginProxyInterface *proxyInter) override;
QWidget *itemWidget(const QString &itemKey) override;
QWidget *itemWidget(const QString &itemKey);
QWidget *itemTipsWidget(const QString &itemKey);
private:

12
plugins/network/networkplugin.cpp
View File

@ -143,6 +143,18 @@ QWidget *NetworkPlugin::itemPopupApplet(const QString &itemKey)
return nullptr;
}
int NetworkPlugin::itemSortKey(const QString &itemKey)
{
const QString key = QString("pos_%1_%2").arg(itemKey).arg(displayMode());
return m_settings.value(key, 0).toInt();
}
void NetworkPlugin::setSortKey(const QString &itemKey, const int order)
{
const QString key = QString("pos_%1_%2").arg(itemKey).arg(displayMode());
m_settings.setValue(key, order);
}
void NetworkPlugin::deviceAdded(const NetworkDevice &device)
{
DeviceItem *item = nullptr;

3
plugins/network/networkplugin.h
View File

@ -51,6 +51,9 @@ public:
QWidget *itemTipsWidget(const QString &itemKey);
QWidget *itemPopupApplet(const QString &itemKey);
int itemSortKey(const QString &itemKey);
void setSortKey(const QString &itemKey, const int order);
private slots:
void deviceAdded(const NetworkDevice &device);
void deviceRemoved(const NetworkDevice &device);

12
plugins/shutdown/shutdownplugin.cpp
View File

@ -228,6 +228,18 @@ void ShutdownPlugin::displayModeChanged(const Dock::DisplayMode displayMode)
updateBatteryVisible();
}
int ShutdownPlugin::itemSortKey(const QString &itemKey)
{
const QString key = QString("pos_%1_%2").arg(itemKey).arg(displayMode());
return m_settings.value(key, 0).toInt();
}
void ShutdownPlugin::setSortKey(const QString &itemKey, const int order)
{
const QString key = QString("pos_%1_%2").arg(itemKey).arg(displayMode());
m_settings.setValue(key, order);
}
void ShutdownPlugin::updateBatteryVisible()
{
const bool exist = !m_powerInter->batteryPercentage().isEmpty();

3
plugins/shutdown/shutdownplugin.h
View File

@ -56,6 +56,9 @@ public:
void invokedMenuItem(const QString &itemKey, const QString &menuId, const bool checked) override;
void displayModeChanged(const Dock::DisplayMode displayMode) override;
int itemSortKey(const QString &itemKey);
void setSortKey(const QString &itemKey, const int order);
private:
void updateBatteryVisible();
void requestContextMenu(const QString &itemKey);

18
plugins/sound/soundplugin.cpp
View File

@ -20,6 +20,7 @@
*/
#include "soundplugin.h"
#include <QDebug>
#define STATE_KEY "enable"
@ -28,7 +29,6 @@ SoundPlugin::SoundPlugin(QObject *parent)
m_settings("deepin", "dde-dock-sound"),
m_soundItem(nullptr)
{
}
const QString SoundPlugin::pluginName() const
@ -101,3 +101,19 @@ void SoundPlugin::invokedMenuItem(const QString &itemKey, const QString &menuId,
m_soundItem->invokeMenuItem(menuId, checked);
}
int SoundPlugin::itemSortKey(const QString &itemKey)
{
Q_UNUSED(itemKey);
const QString key = QString("pos_%1").arg(displayMode());
return m_settings.value(key, 0).toInt();
}
void SoundPlugin::setSortKey(const QString &itemKey, const int order)
{
Q_UNUSED(itemKey);
const QString key = QString("pos_%1").arg(displayMode());
m_settings.setValue(key, order);
}

3
plugins/sound/soundplugin.h
View File

@ -50,6 +50,9 @@ public:
const QString itemContextMenu(const QString &itemKey);
void invokedMenuItem(const QString &itemKey, const QString &menuId, const bool checked);
int itemSortKey(const QString &itemKey);
void setSortKey(const QString &itemKey, const int order);
private:
QSettings m_settings;
SoundItem *m_soundItem;

9
plugins/system-tray/systemtrayplugin.cpp
View File

@ -129,9 +129,14 @@ bool SystemTrayPlugin::itemIsInContainer(const QString &itemKey)
int SystemTrayPlugin::itemSortKey(const QString &itemKey)
{
Q_UNUSED(itemKey);
const QString key = QString("pos_%1_%2").arg(itemKey).arg(displayMode());
return m_containerSettings->value(key, 0).toInt();
}
return 0;
void SystemTrayPlugin::setSortKey(const QString &itemKey, const int order)
{
const QString key = QString("pos_%1_%2").arg(itemKey).arg(displayMode());
m_containerSettings->setValue(key, order);
}
void SystemTrayPlugin::setItemIsInContainer(const QString &itemKey, const bool container)

1
plugins/system-tray/systemtrayplugin.h
View File

@ -53,6 +53,7 @@ public:
bool itemAllowContainer(const QString &itemKey) Q_DECL_OVERRIDE;
bool itemIsInContainer(const QString &itemKey) Q_DECL_OVERRIDE;
int itemSortKey(const QString &itemKey) Q_DECL_OVERRIDE;
void setSortKey(const QString &itemKey, const int order);
void setItemIsInContainer(const QString &itemKey, const bool container) Q_DECL_OVERRIDE;
private: