diff --git a/frame/controller/dockitemcontroller.cpp b/frame/controller/dockitemcontroller.cpp index 85adc37e6..70231eda6 100644 --- a/frame/controller/dockitemcontroller.cpp +++ b/frame/controller/dockitemcontroller.cpp @@ -214,10 +214,8 @@ void DockItemController::refreshFSTItemSpliterVisible() DockItemController::DockItemController(QObject *parent) : QObject(parent), - m_updatePluginsOrderTimer(new QTimer(this)), - - m_appInter(new DBusDock(this)), + m_appInter(new DBusDock("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this)), m_pluginsInter(new DockPluginsController(this)), m_placeholderItem(new StretchItem), m_containerItem(new ContainerItem) diff --git a/frame/controller/dockitemcontroller.h b/frame/controller/dockitemcontroller.h index 5247bcd00..ee006f6be 100644 --- a/frame/controller/dockitemcontroller.h +++ b/frame/controller/dockitemcontroller.h @@ -24,15 +24,18 @@ #include "dockpluginscontroller.h" #include "pluginsiteminterface.h" -#include "dbus/dbusdock.h" #include "item/dockitem.h" #include "item/stretchitem.h" #include "item/appitem.h" #include "item/placeholderitem.h" #include "item/containeritem.h" +#include + #include +using DBusDock = com::deepin::dde::daemon::Dock; + class DockItemController : public QObject { Q_OBJECT @@ -77,16 +80,15 @@ private: void reloadAppItems(); private: - QList> m_itemList; - QTimer *m_updatePluginsOrderTimer; - DBusDock *m_appInter; DockPluginsController *m_pluginsInter; StretchItem *m_placeholderItem; ContainerItem *m_containerItem; static DockItemController *INSTANCE; + + QList> m_itemList; }; #endif // DOCKITEMCONTROLLER_H diff --git a/frame/dbus/dbusdock.cpp b/frame/dbus/dbusdock.cpp deleted file mode 100644 index 32e40b7a2..000000000 --- a/frame/dbus/dbusdock.cpp +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file was generated by qdbusxml2cpp version 0.8 - * Command line was: qdbusxml2cpp -c DBusDock -p dbusdock com.deepin.dde.daemon.Dock.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 "dbusdock.h" - -/* - * Implementation of interface class DBusDock - */ - -DBusDock::DBusDock(QObject *parent) - : QDBusAbstractInterface("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", staticInterfaceName(), QDBusConnection::sessionBus(), parent) -{ - QDBusConnection::sessionBus().connect(this->service(), this->path(), "org.freedesktop.DBus.Properties", "PropertiesChanged","sa{sv}as", this, SLOT(__propertyChanged__(QDBusMessage))); -} - -DBusDock::~DBusDock() -{ - QDBusConnection::sessionBus().disconnect(service(), path(), "org.freedesktop.DBus.Properties", "PropertiesChanged", "sa{sv}as", this, SLOT(propertyChanged(QDBusMessage))); -} - diff --git a/frame/dbus/dbusdock.h b/frame/dbus/dbusdock.h deleted file mode 100644 index 579f23ce0..000000000 --- a/frame/dbus/dbusdock.h +++ /dev/null @@ -1,203 +0,0 @@ -/* - * This file was generated by qdbusxml2cpp version 0.8 - * Command line was: qdbusxml2cpp -c DBusDock -p dbusdock com.deepin.dde.daemon.Dock.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 DBUSDOCK_H_1465782143 -#define DBUSDOCK_H_1465782143 - -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * Proxy class for interface com.deepin.dde.daemon.Dock - */ -class DBusDock: public QDBusAbstractInterface -{ - Q_OBJECT - - Q_SLOT void __propertyChanged__(const QDBusMessage& msg) - { - QList arguments = msg.arguments(); - if (3 != arguments.count()) - return; - QString interfaceName = msg.arguments().at(0).toString(); - if (interfaceName !="com.deepin.dde.daemon.Dock") - return; - QVariantMap changedProps = qdbus_cast(arguments.at(1).value()); - 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 "com.deepin.dde.daemon.Dock"; } - -public: - explicit DBusDock(QObject *parent = 0); - - ~DBusDock(); - - Q_PROPERTY(uint ActiveWindow READ activeWindow NOTIFY ActiveWindowChanged) - inline uint activeWindow() const - { return qvariant_cast< uint >(property("ActiveWindow")); } - - Q_PROPERTY(QList Entries READ entries NOTIFY EntriesChanged) - inline QList entries() const - { return qvariant_cast< QList >(property("Entries")); } - - Q_PROPERTY(int DisplayMode READ displayMode WRITE setDisplayMode NOTIFY DisplayModeChanged) - inline int displayMode() const - { return int(qvariant_cast< int >(property("DisplayMode"))); } - inline void setDisplayMode(int value) - { setProperty("DisplayMode", QVariant::fromValue(int(value))); } - - Q_PROPERTY(int HideMode READ hideMode WRITE setHideMode NOTIFY HideModeChanged) - inline int hideMode() const - { return qvariant_cast< int >(property("HideMode")); } - inline void setHideMode(int value) - { setProperty("HideMode", QVariant::fromValue(value)); } - - Q_PROPERTY(int HideState READ hideState NOTIFY HideStateChanged) - inline int hideState() const - { return int(qvariant_cast< int >(property("HideState"))); } - - Q_PROPERTY(int Position READ position WRITE setPosition NOTIFY PositionChanged) - inline int position() const - { return int(qvariant_cast< int >(property("Position"))); } - inline void setPosition(int value) - { setProperty("Position", QVariant::fromValue(int(value))); } - - Q_PROPERTY(quint32 IconSize READ iconSize WRITE setIconSize NOTIFY IconSizeChanged) - inline quint32 iconSize() const - { return qvariant_cast< quint32 >(property("IconSize")); } - inline void setIconSize(quint32 value) - { setProperty("IconSize", QVariant::fromValue(value)); } - - Q_PROPERTY(quint32 ShowTimeout READ showTimeout NOTIFY ShowTimeoutChanged) - inline quint32 showTimeout() const - { return qvariant_cast< quint32 >(property("ShowTimeout")); } - -public Q_SLOTS: // METHODS - inline QDBusPendingReply<> ActivateWindow(uint in0) - { - QList argumentList; - argumentList << QVariant::fromValue(in0); - return asyncCallWithArgumentList(QStringLiteral("ActivateWindow"), argumentList); - } - - inline QDBusPendingReply<> CloseWindow(uint in0) - { - QList argumentList; - argumentList << QVariant::fromValue(in0); - return asyncCallWithArgumentList(QStringLiteral("CloseWindow"), argumentList); - } - - inline QDBusPendingReply<> PreviewWindow(uint in0) - { - QList argumentList; - argumentList << QVariant::fromValue(in0); - return asyncCallWithArgumentList(QStringLiteral("PreviewWindow"), argumentList); - } - - inline QDBusPendingReply GetEntryIDs() - { - QList argumentList; - return asyncCallWithArgumentList(QStringLiteral("GetEntryIDs"), argumentList); - } - - inline QDBusPendingReply CancelPreviewWindow() - { - QList argumentList; - return asyncCallWithArgumentList(QStringLiteral("CancelPreviewWindow"), argumentList); - } - - inline QDBusPendingReply<> MoveEntry(const int oldIndex, const int newIndex) - { - QList args; - args << oldIndex << newIndex; - - return asyncCallWithArgumentList(QStringLiteral("MoveEntry"), args); - } - - inline QDBusPendingReply RequestDock(const QString &appDesktop, const int index = -1) - { - QList args; - args << appDesktop << index; - - return asyncCallWithArgumentList(QStringLiteral("RequestDock"), args); - } - - inline QDBusPendingReply IsDocked(const QString &appDesktop) - { - QList args; - args << appDesktop; - - return asyncCallWithArgumentList(QStringLiteral("IsDocked"), args); - } - - inline QDBusPendingReply IsOnDock(const QString &appDesktop) - { - QList args; - args << appDesktop; - - return asyncCallWithArgumentList(QStringLiteral("IsOnDock"), args); - } - - inline QDBusPendingReply RequestUndock(const QString &appDesktop) - { - QList args; - args << appDesktop; - - return asyncCallWithArgumentList(QStringLiteral("RequestUndock"), args); - } - - inline QDBusPendingReply<> SetFrontendWindowRect(const int x, const int y, const quint32 width, const quint32 height) - { - QList argumentList; - argumentList << QVariant::fromValue(x) << QVariant::fromValue(y) << QVariant::fromValue(width) << QVariant::fromValue(height); - return asyncCallWithArgumentList(QStringLiteral("SetFrontendWindowRect"), argumentList); - } - -Q_SIGNALS: // SIGNALS - void EntryAdded(const QDBusObjectPath &entryPath, const int index); - void EntryRemoved(const QString &entryId); - void ServiceRestarted(); -// begin property changed signals -void ActiveWindowChanged(); -void DisplayModeChanged(); -void EntriesChanged(); -void HideModeChanged(); -void HideStateChanged(); -void PositionChanged(); -void IconSizeChanged(); -void ShowTimeoutChanged(); -}; - -namespace com { - namespace deepin { - namespace dde { - namespace daemon { - typedef ::DBusDock Dock; - } - } - } -} -#endif diff --git a/frame/util/docksettings.cpp b/frame/util/docksettings.cpp index 53cdf67bd..e967739f0 100644 --- a/frame/util/docksettings.cpp +++ b/frame/util/docksettings.cpp @@ -57,7 +57,7 @@ DockSettings::DockSettings(QWidget *parent) , m_keepHiddenAct(tr("Keep Hidden"), this) , m_smartHideAct(tr("Smart Hide"), this) , m_displayInter(new DBusDisplay(this)) - , m_dockInter(new DBusDock(this)) + , m_dockInter(new DBusDock("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this)) , m_itemController(DockItemController::instance(this)) , m_appearanceInter(new Appearance("com.deepin.daemon.Appearance", "/com/deepin/daemon/Appearance", QDBusConnection::sessionBus(), this)) { diff --git a/frame/util/docksettings.h b/frame/util/docksettings.h index 51dc09620..4ddcf26df 100644 --- a/frame/util/docksettings.h +++ b/frame/util/docksettings.h @@ -23,11 +23,12 @@ #define DOCKSETTINGS_H #include "constants.h" -#include "dbus/dbusdock.h" #include "dbus/dbusmenumanager.h" #include "dbus/dbusdisplay.h" #include "controller/dockitemcontroller.h" + #include +#include #include #include @@ -41,6 +42,7 @@ DWIDGET_USE_NAMESPACE using namespace Dock; using Appearance = com::deepin::daemon::Appearance; +using DBusDock = com::deepin::dde::daemon::Dock; class WhiteMenu : public QMenu {