Merge "load plugin after main-window showed"

This commit is contained in:
mr.asianwang 2015-09-28 18:53:10 +08:00 committed by Deepin Code Review
commit 91c755390f
2 changed files with 7 additions and 6 deletions

View File

@ -17,6 +17,12 @@ DockPluginManager::DockPluginManager(QObject *parent) :
// m_watcher = new QFileSystemWatcher(this);
// m_watcher->addPaths(m_searchPaths);
// connect(m_watcher, &QFileSystemWatcher::fileChanged, this, &DockPluginManager::watchedFileChanged);
// connect(m_watcher, &QFileSystemWatcher::directoryChanged, this, &DockPluginManager::watchedDirectoryChanged);
}
void DockPluginManager::initAll()
{
foreach (QString path, m_searchPaths) {
QDir pluginsDir(path);
@ -27,12 +33,6 @@ DockPluginManager::DockPluginManager(QObject *parent) :
}
}
// connect(m_watcher, &QFileSystemWatcher::fileChanged, this, &DockPluginManager::watchedFileChanged);
// connect(m_watcher, &QFileSystemWatcher::directoryChanged, this, &DockPluginManager::watchedDirectoryChanged);
}
void DockPluginManager::initAll()
{
foreach (DockPluginProxy * proxy, m_proxies.values()) {
proxy->plugin()->init(proxy);
}

View File

@ -47,6 +47,7 @@ int main(int argc, char *argv[])
MainWidget w;
w.show();
qWarning() << "The main window has been shown!";
w.loadResources();
RegisterDdeSession();