feat(plugins): keep order

Change-Id: Iaa9dd11750999fca6faf2d3b1d3bbb60f6ba740b

frame/controller/dockitemcontroller.cpp

@@ -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;
         }
     }

plugins/datetime/datetimeplugin.cpp

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

plugins/datetime/datetimeplugin.h

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

plugins/keyboard-layout/keyboardplugin.h

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

plugins/network/networkplugin.cpp

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

plugins/network/networkplugin.h

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

plugins/shutdown/shutdownplugin.cpp

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

plugins/shutdown/shutdownplugin.h

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

plugins/sound/soundplugin.cpp

@@ -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);
+}

plugins/sound/soundplugin.h

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

plugins/system-tray/systemtrayplugin.cpp

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

plugins/system-tray/systemtrayplugin.h

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