Showing the changes to interface/src/Menu.cpp (1 of 93 files). Show all
Unified · Split
| @@ -196,6 +196,7 @@ Menu::Menu() : · 195 unmodified lines | ||
| 196 | 196 | |
| 197 | 197 | QMenu* toolsMenu = addMenu("Tools"); |
| 198 | 198 | addActionToQMenuAndActionHash(toolsMenu, MenuOption::MetavoxelEditor, 0, this, SLOT(showMetavoxelEditor())); |
| 199 | + addActionToQMenuAndActionHash(toolsMenu, MenuOption::ScriptEditor, Qt::ALT | Qt::Key_S, this, SLOT(showScriptEditor())); | |
| 199 | 200 | |
| 200 | 201 | #ifdef HAVE_QXMPP |
| 201 | 202 | _chatAction = addActionToQMenuAndActionHash(toolsMenu, |
| @@ -260,6 +261,9 @@ Menu::Menu() : · 58 unmodified lines | ||
| 260 | 261 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Bandwidth, 0, true); |
| 261 | 262 | addActionToQMenuAndActionHash(viewMenu, MenuOption::BandwidthDetails, 0, this, SLOT(bandwidthDetails())); |
| 262 | 263 | addActionToQMenuAndActionHash(viewMenu, MenuOption::OctreeStats, 0, this, SLOT(octreeStatsDetails())); |
| 264 | + addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::AudioScope, 0, false, | |
| 265 | + appInstance->getAudio(), | |
| 266 | + SLOT(toggleScope())); | |
| 263 | 267 | |
| 264 | 268 | QMenu* developerMenu = addMenu("Developer"); |
| 265 | 269 | |
| @@ -316,7 +320,8 @@ Menu::Menu() : · 50 unmodified lines | ||
| 316 | 320 | addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::Visage, 0, true, |
| 317 | 321 | appInstance->getVisage(), SLOT(updateEnabled())); |
| 318 | 322 | #endif |
| 319 | − | |
| 323 | + | |
| 324 | + addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::GlowWhenSpeaking, 0, true); | |
| 320 | 325 | addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::ChatCircling, 0, false); |
| 321 | 326 | |
| 322 | 327 | QMenu* handOptionsMenu = developerMenu->addMenu("Hand Options"); |
| @@ -385,6 +390,11 @@ Menu::Menu() : · 62 unmodified lines | ||
| 385 | 390 | false, |
| 386 | 391 | appInstance->getAudio(), |
| 387 | 392 | SLOT(toggleToneInjection())); |
| 393 | + addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioScopePause, | |
| 394 | + Qt::CTRL | Qt::Key_P, | |
| 395 | + false, | |
| 396 | + appInstance->getAudio(), | |
| 397 | + SLOT(toggleScopePause())); | |
| 388 | 398 | |
| 389 | 399 | QMenu* spatialAudioMenu = audioDebugMenu->addMenu("Spatial Audio"); |
| 390 | 400 | |
| @@ -430,6 +440,14 @@ Menu::Menu() : · 39 unmodified lines | ||
| 430 | 440 | Qt::CTRL | Qt::SHIFT | Qt::Key_A, |
| 431 | 441 | true); |
| 432 | 442 | |
| 443 | + addCheckableActionToQMenuAndActionHash(spatialAudioMenu, MenuOption::AudioSpatialProcessingDontDistanceAttenuate, | |
| 444 | + Qt::CTRL | Qt::SHIFT | Qt::Key_Y, | |
| 445 | + false); | |
| 446 | + | |
| 447 | + addCheckableActionToQMenuAndActionHash(spatialAudioMenu, MenuOption::AudioSpatialProcessingAlternateDistanceAttenuate, | |
| 448 | + Qt::CTRL | Qt::SHIFT | Qt::Key_U, | |
| 449 | + false); | |
| 450 | + | |
| 433 | 451 | addActionToQMenuAndActionHash(developerMenu, MenuOption::PasteToVoxel, |
| 434 | 452 | Qt::CTRL | Qt::SHIFT | Qt::Key_V, |
| 435 | 453 | this, |
| @@ -1127,6 +1145,13 @@ void Menu::showMetavoxelEditor() { · 691 unmodified lines | ||
| 1127 | 1145 | _MetavoxelEditor->raise(); |
| 1128 | 1146 | } |
| 1129 | 1147 | |
| 1148 | +void Menu::showScriptEditor() { | |
| 1149 | + if(!_ScriptEditor || !_ScriptEditor->isVisible()) { | |
| 1150 | + _ScriptEditor = new ScriptEditorWindow(); | |
| 1151 | + } | |
| 1152 | + _ScriptEditor->raise(); | |
| 1153 | +} | |
| 1154 | + | |
| 1130 | 1155 | void Menu::showChat() { |
| 1131 | 1156 | QMainWindow* mainWindow = Application::getInstance()->getWindow(); |
| 1132 | 1157 | if (!_chatWindow) { |