Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: 修改控制器中对AM接口的访问

Browse Source 
修改插件加载相关的类对AM接口的访问

Log:
Influence: 任务栏
Task: https://pms.uniontech.com/task-view-133075.html
Change-Id: Ifbf3ce3b8d9fc3098f1a0a5e3ff4a8bc97e68d67
This commit is contained in:
donghualin 2022-06-21 17:43:19 +08:00
parent 03d7942b2f
commit 7fc1ec3ae5
7 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frame/controller/dockpluginscontroller.h
View File

@ -26,8 +26,6 @@
#include "pluginproxyinterface.h" #include "pluginproxyinterface.h"
#include "abstractpluginscontroller.h" #include "abstractpluginscontroller.h"
#include <com_deepin_dde_daemon_dock.h>
#include <QPluginLoader> #include <QPluginLoader>
#include <QList> #include <QList>
#include <QMap> #include <QMap>

2
frame/controller/systemplugincontroller.h
View File

@ -26,8 +26,6 @@
#include "abstractpluginscontroller.h" #include "abstractpluginscontroller.h"
#include "abstractpluginscontroller.h" #include "abstractpluginscontroller.h"
#include <com_deepin_dde_daemon_dock.h>
#include <QPluginLoader> #include <QPluginLoader>
#include <QList> #include <QList>
#include <QMap> #include <QMap>

2
frame/item/components/appsnapshot.cpp
View File

@ -65,7 +65,7 @@ AppSnapshot::AppSnapshot(const WId wid, QWidget *parent)
, m_waitLeaveTimer(new QTimer(this)) , m_waitLeaveTimer(new QTimer(this))
, m_closeBtn2D(new DIconButton(this)) , m_closeBtn2D(new DIconButton(this))
, m_wmHelper(DWindowManagerHelper::instance()) , m_wmHelper(DWindowManagerHelper::instance())
, m_dockDaemonInter(new DockDaemonInter("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this)) , m_dockDaemonInter(new DockInter(dockServiceName(), dockServicePath(), QDBusConnection::sessionBus(), this))
{ {
m_closeBtn2D->setFixedSize(SNAP_CLOSE_BTN_WIDTH, SNAP_CLOSE_BTN_WIDTH); m_closeBtn2D->setFixedSize(SNAP_CLOSE_BTN_WIDTH, SNAP_CLOSE_BTN_WIDTH);
m_closeBtn2D->setIconSize(QSize(SNAP_CLOSE_BTN_WIDTH, SNAP_CLOSE_BTN_WIDTH)); m_closeBtn2D->setIconSize(QSize(SNAP_CLOSE_BTN_WIDTH, SNAP_CLOSE_BTN_WIDTH));

15
frame/item/components/appsnapshot.h
View File

@ -22,16 +22,15 @@
#ifndef APPSNAPSHOT_H #ifndef APPSNAPSHOT_H
#define APPSNAPSHOT_H #define APPSNAPSHOT_H
#include <QWidget> #include "dbusutil.h"
#include <QDebug>
#include <QTimer>
#include <DIconButton> #include <DIconButton>
#include <DWindowManagerHelper> #include <DWindowManagerHelper>
#include <DPushButton> #include <DPushButton>
#include <com_deepin_dde_daemon_dock.h> #include <QWidget>
#include <com_deepin_dde_daemon_dock_entry.h> #include <QDebug>
#include <QTimer>
DWIDGET_USE_NAMESPACE DWIDGET_USE_NAMESPACE
DGUI_USE_NAMESPACE DGUI_USE_NAMESPACE
@ -54,8 +53,6 @@ struct SHMInfo;
struct _XImage; struct _XImage;
typedef _XImage XImage; typedef _XImage XImage;
using DockDaemonInter = com::deepin::dde::daemon::Dock;
namespace Dock { namespace Dock {
class TipsWidget; class TipsWidget;
} }
@ -65,7 +62,7 @@ class AppSnapshot : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit AppSnapshot(const WId wid, QWidget *parent = 0); explicit AppSnapshot(const WId wid, QWidget *parent = Q_NULLPTR);
inline WId wid() const { return m_wid; } inline WId wid() const { return m_wid; }
inline bool attentioned() const { return m_windowInfo.attention; } inline bool attentioned() const { return m_windowInfo.attention; }
@ -120,7 +117,7 @@ private:
QTimer *m_waitLeaveTimer; QTimer *m_waitLeaveTimer;
DIconButton *m_closeBtn2D; DIconButton *m_closeBtn2D;
DWindowManagerHelper *m_wmHelper; DWindowManagerHelper *m_wmHelper;
DockDaemonInter *m_dockDaemonInter; DockInter *m_dockDaemonInter;
}; };
#endif // APPSNAPSHOT_H #endif // APPSNAPSHOT_H

2
frame/item/components/previewcontainer.h
View File

@ -30,8 +30,6 @@
#include "appsnapshot.h" #include "appsnapshot.h"
#include "floatingpreview.h" #include "floatingpreview.h"
#include <com_deepin_dde_daemon_dock_entry.h>
#include <DWindowManagerHelper> #include <DWindowManagerHelper>
DWIDGET_USE_NAMESPACE DWIDGET_USE_NAMESPACE

4
frame/util/abstractpluginscontroller.cpp
View File

@ -41,13 +41,13 @@ static const QStringList CompatiblePluginApiList {
AbstractPluginsController::AbstractPluginsController(QObject *parent) AbstractPluginsController::AbstractPluginsController(QObject *parent)
: QObject(parent) : QObject(parent)
, m_dbusDaemonInterface(QDBusConnection::sessionBus().interface()) , m_dbusDaemonInterface(QDBusConnection::sessionBus().interface())
, m_dockDaemonInter(new DockDaemonInter("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this)) , m_dockDaemonInter(new DockInter(dockServiceName(), dockServicePath(), QDBusConnection::sessionBus(), this))
{ {
qApp->installEventFilter(this); qApp->installEventFilter(this);
refreshPluginSettings(); refreshPluginSettings();
connect(m_dockDaemonInter, &DockDaemonInter::PluginSettingsSynced, this, &AbstractPluginsController::refreshPluginSettings, Qt::QueuedConnection); connect(m_dockDaemonInter, &DockInter::PluginSettingsSynced, this, &AbstractPluginsController::refreshPluginSettings, Qt::QueuedConnection);
} }
AbstractPluginsController::~AbstractPluginsController() AbstractPluginsController::~AbstractPluginsController()

7
frame/util/abstractpluginscontroller.h
View File

@ -24,16 +24,13 @@
#include "pluginproxyinterface.h" #include "pluginproxyinterface.h"
#include "pluginloader.h" #include "pluginloader.h"
#include "dbusutil.h"
#include <com_deepin_dde_daemon_dock.h>
#include <QPluginLoader> #include <QPluginLoader>
#include <QList> #include <QList>
#include <QMap> #include <QMap>
#include <QDBusConnectionInterface> #include <QDBusConnectionInterface>
using DockDaemonInter = com::deepin::dde::daemon::Dock;
class PluginsItemInterface; class PluginsItemInterface;
class AbstractPluginsController : public QObject, PluginProxyInterface class AbstractPluginsController : public QObject, PluginProxyInterface
{ {
@ -83,7 +80,7 @@ private:
private: private:
QDBusConnectionInterface *m_dbusDaemonInterface; QDBusConnectionInterface *m_dbusDaemonInterface;
DockDaemonInter *m_dockDaemonInter; DockInter *m_dockDaemonInter;
// interface, "pluginloader", PluginLoader指针对象 // interface, "pluginloader", PluginLoader指针对象
QMap<PluginsItemInterface *, QMap<QString, QObject *>> m_pluginsMap; QMap<PluginsItemInterface *, QMap<QString, QObject *>> m_pluginsMap;