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

expose completeInitialization() method

Browse Source
This commit is contained in:
Marco Martin 2013-02-05 10:50:18 +01:00
parent 78689b3d40
commit 5562c65127
2 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
scriptengines/qml/declarative/qmlobject.cpp
View File

@ -52,7 +52,6 @@ public:
void errorPrint(); void errorPrint();
void execute(const QString &fileName); void execute(const QString &fileName);
void finishExecute();
void scheduleExecutionEnd(); void scheduleExecutionEnd();
void minimumWidthChanged(); void minimumWidthChanged();
void minimumHeightChanged(); void minimumHeightChanged();
@ -111,31 +110,12 @@ void QmlObjectPrivate::execute(const QString &fileName)
void QmlObjectPrivate::scheduleExecutionEnd() void QmlObjectPrivate::scheduleExecutionEnd()
{ {
if (component->isReady() || component->isError()) { if (component->isReady() || component->isError()) {
finishExecute(); q->completeInitialization();
} else { } else {
QObject::connect(component, SIGNAL(statusChanged(QQmlComponent::Status)), q, SLOT(finishExecute())); QObject::connect(component, SIGNAL(statusChanged(QQmlComponent::Status)), q, SLOT(completeInitialization()));
} }
} }
void QmlObjectPrivate::finishExecute()
{
if (component->isError()) {
errorPrint();
}
root = component->create();
if (!root) {
errorPrint();
}
#ifndef NDEBUG
kDebug() << "Execution of QML done!";
#endif
emit q->finished();
}
QmlObject::QmlObject(QObject *parent) QmlObject::QmlObject(QObject *parent)
: QObject(parent), : QObject(parent),
d(new QmlObjectPrivate(this)) d(new QmlObjectPrivate(this))
@ -191,7 +171,25 @@ QQmlComponent *QmlObject::mainComponent() const
return d->component; return d->component;
} }
void QmlObject::completeInitialization()
{
if (d->component->status() != QQmlComponent::Ready || d->component->isError()) {
d->errorPrint();
return;
}
d->root = d->component->create();
if (!d->root) {
d->errorPrint();
}
#ifndef NDEBUG
kDebug() << "Execution of QML done!";
#endif
emit finished();
}

10
scriptengines/qml/declarative/qmlobject.h
View File

@ -77,6 +77,8 @@ public:
* In this case will be possible to assign new objects in the main engine context * In this case will be possible to assign new objects in the main engine context
* before the main component gets initialized. * before the main component gets initialized.
* So it will be possible to access it immediately from the QML code. * So it will be possible to access it immediately from the QML code.
* The initialization will either be completed automatically asyncronously
* or explicitly by calling completeInitialization()
* *
* @param delay if true the initialization of the QML file will be delayed * @param delay if true the initialization of the QML file will be delayed
* at the end of the event loop * at the end of the event loop
@ -104,6 +106,13 @@ public:
*/ */
QQmlComponent *mainComponent() const; QQmlComponent *mainComponent() const;
public Q_SLOTS:
/**
* Finishes the process of initialization.
* If isInitializationDelayed() is false, calling this will have no effect.
*/
void completeInitialization();
Q_SIGNALS: Q_SIGNALS:
/** /**
* Emitted when the parsing and execution of the QML file is terminated * Emitted when the parsing and execution of the QML file is terminated
@ -114,7 +123,6 @@ private:
friend class QmlObjectPrivate; friend class QmlObjectPrivate;
QmlObjectPrivate * const d; QmlObjectPrivate * const d;
Q_PRIVATE_SLOT(d, void finishExecute())
Q_PRIVATE_SLOT(d, void scheduleExecutionEnd()) Q_PRIVATE_SLOT(d, void scheduleExecutionEnd())
}; };