From d40bc87762d289519708a9df361f7e8c432e2cbf Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 11 Apr 2018 23:58:15 +0200 Subject: [PATCH] Progressbar setup: add missing caption for global settings Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/34300a2d61e380b90a44d9177c580e84e5d24029 Author: Thilo Graf Date: 2018-04-11 (Wed, 11 Apr 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/locale/deutsch.locale | 1 + data/locale/english.locale | 1 + src/gui/osd_progressbar_setup.cpp | 2 +- src/system/locals.h | 1 + src/system/locals_intern.h | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index effcf4ad6..b1df08d2d 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1797,6 +1797,7 @@ miscsettings.progressbar_design_2 horizontale Balken miscsettings.progressbar_design_3 Farbverlauf miscsettings.progressbar_design_4 monochrom miscsettings.progressbar_design_long Design +miscsettings.progressbar_global Allgemein miscsettings.progressbar_gradient 3D-Effekt miscsettings.progressbar_infobar_position Position miscsettings.progressbar_infobar_position_0 Standard diff --git a/data/locale/english.locale b/data/locale/english.locale index 8e617ae48..d46be0cdb 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1797,6 +1797,7 @@ miscsettings.progressbar_design_2 colored horizontal lines miscsettings.progressbar_design_3 colored bar miscsettings.progressbar_design_4 monochrome miscsettings.progressbar_design_long Design +miscsettings.progressbar_global General miscsettings.progressbar_gradient 3D effect miscsettings.progressbar_infobar_position Position miscsettings.progressbar_infobar_position_0 standard diff --git a/src/gui/osd_progressbar_setup.cpp b/src/gui/osd_progressbar_setup.cpp index a1da1e8ae..7f88e65ad 100644 --- a/src/gui/osd_progressbar_setup.cpp +++ b/src/gui/osd_progressbar_setup.cpp @@ -101,7 +101,7 @@ int CProgressbarSetup::showMenu() { CMenuWidget m(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_PROGRESSBAR); - m.addIntroItems(LOCALE_MISCSETTINGS_PROGRESSBAR /*, LOCALE_MISCSETTINGS_GENERAL*/); + m.addIntroItems(LOCALE_MISCSETTINGS_PROGRESSBAR, LOCALE_MISCSETTINGS_PROGRESSBAR_GLOBAL); // general progress bar design CMenuOptionChooser *mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_LONG, diff --git a/src/system/locals.h b/src/system/locals.h index 535d0d536..2e97d55f9 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1824,6 +1824,7 @@ typedef enum LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_3, LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_4, LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_LONG, + LOCALE_MISCSETTINGS_PROGRESSBAR_GLOBAL, LOCALE_MISCSETTINGS_PROGRESSBAR_GRADIENT, LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION, LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_0, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 001b0333f..7596dacdb 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1824,6 +1824,7 @@ const char * locale_real_names[] = "miscsettings.progressbar_design_3", "miscsettings.progressbar_design_4", "miscsettings.progressbar_design_long", + "miscsettings.progressbar_global", "miscsettings.progressbar_gradient", "miscsettings.progressbar_infobar_position", "miscsettings.progressbar_infobar_position_0",