remove old files

Change-Id: I0fe139d8f4e46b90a90c7722797836098e553082
This commit is contained in:
石博文 2016-06-13 15:19:59 +08:00 committed by Hualet Wang
parent 76f95a7368
commit 107574fd72
8 changed files with 17 additions and 139 deletions

View File

@ -32,4 +32,17 @@ DockItemController::DockItemController(QObject *parent)
for (auto entry : m_dockInter->entries())
m_itemList.append(new AppItem(entry));
m_itemList.append(new PlaceholderItem);
connect(m_dockInter, &DBusDock::EntryAdded, this, &DockItemController::appItemAdded);
connect(m_dockInter, &DBusDock::EntryRemoved, this, &DockItemController::appItemRemoved);
}
void DockItemController::appItemAdded(const QDBusObjectPath &path)
{
qDebug() << path.path();
}
void DockItemController::appItemRemoved(const QString &itemId)
{
qDebug() << itemId;
}

View File

@ -21,6 +21,8 @@ signals:
private:
explicit DockItemController(QObject *parent = 0);
void appItemAdded(const QDBusObjectPath &path);
void appItemRemoved(const QString &itemId);
private:
QList<DockItem *> m_itemList;

View File

@ -121,8 +121,8 @@ public Q_SLOTS: // METHODS
}
Q_SIGNALS: // SIGNALS
void EntryAdded(const QDBusObjectPath &in0);
void EntryRemoved(const QString &in0);
void EntryAdded(const QDBusObjectPath &entryPath);
void EntryRemoved(const QString &entryId);
void ServiceRestarted();
// begin property changed signals
void ActiveWindowChanged();

View File

@ -1,28 +0,0 @@
/*
* This file was generated by qdbusxml2cpp version 0.8
* Command line was: qdbusxml2cpp -c DBusDockEntryManager -p dbusdockentrymanager dde-dock-EntryManager.xml
*
* qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
*
* This is an auto-generated file.
* This file may have been hand-edited. Look for HAND-EDIT comments
* before re-generating it.
*/
#include "dbusdockentrymanager.h"
/*
* Implementation of interface class DBusDockEntryManager
*/
DBusDockEntryManager::DBusDockEntryManager(QObject *parent)
: QDBusAbstractInterface("com.deepin.daemon.Dock", "/dde/dock/EntryManager", staticInterfaceName(), QDBusConnection::sessionBus(), parent)
{
QDBusConnection::sessionBus().connect(this->service(), this->path(), "org.freedesktop.DBus.Properties", "PropertiesChanged","sa{sv}as", this, SLOT(__propertyChanged__(QDBusMessage)));
}
DBusDockEntryManager::~DBusDockEntryManager()
{
QDBusConnection::sessionBus().disconnect(service(), path(), "org.freedesktop.DBus.Properties", "PropertiesChanged", "sa{sv}as", this, SLOT(propertyChanged(QDBusMessage)));
}

View File

@ -1,89 +0,0 @@
/*
* This file was generated by qdbusxml2cpp version 0.8
* Command line was: qdbusxml2cpp -c DBusDockEntryManager -p dbusdockentrymanager dde-dock-EntryManager.xml
*
* qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
*
* This is an auto-generated file.
* Do not edit! All changes made to it will be lost.
*/
#ifndef DBUSDOCKENTRYMANAGER_H_1464835422
#define DBUSDOCKENTRYMANAGER_H_1464835422
#include <QtCore/QObject>
#include <QtCore/QByteArray>
#include <QtCore/QList>
#include <QtCore/QMap>
#include <QtCore/QString>
#include <QtCore/QStringList>
#include <QtCore/QVariant>
#include <QtDBus/QtDBus>
/*
* Proxy class for interface dde.dock.EntryManager
*/
class DBusDockEntryManager: public QDBusAbstractInterface
{
Q_OBJECT
Q_SLOT void __propertyChanged__(const QDBusMessage& msg)
{
QList<QVariant> arguments = msg.arguments();
if (3 != arguments.count())
return;
QString interfaceName = msg.arguments().at(0).toString();
if (interfaceName !="dde.dock.EntryManager")
return;
QVariantMap changedProps = qdbus_cast<QVariantMap>(arguments.at(1).value<QDBusArgument>());
foreach(const QString &prop, changedProps.keys()) {
const QMetaObject* self = metaObject();
for (int i=self->propertyOffset(); i < self->propertyCount(); ++i) {
QMetaProperty p = self->property(i);
if (p.name() == prop) {
Q_EMIT p.notifySignal().invoke(this);
}
}
}
}
public:
static inline const char *staticInterfaceName()
{ return "dde.dock.EntryManager"; }
public:
explicit DBusDockEntryManager(QObject *parent = 0);
~DBusDockEntryManager();
Q_PROPERTY(QList<QDBusObjectPath> Entries READ entries NOTIFY EntriesChanged)
inline QList<QDBusObjectPath> entries() const
{ return qvariant_cast< QList<QDBusObjectPath> >(property("Entries")); }
public Q_SLOTS: // METHODS
inline QDBusPendingReply<QStringList> GetEntryIDs()
{
QList<QVariant> argumentList;
return asyncCallWithArgumentList(QStringLiteral("GetEntryIDs"), argumentList);
}
inline QDBusPendingReply<> Reorder(const QStringList &in0)
{
QList<QVariant> argumentList;
argumentList << QVariant::fromValue(in0);
return asyncCallWithArgumentList(QStringLiteral("Reorder"), argumentList);
}
Q_SIGNALS: // SIGNALS
void Added(const QDBusObjectPath &in0);
void Removed(const QString &in0);
void TrayInited();
// begin property changed signals
void EntriesChanged();
};
namespace dde {
namespace dock {
typedef ::DBusDockEntryManager EntryManager;
}
}
#endif

View File

@ -1,16 +0,0 @@
<interface name="dde.dock.EntryManager">
<method name="GetEntryIDs">
<arg type="as" direction="out"></arg>
</method>
<method name="Reorder">
<arg type="as" direction="in"></arg>
</method>
<signal name="Added">
<arg type="o"></arg>
</signal>
<signal name="Removed">
<arg type="s"></arg>
</signal>
<signal name="TrayInited"></signal>
<property name="Entries" type="ao" access="read"></property>
</interface>

View File

@ -8,7 +8,6 @@ PKGCONFIG += xcb-ewmh
SOURCES += main.cpp \
window/mainwindow.cpp \
dbus/dbusdockentrymanager.cpp \
xcb/xcb_misc.cpp \
item/dockitem.cpp \
panel/mainpanel.cpp \
@ -23,7 +22,6 @@ SOURCES += main.cpp \
HEADERS += \
window/mainwindow.h \
dbus/dbusdockentrymanager.h \
xcb/xcb_misc.h \
item/dockitem.h \
panel/mainpanel.h \

View File

@ -22,8 +22,6 @@ AppItem::AppItem(const QDBusObjectPath &entry, QWidget *parent)
m_data = m_itemEntry->data();
qDebug() << m_data;
connect(m_itemEntry, static_cast<void (DBusDockEntry::*)(const QString&, const QString&)>(&DBusDockEntry::DataChanged), this, &AppItem::entryDataChanged);
}