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

auto registers all the enums in widgets declared as Q_ENUMS, accessed as

Browse Source 
widget.EnumValue

svn path=/trunk/KDE/kdebase/workspace/plasma/scriptengines/javascript/; revision=928727
This commit is contained in:
Marco Martin 2009-02-19 22:06:16 +00:00
parent b0df57c67d
commit 5f75ed8359
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scriptengines/javascript/simplejavascriptapplet.cpp
View File

@ -670,11 +670,6 @@ void SimpleJavaScriptApplet::installWidgets(QScriptEngine *engine)
s_widgetLoader = new UiLoader; s_widgetLoader = new UiLoader;
} }
//two customs things needed for VideoWidget
registerEnums(m_engine, globalObject, VideoWidget::staticMetaObject);
qScriptRegisterMetaType<Controls>(m_engine, qScriptValueFromControls, controlsFromScriptValue, QScriptValue());
foreach (const QString &widget, s_widgetLoader->availableWidgets()) { foreach (const QString &widget, s_widgetLoader->availableWidgets()) {
QScriptValue fun = engine->newFunction(createWidget); QScriptValue fun = engine->newFunction(createWidget);
QScriptValue name = engine->toScriptValue(widget); QScriptValue name = engine->toScriptValue(widget);
@ -715,6 +710,14 @@ QScriptValue SimpleJavaScriptApplet::createWidget(QScriptContext *context, QScri
QScriptValue fun = engine->newQObject(w); QScriptValue fun = engine->newQObject(w);
fun.setPrototype(context->callee().property("prototype")); fun.setPrototype(context->callee().property("prototype"));
//register enums will be accessed for instance as frame.Sunken for Frame shadow...
registerEnums(engine, fun, *w->metaObject());
//FIXME: still don't have a better approach than try to cast for every widget that could have flags..
if (qobject_cast<VideoWidget *>(w)) {
qScriptRegisterMetaType<Controls>(engine, qScriptValueFromControls, controlsFromScriptValue, QScriptValue());
}
return fun; return fun;
} }

3
scriptengines/javascript/tests/script-mediaplayer/contents/code/main.js
View File

@ -1,8 +1,7 @@
layout = new LinearLayout(plasmoid); layout = new LinearLayout(plasmoid);
video = new VideoWidget(); video = new VideoWidget();
video.usedControls = DefaultControls; video.usedControls = video.DefaultControls;
layout.addItem(video); layout.addItem(video);
video.url = startupArguments[0]; video.url = startupArguments[0];
video.play(); video.play();