From 463216ebcac513bf8d699b695ba542ae628d39a0 Mon Sep 17 00:00:00 2001 From: 3djc Date: Tue, 6 Apr 2021 18:20:26 +0200 Subject: [PATCH] Cosmetics --- radio/src/gui/colorlcd/menu_screen.cpp | 2 +- radio/src/gui/colorlcd/screen_setup.cpp | 16 ++++++++++++++-- radio/src/gui/colorlcd/screen_setup.h | 4 ++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/radio/src/gui/colorlcd/menu_screen.cpp b/radio/src/gui/colorlcd/menu_screen.cpp index f3f896407..5dc29a2c8 100644 --- a/radio/src/gui/colorlcd/menu_screen.cpp +++ b/radio/src/gui/colorlcd/menu_screen.cpp @@ -32,7 +32,7 @@ void ScreenMenu::updateTabs() { removeAllTabs(); - addTab(new ScreenUserPage()); + addTab(new ScreenUserInterfacePage()); for (int index = 0; index < MAX_CUSTOM_SCREENS; index++) { if (customScreens[index]) { diff --git a/radio/src/gui/colorlcd/screen_setup.cpp b/radio/src/gui/colorlcd/screen_setup.cpp index f5b8e8a88..9a586003a 100644 --- a/radio/src/gui/colorlcd/screen_setup.cpp +++ b/radio/src/gui/colorlcd/screen_setup.cpp @@ -26,14 +26,26 @@ #define SET_DIRTY() storageDirty(EE_MODEL) -ScreenUserPage::ScreenUserPage(): +ScreenUserInterfacePage::ScreenUserInterfacePage(): PageTab(STR_USER_INTERFACE, ICON_THEME_SETUP) { } -void ScreenUserPage::build(FormWindow * window) +void ScreenUserInterfacePage::build(FormWindow * window) { + FormGridLayout grid; + // Theme choice + new StaticText(window, grid.getLabelSlot(), STR_THEME, 0, 0); + // TODO: Theme picklist + grid.nextLine(); + + // Theme options ? + + // Top Bar + new StaticText(window, grid.getLabelSlot(), STR_TOP_BAR, 0, 0); + // TODO: enable settings topbar widgets + grid.nextLine(); } ScreenAddPage::ScreenAddPage(ScreenMenu * menu, uint8_t pageIndex): diff --git a/radio/src/gui/colorlcd/screen_setup.h b/radio/src/gui/colorlcd/screen_setup.h index c68296016..a17f714cc 100644 --- a/radio/src/gui/colorlcd/screen_setup.h +++ b/radio/src/gui/colorlcd/screen_setup.h @@ -22,9 +22,9 @@ #include "layout.h" #include "datastructs.h" -class ScreenUserPage: public PageTab { +class ScreenUserInterfacePage: public PageTab { public: - ScreenUserPage(); + ScreenUserInterfacePage(); void build(FormWindow * window) override;