From 303a5076ede3b8261f53ebc489efe3702c5cd9e7 Mon Sep 17 00:00:00 2001 From: consti10 Date: Wed, 7 Feb 2024 00:53:55 +0100 Subject: [PATCH] finalize joystick edit values element --- qml/ui/AnyParamBusyIndicator.qml | 1 + .../configpopup/quick/BaseJoyEditElement.qml | 4 ++-- qml/ui/configpopup/quick/GoBackElement.qml | 7 ++++-- qml/ui/configpopup/quick/PanelQuick.qml | 9 -------- qml/ui/widgets/WBLinkRateControlWidget.qml | 22 ------------------- 5 files changed, 8 insertions(+), 35 deletions(-) diff --git a/qml/ui/AnyParamBusyIndicator.qml b/qml/ui/AnyParamBusyIndicator.qml index f095a815e..0078a3162 100644 --- a/qml/ui/AnyParamBusyIndicator.qml +++ b/qml/ui/AnyParamBusyIndicator.qml @@ -13,6 +13,7 @@ Item{ width: parent.width height: parent.height + BusyIndicator{ id: any_param_busy_indiscator width: 96 diff --git a/qml/ui/configpopup/quick/BaseJoyEditElement.qml b/qml/ui/configpopup/quick/BaseJoyEditElement.qml index c7f153e1f..f9b245be9 100644 --- a/qml/ui/configpopup/quick/BaseJoyEditElement.qml +++ b/qml/ui/configpopup/quick/BaseJoyEditElement.qml @@ -67,9 +67,9 @@ Item{ border.color: "black" border.width: 3 color: { - return "blue" + return "#333c4c" } - opacity: base_joy_edit_element.focus ? 1.0 : 0.4; + opacity: base_joy_edit_element.focus ? 1.0 : 0.3; //opacity: focus ? 1.0 : 0.4; //color: "green" // "#8cbfd7f3" : "#00000000" diff --git a/qml/ui/configpopup/quick/GoBackElement.qml b/qml/ui/configpopup/quick/GoBackElement.qml index 399a28326..0fee64b11 100644 --- a/qml/ui/configpopup/quick/GoBackElement.qml +++ b/qml/ui/configpopup/quick/GoBackElement.qml @@ -5,8 +5,11 @@ Rectangle{ id: go_back_element width: parent.width height: 50 - color: "blue" - opacity:go_back_element.focus ? 1.0 : 0.4; + + color: { + return "#333c4c" + } + opacity: go_back_element.focus ? 1.0 : 0.3; function close_and_go_back(){ // Go back to the diff --git a/qml/ui/configpopup/quick/PanelQuick.qml b/qml/ui/configpopup/quick/PanelQuick.qml index 2ac01ea1f..fd15eed00 100644 --- a/qml/ui/configpopup/quick/PanelQuick.qml +++ b/qml/ui/configpopup/quick/PanelQuick.qml @@ -120,15 +120,6 @@ Item { } - Rectangle{ - implicitWidth: middle_element.width - implicitHeight: middle_element.height - color: "blue" - opacity: 0.2; - anchors.top: middle_element.top - anchors.left: middle_element.left - } - Column{ anchors.centerIn: parent id: middle_element diff --git a/qml/ui/widgets/WBLinkRateControlWidget.qml b/qml/ui/widgets/WBLinkRateControlWidget.qml index 9ee17494f..8cbca051d 100644 --- a/qml/ui/widgets/WBLinkRateControlWidget.qml +++ b/qml/ui/widgets/WBLinkRateControlWidget.qml @@ -331,28 +331,6 @@ Make the video more stable (less microfreezes) on the cost of less image quality m_text: "Range vs Bitrate" m_info_text: m_DESCRIPTION_CHANNEL_WIDTH } - /*TabBar{ - width: parent.width - height: m_row_height - id: channel_width_tab_bar - currentIndex: m_curr_channel_width==40 ? 1 : 0; - onCurrentIndexChanged: { - //const chan_w= currentIndex==0 ? 20 : 40; - //set_channel_width_async(20) - } - TabButton{ - text: "20Mhz" - onClicked: { - set_channel_width_async(20) - } - } - TabButton{ - text: "40Mhz" - onClicked: { - set_channel_width_async(40) - } - } - }*/ Row{ width: parent.width height: m_row_height