Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all
Unified · Split
| @@ -1173,7 +1173,6 @@ void Application::initializeUi() { · 1172 unmodified lines | |||
| 1173 | offscreenUi->setProxyWindow(_window->windowHandle()); | 1173 | offscreenUi->setProxyWindow(_window->windowHandle()); |
| 1174 | offscreenUi->setBaseUrl(QUrl::fromLocalFile(PathUtils::resourcesPath() + "/qml/")); | 1174 | offscreenUi->setBaseUrl(QUrl::fromLocalFile(PathUtils::resourcesPath() + "/qml/")); |
| 1175 | offscreenUi->load("Root.qml"); | 1175 | offscreenUi->load("Root.qml"); |
| 1176 | offscreenUi->load("RootMenu.qml"); | ||
| 1177 | // FIXME either expose so that dialogs can set this themselves or | 1176 | // FIXME either expose so that dialogs can set this themselves or |
| 1178 | // do better detection in the offscreen UI of what has focus | 1177 | // do better detection in the offscreen UI of what has focus |
| 1179 | offscreenUi->setNavigationFocused(false); | 1178 | offscreenUi->setNavigationFocused(false); |
| @@ -2033,16 +2032,16 @@ void Application::keyPressEvent(QKeyEvent* event) { · 853 unmodified lines | |||
| 2033 | 2032 | ||
| 2034 | break; | 2033 | break; |
| 2035 | } | 2034 | } |
| 2036 | case Qt::Key_Escape: { | 2035 | // case Qt::Key_Escape: { |
| 2037 | getActiveDisplayPlugin()->abandonCalibration(); | 2036 | // getActiveDisplayPlugin()->abandonCalibration(); |
| 2038 | if (!event->isAutoRepeat()) { | 2037 | // if (!event->isAutoRepeat()) { |
| 2039 | // this starts the HFCancelEvent | 2038 | // // this starts the HFCancelEvent |
| 2040 | HFBackEvent startBackEvent(HFBackEvent::startType()); | 2039 | // HFBackEvent startBackEvent(HFBackEvent::startType()); |
| 2041 | sendEvent(this, &startBackEvent); | 2040 | // sendEvent(this, &startBackEvent); |
| 2042 | } | 2041 | // } |
| 2043 | 2042 | // | |
| 2044 | break; | 2043 | // break; |
| 2045 | } | 2044 | // } |
| 2046 | 2045 | ||
| 2047 | default: | 2046 | default: |
| 2048 | event->ignore(); | 2047 | event->ignore(); |