Browse Source

JoyStickButtonAssignment: Fix warning text

As requested here: https://github.com/PX4/PX4-user_guide/pull/2072#issuecomment-1308189200

Improves readability
QGC4.4
Junwoo Hwang 2 years ago committed by Julian Oes
parent
commit
1a3e35d5ab
No known key found for this signature in database
GPG Key ID: F0ED380FEA56DE41
  1. 12
      src/VehicleSetup/JoystickConfigButtons.qml
  2. 2
      translations/qgc.ts
  3. 2
      translations/qgc_source_az_AZ.ts
  4. 4
      translations/qgc_source_bg_BG.ts
  5. 4
      translations/qgc_source_de_DE.ts
  6. 4
      translations/qgc_source_el_GR.ts
  7. 4
      translations/qgc_source_es_ES.ts
  8. 4
      translations/qgc_source_fi_FI.ts
  9. 4
      translations/qgc_source_fr_FR.ts
  10. 4
      translations/qgc_source_he_IL.ts
  11. 4
      translations/qgc_source_it_IT.ts
  12. 2
      translations/qgc_source_ja_JP.ts
  13. 4
      translations/qgc_source_ko_KR.ts
  14. 4
      translations/qgc_source_nl_NL.ts
  15. 4
      translations/qgc_source_no_NO.ts
  16. 4
      translations/qgc_source_pl_PL.ts
  17. 2
      translations/qgc_source_pt_PT.ts
  18. 4
      translations/qgc_source_ru_RU.ts
  19. 4
      translations/qgc_source_sv_SE.ts
  20. 4
      translations/qgc_source_tr_TR.ts
  21. 2
      translations/qgc_source_zh_CN.ts

12
src/VehicleSetup/JoystickConfigButtons.qml

@ -23,6 +23,8 @@ import QGroundControl.FactControls 1.0 @@ -23,6 +23,8 @@ import QGroundControl.FactControls 1.0
ColumnLayout {
width: availableWidth
height: (globals.activeVehicle.supportsJSButton ? buttonCol.height : flowColumn.height) + (ScreenTools.defaultFontPixelHeight * 2)
spacing: ScreenTools.defaultFontPixelHeight
Connections {
target: _activeJoystick
onRawButtonPressedChanged: {
@ -34,16 +36,20 @@ ColumnLayout { @@ -34,16 +36,20 @@ ColumnLayout {
}
}
}
ColumnLayout {
id: flowColumn
y: ScreenTools.defaultFontPixelHeight / 2
width: parent.width
spacing: ScreenTools.defaultFontPixelHeight / 2
anchors.centerIn: parent
spacing: ScreenTools.defaultFontPixelHeight
// Note for reminding the use of multiple buttons for the same action
QGCLabel {
Layout.preferredWidth: parent.width
wrapMode: Text.WordWrap
text: qsTr("Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.")
text: qsTr(" Multiple buttons that have the same action must be pressed simultaneously to invoke the action.")
}
Flow {
id: buttonFlow
Layout.preferredWidth: parent.width

2
translations/qgc.ts

@ -8447,7 +8447,7 @@ Click Ok to start the auto-tuning process. @@ -8447,7 +8447,7 @@ Click Ok to start the auto-tuning process.
<name>JoystickConfigButtons</name>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
<source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
<source> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</source>
<translation type="unfinished"></translation>
</message>
<message>

2
translations/qgc_source_az_AZ.ts

@ -8472,7 +8472,7 @@ Click Ok to start the auto-tuning process. @@ -8472,7 +8472,7 @@ Click Ok to start the auto-tuning process.
<name>JoystickConfigButtons</name>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
<source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
<source> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</source>
<translation>Eyni hərəkəti bir neçə düyməyə təyin etmək, hərəkət üçün bütün bu düymələrin basılmasını tələb edir. Bu, Xodlama ya Təcili Yardım kimi kritik hərəkətlər üçün təsadüfi düymələrin basılmasının qarşısını almaq üçün faydalıdır.</translation>
</message>
<message>

4
translations/qgc_source_bg_BG.ts

@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process. @@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process.
<name>JoystickConfigButtons</name>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
<source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
<translation type="unfinished">Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</translation>
<source> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</source>
<translation type="unfinished"> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</translation>
</message>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="94"/>

4
translations/qgc_source_de_DE.ts

@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process. @@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process.
<name>JoystickConfigButtons</name>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
<source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
<translation type="unfinished">Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</translation>
<source> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</source>
<translation type="unfinished"> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</translation>
</message>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="94"/>

4
translations/qgc_source_el_GR.ts

@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process. @@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process.
<name>JoystickConfigButtons</name>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
<source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
<translation type="unfinished">Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</translation>
<source> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</source>
<translation type="unfinished"> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</translation>
</message>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="94"/>

4
translations/qgc_source_es_ES.ts

@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process. @@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process.
<name>JoystickConfigButtons</name>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
<source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
<translation type="unfinished">Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</translation>
<source> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</source>
<translation type="unfinished"> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</translation>
</message>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="94"/>

4
translations/qgc_source_fi_FI.ts

@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process. @@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process.
<name>JoystickConfigButtons</name>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
<source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
<translation type="unfinished">Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</translation>
<source> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</source>
<translation type="unfinished"> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</translation>
</message>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="94"/>

4
translations/qgc_source_fr_FR.ts

@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process. @@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process.
<name>JoystickConfigButtons</name>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
<source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
<translation type="unfinished">Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</translation>
<source> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</source>
<translation type="unfinished"> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</translation>
</message>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="94"/>

4
translations/qgc_source_he_IL.ts

@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process. @@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process.
<name>JoystickConfigButtons</name>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
<source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
<translation type="unfinished">Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</translation>
<source> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</source>
<translation type="unfinished"> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</translation>
</message>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="94"/>

4
translations/qgc_source_it_IT.ts

@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process. @@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process.
<name>JoystickConfigButtons</name>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
<source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
<translation type="unfinished">Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</translation>
<source> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</source>
<translation type="unfinished"> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</translation>
</message>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="94"/>

2
translations/qgc_source_ja_JP.ts

@ -8463,7 +8463,7 @@ Click Ok to start the auto-tuning process. @@ -8463,7 +8463,7 @@ Click Ok to start the auto-tuning process.
<name>JoystickConfigButtons</name>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
<source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
<source> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</source>
<translation></translation>
</message>
<message>

4
translations/qgc_source_ko_KR.ts

@ -8476,8 +8476,8 @@ Click Ok to start the auto-tuning process. @@ -8476,8 +8476,8 @@ Click Ok to start the auto-tuning process.
<name>JoystickConfigButtons</name>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
<source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
<translation type="unfinished">Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</translation>
<source> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</source>
<translation type="unfinished"> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</translation>
</message>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="94"/>

4
translations/qgc_source_nl_NL.ts

@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process. @@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process.
<name>JoystickConfigButtons</name>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
<source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
<translation type="unfinished">Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</translation>
<source> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</source>
<translation type="unfinished"> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</translation>
</message>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="94"/>

4
translations/qgc_source_no_NO.ts

@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process. @@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process.
<name>JoystickConfigButtons</name>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
<source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
<translation type="unfinished">Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</translation>
<source> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</source>
<translation type="unfinished"> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</translation>
</message>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="94"/>

4
translations/qgc_source_pl_PL.ts

@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process. @@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process.
<name>JoystickConfigButtons</name>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
<source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
<translation type="unfinished">Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</translation>
<source> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</source>
<translation type="unfinished"> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</translation>
</message>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="94"/>

2
translations/qgc_source_pt_PT.ts

@ -8469,7 +8469,7 @@ Clique em Ok para inciar o processo de auto-ajuste.</translation> @@ -8469,7 +8469,7 @@ Clique em Ok para inciar o processo de auto-ajuste.</translation>
<name>JoystickConfigButtons</name>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
<source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
<source> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</source>
<translation>A atribuição da mesma ação para vários botões requer que todos esses botões sejam pressionados para a ação ser tomada. Isso é útil para prevenir acidentes com ações críticas como Armar ou Parada de Emergência.</translation>
</message>
<message>

4
translations/qgc_source_ru_RU.ts

@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process. @@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process.
<name>JoystickConfigButtons</name>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
<source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
<translation type="unfinished">Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</translation>
<source> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</source>
<translation type="unfinished"> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</translation>
</message>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="94"/>

4
translations/qgc_source_sv_SE.ts

@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process. @@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process.
<name>JoystickConfigButtons</name>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
<source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
<translation type="unfinished">Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</translation>
<source> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</source>
<translation type="unfinished"> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</translation>
</message>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="94"/>

4
translations/qgc_source_tr_TR.ts

@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process. @@ -8470,8 +8470,8 @@ Click Ok to start the auto-tuning process.
<name>JoystickConfigButtons</name>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
<source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
<translation type="unfinished">Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</translation>
<source> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</source>
<translation type="unfinished"> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</translation>
</message>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="94"/>

2
translations/qgc_source_zh_CN.ts

@ -8472,7 +8472,7 @@ Click Ok to start the auto-tuning process. @@ -8472,7 +8472,7 @@ Click Ok to start the auto-tuning process.
<name>JoystickConfigButtons</name>
<message>
<location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
<source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
<source> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</source>
<translation> </translation>
</message>
<message>

Loading…
Cancel
Save