alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

packages without structure are invalid

Browse Source
This commit is contained in:
Marco Martin 2013-03-05 14:23:52 +01:00
parent 8646393758
commit 53c161fb58
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plasma/package.cpp
View File

@ -75,6 +75,10 @@ Package &Package::operator=(const Package &rhs)
bool Package::isValid() const bool Package::isValid() const
{ {
if (!d->structure) {
return false;
}
if (d->checkedValid) { if (d->checkedValid) {
return d->valid; return d->valid;
} }

1
src/scriptengines/qml/plasmoid/appletinterface.cpp
View File

@ -105,7 +105,6 @@ void AppletInterface::init()
engine->setNetworkAccessManagerFactory(new PackageAccessManagerFactory(m_appletScriptEngine->package())); engine->setNetworkAccessManagerFactory(new PackageAccessManagerFactory(m_appletScriptEngine->package()));
m_qmlObject->setSource(QUrl::fromLocalFile(m_appletScriptEngine->mainScript())); m_qmlObject->setSource(QUrl::fromLocalFile(m_appletScriptEngine->mainScript()));
if (!m_qmlObject->engine() || !m_qmlObject->engine()->rootContext() || !m_qmlObject->engine()->rootContext()->isValid() || m_qmlObject->mainComponent()->isError()) { if (!m_qmlObject->engine() || !m_qmlObject->engine()->rootContext() || !m_qmlObject->engine()->rootContext()->isValid() || m_qmlObject->mainComponent()->isError()) {
QString reason; QString reason;

2
src/shell/qmlpackages/desktop/contents/views/Desktop.qml
View File

@ -24,7 +24,7 @@ import org.kde.plasma.core 0.1 as PlasmaCore
Rectangle { Rectangle {
id: root id: root
color: Qt.rgba(0,0,0,64); // translucent black color: "black"
width: 640 width: 640
height: 480 height: 480

2
src/shell/qmlpackages/desktop/contents/views/Panel.qml
View File

@ -31,7 +31,7 @@ PlasmaCore.FrameSvgItem {
property Item containment property Item containment
onContainmentChanged: { onContainmentChanged: {
print("New Containment: " + containment) print("New panel Containment: " + containment)
//containment.parent = root //containment.parent = root
containment.visible = true containment.visible = true
containment.anchors.fill = root containment.anchors.fill = root

1
src/shell/view.cpp
View File

@ -101,6 +101,7 @@ void View::setContainment(Plasma::Containment *cont)
} }
QObject *graphicObject = m_containment.data()->property("graphicObject").value<QObject *>(); QObject *graphicObject = m_containment.data()->property("graphicObject").value<QObject *>();
if (graphicObject) { if (graphicObject) {
qDebug() << "using as graphic containment" << graphicObject << m_containment.data(); qDebug() << "using as graphic containment" << graphicObject << m_containment.data();