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

make VideoWidget::setUsedControls work

Browse Source 
separate the enum registering in its own function
use the default controls in the javascript mediaplayer

svn path=/trunk/KDE/kdebase/workspace/plasma/scriptengines/javascript/; revision=925912
This commit is contained in:
Marco Martin 2009-02-14 13:57:37 +00:00
parent 0589a221e2
commit 3bc7fa7a01
2 changed files with 59 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
scriptengines/javascript/simplejavascriptapplet.cpp
View File

@ -33,6 +33,7 @@
#include <Plasma/Svg> #include <Plasma/Svg>
#include <Plasma/FrameSvg> #include <Plasma/FrameSvg>
#include <Plasma/Package> #include <Plasma/Package>
#include <Plasma/VideoWidget>
#include "appletinterface.h" #include "appletinterface.h"
@ -60,6 +61,11 @@ QScriptValue constructQRectFClass(QScriptEngine *engine);
QScriptValue constructQPointClass(QScriptEngine *engine); QScriptValue constructQPointClass(QScriptEngine *engine);
QScriptValue constructQSizeFClass(QScriptEngine *engine); QScriptValue constructQSizeFClass(QScriptEngine *engine);
//typedef VideoWidget::Control Control;
Q_DECLARE_FLAGS(Controls, VideoWidget::Control)
Q_DECLARE_METATYPE(Controls)
class DummyService : public Service class DummyService : public Service
{ {
public: public:
@ -110,6 +116,38 @@ QScriptValue variant2ScriptValue(QScriptEngine *engine, QVariant var)
return qScriptValueFromValue(engine, var); return qScriptValueFromValue(engine, var);
} }
QScriptValue qScriptValueFromControls(QScriptEngine *engine, const Controls &controls)
{
return QScriptValue(engine, controls);
}
void controlsFromScriptValue(const QScriptValue& obj, Controls &controls)
{
int flagValue = obj.toInteger();
//FIXME: it has to be a less ugly way to do that :)
if (flagValue&VideoWidget::Play) {
controls |= VideoWidget::Play;
}
if (flagValue&VideoWidget::Pause) {
controls |= VideoWidget::Pause;
}
if (flagValue&VideoWidget::Stop) {
controls |= VideoWidget::Stop;
}
if (flagValue&VideoWidget::PlayPause) {
controls |= VideoWidget::PlayPause;
}
if (flagValue&VideoWidget::Progress) {
controls |= VideoWidget::Progress;
}
if (flagValue&VideoWidget::Volume) {
controls |= VideoWidget::Volume;
}
if (flagValue&VideoWidget::OpenFile) {
controls |= VideoWidget::OpenFile;
}
}
QScriptValue qScriptValueFromData(QScriptEngine *engine, const DataEngine::Data &data) QScriptValue qScriptValueFromData(QScriptEngine *engine, const DataEngine::Data &data)
{ {
DataEngine::Data::const_iterator begin = data.begin(); DataEngine::Data::const_iterator begin = data.begin();
@ -171,6 +209,19 @@ void kConfigGroupFromScriptValue(const QScriptValue& obj, KConfigGroup &config)
} }
} }
void registerEnums(QScriptEngine *engine, QScriptValue &scriptValue, const QMetaObject &meta)
{
//manually create enum values. ugh
for (int i=0; i < meta.enumeratorCount(); ++i) {
QMetaEnum e = meta.enumerator(i);
//kDebug() << e.name();
for (int i=0; i < e.keyCount(); ++i) {
//kDebug() << e.key(i) << e.value(i);
scriptValue.setProperty(e.key(i), QScriptValue(engine, e.value(i)));
}
}
}
KSharedPtr<UiLoader> SimpleJavaScriptApplet::s_widgetLoader; KSharedPtr<UiLoader> SimpleJavaScriptApplet::s_widgetLoader;
SimpleJavaScriptApplet::SimpleJavaScriptApplet(QObject *parent, const QVariantList &args) SimpleJavaScriptApplet::SimpleJavaScriptApplet(QObject *parent, const QVariantList &args)
@ -390,16 +441,8 @@ void SimpleJavaScriptApplet::setupObjects()
} }
global.setProperty("startupArguments", args); global.setProperty("startupArguments", args);
//manually create enum values. ugh registerEnums(m_engine, global, AppletInterface::staticMetaObject);
QMetaObject meta = AppletInterface::staticMetaObject;
for (int i=0; i < meta.enumeratorCount(); ++i) {
QMetaEnum e = meta.enumerator(i);
//kDebug() << e.name();
for (int i=0; i < e.keyCount(); ++i) {
//kDebug() << e.key(i) << e.value(i);
global.setProperty(e.key(i), QScriptValue(m_engine, e.value(i)));
}
}
// Add a global loadui method for ui files // Add a global loadui method for ui files
QScriptValue fun = m_engine->newFunction(SimpleJavaScriptApplet::loadui); QScriptValue fun = m_engine->newFunction(SimpleJavaScriptApplet::loadui);
@ -627,6 +670,11 @@ 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);
@ -636,7 +684,6 @@ void SimpleJavaScriptApplet::installWidgets(QScriptEngine *engine)
globalObject.setProperty(widget, fun); globalObject.setProperty(widget, fun);
} }
} }
QScriptValue SimpleJavaScriptApplet::createWidget(QScriptContext *context, QScriptEngine *engine) QScriptValue SimpleJavaScriptApplet::createWidget(QScriptContext *context, QScriptEngine *engine)

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

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