History

scripts save on exit and load on entry

aw committed 12 years ago

Commit 0eed0411 parent 19793a96 files · +69 −19Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 6 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+9−4
@@ -38,17 +38,20 @@ static QScriptValue soundConstructor(QScriptContext* context, QScriptEngine* eng · 37 unmodified lines
38 return soundScriptValue;38 return soundScriptValue;
39}39}
40 40
41ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems,41ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, const QString& fileNameString, AbstractMenuInterface* menu,
42 const char* scriptMenuName, AbstractMenuInterface* menu,
43 AbstractControllerScriptingInterface* controllerScriptingInterface) {42 AbstractControllerScriptingInterface* controllerScriptingInterface) {
44 _scriptContents = scriptContents;43 _scriptContents = scriptContents;
45 _isFinished = false;44 _isFinished = false;
46 _isRunning = false;45 _isRunning = false;
47 _isInitialized = false;46 _isInitialized = false;
47 _fileNameString = fileNameString;
48
49 QByteArray fileNameAscii = fileNameString.toLocal8Bit();
50 const char* scriptMenuName = fileNameAscii.data();
48 51
49 // some clients will use these menu features52 // some clients will use these menu features
50 _wantMenuItems = wantMenuItems;53 _wantMenuItems = wantMenuItems;
51 if (scriptMenuName) {54 if (!fileNameString.isEmpty()) {
52 _scriptMenuName = "Stop ";55 _scriptMenuName = "Stop ";
53 _scriptMenuName.append(scriptMenuName);56 _scriptMenuName.append(scriptMenuName);
54 _scriptMenuName.append(QString(" [%1]").arg(_scriptNumber));57 _scriptMenuName.append(QString(" [%1]").arg(_scriptNumber));
@@ -233,9 +236,11 @@ void ScriptEngine::run() { · 178 unmodified lines
233 thread()->quit();236 thread()->quit();
234 }237 }
235 238
236 emit finished();239 emit finished(_fileNameString);
240
237 _isRunning = false;241 _isRunning = false;
238}242}
243
239void ScriptEngine::stop() {244void ScriptEngine::stop() {
240 _isFinished = true;245 _isFinished = true;
241}246}