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

fix some merge error

Browse Source 
Change-Id: I14d057555c7a1d359e0d1e2526e1800ab88a6832
This commit is contained in:
listenerri 2019-01-30 15:55:25 +08:00
parent 55f5770694
commit aef1fb7f0b
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frame/util/pluginloader.cpp
View File

@ -33,12 +33,7 @@ PluginLoader::PluginLoader(const QString &pluginDirPath, QObject *parent)
void PluginLoader::run()
{
QDir pluginsDir("../plugins");
if (!pluginsDir.exists()) {
pluginsDir.setPath("/usr/lib/dde-dock/plugins");
}
qDebug() << "using dock plugins dir:" << pluginsDir.absolutePath();
QDir pluginsDir(m_pluginDirPath);
const QStringList plugins = pluginsDir.entryList(QDir::Files);
for (const QString file : plugins)

2
plugins/trash/popupcontrolwidget.cpp
View File

@ -111,7 +111,7 @@ void PopupControlWidget::clearTrashFloder()
d.setTitle(ClearTrashMutliple.arg(count));
d.setMessage(qApp->translate("DialogManager", "This action cannot be restored"));
d.setIcon(m_dialogTrashFullIcon);
d.setIcon(m_dialogTrashFullIcon, QSize(64, 64));
d.addButton(buttonTexts[0], true, DDialog::ButtonNormal);
d.addButton(buttonTexts[1], false, DDialog::ButtonWarning);
d.setDefaultButton(1);

4
plugins/tray/trayplugin.cpp
View File

@ -82,8 +82,8 @@ void TrayPlugin::init(PluginProxyInterface *proxyInter)
return;
}
connect(m_systemTraysController, &SystemTraysController::systemTrayAdded, this, &TrayPlugin::addTrayWidget);
connect(m_systemTraysController, &SystemTraysController::systemTrayRemoved, this, [=](const QString &itemKey) {trayRemoved(itemKey);});
connect(m_systemTraysController, &SystemTraysController::pluginItemAdded, this, &TrayPlugin::addTrayWidget);
connect(m_systemTraysController, &SystemTraysController::pluginItemRemoved, this, [=](const QString &itemKey) {trayRemoved(itemKey);});
m_trayInter->Manage();