Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 7 files). Show all
Unified · Split
| @@ -42,7 +42,6 @@ static QScriptValue soundConstructor(QScriptContext* context, QScriptEngine* eng · 41 unmodified lines | ||
| 42 | 42 | |
| 43 | 43 | |
| 44 | 44 | ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, const QString& fileNameString, |
| 45 | − AbstractMenuInterface* menu, | |
| 46 | 45 | AbstractControllerScriptingInterface* controllerScriptingInterface) : |
| 47 | 46 | _isAvatar(false), |
| 48 | 47 | _avatarIdentityTimer(NULL), |
| @@ -69,7 +68,6 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, co · 20 unmodified lines | ||
| 69 | 68 | _scriptMenuName.append(_scriptNumber); |
| 70 | 69 | } |
| 71 | 70 | _scriptNumber++; |
| 72 | − _menu = menu; | |
| 73 | 71 | _controllerScriptingInterface = controllerScriptingInterface; |
| 74 | 72 | } |
| 75 | 73 | |
| @@ -105,16 +103,9 @@ void ScriptEngine::setAvatarData(AvatarData* avatarData, const QString& objectNa · 29 unmodified lines | ||
| 105 | 103 | registerGlobalObject(objectName, _avatarData); |
| 106 | 104 | } |
| 107 | 105 | |
| 108 | − | |
| 109 | −void ScriptEngine::setupMenuItems() { | |
| 110 | − if (_menu && _wantMenuItems) { | |
| 111 | − _menu->addActionToQMenuAndActionHash(_menu->getActiveScriptsMenu(), _scriptMenuName, 0, this, SLOT(stop())); | |
| 112 | − } | |
| 113 | −} | |
| 114 | − | |
| 115 | −void ScriptEngine::cleanMenuItems() { | |
| 116 | − if (_menu && _wantMenuItems) { | |
| 117 | − _menu->removeAction(_menu->getActiveScriptsMenu(), _scriptMenuName); | |
| 106 | +void ScriptEngine::cleanupMenuItems() { | |
| 107 | + if (_wantMenuItems) { | |
| 108 | + emit cleanupMenuItem(_scriptMenuName); | |
| 118 | 109 | } |
| 119 | 110 | } |
| 120 | 111 | |
| @@ -172,7 +163,6 @@ void ScriptEngine::init() { · 51 unmodified lines | ||
| 172 | 163 | _voxelsScriptingInterface.getVoxelPacketSender()->setProcessCallIntervalHint(VISUAL_DATA_CALLBACK_USECS); |
| 173 | 164 | _particlesScriptingInterface.getParticlePacketSender()->setProcessCallIntervalHint(VISUAL_DATA_CALLBACK_USECS); |
| 174 | 165 | |
| 175 | − //qDebug() << "Script:\n" << _scriptContents << "\n"; | |
| 176 | 166 | } |
| 177 | 167 | |
| 178 | 168 | void ScriptEngine::registerGlobalObject(const QString& name, QObject* object) { |
| @@ -301,7 +291,7 @@ void ScriptEngine::run() { · 122 unmodified lines | ||
| 301 | 291 | } |
| 302 | 292 | } |
| 303 | 293 | |
| 304 | − cleanMenuItems(); | |
| 294 | + cleanupMenuItems(); | |
| 305 | 295 | |
| 306 | 296 | // If we were on a thread, then wait till it's done |
| 307 | 297 | if (thread()) { |