From eea7e35f77626d0bf7f4b587cebf5ae30f219f3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=87=E9=9D=92?= Date: Thu, 2 Jul 2015 20:48:33 +0800 Subject: [PATCH] Export dock dbus interface --- dde-dock/dde-dock.pro | 20 +++- dde-dock/src/Controller/appmanager.cpp | 7 ++ dde-dock/src/Controller/appmanager.h | 19 +++ dde-dock/src/DBus/dbusclientmanager.cpp | 26 ++++ dde-dock/src/DBus/dbusclientmanager.h | 85 +++++++++++++ dde-dock/src/DBus/dbusdockedappmanager.cpp | 26 ++++ dde-dock/src/DBus/dbusdockedappmanager.h | 87 ++++++++++++++ dde-dock/src/DBus/dbusdocksetting.cpp | 26 ++++ dde-dock/src/DBus/dbusdocksetting.h | 121 +++++++++++++++++++ dde-dock/src/DBus/dbusentrymanager.cpp | 26 ++++ dde-dock/src/DBus/dbusentrymanager.h | 58 +++++++++ dde-dock/src/DBus/dbusentryproxyer.cpp | 27 +++++ dde-dock/src/DBus/dbusentryproxyer.h | 133 +++++++++++++++++++++ dde-dock/src/DBus/dbuspanelmanager.cpp | 26 ++++ dde-dock/src/DBus/dbuspanelmanager.h | 66 ++++++++++ dde-dock/src/Panel/panel.cpp | 8 ++ dde-dock/src/Panel/panel.h | 1 + 17 files changed, 759 insertions(+), 3 deletions(-) create mode 100644 dde-dock/src/Controller/appmanager.cpp create mode 100644 dde-dock/src/Controller/appmanager.h create mode 100644 dde-dock/src/DBus/dbusclientmanager.cpp create mode 100644 dde-dock/src/DBus/dbusclientmanager.h create mode 100644 dde-dock/src/DBus/dbusdockedappmanager.cpp create mode 100644 dde-dock/src/DBus/dbusdockedappmanager.h create mode 100644 dde-dock/src/DBus/dbusdocksetting.cpp create mode 100644 dde-dock/src/DBus/dbusdocksetting.h create mode 100644 dde-dock/src/DBus/dbusentrymanager.cpp create mode 100644 dde-dock/src/DBus/dbusentrymanager.h create mode 100644 dde-dock/src/DBus/dbusentryproxyer.cpp create mode 100644 dde-dock/src/DBus/dbusentryproxyer.h create mode 100644 dde-dock/src/DBus/dbuspanelmanager.cpp create mode 100644 dde-dock/src/DBus/dbuspanelmanager.h diff --git a/dde-dock/dde-dock.pro b/dde-dock/dde-dock.pro index b4e788a10..9a52445b4 100644 --- a/dde-dock/dde-dock.pro +++ b/dde-dock/dde-dock.pro @@ -4,7 +4,7 @@ # #------------------------------------------------- -QT += core gui x11extras +QT += core gui x11extras dbus greaterThan(QT_MAJOR_VERSION, 4): QT += widgets @@ -25,7 +25,14 @@ SOURCES += \ src/systraymanager.cpp \ src/Panel/panelmenu.cpp \ src/Controller/dockmodedata.cpp \ - src/Controller/dockconstants.cpp + src/Controller/dockconstants.cpp \ + src/Controller/appmanager.cpp \ + src/DBus/dbusentrymanager.cpp \ + src/DBus/dbusentryproxyer.cpp \ + src/DBus/dbuspanelmanager.cpp \ + src/DBus/dbusclientmanager.cpp \ + src/DBus/dbusdockedappmanager.cpp \ + src/DBus/dbusdocksetting.cpp HEADERS += \ src/abstractdockitem.h \ @@ -41,7 +48,14 @@ HEADERS += \ src/systraymanager.h \ src/Panel/panelmenu.h \ src/Controller/dockmodedata.h \ - src/Controller/dockconstants.h + src/Controller/dockconstants.h \ + src/Controller/appmanager.h \ + src/DBus/dbusentrymanager.h \ + src/DBus/dbusentryproxyer.h \ + src/DBus/dbuspanelmanager.h \ + src/DBus/dbusclientmanager.h \ + src/DBus/dbusdockedappmanager.h \ + src/DBus/dbusdocksetting.h RESOURCES += \ images.qrc \ diff --git a/dde-dock/src/Controller/appmanager.cpp b/dde-dock/src/Controller/appmanager.cpp new file mode 100644 index 000000000..78638357a --- /dev/null +++ b/dde-dock/src/Controller/appmanager.cpp @@ -0,0 +1,7 @@ +#include "appmanager.h" + +AppManager::AppManager(QObject *parent) : QObject(parent) +{ + +} + diff --git a/dde-dock/src/Controller/appmanager.h b/dde-dock/src/Controller/appmanager.h new file mode 100644 index 000000000..e80aa345d --- /dev/null +++ b/dde-dock/src/Controller/appmanager.h @@ -0,0 +1,19 @@ +#ifndef APPMANAGER_H +#define APPMANAGER_H + +#include +#include "DBus/dbusentrymanager.h" +#include "DBus/dbusentryproxyer.h" + +class AppManager : public QObject +{ + Q_OBJECT +public: + explicit AppManager(QObject *parent = 0); + +signals: + +public slots: +}; + +#endif // APPMANAGER_H diff --git a/dde-dock/src/DBus/dbusclientmanager.cpp b/dde-dock/src/DBus/dbusclientmanager.cpp new file mode 100644 index 000000000..25f56026a --- /dev/null +++ b/dde-dock/src/DBus/dbusclientmanager.cpp @@ -0,0 +1,26 @@ +/* + * This file was generated by qdbusxml2cpp version 0.8 + * Command line was: qdbusxml2cpp -c DBusClientManager -p dbusclientmanager dde.dock.ClientManager.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 "dbusclientmanager.h" + +/* + * Implementation of interface class DBusClientManager + */ + +DBusClientManager::DBusClientManager(QObject *parent) + : QDBusAbstractInterface(staticServerPath(), staticInterfacePath(), staticInterfaceName(), QDBusConnection::sessionBus(), parent) +{ +} + +DBusClientManager::~DBusClientManager() +{ +} + diff --git a/dde-dock/src/DBus/dbusclientmanager.h b/dde-dock/src/DBus/dbusclientmanager.h new file mode 100644 index 000000000..9d0d363a6 --- /dev/null +++ b/dde-dock/src/DBus/dbusclientmanager.h @@ -0,0 +1,85 @@ +/* + * This file was generated by qdbusxml2cpp version 0.8 + * Command line was: qdbusxml2cpp -c DBusClientManager -p dbusclientmanager dde.dock.ClientManager.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 DBUSCLIENTMANAGER_H_1435836676 +#define DBUSCLIENTMANAGER_H_1435836676 + +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * Proxy class for interface dde.dock.ClientManager + */ +class DBusClientManager: public QDBusAbstractInterface +{ + Q_OBJECT +public: + static inline const char *staticServerPath() + { return "com.deepin.daemon.Dock"; } + static inline const char *staticInterfacePath() + { return "/dde/dock/ClientManager"; } + static inline const char *staticInterfaceName() + { return "dde.dock.ClientManager"; } + +public: + DBusClientManager(QObject *parent = 0); + + ~DBusClientManager(); + +public Q_SLOTS: // METHODS + inline QDBusPendingReply ActiveWindow(uint in0) + { + QList argumentList; + argumentList << QVariant::fromValue(in0); + return asyncCallWithArgumentList(QStringLiteral("ActiveWindow"), argumentList); + } + + inline QDBusPendingReply CloseWindow(uint in0) + { + QList argumentList; + argumentList << QVariant::fromValue(in0); + return asyncCallWithArgumentList(QStringLiteral("CloseWindow"), argumentList); + } + + inline QDBusPendingReply CurrentActiveWindow() + { + QList argumentList; + return asyncCallWithArgumentList(QStringLiteral("CurrentActiveWindow"), argumentList); + } + + inline QDBusPendingReply IsLauncherShown() + { + QList argumentList; + return asyncCallWithArgumentList(QStringLiteral("IsLauncherShown"), argumentList); + } + + inline QDBusPendingReply<> ToggleShowDesktop() + { + QList argumentList; + return asyncCallWithArgumentList(QStringLiteral("ToggleShowDesktop"), argumentList); + } + +Q_SIGNALS: // SIGNALS + void ActiveWindowChanged(uint in0); + void ShowingDesktopChanged(); +}; + +namespace dde { + namespace dock { + typedef ::DBusClientManager ClientManager; + } +} +#endif diff --git a/dde-dock/src/DBus/dbusdockedappmanager.cpp b/dde-dock/src/DBus/dbusdockedappmanager.cpp new file mode 100644 index 000000000..86a8e0499 --- /dev/null +++ b/dde-dock/src/DBus/dbusdockedappmanager.cpp @@ -0,0 +1,26 @@ +/* + * This file was generated by qdbusxml2cpp version 0.8 + * Command line was: qdbusxml2cpp -c DBusDockedAppManager -p dbusdockedappmanager dde.dock.DockedAppManager.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 "dbusdockedappmanager.h" + +/* + * Implementation of interface class DBusDockedAppManager + */ + +DBusDockedAppManager::DBusDockedAppManager(QObject *parent) + : QDBusAbstractInterface(staticServerPath(), staticInterfacePath(), staticInterfaceName(), QDBusConnection::sessionBus(), parent) +{ +} + +DBusDockedAppManager::~DBusDockedAppManager() +{ +} + diff --git a/dde-dock/src/DBus/dbusdockedappmanager.h b/dde-dock/src/DBus/dbusdockedappmanager.h new file mode 100644 index 000000000..edb72364c --- /dev/null +++ b/dde-dock/src/DBus/dbusdockedappmanager.h @@ -0,0 +1,87 @@ +/* + * This file was generated by qdbusxml2cpp version 0.8 + * Command line was: qdbusxml2cpp -c DBusDockedAppManager -p dbusdockedappmanager dde.dock.DockedAppManager.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 DBUSDOCKEDAPPMANAGER_H_1435837249 +#define DBUSDOCKEDAPPMANAGER_H_1435837249 + +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * Proxy class for interface dde.dock.DockedAppManager + */ +class DBusDockedAppManager: public QDBusAbstractInterface +{ + Q_OBJECT +public: + static inline const char *staticServerPath() + { return "com.deepin.daemon.Dock"; } + static inline const char *staticInterfacePath() + { return "/dde/dock/DockedAppManager"; } + static inline const char *staticInterfaceName() + { return "dde.dock.DockedAppManager"; } + +public: + DBusDockedAppManager(QObject *parent = 0); + + ~DBusDockedAppManager(); + +public Q_SLOTS: // METHODS + inline QDBusPendingReply Dock(const QString &in0, const QString &in1, const QString &in2, const QString &in3) + { + QList argumentList; + argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1) << QVariant::fromValue(in2) << QVariant::fromValue(in3); + return asyncCallWithArgumentList(QStringLiteral("Dock"), argumentList); + } + + inline QDBusPendingReply DockedAppList() + { + QList argumentList; + return asyncCallWithArgumentList(QStringLiteral("DockedAppList"), argumentList); + } + + inline QDBusPendingReply IsDocked(const QString &in0) + { + QList argumentList; + argumentList << QVariant::fromValue(in0); + return asyncCallWithArgumentList(QStringLiteral("IsDocked"), argumentList); + } + + inline QDBusPendingReply<> Sort(const QStringList &in0) + { + QList argumentList; + argumentList << QVariant::fromValue(in0); + return asyncCallWithArgumentList(QStringLiteral("Sort"), argumentList); + } + + inline QDBusPendingReply Undock(const QString &in0) + { + QList argumentList; + argumentList << QVariant::fromValue(in0); + return asyncCallWithArgumentList(QStringLiteral("Undock"), argumentList); + } + +Q_SIGNALS: // SIGNALS + void Docked(const QString &in0); + void Undocked(const QString &in0); +}; + +namespace dde { + namespace dock { + typedef ::DBusDockedAppManager DockedAppManager; + } +} +#endif diff --git a/dde-dock/src/DBus/dbusdocksetting.cpp b/dde-dock/src/DBus/dbusdocksetting.cpp new file mode 100644 index 000000000..77e8f5a57 --- /dev/null +++ b/dde-dock/src/DBus/dbusdocksetting.cpp @@ -0,0 +1,26 @@ +/* + * This file was generated by qdbusxml2cpp version 0.8 + * Command line was: qdbusxml2cpp -c DBusDockSetting -p dbusdocksetting dde.dock.DockSetting.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 "dbusdocksetting.h" + +/* + * Implementation of interface class DBusDockSetting + */ + +DBusDockSetting::DBusDockSetting(QObject *parent) + : QDBusAbstractInterface(staticServerPath(), staticInterfacePath(), staticInterfaceName(), QDBusConnection::sessionBus(), parent) +{ +} + +DBusDockSetting::~DBusDockSetting() +{ +} + diff --git a/dde-dock/src/DBus/dbusdocksetting.h b/dde-dock/src/DBus/dbusdocksetting.h new file mode 100644 index 000000000..672ea0f11 --- /dev/null +++ b/dde-dock/src/DBus/dbusdocksetting.h @@ -0,0 +1,121 @@ +/* + * This file was generated by qdbusxml2cpp version 0.8 + * Command line was: qdbusxml2cpp -c DBusDockSetting -p dbusdocksetting dde.dock.DockSetting.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 DBUSDOCKSETTING_H_1435836997 +#define DBUSDOCKSETTING_H_1435836997 + +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * Proxy class for interface dde.dock.DockSetting + */ +class DBusDockSetting: public QDBusAbstractInterface +{ + Q_OBJECT +public: + static inline const char *staticServerPath() + { return "com.deepin.daemon.Dock"; } + static inline const char *staticInterfacePath() + { return "/dde/dock/DockSetting"; } + static inline const char *staticInterfaceName() + { return "dde.dock.DockSetting"; } + +public: + DBusDockSetting(QObject *parent = 0); + + ~DBusDockSetting(); + +public Q_SLOTS: // METHODS + inline QDBusPendingReply GetClockType() + { + QList argumentList; + return asyncCallWithArgumentList(QStringLiteral("GetClockType"), argumentList); + } + + inline QDBusPendingReply GetDisplayDate() + { + QList argumentList; + return asyncCallWithArgumentList(QStringLiteral("GetDisplayDate"), argumentList); + } + + inline QDBusPendingReply GetDisplayMode() + { + QList argumentList; + return asyncCallWithArgumentList(QStringLiteral("GetDisplayMode"), argumentList); + } + + inline QDBusPendingReply GetDisplayWeek() + { + QList argumentList; + return asyncCallWithArgumentList(QStringLiteral("GetDisplayWeek"), argumentList); + } + + inline QDBusPendingReply GetHideMode() + { + QList argumentList; + return asyncCallWithArgumentList(QStringLiteral("GetHideMode"), argumentList); + } + + inline QDBusPendingReply SetClockType(int in0) + { + QList argumentList; + argumentList << QVariant::fromValue(in0); + return asyncCallWithArgumentList(QStringLiteral("SetClockType"), argumentList); + } + + inline QDBusPendingReply SetDisplayDate(bool in0) + { + QList argumentList; + argumentList << QVariant::fromValue(in0); + return asyncCallWithArgumentList(QStringLiteral("SetDisplayDate"), argumentList); + } + + inline QDBusPendingReply SetDisplayMode(int in0) + { + QList argumentList; + argumentList << QVariant::fromValue(in0); + return asyncCallWithArgumentList(QStringLiteral("SetDisplayMode"), argumentList); + } + + inline QDBusPendingReply SetDisplayWeek(bool in0) + { + QList argumentList; + argumentList << QVariant::fromValue(in0); + return asyncCallWithArgumentList(QStringLiteral("SetDisplayWeek"), argumentList); + } + + inline QDBusPendingReply SetHideMode(int in0) + { + QList argumentList; + argumentList << QVariant::fromValue(in0); + return asyncCallWithArgumentList(QStringLiteral("SetHideMode"), argumentList); + } + +Q_SIGNALS: // SIGNALS + void ClockTypeChanged(int in0); + void DisplayDateChanged(bool in0); + void DisplayModeChanged(int in0); + void DisplayWeekChanged(bool in0); + void HideModeChanged(int in0); +}; + +namespace dde { + namespace dock { + typedef ::DBusDockSetting DockSetting; + } +} +#endif diff --git a/dde-dock/src/DBus/dbusentrymanager.cpp b/dde-dock/src/DBus/dbusentrymanager.cpp new file mode 100644 index 000000000..0e4a49c91 --- /dev/null +++ b/dde-dock/src/DBus/dbusentrymanager.cpp @@ -0,0 +1,26 @@ +/* + * This file was generated by qdbusxml2cpp version 0.8 + * Command line was: qdbusxml2cpp -c DBusEntryManager -p dbusentrymanager 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 "dbusentrymanager.h" + +/* + * Implementation of interface class DBusEntryManager + */ + +DBusEntryManager::DBusEntryManager(QObject *parent) + : QDBusAbstractInterface(staticServerPath(), staticInterfacePath(), staticInterfaceName(), QDBusConnection::sessionBus(), parent) +{ +} + +DBusEntryManager::~DBusEntryManager() +{ +} + diff --git a/dde-dock/src/DBus/dbusentrymanager.h b/dde-dock/src/DBus/dbusentrymanager.h new file mode 100644 index 000000000..f9ee5edf9 --- /dev/null +++ b/dde-dock/src/DBus/dbusentrymanager.h @@ -0,0 +1,58 @@ +/* + * This file was generated by qdbusxml2cpp version 0.8 + * Command line was: qdbusxml2cpp -c DBusEntryManager -p dbusentrymanager 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 DBUSENTRYMANAGER_H_1435836026 +#define DBUSENTRYMANAGER_H_1435836026 + +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * Proxy class for interface dde.dock.EntryManager + */ +class DBusEntryManager: public QDBusAbstractInterface +{ + Q_OBJECT +public: + static inline const char *staticServerPath() + { return "com.deepin.daemon.Dock"; } + static inline const char *staticInterfacePath() + { return "/dde/dock/EntryManager"; } + static inline const char *staticInterfaceName() + { return "dde.dock.EntryManager"; } + +public: + DBusEntryManager(QObject *parent = 0); + + ~DBusEntryManager(); + + Q_PROPERTY(QList Entries READ entries) + inline QList entries() const + { return qvariant_cast< QList >(property("Entries")); } + +public Q_SLOTS: // METHODS +Q_SIGNALS: // SIGNALS + void Added(const QDBusObjectPath &in0); + void Removed(const QString &in0); + void TrayInited(); +}; + +namespace dde { + namespace dock { + typedef ::DBusEntryManager EntryManager; + } +} +#endif diff --git a/dde-dock/src/DBus/dbusentryproxyer.cpp b/dde-dock/src/DBus/dbusentryproxyer.cpp new file mode 100644 index 000000000..d1ce50653 --- /dev/null +++ b/dde-dock/src/DBus/dbusentryproxyer.cpp @@ -0,0 +1,27 @@ +/* + * This file was generated by qdbusxml2cpp version 0.8 + * Command line was: qdbusxml2cpp -c DBusEntryProxyer -p dbusentryproxyer dde.dock.EntryProxyer.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 "dbusentryproxyer.h" + +/* + * Implementation of interface class DBusEntryProxyer + */ + +DBusEntryProxyer::DBusEntryProxyer(const QString &path,QObject *parent) + : QDBusAbstractInterface(staticServerPath(), path, staticInterfaceName(), QDBusConnection::sessionBus(), parent) +{ + qDBusRegisterMetaType(); +} + +DBusEntryProxyer::~DBusEntryProxyer() +{ +} + diff --git a/dde-dock/src/DBus/dbusentryproxyer.h b/dde-dock/src/DBus/dbusentryproxyer.h new file mode 100644 index 000000000..8451c5730 --- /dev/null +++ b/dde-dock/src/DBus/dbusentryproxyer.h @@ -0,0 +1,133 @@ +/* + * This file was generated by qdbusxml2cpp version 0.8 + * Command line was: qdbusxml2cpp -c DBusEntryProxyer -p dbusentryproxyer dde.dock.EntryProxyer.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 DBUSENTRYPROXYER_H_1435838653 +#define DBUSENTRYPROXYER_H_1435838653 + +#include +#include +#include +#include +#include +#include +#include +#include + +typedef QMap StringMap; +Q_DECLARE_METATYPE(StringMap) +/* + * Proxy class for interface dde.dock.EntryProxyer + */ +class DBusEntryProxyer: public QDBusAbstractInterface +{ + Q_OBJECT +public: + static inline const char *staticServerPath() + { return "com.deepin.daemon.Dock"; } + static inline const char *staticInterfaceName() + { return "dde.dock.EntryProxyer"; } + +public: + DBusEntryProxyer(const QString &path, QObject *parent = 0); + + ~DBusEntryProxyer(); + + Q_PROPERTY(StringMap Data READ data) + inline StringMap data() const + { return qvariant_cast< StringMap >(property("Data")); } + + Q_PROPERTY(QString Id READ id) + inline QString id() const + { return qvariant_cast< QString >(property("Id")); } + + Q_PROPERTY(QString Type READ type) + inline QString type() const + { return qvariant_cast< QString >(property("Type")); } + +public Q_SLOTS: // METHODS + inline QDBusPendingReply Activate(int in0, int in1) + { + QList argumentList; + argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1); + return asyncCallWithArgumentList(QStringLiteral("Activate"), argumentList); + } + + inline QDBusPendingReply<> ContextMenu(int in0, int in1) + { + QList argumentList; + argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1); + return asyncCallWithArgumentList(QStringLiteral("ContextMenu"), argumentList); + } + + inline QDBusPendingReply<> HandleDragDrop(int in0, int in1, const QString &in2) + { + QList argumentList; + argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1) << QVariant::fromValue(in2); + return asyncCallWithArgumentList(QStringLiteral("HandleDragDrop"), argumentList); + } + + inline QDBusPendingReply<> HandleDragEnter(int in0, int in1, const QString &in2) + { + QList argumentList; + argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1) << QVariant::fromValue(in2); + return asyncCallWithArgumentList(QStringLiteral("HandleDragEnter"), argumentList); + } + + inline QDBusPendingReply<> HandleDragLeave(int in0, int in1, const QString &in2) + { + QList argumentList; + argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1) << QVariant::fromValue(in2); + return asyncCallWithArgumentList(QStringLiteral("HandleDragLeave"), argumentList); + } + + inline QDBusPendingReply<> HandleDragOver(int in0, int in1, const QString &in2) + { + QList argumentList; + argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1) << QVariant::fromValue(in2); + return asyncCallWithArgumentList(QStringLiteral("HandleDragOver"), argumentList); + } + + inline QDBusPendingReply<> HandleMenuItem(const QString &in0) + { + QList argumentList; + argumentList << QVariant::fromValue(in0); + return asyncCallWithArgumentList(QStringLiteral("HandleMenuItem"), argumentList); + } + + inline QDBusPendingReply<> HandleMouseWheel(int in0, int in1, int in2) + { + QList argumentList; + argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1) << QVariant::fromValue(in2); + return asyncCallWithArgumentList(QStringLiteral("HandleMouseWheel"), argumentList); + } + + inline QDBusPendingReply<> SecondaryActivate(int in0, int in1) + { + QList argumentList; + argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1); + return asyncCallWithArgumentList(QStringLiteral("SecondaryActivate"), argumentList); + } + + inline QDBusPendingReply<> ShowQuickWindow() + { + QList argumentList; + return asyncCallWithArgumentList(QStringLiteral("ShowQuickWindow"), argumentList); + } + +Q_SIGNALS: // SIGNALS + void DataChanged(const QString &in0, const QString &in1); +}; + +namespace dde { + namespace dock { + typedef ::DBusEntryProxyer EntryProxyer; + } +} +#endif diff --git a/dde-dock/src/DBus/dbuspanelmanager.cpp b/dde-dock/src/DBus/dbuspanelmanager.cpp new file mode 100644 index 000000000..58fb701f7 --- /dev/null +++ b/dde-dock/src/DBus/dbuspanelmanager.cpp @@ -0,0 +1,26 @@ +/* + * This file was generated by qdbusxml2cpp version 0.8 + * Command line was: qdbusxml2cpp -c DBusPanelManager -p dbuspanelmanager dde.dock.Property.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 "dbuspanelmanager.h" + +/* + * Implementation of interface class DBusPanelManager + */ + +DBusPanelManager::DBusPanelManager(QObject *parent) + : QDBusAbstractInterface(staticServerPath(), staticInterfacePath(), staticInterfaceName(), QDBusConnection::sessionBus(), parent) +{ +} + +DBusPanelManager::~DBusPanelManager() +{ +} + diff --git a/dde-dock/src/DBus/dbuspanelmanager.h b/dde-dock/src/DBus/dbuspanelmanager.h new file mode 100644 index 000000000..191ab505c --- /dev/null +++ b/dde-dock/src/DBus/dbuspanelmanager.h @@ -0,0 +1,66 @@ +/* + * This file was generated by qdbusxml2cpp version 0.8 + * Command line was: qdbusxml2cpp -c DBusPanelManager -p dbuspanelmanager dde.dock.Property.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 DBUSPANELMANAGER_H_1435837517 +#define DBUSPANELMANAGER_H_1435837517 + +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * Proxy class for interface dde.dock.Property + */ +class DBusPanelManager: public QDBusAbstractInterface +{ + Q_OBJECT +public: + static inline const char *staticServerPath() + { return "com.deepin.daemon.Dock"; } + static inline const char *staticInterfacePath() + { return "/dde/dock/Property"; } + static inline const char *staticInterfaceName() + { return "dde.dock.Property"; } + +public: + DBusPanelManager(QObject *parent = 0); + + ~DBusPanelManager(); + + Q_PROPERTY(int Height READ height) + inline int height() const + { return qvariant_cast< int >(property("Height")); } + + Q_PROPERTY(int PanelWidth READ panelWidth) + inline int panelWidth() const + { return qvariant_cast< int >(property("PanelWidth")); } + +public Q_SLOTS: // METHODS + inline QDBusPendingReply SetPanelWidth(int in0) + { + QList argumentList; + argumentList << QVariant::fromValue(in0); + return asyncCallWithArgumentList(QStringLiteral("SetPanelWidth"), argumentList); + } + +Q_SIGNALS: // SIGNALS +}; + +namespace dde { + namespace dock { + typedef ::DBusPanelManager Property; + } +} +#endif diff --git a/dde-dock/src/Panel/panel.cpp b/dde-dock/src/Panel/panel.cpp index b5653b345..2e3ac3d7a 100644 --- a/dde-dock/src/Panel/panel.cpp +++ b/dde-dock/src/Panel/panel.cpp @@ -45,6 +45,14 @@ Panel::Panel(QWidget *parent) panelMenu = new PanelMenu(); slotDockModeChanged(dockCons->getDockMode(),dockCons->getDockMode()); + + + + + + + /////////////////////////// + AppManager *appManager = new AppManager(this); } void Panel::resize(const QSize &size) diff --git a/dde-dock/src/Panel/panel.h b/dde-dock/src/Panel/panel.h index b85942a56..12fa16aaf 100644 --- a/dde-dock/src/Panel/panel.h +++ b/dde-dock/src/Panel/panel.h @@ -10,6 +10,7 @@ #include "Widgets/docklayout.h" #include "Widgets/screenmask.h" #include "panelmenu.h" +#include "Controller/appmanager.h" class Panel : public QLabel {