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

change interface

Browse Source 
Change-Id: I3abad84dcab440f0767a5fc1f123c7c4e64fc03d
This commit is contained in:
石博文 2016-06-23 16:43:22 +08:00 committed by Hualet Wang
parent 96b46370f2
commit 558b49e7a5
5 changed files with 15 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

@ -68,7 +68,7 @@ DockItemController::DockItemController(QObject *parent)
connect(m_appInter, &DBusDock::EntryAdded, this, &DockItemController::appItemAdded);
connect(m_appInter, &DBusDock::EntryRemoved, this, &DockItemController::appItemRemoved);
connect(m_pluginsInter, &DockPluginsController::pluginsInserted, this, &DockItemController::pluginsItemAdded);
connect(m_pluginsInter, &DockPluginsController::pluginsInserted, this, &DockItemController::pluginsItemInserted);
}
void DockItemController::appItemAdded(const QDBusObjectPath &path, const int index)
@ -110,10 +110,8 @@ void DockItemController::appItemRemoved(const QString &appId)
}
}
void DockItemController::pluginsItemAdded(PluginsItemInterface *interface)
void DockItemController::pluginsItemInserted(PluginsItem *item)
{
PluginsItem *item = new PluginsItem(interface);
m_itemList.append(item);
emit itemInserted(m_itemList.size(), item);
}

2
frame/controller/dockitemcontroller.h
View File

@ -31,7 +31,7 @@ private:
explicit DockItemController(QObject *parent = 0);
void appItemAdded(const QDBusObjectPath &path, const int index);
void appItemRemoved(const QString &appId);
void pluginsItemAdded(PluginsItemInterface *interface);
void pluginsItemInserted(PluginsItem *item);
private:
QList<DockItem *> m_itemList;

7
frame/controller/dockpluginscontroller.cpp
View File

@ -1,11 +1,13 @@
#include "dockpluginscontroller.h"
#include "pluginsiteminterface.h"
#include "dockitemcontroller.h"
#include <QDebug>
#include <QDir>
DockPluginsController::DockPluginsController(QObject *parent)
: QObject(parent)
DockPluginsController::DockPluginsController(DockItemController *itemControllerInter)
: QObject(itemControllerInter),
m_itemControllerInter(itemControllerInter)
{
QMetaObject::invokeMethod(this, "loadPlugins", Qt::QueuedConnection);
}
@ -42,6 +44,5 @@ void DockPluginsController::loadPlugins()
m_pluginLoaderList.append(pluginLoader);
m_pluginsInterfaceList.append(interface);
emit pluginsInserted(interface);
}
}

8
frame/controller/dockpluginscontroller.h
View File

@ -1,20 +1,23 @@
#ifndef DOCKPLUGINSCONTROLLER_H
#define DOCKPLUGINSCONTROLLER_H
#include "item/pluginsitem.h"
#include <QPluginLoader>
#include <QList>
class DockItemController;
class PluginsItemInterface;
class DockPluginsController : public QObject
{
Q_OBJECT
public:
explicit DockPluginsController(QObject *parent = 0);
explicit DockPluginsController(DockItemController *itemControllerInter = 0);
~DockPluginsController();
signals:
void pluginsInserted(PluginsItemInterface *interface) const;
void pluginsInserted(PluginsItem *pluginsItem) const;
private slots:
void loadPlugins();
@ -22,6 +25,7 @@ private slots:
private:
QList<PluginsItemInterface *> m_pluginsInterfaceList;
QList<QPluginLoader *> m_pluginLoaderList;
DockItemController *m_itemControllerInter;
};
#endif // DOCKPLUGINSCONTROLLER_H

2
frame/main.cpp
View File

@ -19,6 +19,8 @@ int main(int argc, char *argv[])
app.setApplicationDisplayName("DDE Dock");
app.setApplicationVersion("2.0");
QDBusConnection::sessionBus().registerService("com.deepin.dde.dock");
MainWindow mw;
QTimer::singleShot(500, &mw, &MainWindow::show);