Skip to content

Commit 41977ea

Browse files
author
philmoz
committed
Shorten function names and move parameter position to fit 'enable' checkbox on 128x64 LCD.
1 parent 91f17d2 commit 41977ea

File tree

18 files changed

+39
-35
lines changed

18 files changed

+39
-35
lines changed

‎radio/src/gui/128x64/model_special_functions.cpp‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,9 +312,14 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
312312
}
313313
#endif
314314
#if defined(SDCARD)
315-
else if (func == FUNC_PLAY_TRACK || func == FUNC_BACKGND_MUSIC || func == FUNC_PLAY_SCRIPT || func==FUNC_RGB_LED) {
315+
else if (func == FUNC_PLAY_TRACK || func == FUNC_BACKGND_MUSIC || func == FUNC_PLAY_SCRIPT || func == FUNC_RGB_LED) {
316+
coord_t x = MODEL_SPECIAL_FUNC_3RD_COLUMN - 6;
317+
if (func == FUNC_PLAY_SCRIPT)
318+
x = x - 5 * FW;
319+
else if (func == FUNC_PLAY_TRACK)
320+
x = x - 2 * FW;
316321
if (ZEXIST(cfn->play.name))
317-
lcdDrawSizedText(MODEL_SPECIAL_FUNC_3RD_COLUMN-6, y, cfn->play.name, sizeof(cfn->play.name), attr);
322+
lcdDrawSizedText(x, y, cfn->play.name, sizeof(cfn->play.name), attr);
318323
else
319324
lcdDrawTextAtIndex(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, STR_VCSWFUNC, 0, attr);
320325
if (active && event==EVT_KEY_BREAK(KEY_ENTER)) {

‎radio/src/translations/cn.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@
9393
#define TR_SF_RGBLEDS "RGB leds"
9494

9595
#define TR_SOUND "播放声音"
96-
#define TR_PLAY_TRACK "播放音频文件"
96+
#define TR_PLAY_TRACK TR("Ply Trk", "播放音频文件")
9797
#define TR_PLAY_VALUE "播放数值"
9898
#define TR_SF_HAPTIC "振动"
9999
#define TR_SF_BG_MUSIC "播放背景音乐"
100100
#define TR_SF_BG_MUSIC_PAUSE "暂停背景音乐"
101101
#define TR_SF_LOGS "记录日志到SD卡"
102102
#define TR_ADJUST_GVAR "修改全局变量GV值"
103-
#define TR_SF_PLAY_SCRIPT "Lua脚本"
103+
#define TR_SF_PLAY_SCRIPT TR("Lua", "Lua脚本")
104104
#define TR_SF_BACKLIGHT "背光"
105105
#define TR_SF_VARIO "Vario传感器"
106106
#define TR_SF_TEST "测试"

‎radio/src/translations/cz.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
#define TR_PLAY_TRACK TR3("\200\201Stopa", "\200\201Stopa", "Přehrát wav")
111111
#define TR_PLAY_VALUE TR3("\200\201Hlásit ", "\200\201Hlásit ", "Hlásit stav")
112112
#define TR_SF_HAPTIC "Vibrovat"
113-
#define TR_SF_PLAY_SCRIPT "Lua Skript"
113+
#define TR_SF_PLAY_SCRIPT TR("Lua", "Lua Skript")
114114
#define TR_SF_BG_MUSIC TR3("\200\201Hudba","\200\201Hudba","Hudba")
115115
#define TR_SF_BG_MUSIC_PAUSE TR3("\200\201Hudba ||","\200\201Hudba ||","Hudba pauza")
116116
#define TR_SF_LOGS "Loguj na SD"

‎radio/src/translations/da.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@
105105
#define TR_SF_RGBLEDS "RGB leds"
106106

107107
#define TR_SOUND "Spil lyd"
108-
#define TR_PLAY_TRACK TR("Afspil lyd", "Afspil lydfil")
108+
#define TR_PLAY_TRACK TR("Ply Trk", "Afspil lydfil")
109109
#define TR_PLAY_VALUE TR("Spil Vær","Spil Værdi")
110110
#define TR_SF_HAPTIC TR("Vib.", "Vibration")
111-
#define TR_SF_PLAY_SCRIPT "Lua Script"
111+
#define TR_SF_PLAY_SCRIPT TR("Lua", "Lua Script")
112112
#define TR_SF_BG_MUSIC "BgMusik"
113113
#define TR_SF_BG_MUSIC_PAUSE "BgMusik ||"
114114
#define TR_SF_LOGS "SD Log"

‎radio/src/translations/de.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@
102102
#define TR_SF_RGBLEDS "RGB leds"
103103

104104
#define TR_SOUND "Spiel Töne"
105-
#define TR_PLAY_TRACK "Sag Text"
105+
#define TR_PLAY_TRACK TR("Ply Trk", "Sag Text")
106106
#define TR_PLAY_VALUE "Sag Wert"
107107
#define TR_SF_HAPTIC "Haptik"
108-
#define TR_SF_PLAY_SCRIPT "Lua Skript"
108+
#define TR_SF_PLAY_SCRIPT TR("Lua", "Lua Skript")
109109
#define TR_SF_BG_MUSIC "StartMusik"
110110
#define TR_SF_BG_MUSIC_PAUSE "Stop Musik"
111111
#define TR_SF_LOGS "SD-Aufz."

‎radio/src/translations/en.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@
9898
#define TR_SF_RGBLEDS "RGB leds"
9999

100100
#define TR_SOUND "Play Sound"
101-
#define TR_PLAY_TRACK "Play Track"
101+
#define TR_PLAY_TRACK TR("Ply Trk", "Play Track")
102102
#define TR_PLAY_VALUE TR("Play Val","Play Value")
103103
#define TR_SF_HAPTIC "Haptic"
104-
#define TR_SF_PLAY_SCRIPT "Lua Script"
104+
#define TR_SF_PLAY_SCRIPT TR("Lua", "Lua Script")
105105
#define TR_SF_BG_MUSIC "BgMusic"
106106
#define TR_SF_BG_MUSIC_PAUSE "BgMusic ||"
107107
#define TR_SF_LOGS "SD Logs"

‎radio/src/translations/es.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@
100100
#define TR_SF_RGBLEDS "RGB leds"
101101

102102
#define TR_SOUND "Oir sonido"
103-
#define TR_PLAY_TRACK "Oir pista"
103+
#define TR_PLAY_TRACK TR("Ply Trk", "Oir pista")
104104
#define TR_PLAY_VALUE "Oir valor"
105105
#define TR_SF_HAPTIC "Haptic"
106-
#define TR_SF_PLAY_SCRIPT "Lua Script"
106+
#define TR_SF_PLAY_SCRIPT TR("Lua", "Lua Script")
107107
#define TR_SF_BG_MUSIC "BgMúsica"
108108
#define TR_SF_BG_MUSIC_PAUSE "BgMúsica||"
109109
#define TR_SF_LOGS "SD Logs"

‎radio/src/translations/fi.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@
105105
#define TR_SF_RGBLEDS "RGB leds"
106106

107107
#define TR_SOUND "Play Sound"
108-
#define TR_PLAY_TRACK "Play Track"
108+
#define TR_PLAY_TRACK TR("Ply Trk", "Play Track")
109109
#define TR_PLAY_VALUE TR("Play Val","Play Value")
110110
#define TR_SF_HAPTIC "Haptic"
111-
#define TR_SF_PLAY_SCRIPT "Lua Script"
111+
#define TR_SF_PLAY_SCRIPT TR("Lua", "Lua Script")
112112
#define TR_SF_BG_MUSIC "BgMusic"
113113
#define TR_SF_BG_MUSIC_PAUSE "BgMusic ||"
114114
#define TR_SF_LOGS "SD Logs"

‎radio/src/translations/fr.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@
104104
#define TR_SF_RGBLEDS "RGB leds"
105105

106106
#define TR_SOUND "Jouer son"
107-
#define TR_PLAY_TRACK "Jouer fichier"
107+
#define TR_PLAY_TRACK TR("Ply Trk", "Jouer fichier")
108108
#define TR_PLAY_VALUE "Lire valeur"
109109
#define TR_SF_HAPTIC "Vibreur"
110-
#define TR_SF_PLAY_SCRIPT "Script Lua"
110+
#define TR_SF_PLAY_SCRIPT TR("Lua", "Script Lua")
111111
#define TR_SF_BG_MUSIC "Musique"
112112
#define TR_SF_BG_MUSIC_PAUSE "Pause Musique"
113113
#define TR_SF_LOGS "Logs SD"

‎radio/src/translations/he.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,15 @@
100100
#define TR_SF_MOD_BIND "ModuleBind"
101101

102102
#define TR_SOUND "Play Sound"
103-
#define TR_PLAY_TRACK "Play Track"
103+
#define TR_PLAY_TRACK TR("Ply Trk", "Play Track")
104104
#define TR_PLAY_VALUE TR("Play Val","Play Value")
105105
#define TR_SF_HAPTIC "Haptic"
106-
#define TR_SF_PLAY_SCRIPT "Lua Script"
106+
#define TR_SF_PLAY_SCRIPT TR("Lua", "Lua Script")
107107
#define TR_SF_BG_MUSIC "BgMusic"
108108
#define TR_SF_BG_MUSIC_PAUSE "BgMusic ||"
109109
#define TR_SF_LOGS "SD Logs"
110110
#define TR_ADJUST_GVAR "Adjust"
111111
#define TR_SF_BACKLIGHT "Backlight"
112-
#define TR_SF_PLAY_SCRIPT "Lua Script"
113112
#define TR_SF_VARIO "Vario"
114113
#define TR_SF_TEST "Test"
115114

0 commit comments

Comments
 (0)