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

simplify the code, less reliance on the applet interface now

Browse Source 
svn path=/trunk/KDE/kdebase/runtime/; revision=1171487
This commit is contained in:
Aaron J. Seigo 2010-09-04 00:04:40 +00:00
parent 348343ee0f
commit 244ee38b05
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scriptengines/javascript/plasmoid/simplejavascriptapplet.cpp
View File

@ -110,6 +110,7 @@ SimpleJavaScriptApplet::SimpleJavaScriptApplet(QObject *parent, const QVariantLi
SimpleJavaScriptApplet::~SimpleJavaScriptApplet() SimpleJavaScriptApplet::~SimpleJavaScriptApplet()
{ {
delete m_interface;
if (s_widgetLoader.count() == 1) { if (s_widgetLoader.count() == 1) {
s_widgetLoader.clear(); s_widgetLoader.clear();
} }
@ -117,27 +118,20 @@ SimpleJavaScriptApplet::~SimpleJavaScriptApplet()
void SimpleJavaScriptApplet::reportError(ScriptEnv *env, bool fatal) void SimpleJavaScriptApplet::reportError(ScriptEnv *env, bool fatal)
{ {
SimpleJavaScriptApplet *jsApplet = qobject_cast<SimpleJavaScriptApplet *>(env->parent());
AppletInterface *interface = AppletInterface::extract(env->engine());
const QScriptValue error = env->engine()->uncaughtException(); const QScriptValue error = env->engine()->uncaughtException();
QString file = error.property("fileName").toString(); QString file = error.property("fileName").toString();
if (interface) { file.remove(package()->path());
file.remove(interface->package()->path());
}
const QString failureMsg = i18n("Error in %1 on line %2.<br><br>%3", const QString failureMsg = i18n("Error in %1 on line %2.<br><br>%3",
file, error.property("lineNumber").toString(), file, error.property("lineNumber").toString(),
error.toString()); error.toString());
if (jsApplet) { if (fatal) {
if (fatal) { setFailedToLaunch(true, failureMsg);
jsApplet->setFailedToLaunch(true, failureMsg);
} else {
jsApplet->showMessage(KIcon("dialog-error"), failureMsg, Plasma::ButtonOk);
}
} else { } else {
kDebug() << failureMsg; showMessage(KIcon("dialog-error"), failureMsg, Plasma::ButtonOk);
} }
kDebug() << failureMsg;
kDebug() << env->engine()->uncaughtExceptionBacktrace(); kDebug() << env->engine()->uncaughtExceptionBacktrace();
} }
@ -711,9 +705,9 @@ QString SimpleJavaScriptApplet::findSvg(QScriptEngine *engine, const QString &fi
return file; return file;
} }
QString path = interface->package()->filePath("images", file + ".svg"); QString path = interface->file("images", file + ".svg");
if (path.isEmpty()) { if (path.isEmpty()) {
path = interface->package()->filePath("images", file + ".svgz"); path = interface->file("images", file + ".svgz");
if (path.isEmpty()) { if (path.isEmpty()) {
return file; return file;