Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

QT5/6 things, improved sidebar (#673) #674

Merged
merged 1 commit into from
Mar 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 0 additions & 5 deletions android/gradle/wrapper/gradle-wrapper.properties

This file was deleted.

172 changes: 0 additions & 172 deletions android/gradlew

This file was deleted.

84 changes: 0 additions & 84 deletions android/gradlew.bat

This file was deleted.

4 changes: 4 additions & 0 deletions qml/qml.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -307,5 +307,9 @@
<file>ui/sidebar/InfoElement2.qml</file>
<file>ui/elements/ErrorMessageBox.qml</file>
<file>ui/elements/ColorDialoque.qml</file>
<file>ui/sidebar/ChoiceSelector.qml</file>
<file>ui/sidebar/BaseJoyEditElement2.qml</file>
<file>ui/sidebar/MavlinkChoiceElement2.qml</file>
<file>ui/sidebar/MappedMavlinkChoices.qml</file>
</qresource>
</RCC>
6 changes: 6 additions & 0 deletions qml/ui/HUDOverlayGrid.qml
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,12 @@ Item {
width: parent.width
height: parent.height
visible: !quickPanel.visible
MouseArea{
anchors.fill: parent
onClicked: {
sidebar.notify_sidebar_user_clicked_outside();
}
}

// By default on top row
// --------------------------------------------------------------------------
Expand Down
98 changes: 98 additions & 0 deletions qml/ui/sidebar/BaseJoyEditElement2.qml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import QtQuick.Controls.Material 2.12

import Qt.labs.settings 1.0

import OpenHD 1.0

import "../../ui" as Ui
import "../elements"

//
// Base for an UI element that has the following properties:
// left / right: Increment / Decrement (model) value (If increment / decrement is available)
// top / bottom : Go to next / previous element
// MIDDLE: Show the current value
//
// It looks like this:
// |--------------------|
// | TITLE VALUE * | -> Selector (can be opened)
// |--------------------|
//
// Joystick navigatable (focus) but also supports touch.
Item{
id: base_joy_edit_element
width: 320
height: 70

property string m_title: "FILL ME"

property bool m_is_selected: false

property string m_displayed_value: "VALUE T"

property bool m_is_enabled: true

// Allows the parent to override the text color
// Right now only used by the change frequency element
property bool override_show_red_text: false

// Emitted if the the element is clicked (for non-joystick usage)
signal base_joy_edit_element_clicked();

function takeover_control(){
focus=true;
}

Rectangle{
width: parent.width
height:parent.height
border.color: "white"
border.width: base_joy_edit_element.focus ? 3 : 0;
color: "#333c4c"
opacity: base_joy_edit_element.focus ? 1.0 : 0.3;
}


Text {
id: title_str
text: qsTr(m_title)
width: parent.width/2
height: parent.height
verticalAlignment: Qt.AlignVCenter
horizontalAlignment: Qt.AlignHCenter
font.pixelSize: 18
anchors.top: parent.top
color: "white"
}

Text{
id:value_string
width: parent.width/2
height: parent.height
text: m_displayed_value
verticalAlignment: Qt.AlignVCenter
horizontalAlignment: Qt.AlignHCenter
font.pixelSize: 15
color: override_show_red_text? "red" : "white"
anchors.right: parent.right
}


Rectangle{
width: parent.width
height: parent.height
color: "gray"
opacity: 0.7
visible: !m_is_enabled
}

MouseArea{
anchors.fill: parent
onClicked: {
base_joy_edit_element_clicked()
}
}
}
Loading
Loading