Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 30 files). Show all
Unified · Split
| @@ -38,8 +38,8 @@ static QScriptValue soundConstructor(QScriptContext* context, QScriptEngine* eng · 37 unmodified lines | |||
| 38 | return soundScriptValue; | 38 | return soundScriptValue; |
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, | 41 | |
| 42 | const char* scriptMenuName, AbstractMenuInterface* menu, | 42 | ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, const QString& fileNameString, AbstractMenuInterface* menu, |
| 43 | AbstractControllerScriptingInterface* controllerScriptingInterface) : | 43 | AbstractControllerScriptingInterface* controllerScriptingInterface) : |
| 44 | _avatarData(NULL) | 44 | _avatarData(NULL) |
| 45 | { | 45 | { |
| @@ -47,10 +47,14 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, · 1 unmodified line | |||
| 47 | _isFinished = false; | 47 | _isFinished = false; |
| 48 | _isRunning = false; | 48 | _isRunning = false; |
| 49 | _isInitialized = false; | 49 | _isInitialized = false; |
| 50 | _fileNameString = fileNameString; | ||
| 51 | |||
| 52 | QByteArray fileNameAscii = fileNameString.toLocal8Bit(); | ||
| 53 | const char* scriptMenuName = fileNameAscii.data(); | ||
| 50 | 54 | ||
| 51 | // some clients will use these menu features | 55 | // some clients will use these menu features |
| 52 | _wantMenuItems = wantMenuItems; | 56 | _wantMenuItems = wantMenuItems; |
| 53 | if (scriptMenuName) { | 57 | if (!fileNameString.isEmpty()) { |
| 54 | _scriptMenuName = "Stop "; | 58 | _scriptMenuName = "Stop "; |
| 55 | _scriptMenuName.append(scriptMenuName); | 59 | _scriptMenuName.append(scriptMenuName); |
| 56 | _scriptMenuName.append(QString(" [%1]").arg(_scriptNumber)); | 60 | _scriptMenuName.append(QString(" [%1]").arg(_scriptNumber)); |
| @@ -272,9 +276,11 @@ void ScriptEngine::run() { · 215 unmodified lines | |||
| 272 | thread()->quit(); | 276 | thread()->quit(); |
| 273 | } | 277 | } |
| 274 | 278 | ||
| 275 | emit finished(); | 279 | emit finished(_fileNameString); |
| 280 | |||
| 276 | _isRunning = false; | 281 | _isRunning = false; |
| 277 | } | 282 | } |
| 283 | |||
| 278 | void ScriptEngine::stop() { | 284 | void ScriptEngine::stop() { |
| 279 | _isFinished = true; | 285 | _isFinished = true; |
| 280 | } | 286 | } |