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

Warnings removed for make translations

Browse Source
This commit is contained in:
Bertrand Songis
2019-09-10 13:55:33 +02:00
parent a78b5f4e2b
commit 4e24aef20f
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/warnings.h
+1
View File
@@ -47,6 +47,7 @@
class AppMessages class AppMessages
{ {
Q_OBJECT
Q_DECLARE_TR_FUNCTIONS("AppMessages") Q_DECLARE_TR_FUNCTIONS("AppMessages")
public: public:
// These are used for saving "[don't] show this message again" user preferences. // These are used for saving "[don't] show this message again" user preferences.
radio/src/gui/128x64/model_special_functions.cpp
+2 -6
View File
@@ -148,9 +148,8 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
#if defined(PCBXLITE) #if defined(PCBXLITE)
if (menuHorizontalPosition==0 && event==EVT_KEY_LONG(KEY_ENTER) && !READ_ONLY()) { // ENT LONG on xlite brings up switch type menu, so this menu is activated with SHIT + ENT LONG
killEvents(KEY_ENTER); if (menuHorizontalPosition==0 && event==EVT_KEY_LONG(KEY_ENTER) && IS_SHIFT_PRESSED() && !READ_ONLY()) {
if (IS_SHIFT_PRESSED()) { // ENT LONG on xlite brings up switch type menu, so this menu is activated with SHIT + ENT LONG
#else #else
if (menuHorizontalPosition<0 && event==EVT_KEY_LONG(KEY_ENTER) && !READ_ONLY()) { if (menuHorizontalPosition<0 && event==EVT_KEY_LONG(KEY_ENTER) && !READ_ONLY()) {
#endif #endif
@@ -172,9 +171,6 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
} }
POPUP_MENU_START(onCustomFunctionsMenu); POPUP_MENU_START(onCustomFunctionsMenu);
} }
#if defined(PCBXLITE)
}
#endif
#endif // PCBTARANIS #endif // PCBTARANIS
for (uint8_t i=0; i<NUM_BODY_LINES; i++) { for (uint8_t i=0; i<NUM_BODY_LINES; i++) {