Showing the changes to interface/src/Menu.cpp (1 of 7 files). Show all
Unified · Split
| @@ -233,6 +233,8 @@ Menu::Menu() : · 232 unmodified lines | |||
| 233 | QMenu* toolsMenu = addMenu("Tools"); | 233 | QMenu* toolsMenu = addMenu("Tools"); |
| 234 | addActionToQMenuAndActionHash(toolsMenu, MenuOption::MetavoxelEditor, 0, this, SLOT(showMetavoxelEditor())); | 234 | addActionToQMenuAndActionHash(toolsMenu, MenuOption::MetavoxelEditor, 0, this, SLOT(showMetavoxelEditor())); |
| 235 | addActionToQMenuAndActionHash(toolsMenu, MenuOption::ScriptEditor, Qt::ALT | Qt::Key_S, this, SLOT(showScriptEditor())); | 235 | addActionToQMenuAndActionHash(toolsMenu, MenuOption::ScriptEditor, Qt::ALT | Qt::Key_S, this, SLOT(showScriptEditor())); |
| 236 | addCheckableActionToQMenuAndActionHash(toolsMenu, MenuOption::ControlWithSpeech, Qt::CTRL | Qt::SHIFT | Qt::Key_C, true, | ||
| 237 | Application::getInstance(), SLOT(setSpeechRecognitionEnabled(bool))); | ||
| 236 | 238 | ||
| 237 | #ifdef HAVE_QXMPP | 239 | #ifdef HAVE_QXMPP |
| 238 | _chatAction = addActionToQMenuAndActionHash(toolsMenu, | 240 | _chatAction = addActionToQMenuAndActionHash(toolsMenu, |
| @@ -651,6 +653,7 @@ void Menu::loadSettings(QSettings* settings) { · 412 unmodified lines | |||
| 651 | _snapshotsLocation = settings->value("snapshotsLocation", | 653 | _snapshotsLocation = settings->value("snapshotsLocation", |
| 652 | QStandardPaths::writableLocation(QStandardPaths::DesktopLocation)).toString(); | 654 | QStandardPaths::writableLocation(QStandardPaths::DesktopLocation)).toString(); |
| 653 | setScriptsLocation(settings->value("scriptsLocation", QString()).toString()); | 655 | setScriptsLocation(settings->value("scriptsLocation", QString()).toString()); |
| 656 | Application::getInstance()->setSpeechRecognitionEnabled(settings->value("speechRecognitionEnabled", false).toBool()); | ||
| 654 | 657 | ||
| 655 | settings->beginGroup("View Frustum Offset Camera"); | 658 | settings->beginGroup("View Frustum Offset Camera"); |
| 656 | // in case settings is corrupt or missing loadSetting() will check for NaN | 659 | // in case settings is corrupt or missing loadSetting() will check for NaN |
| @@ -699,6 +702,7 @@ void Menu::saveSettings(QSettings* settings) { · 42 unmodified lines | |||
| 699 | settings->setValue("boundaryLevelAdjust", _boundaryLevelAdjust); | 702 | settings->setValue("boundaryLevelAdjust", _boundaryLevelAdjust); |
| 700 | settings->setValue("snapshotsLocation", _snapshotsLocation); | 703 | settings->setValue("snapshotsLocation", _snapshotsLocation); |
| 701 | settings->setValue("scriptsLocation", _scriptsLocation); | 704 | settings->setValue("scriptsLocation", _scriptsLocation); |
| 705 | settings->setValue("speechRecognitionEnabled", Application::getInstance()->getSpeechRecognitionEnabled()); | ||
| 702 | settings->beginGroup("View Frustum Offset Camera"); | 706 | settings->beginGroup("View Frustum Offset Camera"); |
| 703 | settings->setValue("viewFrustumOffsetYaw", _viewFrustumOffset.yaw); | 707 | settings->setValue("viewFrustumOffsetYaw", _viewFrustumOffset.yaw); |
| 704 | settings->setValue("viewFrustumOffsetPitch", _viewFrustumOffset.pitch); | 708 | settings->setValue("viewFrustumOffsetPitch", _viewFrustumOffset.pitch); |