Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(color): allow changing the size of topbar widgets #5235

Merged
merged 14 commits into from
Jul 27, 2024
Prev Previous commit
Next Next commit
Add new string to translation files.
philmoz committed Jul 26, 2024
commit b868b6439f9ea529fd96abe0f58f62fa8a4a7553
4 changes: 2 additions & 2 deletions radio/src/gui/colorlcd/screen_user_interface.cpp
Original file line number Diff line number Diff line change
@@ -156,7 +156,7 @@ void ScreenUserInterfacePage::build(Window* window)
});

line = window->newLine(grid);
new StaticText(line, rect_t{}, "Widget width");
new StaticText(line, rect_t{}, STR_WIDGET_SIZE);
line = window->newLine(grid);
auto box = new Window(line, rect_t{});
box->setFlexLayout(LV_FLEX_FLOW_ROW, PAD_TINY);
@@ -196,7 +196,7 @@ void ScreenUserInterfacePage::build(Window* window)
remaining -= g_model.topbarWidgetWidth[n];
}
storageDirty(EE_MODEL);
}, "Widget width");
}, STR_WIDGET_SIZE);
widths[i]->setAvailableHandler([=](int value) {
int remaining = MAX_TOPBAR_ZONES;
for (int n = 0; n < i; n += 1)
1 change: 1 addition & 0 deletions radio/src/translations.cpp
Original file line number Diff line number Diff line change
@@ -1107,6 +1107,7 @@ const char STR_RADIO_INFO_WIDGET[] = TR_RADIO_INFO_WIDGET;
const char STR_LOW_BATT_COLOR[] = TR_LOW_BATT_COLOR;
const char STR_MID_BATT_COLOR[] = TR_MID_BATT_COLOR;
const char STR_HIGH_BATT_COLOR[] = TR_HIGH_BATT_COLOR;
const char STR_WIDGET_SIZE[] = TR_WIDGET_SIZE;
#endif

const char STR_MIX_SLOW_PREC[] = TR_MIX_SLOW_PREC;
1 change: 1 addition & 0 deletions radio/src/translations.h
Original file line number Diff line number Diff line change
@@ -1272,6 +1272,7 @@ extern const char STR_RADIO_INFO_WIDGET[];
extern const char STR_LOW_BATT_COLOR[];
extern const char STR_MID_BATT_COLOR[];
extern const char STR_HIGH_BATT_COLOR[];
extern const char STR_WIDGET_SIZE[];
#endif

extern const char STR_MIX_SLOW_PREC[];
2 changes: 2 additions & 0 deletions radio/src/translations/cn.h
Original file line number Diff line number Diff line change
@@ -1302,3 +1302,5 @@
#define TR_LOW_BATT_COLOR "低电量"
#define TR_MID_BATT_COLOR "中电量"
#define TR_HIGH_BATT_COLOR "高电量"

#define TR_WIDGET_SIZE "Widget size"
2 changes: 2 additions & 0 deletions radio/src/translations/cz.h
Original file line number Diff line number Diff line change
@@ -1315,3 +1315,5 @@
#define TR_LOW_BATT_COLOR "Vybitá baterie"
#define TR_MID_BATT_COLOR "Středně nabitá baterie"
#define TR_HIGH_BATT_COLOR "Plně nabitá baterie"

#define TR_WIDGET_SIZE "Widget size"
2 changes: 2 additions & 0 deletions radio/src/translations/da.h
Original file line number Diff line number Diff line change
@@ -1315,3 +1315,5 @@
#define TR_LOW_BATT_COLOR "Batteri lavt"
#define TR_MID_BATT_COLOR "Batteri medio"
#define TR_HIGH_BATT_COLOR "Batteri højt"

#define TR_WIDGET_SIZE "Widget size"
2 changes: 2 additions & 0 deletions radio/src/translations/de.h
Original file line number Diff line number Diff line change
@@ -1306,3 +1306,5 @@
#define TR_LOW_BATT_COLOR "Farbe Akku fast leer"
#define TR_MID_BATT_COLOR "Farbe Akku mittel"
#define TR_HIGH_BATT_COLOR "Farbe Akku voll"

#define TR_WIDGET_SIZE "Widget size"
2 changes: 2 additions & 0 deletions radio/src/translations/en.h
Original file line number Diff line number Diff line change
@@ -1301,3 +1301,5 @@
#define TR_LOW_BATT_COLOR "Low battery"
#define TR_MID_BATT_COLOR "Mid battery"
#define TR_HIGH_BATT_COLOR "High battery"

#define TR_WIDGET_SIZE "Widget size"
2 changes: 2 additions & 0 deletions radio/src/translations/es.h
Original file line number Diff line number Diff line change
@@ -1303,3 +1303,5 @@
#define TR_LOW_BATT_COLOR "Low battery"
#define TR_MID_BATT_COLOR "Mid battery"
#define TR_HIGH_BATT_COLOR "High battery"

#define TR_WIDGET_SIZE "Widget size"
2 changes: 2 additions & 0 deletions radio/src/translations/fi.h
Original file line number Diff line number Diff line change
@@ -1319,3 +1319,5 @@
#define TR_LOW_BATT_COLOR "Low battery"
#define TR_MID_BATT_COLOR "Mid battery"
#define TR_HIGH_BATT_COLOR "High battery"

#define TR_WIDGET_SIZE "Widget size"
2 changes: 2 additions & 0 deletions radio/src/translations/fr.h
Original file line number Diff line number Diff line change
@@ -1318,3 +1318,5 @@
#define TR_LOW_BATT_COLOR "Low battery"
#define TR_MID_BATT_COLOR "Mid battery"
#define TR_HIGH_BATT_COLOR "High battery"

#define TR_WIDGET_SIZE "Widget size"
2 changes: 2 additions & 0 deletions radio/src/translations/he.h
Original file line number Diff line number Diff line change
@@ -1302,3 +1302,5 @@
#define TR_LOW_BATT_COLOR "מתח סוללה נמוך"
#define TR_MID_BATT_COLOR "מתח סוללה בינוני"
#define TR_HIGH_BATT_COLOR "מתח סוללה גבוה"

#define TR_WIDGET_SIZE "Widget size"
2 changes: 2 additions & 0 deletions radio/src/translations/it.h
Original file line number Diff line number Diff line change
@@ -1298,3 +1298,5 @@
#define TR_LOW_BATT_COLOR "Batteria scarica"
#define TR_MID_BATT_COLOR "Batteria media"
#define TR_HIGH_BATT_COLOR "Batteria carica"

#define TR_WIDGET_SIZE "Widget size"
2 changes: 2 additions & 0 deletions radio/src/translations/jp.h
Original file line number Diff line number Diff line change
@@ -1302,3 +1302,5 @@
#define TR_LOW_BATT_COLOR "バッテリー低"
#define TR_MID_BATT_COLOR "バッテリー中"
#define TR_HIGH_BATT_COLOR "バッテリー高"

#define TR_WIDGET_SIZE "Widget size"
2 changes: 2 additions & 0 deletions radio/src/translations/nl.h
Original file line number Diff line number Diff line change
@@ -1309,3 +1309,5 @@
#define TR_LOW_BATT_COLOR "Low battery"
#define TR_MID_BATT_COLOR "Mid battery"
#define TR_HIGH_BATT_COLOR "High battery"

#define TR_WIDGET_SIZE "Widget size"
2 changes: 2 additions & 0 deletions radio/src/translations/pl.h
Original file line number Diff line number Diff line change
@@ -1302,3 +1302,5 @@
#define TR_LOW_BATT_COLOR "Rozładowana bateria"
#define TR_MID_BATT_COLOR "Średni stan baterii"
#define TR_HIGH_BATT_COLOR "Naładowana bateria"

#define TR_WIDGET_SIZE "Widget size"
2 changes: 2 additions & 0 deletions radio/src/translations/pt.h
Original file line number Diff line number Diff line change
@@ -1306,3 +1306,5 @@
#define TR_LOW_BATT_COLOR "Bateria Baixa"
#define TR_MID_BATT_COLOR "Bateria Média"
#define TR_HIGH_BATT_COLOR "Bateria Alta"

#define TR_WIDGET_SIZE "Widget size"
2 changes: 2 additions & 0 deletions radio/src/translations/ru.h
Original file line number Diff line number Diff line change
@@ -1305,3 +1305,5 @@
#define TR_LOW_BATT_COLOR "Разряженная АКБ"
#define TR_MID_BATT_COLOR "Середина АКБ "
#define TR_HIGH_BATT_COLOR "Заряженная АКБ"

#define TR_WIDGET_SIZE "Widget size"
2 changes: 2 additions & 0 deletions radio/src/translations/se.h
Original file line number Diff line number Diff line change
@@ -1337,3 +1337,5 @@
#define TR_LOW_BATT_COLOR "Lågt batteri"
#define TR_MID_BATT_COLOR "Medium batteri"
#define TR_HIGH_BATT_COLOR "Högt batteri"

#define TR_WIDGET_SIZE "Widget size"
2 changes: 2 additions & 0 deletions radio/src/translations/tw.h
Original file line number Diff line number Diff line change
@@ -1307,3 +1307,5 @@
#define TR_LOW_BATT_COLOR "低電量"
#define TR_MID_BATT_COLOR "中電量"
#define TR_HIGH_BATT_COLOR "高電量"

#define TR_WIDGET_SIZE "Widget size"
2 changes: 2 additions & 0 deletions radio/src/translations/ua.h
Original file line number Diff line number Diff line change
@@ -1301,3 +1301,5 @@
#define TR_LOW_BATT_COLOR "Розряджена батарея"
#define TR_MID_BATT_COLOR "Середній заряд батареї"
#define TR_HIGH_BATT_COLOR "Заряджена батарея"

#define TR_WIDGET_SIZE "Widget size"