From a0753f6393313f0ffebce8439bd5e91917213d3a Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Fri, 7 Jun 2019 15:41:44 -0700 Subject: [PATCH] removed ctrl+b and ctrl+n as shortcuts --- interface/resources/qml/hifi/Desktop.qml | 1 - interface/src/Application.cpp | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/interface/resources/qml/hifi/Desktop.qml b/interface/resources/qml/hifi/Desktop.qml index a97d94d91c..5fa6234504 100644 --- a/interface/resources/qml/hifi/Desktop.qml +++ b/interface/resources/qml/hifi/Desktop.qml @@ -25,7 +25,6 @@ OriginalDesktop.Desktop { Action { text: "Open Browser" - shortcut: "Ctrl+B" onTriggered: { console.log("Open browser"); browserBuilder.createObject(desktop); diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 4a0bce5103..a2813eaa57 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -4303,10 +4303,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(); } @@ -4345,12 +4342,6 @@ void Application::keyPressEvent(QKeyEvent* event) { } break; - case Qt::Key_N: - if (!isOption && !isShifted && isMeta) { - DependencyManager::get()->toggleIgnoreRadius(); - } - break; - case Qt::Key_S: if (isShifted && isMeta && !isOption) { Menu::getInstance()->triggerOption(MenuOption::SuppressShortTimings);