Skip to content

Commit

Permalink
Added Configuration Button and Fix Arm Status Label
Browse files Browse the repository at this point in the history
  • Loading branch information
bytesByHarsh committed Dec 10, 2024
1 parent 965192e commit 8fd72ea
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 2 deletions.
2 changes: 2 additions & 0 deletions src/UI/preferences/RemoteIDSettings.qml
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,9 @@ SettingsPage {
}
SettingsGroupLayout {
outerBorderColor: _activeRID ? (_remoteIDManager.armStatusGood ? defaultBorderColor : qgcPal.colorRed) : defaultBorderColor
visible: armStatusLabel.labelText !== ""
LabelledLabel {
id : armStatusLabel
label: qsTr("Arm Status Error")
labelText: _remoteIDManager?_remoteIDManager.armStatusError:"Vehicle Not Connected"
visible: labelText !== ""
Expand Down
20 changes: 18 additions & 2 deletions src/UI/toolbar/RemoteIDIndicatorPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -329,15 +329,15 @@ ToolIndicatorPage {


SettingsGroupLayout {
visible: armStatusLabel.labelText !== ""
LabelledLabel {
id : armStatusLabel
label: qsTr("Arm Status Error")
labelText: remoteIDManager.armStatusError
visible: labelText !== ""
Layout.fillWidth: true
}
}


SettingsGroupLayout {
heading: qsTr("Self ID")
headingDescription: qsTr("If an emergency is declared, Emergency Text will be broadcast even if Broadcast setting is not enabled.")
Expand Down Expand Up @@ -401,6 +401,22 @@ ToolIndicatorPage {
property Fact _fact: remoteIDSettings.selfIDEmergency
}
}

SettingsGroupLayout {
Layout.fillWidth: true

RowLayout {
Layout.fillWidth: true

QGCLabel { Layout.fillWidth: true; text: qsTr("Remote ID") }
QGCButton {
text: qsTr("Configure")
onClicked: {
goToSettings()
}
}
}
}
}

}
Expand Down

0 comments on commit 8fd72ea

Please sign in to comment.