diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index b1df08d2d..4dbb64401 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -382,6 +382,7 @@ colorstatusbar.text Infobar colorthememenu.head Theme auswählen colorthememenu.head2 Themes laden colorthememenu.menu_hints Hinweisfenster +colorthememenu.misc Sonstiges colorthememenu.name Themename colorthememenu.neutrino_theme Theme zurücksetzen colorthememenu.question Aktuelles Theme beibehalten? diff --git a/data/locale/english.locale b/data/locale/english.locale index d46be0cdb..c5811c1a3 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -382,6 +382,7 @@ colorstatusbar.text Infobar colorthememenu.head Select theme colorthememenu.head2 Load themes colorthememenu.menu_hints Hint box +colorthememenu.misc Misc colorthememenu.name Theme name colorthememenu.neutrino_theme Reset theme colorthememenu.question Use selected theme? diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index e2119a81a..352afaf58 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -906,13 +906,6 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) oj->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT_DIRECTION); menu_colors->addItem(oj); - // menue separator line gradient enable - menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE)); - oj = new CMenuOptionChooser(LOCALE_COLOR_GRADIENT_SEPARATOR_ENABLE, &t.menu_Separator_gradient_enable, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true ); - oj->OnAfterChangeOption.connect(slot_repaint); - oj->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT_SEPARATOR_ENABLE); - menu_colors->addItem(oj); - // infoviewer color CColorChooser* chInfobarcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.infobar_red, &t.infobar_green, &t.infobar_blue, &t.infobar_alpha, colorSetupNotifier); @@ -931,7 +924,7 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) menu_colors->addItem(mf); // infoviewer gradient top - menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE)); + menu_colors->addItem( new CMenuSeparator(CMenuSeparator::EMPTY)); oj = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_GRADIENT_TOP, &t.infobar_gradient_top, OPTIONS_COL_GRADIENT_OPTIONS, OPTIONS_COL_GRADIENT_OPTIONS_COUNT, true); oj->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT); menu_colors->addItem(oj); @@ -942,7 +935,7 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) menu_colors->addItem(oj); // infoviewer gradient body - menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE)); + menu_colors->addItem( new CMenuSeparator(CMenuSeparator::EMPTY)); oj = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_GRADIENT_BODY, &t.infobar_gradient_body, OPTIONS_COL_GRADIENT_OPTIONS, OPTIONS_COL_GRADIENT_OPTIONS_COUNT, true); oj->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT); menu_colors->addItem(oj); @@ -953,7 +946,7 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) menu_colors->addItem(oj); // infoviewer gradient bottom - menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE)); + menu_colors->addItem( new CMenuSeparator(CMenuSeparator::EMPTY)); oj = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_GRADIENT_BOTTOM, &t.infobar_gradient_bottom, OPTIONS_COL_GRADIENT_OPTIONS, OPTIONS_COL_GRADIENT_OPTIONS_COUNT, true); oj->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT); menu_colors->addItem(oj); @@ -964,7 +957,7 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) menu_colors->addItem(oj); // ca bar - menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE)); + menu_colors->addItem( new CMenuSeparator(CMenuSeparator::EMPTY)); mf = new CMenuDForwarder(LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DISPLAY, g_settings.infobar_casystem_display < 2, NULL, chInfobarCASystem ); mf->setHint("", LOCALE_MENU_HINT_INFOBAR_CASYS_COLOR); menu_colors->addItem(mf); @@ -989,13 +982,6 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) oj->setHint("", LOCALE_MENU_HINT_COLORED_EVENTS); menu_colors->addItem(oj); - // shadow - menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE)); - - mf = new CMenuDForwarder(LOCALE_COLORMENU_SHADOW_COLOR, true, NULL, chShadowColor ); - mf->setHint("", LOCALE_MENU_HINT_COLORS_SHADOW); - menu_colors->addItem(mf); - // progressbar menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_PROGRESSBAR)); @@ -1008,6 +994,19 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) mf = new CMenuDForwarder(LOCALE_COLORMENU_PROGRESSBAR_ACTIVE, true, NULL, chProgressbar_active ); mf->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_ACTIVE); menu_colors->addItem(mf); + + // shadow + menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE| CMenuSeparator::STRING, LOCALE_COLORTHEMEMENU_MISC)); + + mf = new CMenuDForwarder(LOCALE_COLORMENU_SHADOW_COLOR, true, NULL, chShadowColor ); + mf->setHint("", LOCALE_MENU_HINT_COLORS_SHADOW); + menu_colors->addItem(mf); + + // menue separator line gradient enable + oj = new CMenuOptionChooser(LOCALE_COLOR_GRADIENT_SEPARATOR_ENABLE, &t.menu_Separator_gradient_enable, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true ); + oj->OnAfterChangeOption.connect(slot_repaint); + oj->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT_SEPARATOR_ENABLE); + menu_colors->addItem(oj); } /* for font size setup */ diff --git a/src/system/locals.h b/src/system/locals.h index 2e97d55f9..75553d610 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -409,6 +409,7 @@ typedef enum LOCALE_COLORTHEMEMENU_HEAD, LOCALE_COLORTHEMEMENU_HEAD2, LOCALE_COLORTHEMEMENU_MENU_HINTS, + LOCALE_COLORTHEMEMENU_MISC, LOCALE_COLORTHEMEMENU_NAME, LOCALE_COLORTHEMEMENU_NEUTRINO_THEME, LOCALE_COLORTHEMEMENU_QUESTION, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 7596dacdb..e2e9731f1 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -409,6 +409,7 @@ const char * locale_real_names[] = "colorthememenu.head", "colorthememenu.head2", "colorthememenu.menu_hints", + "colorthememenu.misc", "colorthememenu.name", "colorthememenu.neutrino_theme", "colorthememenu.question",