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

change: plugins dir

Browse Source 
Change-Id: I5b504a14294b803ff86a2707ebf6a7c5f0f3e24c
This commit is contained in:
listenerri 2019-01-15 13:53:39 +08:00
parent da7dd19389
commit 4eaefdb7ef
Notes: gerrit 2019-01-15 16:14:41 +08:00 
Verified+1: <jenkins@deepin.com>
Code-Review+2: listenerri <listenerri@gmail.com>
Submitted-by: listenerri <listenerri@gmail.com>
Submitted-at: Tue, 15 Jan 2019 16:14:41 +0800
Reviewed-on: https://cr.deepin.io/41334
Project: dde/dde-dock
Branch: refs/heads/master
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frame/controller/dockpluginloader.cpp
View File

@ -32,11 +32,12 @@ DockPluginLoader::DockPluginLoader(QObject *parent)
void DockPluginLoader::run()
{
#ifdef QT_DEBUG
const QDir pluginsDir("../plugins");
#else
const QDir pluginsDir("../lib/dde-dock/plugins");
#endif
QDir pluginsDir("../plugins");
if (!pluginsDir.exists()) {
pluginsDir.setPath("/usr/lib/dde-dock/plugins");
}
qDebug() << "using dock plugins dir:" << pluginsDir.absolutePath();
const QStringList plugins = pluginsDir.entryList(QDir::Files);
for (const QString file : plugins)

11
plugins/tray/system-trays/systemtrayloader.cpp
View File

@ -32,11 +32,12 @@ SystemTrayLoader::SystemTrayLoader(QObject *parent)
void SystemTrayLoader::run()
{
#ifdef QT_DEBUG
const QDir pluginsDir("../plugins/system-trays");
#else
const QDir pluginsDir("../lib/dde-dock/plugins/system-trays");
#endif
QDir pluginsDir("../plugins/system-trays");
if (!pluginsDir.exists()) {
pluginsDir.setPath("/usr/lib/dde-dock/plugins/system-trays");
}
qDebug() << "using system tray plugins dir:" << pluginsDir.absolutePath();
const QStringList plugins = pluginsDir.entryList(QDir::Files);
for (const QString file : plugins)

3
plugins/tray/xwindowtraywidget.cpp
View File

@ -95,11 +95,14 @@ XWindowTrayWidget::XWindowTrayWidget(quint32 winId, QWidget *parent)
connect(m_sendHoverEvent, &QTimer::timeout, this, &XWindowTrayWidget::sendHoverEvent);
m_updateTimer->start();
qDebug() << ">>>>>>>>>>>>>>>>>>>>>>>new xwindow" << winId;
}
XWindowTrayWidget::~XWindowTrayWidget()
{
AppWinidSuffixMap[m_appName].remove(m_windowId);
qDebug() << ">>>>>>>>>>>>>>>>>>>>>>>destory xwindow" << m_windowId;
}
const QImage XWindowTrayWidget::trayImage()