me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change SettingsShortNames to use one string

Browse Source 
This unifies its behaviour with SettingsMenuEntries.
This commit is contained in:
Alvin Wong
2021-03-29 19:07:50 +08:00
parent 12f98e5f9c
commit 55fa5c95e4
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Translations/make_translation.py
View File

@@ -427,7 +427,7 @@ def write_language(lang: dict, defs: dict, f: TextIO) -> None:
# ----- Writing SettingsDescriptions # ----- Writing SettingsDescriptions
obj = lang["menuOptions"] obj = lang["menuOptions"]
f.write("const char* SettingsShortNames[][2] = {\n") f.write("const char* SettingsShortNames[] = {\n")
max_len = 25 max_len = 25
index = 0 index = 0
@@ -436,7 +436,8 @@ def write_language(lang: dict, defs: dict, f: TextIO) -> None:
if "feature" in mod: if "feature" in mod:
f.write(f"#ifdef {mod['feature']}\n") f.write(f"#ifdef {mod['feature']}\n")
f.write(f" /* [{index:02d}] {eid.ljust(max_len)[:max_len]} */ ") f.write(f" /* [{index:02d}] {eid.ljust(max_len)[:max_len]} */ ")
f.write(f'{{ "{convert_string(symbol_conversion_table, (obj[eid]["text2"][0]))}", "{convert_string(symbol_conversion_table, (obj[eid]["text2"][1]))}" }},//{obj[eid]["text2"]} \n') txt = f'{obj[eid]["text2"][0]}\\n{obj[eid]["text2"][1]}'
f.write(f'{{ "{convert_string(symbol_conversion_table, txt)}" }},//{obj[eid]["text2"]} \n')
if "feature" in mod: if "feature" in mod:
f.write("#endif\n") f.write("#endif\n")

2
source/Core/Inc/Translation.h
View File

@@ -12,7 +12,7 @@ extern const uint8_t USER_FONT_12[];
extern const uint8_t USER_FONT_6x8[]; extern const uint8_t USER_FONT_6x8[];
extern const bool HasFahrenheit; extern const bool HasFahrenheit;
extern const char *SettingsShortNames[][2]; extern const char *SettingsShortNames[];
extern const char *SettingsDescriptions[]; extern const char *SettingsDescriptions[];
extern const char *SettingsMenuEntries[]; extern const char *SettingsMenuEntries[];

11
source/Core/Src/gui.cpp
View File

@@ -239,15 +239,12 @@ const menuitem advancedMenu[] = {
static void printShortDescriptionDoubleLine(SettingsItemIndex settingsItemIndex) { static void printShortDescriptionDoubleLine(SettingsItemIndex settingsItemIndex) {
uint8_t shortDescIndex = static_cast<uint8_t>(settingsItemIndex); uint8_t shortDescIndex = static_cast<uint8_t>(settingsItemIndex);
if (SettingsShortNames[shortDescIndex][0][0] == '\x00') { OLED::setCursor(0, 0);
if (SettingsShortNames[shortDescIndex][0] == '\x01') {
// Empty first line means that this uses large font (for CJK). // Empty first line means that this uses large font (for CJK).
OLED::setCursor(0, 0); OLED::print(SettingsShortNames[shortDescIndex] + 1, FontStyle::LARGE);
OLED::print(SettingsShortNames[shortDescIndex][1], FontStyle::LARGE);
} else { } else {
OLED::setCursor(0, 0); OLED::print(SettingsShortNames[shortDescIndex], FontStyle::SMALL);
OLED::print(SettingsShortNames[shortDescIndex][0], FontStyle::SMALL);
OLED::setCursor(0, 8);
OLED::print(SettingsShortNames[shortDescIndex][1], FontStyle::SMALL);
} }
} }