From d2f474eb11c1a9ebf3483f66f355cac078204759 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 25 Nov 2022 20:41:34 +0100 Subject: [PATCH] glcdsetup: minor arrangement fix Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/91ccbd4bb447d38dd9c0ff8e4a10246f2037b79a Author: vanhofen Date: 2022-11-25 (Fri, 25 Nov 2022) Origin message was: ------------------ - glcdsetup: minor arrangement fix ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/locale/deutsch.locale | 2 +- src/gui/glcdsetup.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 2e7e30d6f..5fc85c41f 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -907,7 +907,7 @@ fsk.to_12 bis 12 fsk.to_16 bis 16 fsk.to_7 bis 7 glcd.align_center zentriert -glcd.align_channel Sender ausrichten +glcd.align_channel Sendername ausrichten glcd.align_duration Sendungsdauer ausrichten glcd.align_end Sendungsende ausrichten glcd.align_epg EPG ausrichten diff --git a/src/gui/glcdsetup.cpp b/src/gui/glcdsetup.cpp index 1f1e51328..bd28ba317 100644 --- a/src/gui/glcdsetup.cpp +++ b/src/gui/glcdsetup.cpp @@ -471,8 +471,6 @@ int GLCD_Menu::GLCD_Theme_Settings() gts->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_GLCD_POSITION_SETTINGS)); - gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_LOGO, &t.glcd_logo, - OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); gts->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_CHANNEL, &t.glcd_channel_percent, true, 0, 100, this)); gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_ALIGN_CHANNEL, &t.glcd_channel_align, @@ -481,6 +479,11 @@ int GLCD_Menu::GLCD_Theme_Settings() &t.glcd_channel_x_position, true, 0, oled_width, this)); gts->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_CHANNEL_Y_POSITION, &t.glcd_channel_y_position, true, 0, oled_height, this)); + + gts->addItem(GenericMenuSeparator); + + gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_LOGO, &t.glcd_logo, + OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); nc = new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_LOGO, &t.glcd_logo_percent, t.glcd_logo, 0, 100, this); gts->addItem(nc);