From 2254f0f9f7ac1e875cf82ac57e56bf4b6c55f34d Mon Sep 17 00:00:00 2001 From: consti10 Date: Mon, 6 Nov 2023 13:17:45 +0100 Subject: [PATCH] Flow settings OSD -> Widgets first, remove record widget (merged into video widget), add categorizer and re-order osd widget on / off settings --- qml/ui/HUDOverlayGrid.qml | 1 - .../qopenhd_settings/AppWidgetSettingsView.qml | 2 +- qml/ui/widgets/BaseWidget.qml | 8 -------- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/qml/ui/HUDOverlayGrid.qml b/qml/ui/HUDOverlayGrid.qml index 1f43ea202..feeda9815 100644 --- a/qml/ui/HUDOverlayGrid.qml +++ b/qml/ui/HUDOverlayGrid.qml @@ -269,7 +269,6 @@ Item { // -------------------------------------------------------------------------- LinkDownRSSIWidget { id: downlink - m_next_item: record_video_widget } WBLinkRateControlWidget{ id: wBLinkRateControlWidget diff --git a/qml/ui/configpopup/qopenhd_settings/AppWidgetSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppWidgetSettingsView.qml index 993766a0e..22a0d4fca 100755 --- a/qml/ui/configpopup/qopenhd_settings/AppWidgetSettingsView.qml +++ b/qml/ui/configpopup/qopenhd_settings/AppWidgetSettingsView.qml @@ -77,7 +77,7 @@ ScrollView { } SettingBaseElement{ m_short_description: "Show video widget" - m_long_description: "More stats about each camera stream and quick resolution changes." + m_long_description: "More stats about each camera stream, quick resolution changes and quick air recording." Switch { width: 32 height: elementHeight diff --git a/qml/ui/widgets/BaseWidget.qml b/qml/ui/widgets/BaseWidget.qml index 55c1643ba..35d643eab 100644 --- a/qml/ui/widgets/BaseWidget.qml +++ b/qml/ui/widgets/BaseWidget.qml @@ -113,8 +113,6 @@ BaseWidgetForm { property bool disable_dragging: false // --------------------------------------------------------------------- // Custom keyboard KeyNavigation - // Must be also of type BaseWidget - property var m_next_item: // DIRTY function dirty_open_action_popup(){ widgetAction.open() @@ -155,12 +153,6 @@ BaseWidgetForm { // TODO: Go to the next item } } - function set_focus_next_item(){ - if(m_next_item==undefined){ - console.log("Next item undefined") - return; - } - } //layer.enabled: false