Differential D6037 Diff 17063 src/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp

Changeset View

Standalone View

View Options

src/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp

Show All 16 Lines1/* This file is part of the KDE project
17 You should have received a copy of the GNU Library General Public License 17​ You should have received a copy of the GNU Library General Public License
18 along with this program; see the file COPYING. If not, write to 18​ along with this program; see the file COPYING. If not, write to
19 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 19​ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20 * Boston, MA 02110-1301, USA. 20​ * Boston, MA 02110-1301, USA.
21*/ 21​*/
22 22​
23#include "kexiscriptdesignview.h" 23​#include "kexiscriptdesignview.h"
24#include "kexiscripteditor.h" 24​#include "kexiscripteditor.h"
25​#include "kexiscriptadaptor.h"
26​#include "../kexidb/kexidbmodule.h"
27​#include "kexiscriptingdebug.h"
28​#include "kexiscriptpart.h"
29​
25#include <KexiIcon.h> 30​#include <KexiIcon.h>
26#include <KexiMainWindowIface.h> 31​#include <KexiMainWindowIface.h>
27 32​#include <kexipart.h>
28#include <Kross/Manager> ​
29#include <Kross/Action> ​
30#include <Kross/Interpreter> ​
31 33​
32#include <KDbConnection> 34​#include <KDbConnection>
35​#include <KPropertyListData>
33 36​
34#include <KActionMenu> 37​#include <KActionMenu>
35#include <KMessageBox> 38​#include <KMessageBox>
36 39​
37#include <QSplitter> 40​#include <QSplitter>
38#include <QTimer> 41​#include <QTimer>
39#include <QDomDocument> 42​#include <QDomDocument>
40#include <QTextBrowser> 43​#include <QTextBrowser>
41#include <QDebug> ​
42#include <QFileDialog> 44​#include <QFileDialog>
45​#include <QMenu>
46​#include <QJSEngine>
47​#include <QJSValue>
48​#include <QJSValueIterator>
49​
50​static QString _stdout;
51​
52​void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg)
53​{
54​ _stdout += msg + "\n";
55​}
43 56​
44/// @internal 57​/// @internal
45class KexiScriptDesignViewPrivate 58​class KexiScriptDesignViewPrivate
46{ 59​{
47public: 60​public:
48 61​
49 QSplitter* splitter; 62​ QSplitter* splitter;
50 63​
51 /** ​
52 * The \a Kross::Action instance which provides ​
53 * us access to the scripting framework Kross. ​
54 */ ​
55 Kross::Action* scriptaction; ​
56 ​
57 /// The \a KexiScriptEditor to edit the scripting code. 64​ /// The \a KexiScriptEditor to edit the scripting code.
58 KexiScriptEditor* editor; 65​ KexiScriptEditor* editor;
59 66​
60 /// The \a KPropertySet used in the propertyeditor. 67​ /// The \a KPropertySet used in the propertyeditor.
61 KPropertySet* properties; 68​ KPropertySet* properties;
62 69​
63 /// Boolean flag to avoid infinite recursion. 70​ /// Boolean flag to avoid infinite recursion.
64 bool updatesProperties; 71​ bool updatesProperties;
65 72​
66 /// Used to display statusmessages. 73​ /// Used to display statusmessages.
67 QTextBrowser* statusbrowser; 74​ QTextBrowser* statusbrowser;
68 75​
69 /** The type of script 76​ /** The type of script
70 * executable = regular script that can be executed by the user 77​ * executable = regular script that can be executed by the user
71 * module = a script which doesn't contain a 'main', only 78​ * module = a script which doesn't contain a 'main', only
72 * functions that can be used by other scripts 79​ * functions that can be used by other scripts
73 * object = a script which contains code to be loaded into another 80​ * object = a script which contains code to be loaded into another
74 object such as a report or form 81​ object such as a report or form
75 */ 82​ */
76 QString scriptType; 83​ QString scriptType;
84​
85​ QString factoryConstructors;
77}; 86​};
78 87​
79KexiScriptDesignView::KexiScriptDesignView( 88​KexiScriptDesignView::KexiScriptDesignView(
80 QWidget *parent, Kross::Action* scriptaction) 89​ QWidget *parent)
81 : KexiView(parent) 90​ : KexiView(parent)
82 , d(new KexiScriptDesignViewPrivate()) 91​ , d(new KexiScriptDesignViewPrivate())
83{ 92​{
84 setObjectName("KexiScriptDesignView"); 93​ setObjectName("KexiScriptDesignView");
85 d->scriptaction = scriptaction; 94​
86 d->updatesProperties = false; 95​ d->updatesProperties = false;
87 96​
88 d->splitter = new QSplitter(this); 97​ d->splitter = new QSplitter(this);
89 d->splitter->setOrientation(Qt::Vertical); 98​ d->splitter->setOrientation(Qt::Vertical);
90 99​
91 d->editor = new KexiScriptEditor(d->splitter); 100​ d->editor = new KexiScriptEditor(d->splitter);
92 d->splitter->addWidget(d->editor); 101​ d->splitter->addWidget(d->editor);
93 d->editor->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); 102​ d->editor->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
▲ Show 20 Lines • Show All 74 Lines • ▼ Show 20 Line(s)
168 a->setObjectName("script_export"); 177​ a->setObjectName("script_export");
169 a->setToolTip(xi18n("Export script")); 178​ a->setToolTip(xi18n("Export script"));
170 a->setWhatsThis(xi18n("Exports script to a file.")); 179​ a->setWhatsThis(xi18n("Exports script to a file."));
171 connect(a, SIGNAL(triggered(bool)), this, SLOT(slotExport())); 180​ connect(a, SIGNAL(triggered(bool)), this, SLOT(slotExport()));
172 mainMenuActions << a; 181​ mainMenuActions << a;
173 182​
174 setMainMenuActions(mainMenuActions); 183​ setMainMenuActions(mainMenuActions);
175 184​
176 loadData(); ​
177 ​
178 d->properties = new KPropertySet(this); 185​ d->properties = new KPropertySet(this);
179 connect(d->properties, SIGNAL(propertyChanged(KPropertySet&,KProperty&)), 186​ connect(d->properties, SIGNAL(propertyChanged(KPropertySet&,KProperty&)),
180 this, SLOT(slotPropertyChanged(KPropertySet&,KProperty&))); 187​ this, SLOT(slotPropertyChanged(KPropertySet&,KProperty&)));
181 188​
182 // To schedule the initialize fixes a crasher in Kate. 189​ initialize("");
183 QTimer::singleShot(50, this, SLOT(initialize())); 190​ loadData();
184} 191​}
185 192​
186KexiScriptDesignView::~KexiScriptDesignView() 193​KexiScriptDesignView::~KexiScriptDesignView()
187{ 194​{
188 delete d->properties; 195​ delete d->properties;
189 delete d; 196​ delete d;
190} 197​}
191 198​
192Kross::Action* KexiScriptDesignView::scriptAction() const 199​#if 0
200​QString KexiScriptDesignView::scriptAction() const
193{ 201​{
194 return d->scriptaction; 202​ return d->scriptaction;
195} 203​}
204​#endif
196 205​
197void KexiScriptDesignView::initialize() 206​void KexiScriptDesignView::initialize(const QString &program)
198{ 207​{
199 setDirty(false); 208​ setDirty(false);
200 updateProperties(); 209​ updateProperties();
201 d->editor->initialize(d->scriptaction); 210​ d->editor->initialize(program);
202 connect(d->editor, SIGNAL(textChanged()), this, SLOT(setDirty())); 211​ connect(d->editor, SIGNAL(textChanged()), this, SLOT(setDirty()));
203 d->splitter->setSizes( QList<int>() << height() * 2 / 3 << height() * 1 / 3 ); 212​ d->splitter->setSizes( QList<int>() << height() * 2 / 3 << height() * 1 / 3 );
204} 213​}
205 214​
206void KexiScriptDesignView::slotImport() 215​void KexiScriptDesignView::slotImport()
207{ 216​{
208 QStringList filters; ​
209 foreach(const QString &interpreter, Kross::Manager::self().interpreters()) { ​
210 filters << Kross::Manager::self().interpreterInfo(interpreter)->mimeTypes(); ​
211 } ​
212 //! @todo KEXI3 add equivalent of kfiledialog:/// ​
213 //! @todo KEXI3 multiple filters ​
214 // for now support jsut one filter ​
215 QString filterString; ​
216 if (filters.count() == 1) { ​
217 const QMimeDatabase db; ​
218 const QString filterString = db.mimeTypeForName(filters.first()).filterString(); ​
219 } ​
220 //QUrl("kfiledialog:///kexiscriptingdesigner"), 217​ //QUrl("kfiledialog:///kexiscriptingdesigner"),
221 const QUrl result = QFileDialog::getOpenFileUrl(this, xi18nc("@title:window", "Import Script"), 218​ const QUrl result = QFileDialog::getOpenFileUrl(this, xi18nc("@title:window", "Import Script"),
222 QUrl(), filterString); 219​ QUrl(), "Javascript (*.js)");
223 if (!result.isValid()) { 220​ if (!result.isValid()) {
224 return; 221​ return;
225 } 222​ }
226 //! @todo support remote files? 223​ //! @todo support remote files?
227 QFile f(result.toLocalFile()); 224​ QFile f(result.toLocalFile());
228 if (!f.open(QIODevice::ReadOnly | QIODevice::Text)) { 225​ if (!f.open(QIODevice::ReadOnly | QIODevice::Text)) {
229 KMessageBox::sorry(this, 226​ KMessageBox::sorry(this,
230 xi18nc("@info", "Could not read <filename>%1</filename>.", file)); 227​ xi18nc("@info", "Could not read <filename>%1</filename>.", result.toLocalFile()));
231 return; 228​ return;
232 } 229​ }
233 d->editor->setText(f.readAll()); 230​ d->editor->setText(f.readAll());
234 f.close(); 231​ f.close();
235} 232​}
236 233​
237void KexiScriptDesignView::slotExport() 234​void KexiScriptDesignView::slotExport()
238{ 235​{
239 QStringList filters; 236​ const QUrl result = QFileDialog::getSaveFileUrl(this, xi18nc("@title:window", "Export Script"),
240 foreach(const QString &interpreter, Kross::Manager::self().interpreters()) { 237​ QUrl("kfiledialog:///kexiscriptingdesigner"), "Javascript (*.js)" );
241 filters << Kross::Manager::self().interpreterInfo(interpreter)->mimeTypes(); 238​ if (!result.isValid())
242 } ​
243 const QString file = KFileDialog::getSaveFileName( ​
244 QUrl("kfiledialog:///kexiscriptingdesigner"), ​
245 filters.join(" "), this, xi18nc("@title:window", "Export Script")); ​
246 if (file.isEmpty()) ​
247 return; 239​ return;
248 QFile f(file); 240​ QFile f(result.toLocalFile());
249 if (! f.open(QIODevice::WriteOnly | QIODevice::Text)) { 241​ if (! f.open(QIODevice::WriteOnly | QIODevice::Text)) {
250 KMessageBox::sorry(this, 242​ KMessageBox::sorry(this,
251 xi18nc("@info", "Could not write <filename>%1</filename>.", file)); 243​ xi18nc("@info", "Could not write <filename>%1</filename>.", result.toLocalFile()));
252 return; 244​ return;
253 } 245​ }
254 f.write(d->editor->text().toUtf8()); 246​ f.write(d->editor->text().toUtf8());
255 f.close(); 247​ f.close();
256} 248​}
257 249​
258void KexiScriptDesignView::updateProperties() 250​void KexiScriptDesignView::updateProperties()
259{ 251​{
260 if (d->updatesProperties) 252​ if (d->updatesProperties)
261 return; 253​ return;
262 d->updatesProperties = true; 254​ d->updatesProperties = true;
263 255​
264 Kross::Manager* manager = &Kross::Manager::self(); ​
265 ​
266 QString interpretername = d->scriptaction->interpreter(); ​
267 Kross::InterpreterInfo* info = interpretername.isEmpty() ? 0 : manager->interpreterInfo(interpretername); ​
268 ​
269 if (!info) { ​
270 // if interpreter isn't defined or invalid, try to fallback. ​
271 foreach (const QString& interpretername, ​
272 QStringList() << "python" << "ruby" << "qtscript" << "javascript" << "java") ​
273 { ​
274 info = manager->interpreterInfo(interpretername); ​
275 if (info) { ​
276 d->scriptaction->setInterpreter(interpretername); ​
277 break; ​
278 } ​
279 } ​
280 } ​
281 ​
282 if (!info) { ​
283 d->updatesProperties = false; ​
284 return; ​
285 } ​
286 ​
287 d->properties->clear(); 256​ d->properties->clear();
288 257​
289 QStringList types; 258​ QStringList types;
290 types << "executable" << "module" << "object"; 259​ types << "executable" << "module" << "object";
291 KPropertyListData* typelist = new KPropertyListData(types, types); 260​ KPropertyListData* typelist = new KPropertyListData(types, types);
292 KProperty* t = new KProperty( 261​ KProperty* t = new KProperty(
293 "type", // name 262​ "type", // name
294 typelist, // ListData 263​ typelist, // ListData
295 (d->scriptType.isEmpty() ? "executable" : d->scriptType), // value 264​ (d->scriptType.isEmpty() ? "executable" : d->scriptType), // value
296 xi18n("Script Type"), // caption 265​ xi18n("Script Type"), // caption
297 xi18n("The type of script"), // description 266​ xi18n("The type of script"), // description
298 KProperty::List // type 267​ KProperty::List // type
299 ); 268​ );
300 d->properties->addProperty(t); 269​ d->properties->addProperty(t);
301 270​
302 QStringList interpreters = manager->interpreters(); ​
303 ​
304 qDebug() << interpreters; ​
305 ​
306 KPropertyListData* proplist = new KPropertyListData(interpreters, interpreters); ​
307 KProperty* prop = new KProperty( ​
308 "language", // name ​
309 proplist, // ListData ​
310 d->scriptaction->interpreter(), // value ​
311 xi18n("Interpreter"), // caption ​
312 xi18n("The used scripting interpreter."), // description ​
313 KProperty::List // type ​
314 ); ​
315 d->properties->addProperty(prop); ​
316 ​
317 Kross::InterpreterInfo::Option::Map options = info->options(); ​
318 Kross::InterpreterInfo::Option::Map::ConstIterator it, end(options.constEnd()); ​
319 for (it = options.constBegin(); it != end; ++it) { ​
320 Kross::InterpreterInfo::Option* option = it.value(); ​
321 KProperty* prop = new KProperty( ​
322 it.key().toLatin1(), // name ​
323 d->scriptaction->option(it.key(), option->value), // value ​
324 it.key(), // caption ​
325 option->comment, // description ​
326 KProperty::Auto // type ​
327 ); ​
328 d->properties->addProperty(prop); ​
329 } ​
330 ​
331 //propertySetSwitched(); 271​ //propertySetSwitched();
332 propertySetReloaded(true); 272​ propertySetReloaded(true);
333 d->updatesProperties = false; 273​ d->updatesProperties = false;
334} 274​}
335 275​
336KPropertySet* KexiScriptDesignView::propertySet() 276​KPropertySet* KexiScriptDesignView::propertySet()
337{ 277​{
338 return d->properties; 278​ return d->properties;
339} 279​}
340 280​
341void KexiScriptDesignView::slotPropertyChanged(KPropertySet& /*set*/, KProperty& property) 281​void KexiScriptDesignView::slotPropertyChanged(KPropertySet& /*set*/, KProperty& property)
342{ 282​{
343 if (property.isNull()) 283​ if (property.isNull())
344 return; 284​ return;
345 285​
346 if (property.name() == "language") { 286​ if (property.name() == "type") {
347 QString language = property.value().toString(); ​
348 qDebug() << "language:" << language; ​
349 d->scriptaction->setInterpreter(language); ​
350 // We assume Kross and the HighlightingInterface are using same ​
351 // names for the support languages... ​
352 d->editor->setHighlightMode(language); ​
353 updateProperties(); ​
354 } ​
355 else if (property.name() == "type") { ​
356 d->scriptType = property.value().toString(); 287​ d->scriptType = property.value().toString();
357 } 288​ }
358 else { 289​ else {
359 bool ok = d->scriptaction->setOption(property.name(), property.value()); ​
360 if (! ok) { ​
361 qWarning() << "unknown property:" << property.name(); 290​ qWarning() << "unknown property:" << property.name();
362 return; 291​ return;
363 } 292​ }
364 } ​
365 293​
366 setDirty(true); 294​ setDirty(true);
367} 295​}
368 296​
369void KexiScriptDesignView::execute() 297​void KexiScriptDesignView::execute()
370{ 298​{
371 d->statusbrowser->clear(); 299​ d->statusbrowser->clear();
372 QTime time; 300​ QTime time;
373 time.start(); 301​ time.start();
374 d->statusbrowser->append(xi18nc("@info", 302​ d->statusbrowser->append(xi18nc("@info",
375 "Execution of the script <resource>%1</resource> started.", 303​ "Execution of the script <resource>%1</resource> started.",
376 d->scriptaction->name())); 304​ part()->instanceName()));
377 305​
378 d->scriptaction->trigger(); 306​ KexiScriptPart *pt = qobject_cast<KexiScriptPart*>(part());
379 if (d->scriptaction->hadError()) { ​
380 QString errormessage = d->scriptaction->errorMessage(); ​
381 d->statusbrowser->append(QString("<b>%2</b><br>").arg(errormessage.toHtmlEscaped())); ​
382 307​
383 QString tracedetails = d->scriptaction->errorTrace(); 308​ _stdout = QString();
384 d->statusbrowser->append(tracedetails.toHtmlEscaped()); 309​ qInstallMessageHandler(myMessageOutput);
310​ if (pt) {
311​ QJSValue result = pt->execute(d->editor->text().toUtf8());
312​
313​ d->statusbrowser->append(_stdout);
314​ if (result.isError()) {
315​ QString errormessage = result.toString();
316​ d->statusbrowser->append(QString("<b>%2</b><br>").arg(errormessage.toHtmlEscaped()));
385 317​
386 long lineno = d->scriptaction->errorLineNo(); 318​ long lineno = result.property("lineNumber").toInt();
387 if (lineno >= 0) 319​ if (lineno >= 0)
388 d->editor->setLineNo(lineno); 320​ d->editor->setLineNo(lineno);
389 } 321​ }
390 else { 322​ else {
391 // xgettext: no-c-format 323​ // xgettext: no-c-format
392 d->statusbrowser->append(xi18n("Successfully executed. Time elapsed: %1ms", time.elapsed())); 324​ d->statusbrowser->append(xi18n("Successfully executed. Time elapsed: %1ms", time.elapsed()));
393 } 325​ }
394} 326​ }
327​ qInstallMessageHandler(0);
328​}
395 329​
396bool KexiScriptDesignView::loadData() 330​bool KexiScriptDesignView::loadData()
397{ 331​{
398 QString data; 332​ QString data;
399 if (!loadDataBlock(&data)) { 333​ if (!loadDataBlock(&data)) {
400 qDebug() << "no DataBlock"; 334​ KexiScriptingDebug() << "no DataBlock";
401 return false; 335​ return false;
402 } 336​ }
403 337​
404 QString errMsg; 338​ QString errMsg;
405 int errLine; 339​ int errLine;
406 int errCol; 340​ int errCol;
407 341​
408 QDomDocument domdoc; 342​ QDomDocument domdoc;
409 bool parsed = domdoc.setContent(data, false, &errMsg, &errLine, &errCol); 343​ bool parsed = domdoc.setContent(data, false, &errMsg, &errLine, &errCol);
410 344​
411 if (! parsed) { 345​ if (! parsed) {
412 qDebug() << "XML parsing error line: " << errLine << " col: " << errCol << " message: " << errMsg; 346​ KexiScriptingDebug() << "XML parsing error line: " << errLine << " col: " << errCol << " message: " << errMsg;
staniekUnsubmitted
Done

-> KexiScriptingWarning

staniek: -> KexiScriptingWarning
413 return false; 347​ return false;
414 } 348​ }
415 349​
416 QDomElement scriptelem = domdoc.namedItem("script").toElement(); 350​ QDomElement scriptelem = domdoc.namedItem("script").toElement();
417 if (scriptelem.isNull()) { 351​ if (scriptelem.isNull()) {
418 qDebug() << "script domelement is null"; 352​ KexiScriptingDebug() << "script domelement is null";
staniekUnsubmitted
Done

-> KexiScriptingWarning

staniek: -> KexiScriptingWarning
419 return false; 353​ return false;
420 } 354​ }
421 355​
422 d->scriptType = scriptelem.attribute("scripttype"); 356​ d->scriptType = scriptelem.attribute("scripttype");
423 if (d->scriptType.isEmpty()) { 357​ if (d->scriptType.isEmpty()) {
424 d->scriptType = "executable"; 358​ d->scriptType = "executable";
425 } 359​ }
426 360​
427 QString interpretername = scriptelem.attribute("language"); 361​ initialize(scriptelem.text().toUtf8());
428 Kross::Manager* manager = &Kross::Manager::self(); ​
429 Kross::InterpreterInfo* info = interpretername.isEmpty() ? 0 : manager->interpreterInfo(interpretername); ​
430 if (info) { ​
431 d->scriptaction->setInterpreter(interpretername); ​
432 ​
433 Kross::InterpreterInfo::Option::Map options = info->options(); ​
434 Kross::InterpreterInfo::Option::Map::ConstIterator it, end = options.constEnd(); ​
435 for (it = options.constBegin(); it != end; ++it) { ​
436 QString value = scriptelem.attribute(it.key()); ​
437 if (! value.isNull()) { ​
438 QVariant v(value); ​
439 if (v.convert(it.value()->value.type())) // preserve the QVariant's type ​
440 d->scriptaction->setOption(it.key(), v); ​
441 } ​
442 } ​
443 } ​
444 ​
445 d->scriptaction->setCode(scriptelem.text().toUtf8()); ​
446 362​
447 return true; 363​ return true;
448} 364​}
449 365​
450KDbObject* KexiScriptDesignView::storeNewData(const KDbObject& object, 366​KDbObject* KexiScriptDesignView::storeNewData(const KDbObject& object,
451 KexiView::StoreNewDataOptions options, 367​ KexiView::StoreNewDataOptions options,
452 bool *cancel) 368​ bool *cancel)
453{ 369​{
454 KDbObject *s = KexiView::storeNewData(object, options, cancel); 370​ KDbObject *s = KexiView::storeNewData(object, options, cancel);
455 371​
456 if (!s || *cancel) { 372​ if (!s || *cancel) {
457 delete s; 373​ delete s;
458 return 0; 374​ return 0;
459 } 375​ }
460 qDebug() << "new id:" << s->id(); 376​ KexiScriptingDebug() << "new id:" << s->id();
461 377​
462 if (! storeData()) { 378​ if (! storeData()) {
463 qWarning() << "Failed to store the data."; 379​ qWarning() << "Failed to store the data.";
464 //failure: remove object's object data to avoid garbage 380​ //failure: remove object's object data to avoid garbage
465 KDbConnection *conn = KexiMainWindowIface::global()->project()->dbConnection(); 381​ KDbConnection *conn = KexiMainWindowIface::global()->project()->dbConnection();
466 conn->removeObject(s->id()); 382​ conn->removeObject(s->id());
467 delete s; 383​ delete s;
468 return 0; 384​ return 0;
469 } 385​ }
470 386​
471 return s; 387​ return s;
472} 388​}
473 389​
474tristate KexiScriptDesignView::storeData(bool /*dontAsk*/) 390​tristate KexiScriptDesignView::storeData(bool /*dontAsk*/)
475{ 391​{
392​ KexiScriptingDebug() << "Saving script" << d->editor->text().toUtf8();
476 QDomDocument domdoc("script"); 393​ QDomDocument domdoc("script");
477 QDomElement scriptelem = domdoc.createElement("script"); 394​ QDomElement scriptelem = domdoc.createElement("script");
478 domdoc.appendChild(scriptelem); 395​ domdoc.appendChild(scriptelem);
479 396​
480 QString language = d->scriptaction->interpreter(); 397​ scriptelem.setAttribute("language", "javascript");
481 scriptelem.setAttribute("language", language); ​
482 //! @todo move different types to their own part?? 398​ //! @todo move different types to their own part??
483 scriptelem.setAttribute("scripttype", d->scriptType); 399​ scriptelem.setAttribute("scripttype", d->scriptType);
484 400​
485 Kross::InterpreterInfo* info = Kross::Manager::self().interpreterInfo(language); 401​ QDomText scriptcode = domdoc.createTextNode(d->editor->text().toUtf8());
486 if (info) { ​
487 Kross::InterpreterInfo::Option::Map defoptions = info->options(); ​
488 QMap<QString, QVariant> options = d->scriptaction->options(); ​
489 QMap<QString, QVariant>::ConstIterator it, end(options.constEnd()); ​
490 for (it = options.constBegin(); it != end; ++it) ​
491 if (defoptions.contains(it.key())) // only remember options which the InterpreterInfo knows about... ​
492 scriptelem.setAttribute(it.key(), it.value().toString()); ​
493 } ​
494 ​
495 QDomText scriptcode = domdoc.createTextNode(d->scriptaction->code()); ​
496 scriptelem.appendChild(scriptcode); 402​ scriptelem.appendChild(scriptcode);
497 403​
498 return storeDataBlock(domdoc.toString()); 404​ return storeDataBlock(domdoc.toString());
499} 405​}
staniekUnsubmitted
Done

BTW
Can we have have check for Qt version in CMake and if < 5.8 then disable scritping. I am OK with having 5.8 a dependency of scripting.

staniek: BTW Can we have have check for Qt version in CMake and if < 5.8 then disable scritping. I am OK…
staniekUnsubmitted
Done

Sorry for confusion wrt disabling scripting.

staniek: Sorry for confusion wrt disabling scripting.
500 ​
501 ​