diff --git a/scriptengines/javascript/CMakeLists.txt b/scriptengines/javascript/CMakeLists.txt index d5a295eb6..becb1682d 100644 --- a/scriptengines/javascript/CMakeLists.txt +++ b/scriptengines/javascript/CMakeLists.txt @@ -12,6 +12,9 @@ set(simple_javascript_engine_SRCS qtgui/timer.cpp ) +include_directories(${PHONON_INCLUDES}) + + kde4_add_plugin(plasma_appletscript_simple_javascript ${simple_javascript_engine_SRCS}) diff --git a/scriptengines/javascript/simplejavascriptapplet.cpp b/scriptengines/javascript/simplejavascriptapplet.cpp index dcf8e3719..14f44e582 100644 --- a/scriptengines/javascript/simplejavascriptapplet.cpp +++ b/scriptengines/javascript/simplejavascriptapplet.cpp @@ -636,13 +636,7 @@ void SimpleJavaScriptApplet::installWidgets(QScriptEngine *engine) globalObject.setProperty(widget, fun); } -#ifndef HAVE_PHONON - QScriptValue fun = engine->newFunction(notSupported); - fun.setProperty( QString("message"), - QScriptValue(engine, i18n("Phonon support was not available")), - QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration ); - globalObject.setProperty(QString("VideoWidget"), fun); -#endif + } QScriptValue SimpleJavaScriptApplet::createWidget(QScriptContext *context, QScriptEngine *engine) @@ -680,7 +674,7 @@ QScriptValue SimpleJavaScriptApplet::createWidget(QScriptContext *context, QScri QScriptValue SimpleJavaScriptApplet::notSupported(QScriptContext *context, QScriptEngine *engine) { QString message = context->callee().property("message").toString(); - return context->throwError(i18n("This operation was not supported, %1").arg(message) ); + return context->throwError(i18n("This operation was not supported, %1", message) ); } diff --git a/scriptengines/javascript/simplejavascriptapplet.h b/scriptengines/javascript/simplejavascriptapplet.h index f65cc5cc8..b4419bc05 100644 --- a/scriptengines/javascript/simplejavascriptapplet.h +++ b/scriptengines/javascript/simplejavascriptapplet.h @@ -76,6 +76,7 @@ private: static KSharedPtr s_widgetLoader; QScriptEngine *m_engine; QScriptValue m_self; + QVariantList m_args; AppletInterface *m_interface; friend class AppletInterface; }; diff --git a/scriptengines/javascript/tests/script-mediaplayer/contents/code/main.js b/scriptengines/javascript/tests/script-mediaplayer/contents/code/main.js index 0b66a4348..ceda3efa6 100644 --- a/scriptengines/javascript/tests/script-mediaplayer/contents/code/main.js +++ b/scriptengines/javascript/tests/script-mediaplayer/contents/code/main.js @@ -2,7 +2,7 @@ layout = new LinearLayout(plasmoid); video = new VideoWidget(); layout.addItem(video); -video.file = startupArguments[0]; +video.url = startupArguments[0]; video.play(); diff --git a/scriptengines/javascript/uiloader.cpp b/scriptengines/javascript/uiloader.cpp index c3db66138..9b044e5ab 100644 --- a/scriptengines/javascript/uiloader.cpp +++ b/scriptengines/javascript/uiloader.cpp @@ -45,9 +45,8 @@ #include #include #include -#ifdef HAVE_PHONON #include -#endif + QGraphicsWidget *createBusyWidget(QGraphicsWidget *parent) { return new Plasma::BusyWidget(parent); } QGraphicsWidget *createCheckBox(QGraphicsWidget *parent) { return new Plasma::CheckBox(parent); } @@ -70,9 +69,7 @@ QGraphicsWidget *createTabBar(QGraphicsWidget *parent) { return new Plasma::TabB QGraphicsWidget *createTextEdit(QGraphicsWidget *parent) { return new Plasma::TextEdit(parent); } QGraphicsWidget *createToolButton(QGraphicsWidget *parent) { return new Plasma::ToolButton(parent); } QGraphicsWidget *createTreeView(QGraphicsWidget *parent) { return new Plasma::TreeView(parent); } -#ifdef HAVE_PHONON QGraphicsWidget *createVideoWidget(QGraphicsWidget *parent) { return new Plasma::VideoWidget(parent); } -#endif UiLoader::UiLoader() { @@ -97,9 +94,7 @@ UiLoader::UiLoader() m_widgetCtors.insert("TextEdit", createTextEdit); m_widgetCtors.insert("ToolButton", createToolButton); m_widgetCtors.insert("TreeView", createTreeView); -#ifdef HAVE_PHONON m_widgetCtors.insert("VideoWidget", createVideoWidget); -#endif } UiLoader::~UiLoader()