diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 6472d2c3a..054784874 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -787,7 +787,8 @@ glcd.head GraphLCD glcd.mirror_osd OSD-MenĂ¼ auf GraphLCD anzeigen glcd.mirror_video Videobild auf GraphLCD anzeigen glcd.restart Neu erkennen -glcd.scroll_speed Scroll-Geschwindigkeit +glcd.scroll Laufschrift +glcd.scroll_speed Geschwindigkeit der Laufschrift glcd.select.bar Fortschrittsbalken-Farbe glcd.select.bg Hintergrund-Farbe glcd.select.fg Vordergrund-Farbe diff --git a/data/locale/english.locale b/data/locale/english.locale index 8d0920d40..dde0be06a 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -787,6 +787,7 @@ glcd.head GraphLCD glcd.mirror_osd Show OSD menu on GraphLCD glcd.mirror_video Show running video on GraphLCD glcd.restart Rescan +glcd.scroll Scrolling glcd.scroll_speed Scrolling Speed glcd.select.bar Progress bar color glcd.select.bg Background color diff --git a/src/driver/nglcd.cpp b/src/driver/nglcd.cpp index 298297843..b93393a12 100644 --- a/src/driver/nglcd.cpp +++ b/src/driver/nglcd.cpp @@ -784,8 +784,16 @@ void nGLCD::Run(void) { Channel = g_Locale->getText(LOCALE_GLCD_VOLUME); ChannelWidth = font_channel.Width(Channel); - doScrollChannel = ChannelWidth > bitmap->Width() - 4; - scrollChannelForward = true; + if (g_settings.glcd_scroll) + { + doScrollChannel = ChannelWidth > bitmap->Width() - 4; + scrollChannelForward = true; + } + else + { + doScrollChannel = false; + scrollChannelForward = false; + } scrollChannelSkip = 0; if (doScrollChannel) { @@ -808,8 +816,16 @@ void nGLCD::Run(void) { Epg = stagingEpg; EpgWidth = font_epg.Width(Epg); - doScrollEpg = EpgWidth > bitmap->Width() - 4; - scrollEpgForward = true; + if (g_settings.glcd_scroll) + { + doScrollEpg = EpgWidth > bitmap->Width() - 4; + scrollEpgForward = true; + } + else + { + doScrollEpg = false; + scrollEpgForward = false; + } scrollEpgSkip = 0; if (doScrollEpg) { @@ -823,8 +839,16 @@ void nGLCD::Run(void) { Channel = stagingChannel; ChannelWidth = font_channel.Width(Channel); - doScrollChannel = ChannelWidth > bitmap->Width() - 4; - scrollChannelForward = true; + if (g_settings.glcd_scroll) + { + doScrollChannel = ChannelWidth > bitmap->Width() - 4; + scrollChannelForward = true; + } + else + { + doScrollChannel = false; + scrollChannelForward = false; + } scrollChannelSkip = 0; if (doScrollChannel) { @@ -854,8 +878,16 @@ void nGLCD::Run(void) EpgWidth = 0; Scale = 0; doScrollEpg = false; - doScrollChannel = ChannelWidth > bitmap->Width() - 4; - scrollChannelForward = true; + if (g_settings.glcd_scroll) + { + doScrollChannel = ChannelWidth > bitmap->Width() - 4; + scrollChannelForward = true; + } + else + { + doScrollChannel = false; + scrollChannelForward = false; + } scrollChannelSkip = 0; if (doScrollChannel) { @@ -876,8 +908,16 @@ void nGLCD::Run(void) { Epg = info_CurrentNext.current_name; EpgWidth = font_epg.Width(Epg); - doScrollEpg = EpgWidth > bitmap->Width() - 4; - scrollEpgForward = true; + if (g_settings.glcd_scroll) + { + doScrollEpg = EpgWidth > bitmap->Width() - 4; + scrollEpgForward = true; + } + else + { + doScrollEpg = false; + scrollEpgForward = false; + } scrollEpgSkip = 0; if (doScrollEpg) { diff --git a/src/gui/glcdsetup.cpp b/src/gui/glcdsetup.cpp index 8c93bd9fb..804b2be7a 100644 --- a/src/gui/glcdsetup.cpp +++ b/src/gui/glcdsetup.cpp @@ -194,6 +194,7 @@ bool GLCD_Menu::changeNotify (const neutrino_locale_t OptionName, void *Data) case LOCALE_GLCD_SIZE_TIME: case LOCALE_GLCD_SIZE_TIME_STANDBY: case LOCALE_GLCD_TIME_IN_STANDBY: + case LOCALE_GLCD_SCROLL: case LOCALE_GLCD_SCROLL_SPEED: break; default: @@ -268,6 +269,9 @@ void GLCD_Menu::GLCD_Menu_Settings() m.addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_BRIGHTNESS_STANDBY, &g_settings.glcd_brightness_standby, true, 0, 100, this)); m.addItem(GenericMenuSeparatorLine); + m.addItem(new CMenuOptionChooser(LOCALE_GLCD_SCROLL, &g_settings.glcd_scroll, + OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this, + CRCInput::convertDigitToKey(shortcut++))); m.addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SCROLL_SPEED, &g_settings.glcd_scroll_speed, true, 1, 63, this)); m.addItem(GenericMenuSeparatorLine); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 76c10c6b9..2b0a7991a 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -695,6 +695,7 @@ if (g_info.hw_caps->can_shutdown) g_settings.glcd_brightness = configfile.getInt32("glcd_brightness", 75); g_settings.glcd_brightness_standby = configfile.getInt32("glcd_brightness_standby", 45); #endif + g_settings.glcd_scroll = configfile.getInt32("glcd_scroll", 1); #if BOXMODEL_VUUNO4KSE || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO g_settings.glcd_scroll_speed = configfile.getInt32("glcd_scroll_speed", 1); #elif BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUDUO4KSE || BOXMODEL_VUULTIMO4K @@ -1479,6 +1480,7 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setString("glcd_font", g_settings.glcd_font); configfile.setInt32("glcd_brightness", g_settings.glcd_brightness); configfile.setInt32("glcd_brightness_standby", g_settings.glcd_brightness_standby); + configfile.setInt32("glcd_scroll", g_settings.glcd_scroll); configfile.setInt32("glcd_scroll_speed", g_settings.glcd_scroll_speed); configfile.setInt32("glcd_selected_config", g_settings.glcd_selected_config); #endif diff --git a/src/system/locals.h b/src/system/locals.h index 3e0523203..cb39ef573 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -814,6 +814,7 @@ typedef enum LOCALE_GLCD_MIRROR_OSD, LOCALE_GLCD_MIRROR_VIDEO, LOCALE_GLCD_RESTART, + LOCALE_GLCD_SCROLL, LOCALE_GLCD_SCROLL_SPEED, LOCALE_GLCD_SELECT_BAR, LOCALE_GLCD_SELECT_BG, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 234958e03..e22d48527 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -814,6 +814,7 @@ const char *locale_real_names[] = "glcd.mirror_osd", "glcd.mirror_video", "glcd.restart", + "glcd.scroll", "glcd.scroll_speed", "glcd.select.bar", "glcd.select.bg", diff --git a/src/system/settings.h b/src/system/settings.h index fe94ca4cb..db1a4f15a 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -810,6 +810,7 @@ struct SNeutrinoSettings int glcd_show_logo; int glcd_brightness; int glcd_brightness_standby; + int glcd_scroll; int glcd_scroll_speed; int glcd_selected_config; #endif