From 96bcdec1f14e8f880b0ef053c5436af3662b19b8 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Fri, 17 Jul 2015 13:08:16 -0400 Subject: Commit some quick fixes: 1) Switch some X11->XCB functions around (SetAsDesktop(), SetDisableWMActions()). 2) Fix up some QtQuick plugin detection routines (now it will properly see the user's quickplugins if any). 3) Connect the status change signal/slots for QtQuick plugins to try and detect script failures and remove the script (still not working reliably). --- lumina-desktop/desktop-plugins/quickcontainer/QuickDPlugin.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lumina-desktop/desktop-plugins') diff --git a/lumina-desktop/desktop-plugins/quickcontainer/QuickDPlugin.h b/lumina-desktop/desktop-plugins/quickcontainer/QuickDPlugin.h index 3a14b26c..0e6cda2f 100644 --- a/lumina-desktop/desktop-plugins/quickcontainer/QuickDPlugin.h +++ b/lumina-desktop/desktop-plugins/quickcontainer/QuickDPlugin.h @@ -23,8 +23,10 @@ public: this->layout()->setContentsMargins(0,0,0,0); container = new QQuickWidget(this); container->setResizeMode(QQuickWidget::SizeRootObjectToView); + connect(container, SIGNAL(statusChanged(QQuickWidget::Status)), this, SLOT(statusChange(QQuickWidget::Status)) ); this->layout()->addWidget(container); container->setSource(QUrl::fromLocalFile( LUtils::findQuickPluginFile(ID.section("---",0,0)) )); + QApplication::processEvents(); //to check for errors right away this->setInitialSize(container->initialSize().width(), container->initialSize().height()); } @@ -37,6 +39,7 @@ private slots: void statusChange(QQuickWidget::Status status){ if(status == QQuickWidget::Error){ qDebug() << "Quick Widget Error:" << this->ID(); + container->setSource(QUrl()); //clear out the script - experienced an error } } -- cgit