Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 13:43:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #15711 from PrestonB1123/removingShortcuts

Browse source 
DEV-108: Removed ctrl+b and ctrl+n as shortcuts
This commit is contained in:
PrestonB1123 2019-06-07 16:26:38 -07:00 committed by GitHub
commit 059d931d17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/hifi/Desktop.qml
View file

@ -25,7 +25,6 @@ OriginalDesktop.Desktop {
Action {
text: "Open Browser"
shortcut: "Ctrl+B"
onTriggered: {
console.log("Open browser");
browserBuilder.createObject(desktop);

11
interface/src/Application.cpp
View file

@ -4309,10 +4309,7 @@ void Application::keyPressEvent(QKeyEvent* event) {
break;
case Qt::Key_B:
if (isMeta) {
auto offscreenUi = getOffscreenUI();
offscreenUi->load("Browser.qml");
} else if (isOption) {
if (isOption) {
controller::InputRecorder* inputRecorder = controller::InputRecorder::getInstance();
inputRecorder->stopPlayback();
}
@ -4351,12 +4348,6 @@ void Application::keyPressEvent(QKeyEvent* event) {
}
break;
case Qt::Key_N:
if (!isOption && !isShifted && isMeta) {
DependencyManager::get<NodeList>()->toggleIgnoreRadius();
}
break;
case Qt::Key_S:
if (isShifted && isMeta && !isOption) {
Menu::getInstance()->triggerOption(MenuOption::SuppressShortTimings);