From 72545e097f7d770071efed94f8fabdfa10776be6 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 15 Apr 2019 11:01:26 +0200 Subject: [PATCH] Cosmetics --- radio/src/gui/128x64/gui.h | 1 + radio/src/gui/128x64/radio_setup.cpp | 35 ++++++++++++++-------------- radio/src/gui/128x64/widgets.cpp | 14 +++++++---- radio/src/translations/en.h.txt | 8 +++---- 4 files changed, 32 insertions(+), 26 deletions(-) diff --git a/radio/src/gui/128x64/gui.h b/radio/src/gui/128x64/gui.h index 0a60539ca..69aad90a1 100644 --- a/radio/src/gui/128x64/gui.h +++ b/radio/src/gui/128x64/gui.h @@ -52,6 +52,7 @@ extern uint8_t noHighlightCounter; #define NO_HIGHLIGHT() (noHighlightCounter > 0) #define START_NO_HIGHLIGHT() do { noHighlightCounter = 25; } while(0) +void drawSlider(coord_t x, coord_t y, uint8_t width, uint8_t value, uint8_t max, uint8_t attr); void drawSlider(coord_t x, coord_t y, uint8_t value, uint8_t max, uint8_t attr); extern int8_t checkIncDec_Ret; // global helper vars diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp index f2813dfea..ec06f1709 100644 --- a/radio/src/gui/128x64/radio_setup.cpp +++ b/radio/src/gui/128x64/radio_setup.cpp @@ -26,15 +26,13 @@ const unsigned char sticks[] = { #include "sticks.lbm" }; -#define RADIO_SETUP_2ND_COLUMN (LCD_W-7*FW-3) -#define RADIO_SETUP_DATE_COLUMN (FW*15+7) -#define RADIO_SETUP_TIME_COLUMN (RADIO_SETUP_2ND_COLUMN + 2 * FWNUM) +#define RADIO_SETUP_2ND_COLUMN 79 - #define SLIDER_5POS(y, value, label, event, attr) { \ - int8_t tmp = value; \ - drawSlider(RADIO_SETUP_2ND_COLUMN, y, 2+tmp, 4, attr); \ - value = editChoice(RADIO_SETUP_2ND_COLUMN, y, label, NULL, tmp, -2, +2, attr, event); \ - } +#define SLIDER_5POS(y, value, label, event, attr) { \ + int8_t tmp = value; \ + drawSlider(RADIO_SETUP_2ND_COLUMN, y, LCD_W - 2 - RADIO_SETUP_2ND_COLUMN, 2+tmp, 4, attr); \ + value = editChoice(RADIO_SETUP_2ND_COLUMN, y, label, NULL, tmp, -2, +2, attr, event); \ +} #if defined(SPLASH) #define CASE_SPLASH_PARAM(x) x, @@ -190,17 +188,17 @@ void menuRadioSetup(event_t event) #if defined(RTCLOCK) case ITEM_SETUP_DATE: lcdDrawTextAlignedLeft(y, STR_DATE); - lcdDrawChar(RADIO_SETUP_DATE_COLUMN, y, '-'); - lcdDrawChar(RADIO_SETUP_DATE_COLUMN+3*FW-2, y, '-'); for (uint8_t j=0; j<3; j++) { uint8_t rowattr = (menuHorizontalPosition==j ? attr : 0); switch (j) { case 0: - lcdDrawNumber(RADIO_SETUP_DATE_COLUMN, y, t.tm_year+TM_YEAR_BASE, rowattr|RIGHT); + lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, t.tm_year+TM_YEAR_BASE, rowattr); + lcdDrawChar(lcdNextPos, y, '-'); if (rowattr && s_editMode > 0) t.tm_year = checkIncDec(event, t.tm_year, 112, 200, 0); break; case 1: - lcdDrawNumber(RADIO_SETUP_DATE_COLUMN+3*FW-2, y, t.tm_mon+1, rowattr|LEADING0|RIGHT, 2); + lcdDrawNumber(lcdNextPos, y, t.tm_mon+1, rowattr|LEADING0, 2); + lcdDrawChar(lcdNextPos, y, '-'); if (rowattr && s_editMode > 0) t.tm_mon = checkIncDec(event, t.tm_mon, 0, 11, 0); break; case 2: @@ -209,7 +207,7 @@ void menuRadioSetup(event_t event) int8_t dlim = (((((year%4==0) && (year%100!=0)) || (year%400==0)) && (t.tm_mon==1)) ? 1 : 0); static const uint8_t dmon[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; dlim += dmon[t.tm_mon]; - lcdDrawNumber(RADIO_SETUP_DATE_COLUMN+6*FW-4, y, t.tm_mday, rowattr|LEADING0|RIGHT, 2); + lcdDrawNumber(lcdNextPos, y, t.tm_mday, rowattr|LEADING0, 2); if (rowattr && s_editMode > 0) t.tm_mday = checkIncDec(event, t.tm_mday, 1, dlim, 0); break; } @@ -222,20 +220,21 @@ void menuRadioSetup(event_t event) case ITEM_SETUP_TIME: lcdDrawTextAlignedLeft(y, STR_TIME); - lcdDrawChar(RADIO_SETUP_TIME_COLUMN+1, y, ':'); lcdDrawChar(RADIO_SETUP_TIME_COLUMN+3*FW-2, y, ':'); for (uint8_t j=0; j<3; j++) { uint8_t rowattr = (menuHorizontalPosition==j ? attr : 0); switch (j) { case 0: - lcdDrawNumber(RADIO_SETUP_TIME_COLUMN, y, t.tm_hour, rowattr|LEADING0|RIGHT, 2); + lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, t.tm_hour, rowattr|LEADING0, 2); + lcdDrawChar(lcdNextPos + 1, y, ':'); if (rowattr && s_editMode > 0) t.tm_hour = checkIncDec(event, t.tm_hour, 0, 23, 0); break; case 1: - lcdDrawNumber(RADIO_SETUP_TIME_COLUMN+3*FWNUM, y, t.tm_min, rowattr|LEADING0|RIGHT, 2); + lcdDrawNumber(lcdNextPos + 1, y, t.tm_min, rowattr|LEADING0, 2); + lcdDrawChar(lcdNextPos + 1, y, ':'); if (rowattr && s_editMode > 0) t.tm_min = checkIncDec(event, t.tm_min, 0, 59, 0); break; case 2: - lcdDrawNumber(RADIO_SETUP_TIME_COLUMN+6*FWNUM, y, t.tm_sec, rowattr|LEADING0|RIGHT, 2); + lcdDrawNumber(lcdNextPos + 1, y, t.tm_sec, rowattr|LEADING0, 2); if (rowattr && s_editMode > 0) t.tm_sec = checkIncDec(event, t.tm_sec, 0, 59, 0); break; } @@ -295,7 +294,7 @@ void menuRadioSetup(event_t event) { lcdDrawTextAlignedLeft(y, STR_SPEAKER_VOLUME); uint8_t b = g_eeGeneral.speakerVolume+VOLUME_LEVEL_DEF; - drawSlider(RADIO_SETUP_2ND_COLUMN, y, b, VOLUME_LEVEL_MAX, attr); + drawSlider(RADIO_SETUP_2ND_COLUMN, y, LCD_W - 2 - RADIO_SETUP_2ND_COLUMN, b, VOLUME_LEVEL_MAX, attr); if (attr) { CHECK_INCDEC_GENVAR(event, b, 0, VOLUME_LEVEL_MAX); if (checkIncDec_Ret) { diff --git a/radio/src/gui/128x64/widgets.cpp b/radio/src/gui/128x64/widgets.cpp index 6ac179599..81164694b 100644 --- a/radio/src/gui/128x64/widgets.cpp +++ b/radio/src/gui/128x64/widgets.cpp @@ -96,13 +96,19 @@ int8_t editSwitch(coord_t x, coord_t y, int8_t value, LcdFlags attr, event_t eve return value; } -void drawSlider(coord_t x, coord_t y, uint8_t value, uint8_t max, uint8_t attr) +void drawSlider(coord_t x, coord_t y, uint8_t width, uint8_t value, uint8_t max, uint8_t attr) { - lcdDrawChar(x+(value*4*FW)/max, y, '$'); - lcdDrawSolidHorizontalLine(x, y+3, 5*FW-1, FORCE); - if (attr && (!(attr & BLINK) || !BLINK_ON_PHASE)) lcdDrawSolidFilledRect(x, y, 5*FW-1, FH-1); + lcdDrawChar(x + (value * (width - FWNUM)) / max, y, '$'); + lcdDrawSolidHorizontalLine(x, y + 3, width, FORCE); + if (attr && (!(attr & BLINK) || !BLINK_ON_PHASE)) { + lcdDrawSolidFilledRect(x, y, width, FH - 1); + } } +void drawSlider(coord_t x, coord_t y, uint8_t value, uint8_t max, uint8_t attr) +{ + drawSlider(x, y, 5*FW - 1, value, max, attr); +} #if defined(GVARS) void drawGVarValue(coord_t x, coord_t y, uint8_t gvar, gvar_t value, LcdFlags flags) diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 232d7d49d..b95aa1225 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -647,7 +647,7 @@ #define TR_GYRO_MAX "Max" #define TR_CONTRAST "Contrast" #define TR_ALARMS_LABEL "Alarms" -#define TR_BATTERY_RANGE TR("Battery range", "Battery meter range") +#define TR_BATTERY_RANGE TR("Batt. range", "Battery meter range") #define TR_BATTERYWARNING INDENT "Battery low" #define TR_INACTIVITYALARM INDENT "Inactivity" #define TR_MEMORYWARNING INDENT "Memory low" @@ -813,9 +813,9 @@ #define TR_LONGITUDE "Longitude" #define TR_GPSCOORD TR("GPS Coords", INDENT "Coordinate format") #define TR_VARIO TR("Vario", "Variometer") -#define TR_PITCH_AT_ZERO INDENT "Pitch at zero" -#define TR_PITCH_AT_MAX INDENT "Pitch at max" -#define TR_REPEAT_AT_ZERO INDENT "Repeat at zero" +#define TR_PITCH_AT_ZERO INDENT "Pitch zero" +#define TR_PITCH_AT_MAX INDENT "Pitch max" +#define TR_REPEAT_AT_ZERO INDENT "Repeat zero" #define TR_POWEROFF "\027Power OFF..." #define TR_SHUTDOWN "SHUTTING DOWN" #define TR_SAVEMODEL "Saving model settings"