piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Always show GPS button in radio setup (#2732)

Browse Source 
* fix: Always show GPS button in radio setup
It is related to GPS telemetry, not internal GPS.
This probably needs to implemented differently in the future.

* de optimization (#2737)

* de optimization

since the GPS button is now displayed by default (#2732), the labels for the "Alarms" and "LCD" are much too long and thus GPS is pushed into a new line. This looks unattractive and is a waste of space

* Update de.h

* chore: Cleanup

Co-authored-by: ParkerEde <ralf@krusecity.de>
This commit is contained in:
Peter Feerick
2022-11-16 20:16:04 +10:00
committed by GitHub
co-authored by ParkerEde
parent 2ab1a9f725
commit 37b1b2ee28
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/radio_setup.cpp
+1 -5
View File
@@ -545,7 +545,6 @@ class BacklightPage : public Page {
}
};
#if defined(INTERNAL_GPS)
class GpsPage : public Page {
public:
GpsPage() :
@@ -583,7 +582,6 @@ class GpsPage : public Page {
line = body.newLine(&grid);
}
};
#endif
RadioSetupPage::RadioSetupPage():
PageTab(STR_RADIO_SETUP, ICON_RADIO_SETUP)
@@ -609,10 +607,8 @@ void RadioSetupPage::build(FormWindow * window)
#endif
{STR_ALARM, []() { new AlarmsPage(); }},
{STR_BACKLIGHT_LABEL, []() { new BacklightPage(); }},
#if defined(INTERNAL_GPS)
{STR_GPS, [](){new GpsPage();}},
#endif
});
});
#if defined(PWR_BUTTON_PRESS)
radio/src/translations/de.h
+5 -5
View File
@@ -404,13 +404,13 @@
#else
#define TR_GV TR("G", "GV")
#endif
#define TR_ACHANNEL TR("A\004gemessen", "A\004Kanal gemessen =>") // 9XR-Pro
#define TR_RANGE TR(INDENT "Bereich", INDENT "Variobereich m/s") // 9XR-Pro
#define TR_ACHANNEL TR("A\004gemessen", "A\004Kanal gemessen =>")
#define TR_RANGE TR(INDENT "Bereich", INDENT "Variobereich m/s")
#define TR_CENTER TR(INDENT "Mitte", INDENT "Variomitte m/s")
#define TR_BAR "Balken"
#define TR_ALARM TR("Alarme ", "Aufleuchten bei Alarm") // 9XR-Pro
#define TR_ALARM "Alarme"
#define TR_USRDATA "Daten berechnen aus"
#define TR_BLADES TR("Prop", "Prop-Blätter") // 9XR-Pro
#define TR_BLADES TR("Prop", "Prop-Blätter")
#define TR_SCREEN "Seite: "
#define TR_SOUND_LABEL "Töne"
#define TR_LENGTH "Dauer"
@@ -443,7 +443,7 @@
#define TR_MINUTEBEEP TR("Min-Alarm", "Minuten-Alarm")
#define TR_BEEPCOUNTDOWN INDENT "Countdown"
#define TR_PERSISTENT TR(INDENT "Permanent", INDENT "Permanent")
#define TR_BACKLIGHT_LABEL "LCD-Beleuchtung"
#define TR_BACKLIGHT_LABEL "Bildschirm"
#define TR_GHOST_MENU_LABEL "GHOST MENU"
#define TR_STATUS "Status"
#define TR_BLDELAY INDENT "Dauer"