Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 20:58:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15917 from PrestonB1123/disablePShortcut

Browse source 
disabled P shortcut and re-enabled in metaverse
This commit is contained in:
Shannon Romano 2019-07-11 13:32:11 -07:00 committed by GitHub
commit dd9b4a8143
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
interface/src/Application.cpp
View file

@ -4429,27 +4429,6 @@ void Application::keyPressEvent(QKeyEvent* event) {
} }
break; break;
case Qt::Key_P: {
if (!isShifted && !isMeta && !isOption && !event->isAutoRepeat()) {
AudioInjectorOptions options;
options.localOnly = true;
options.positionSet = false; // system sound
options.stereo = true;
Setting::Handle<bool> notificationSounds{ MenuOption::NotificationSounds, true };
Setting::Handle<bool> notificationSoundSnapshot{ MenuOption::NotificationSoundsSnapshot, true };
if (notificationSounds.get() && notificationSoundSnapshot.get()) {
if (_snapshotSoundInjector) {
DependencyManager::get<AudioInjectorManager>()->setOptionsAndRestart(_snapshotSoundInjector, options);
} else {
_snapshotSoundInjector = DependencyManager::get<AudioInjectorManager>()->playSound(_snapshotSound, options);
}
}
takeSnapshot(true);
}
break;
}
case Qt::Key_Apostrophe: { case Qt::Key_Apostrophe: {
if (isMeta) { if (isMeta) {
auto cursor = Cursor::Manager::instance().getCursor(); auto cursor = Cursor::Manager::instance().getCursor();

8
scripts/system/keyboardShortcuts/keyboardShortcuts.js
View file

@ -12,11 +12,19 @@
// //
(function () { // BEGIN LOCAL_SCOPE (function () { // BEGIN LOCAL_SCOPE
var snapActivateSound = SoundCache.getSound(Script.resourcesPath() + "sounds/snapshot/snap.wav");
function keyPressEvent(event) { function keyPressEvent(event) {
if (event.text.toUpperCase() === "B" && event.isControl) { if (event.text.toUpperCase() === "B" && event.isControl) {
Window.openWebBrowser(); Window.openWebBrowser();
} else if (event.text.toUpperCase() === "N" && event.isControl) { } else if (event.text.toUpperCase() === "N" && event.isControl) {
Users.toggleIgnoreRadius(); Users.toggleIgnoreRadius();
} else if (event.text.toUpperCase() === "P") {
Audio.playSound(snapActivateSound, {
position: { x: MyAvatar.position.x, y: MyAvatar.position.y, z: MyAvatar.position.z },
localOnly: true,
volume: 0.5
});
Window.takeSnapshot(true);
} }
} }