History

Moved SpeechRecognizer out of Menu

Added it in the DM

Atlante45 committed 11 years ago

Commit 8933da71 parent 7f702d37 files · +32 −48Browse files

Showing the changes to interface/src/Application.cpp (1 of 7 files). Show all

Unified · Split

interface/src/Application.cpp+8−2
@@ -180,6 +180,9 @@ bool setupEssentials(int& argc, char** argv) { · 179 unmodified lines
180180 auto lodManager = DependencyManager::set<LODManager>();
181181 auto jsConsole = DependencyManager::set<StandAloneJSConsole>();
182182 auto dialogsManager = DependencyManager::set<DialogsManager>();
183+#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
184+ auto speechRecognizer = DependencyManager::set<SpeechRecognizer>();
185+#endif
183186
184187 return true;
185188 }
@@ -3464,7 +3467,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 3278 unmodified lines
34643467 scriptEngine->registerGlobalObject("Camera", &_myCamera);
34653468
34663469 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
3467− scriptEngine->registerGlobalObject("SpeechRecognizer", Menu::getInstance()->getSpeechRecognizer());
3470+ scriptEngine->registerGlobalObject("SpeechRecognizer", DependencyManager::get<SpeechRecognizer>().data());
34683471 #endif
34693472
34703473 ClipboardScriptingInterface* clipboardScriptable = new ClipboardScriptingInterface();
@@ -3787,7 +3790,10 @@ void Application::loadScriptURLDialog() { · 316 unmodified lines
37873790 }
37883791 }
37893792
3790−
3793+void Application::setScriptsLocation(const QString& scriptsLocation) {
3794+ _scriptsLocation = scriptsLocation;
3795+ emit scriptLocationChanged(scriptsLocation);
3796+}
37913797
37923798 void Application::toggleLogDialog() {
37933799 if (! _logDialog) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t