Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-02 15:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: plugin init is done in other threads

Browse Source 
加载插件是按队列进行的，但是插件初始化是不需要按队列来的
This commit is contained in:
justforlxz.com 2019-06-28 16:58:31 +08:00 committed by 流年匆忙
parent d7b3b4a59a
commit c37ea37404
4 changed files with 57 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frame/util/abstractpluginscontroller.cpp
View File

@ -133,7 +133,7 @@ void AbstractPluginsController::startLoader(PluginLoader *loader)
QGSettings gsetting("com.deepin.dde.dock", "/com/deepin/dde/dock/");
QTimer::singleShot(gsetting.get("delay-plugins-time").toUInt(),
loader, [=] { loader->start(QThread::NormalPriority); });
loader, [=] { loader->start(QThread::LowestPriority); });
}
void AbstractPluginsController::displayModeChanged()
@ -205,7 +205,12 @@ void AbstractPluginsController::loadPlugin(const QString &pluginFile)
return;
}
initPlugin(interface);
// NOTE(justforlxz): 插件的所有初始化工作都在init函数中进行，
// loadPlugin函数是按队列执行的，initPlugin函数会有可能导致
// 函数执行被阻塞。
QTimer::singleShot(1, this, [=] {
initPlugin(interface);
});
}
void AbstractPluginsController::initPlugin(PluginsItemInterface *interface) {

2
frame/window/mainwindow.cpp
View File

@ -141,7 +141,7 @@ void MainWindow::launch()
});
qApp->processEvents();
QTimer::singleShot(0, this, &MainWindow::show);
QTimer::singleShot(300, this, &MainWindow::show);
}
bool MainWindow::event(QEvent *e)

47
plugins/datetime/datetimeplugin.cpp
View File

@ -29,22 +29,8 @@
#define TIME_FORMAT_KEY "24HourFormat"
DatetimePlugin::DatetimePlugin(QObject *parent)
: QObject(parent),
m_dateTipsLabel(new TipsWidget),
m_refershTimer(new QTimer(this))
: QObject(parent)
{
m_dateTipsLabel->setObjectName("datetime");
m_refershTimer->setInterval(1000);
m_refershTimer->start();
m_centralWidget = new DatetimeWidget;
connect(m_centralWidget, &DatetimeWidget::requestUpdateGeometry, [this] { m_proxyInter->itemUpdate(this, pluginName()); });
connect(m_refershTimer, &QTimer::timeout, this, &DatetimePlugin::updateCurrentTimeString);
}
const QString DatetimePlugin::pluginName() const
@ -60,7 +46,6 @@ const QString DatetimePlugin::pluginDisplayName() const
void DatetimePlugin::init(PluginProxyInterface *proxyInter)
{
m_proxyInter = proxyInter;
m_centralWidget->set24HourFormat(m_proxyInter->getValue(this, TIME_FORMAT_KEY, true).toBool());
// transfer config
QSettings settings("deepin", "dde-dock-datetime");
@ -71,8 +56,34 @@ void DatetimePlugin::init(PluginProxyInterface *proxyInter)
QFile::remove(settings.fileName());
}
if (!pluginIsDisable())
m_proxyInter->itemAdded(this, pluginName());
if (pluginIsDisable()) {
return;
}
m_dateTipsLabel = new TipsWidget;
m_refershTimer = new QTimer(this);
m_dateTipsLabel->setObjectName("datetime");
m_refershTimer->setInterval(1000);
m_refershTimer->start();
m_centralWidget = new DatetimeWidget;
m_dateTipsLabel = new TipsWidget;
m_refershTimer = new QTimer(this);
m_dateTipsLabel->setObjectName("datetime");
m_refershTimer->setInterval(1000);
m_refershTimer->start();
m_centralWidget = new DatetimeWidget;
connect(m_centralWidget, &DatetimeWidget::requestUpdateGeometry, [this] { m_proxyInter->itemUpdate(this, pluginName()); });
connect(m_refershTimer, &QTimer::timeout, this, &DatetimePlugin::updateCurrentTimeString);
connect(m_centralWidget, &DatetimeWidget::requestUpdateGeometry, [this] { m_proxyInter->itemUpdate(this, pluginName()); });
connect(m_refershTimer, &QTimer::timeout, this, &DatetimePlugin::updateCurrentTimeString);
m_proxyInter->itemAdded(this, pluginName());
}
void DatetimePlugin::pluginStateSwitched()

38
plugins/tray/trayplugin.cpp
View File

@ -41,24 +41,8 @@
using org::kde::StatusNotifierWatcher;
TrayPlugin::TrayPlugin(QObject *parent)
: QObject(parent),
m_trayInter(new DBusTrayManager(this)),
m_sniWatcher(new StatusNotifierWatcher(SNI_WATCHER_SERVICE, SNI_WATCHER_PATH, QDBusConnection::sessionBus(), this)),
m_fashionItem (new FashionTrayItem(this)),
m_systemTraysController(new SystemTraysController(this)),
m_refreshXEmbedItemsTimer(new QTimer(this)),
m_refreshSNIItemsTimer(new QTimer(this)),
m_tipsLabel(new TipsWidget)
: QObject(parent)
{
m_refreshXEmbedItemsTimer->setInterval(0);
m_refreshXEmbedItemsTimer->setSingleShot(true);
m_refreshSNIItemsTimer->setInterval(0);
m_refreshSNIItemsTimer->setSingleShot(true);
m_tipsLabel->setObjectName("tray");
m_tipsLabel->setText(tr("System Tray"));
m_tipsLabel->setVisible(false);
}
const QString TrayPlugin::pluginName() const
@ -83,8 +67,26 @@ void TrayPlugin::init(PluginProxyInterface *proxyInter)
return;
}
m_trayInter = new DBusTrayManager(this);
m_sniWatcher = new StatusNotifierWatcher(SNI_WATCHER_SERVICE, SNI_WATCHER_PATH, QDBusConnection::sessionBus(), this);
m_fashionItem = new FashionTrayItem(this);
m_systemTraysController = new SystemTraysController(this);
m_refreshXEmbedItemsTimer = new QTimer(this);
m_refreshSNIItemsTimer = new QTimer(this);
m_tipsLabel = new TipsWidget;
m_refreshXEmbedItemsTimer->setInterval(0);
m_refreshXEmbedItemsTimer->setSingleShot(true);
m_refreshSNIItemsTimer->setInterval(0);
m_refreshSNIItemsTimer->setSingleShot(true);
m_tipsLabel->setObjectName("tray");
m_tipsLabel->setText(tr("System Tray"));
m_tipsLabel->setVisible(false);
connect(m_systemTraysController, &SystemTraysController::pluginItemAdded, this, &TrayPlugin::addTrayWidget);
connect(m_systemTraysController, &SystemTraysController::pluginItemRemoved, this, [=](const QString &itemKey) {trayRemoved(itemKey);});
connect(m_systemTraysController, &SystemTraysController::pluginItemRemoved, this, [=](const QString &itemKey) { trayRemoved(itemKey); });
m_trayInter->Manage();