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