mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 01:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

themes: move rounded corners to theme section

Browse Source
This commit is contained in:
Thilo Graf
2019-02-11 11:14:12 +01:00
parent 92eef239ef
commit 289e167462
14 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/osd_setup.cpp
View File

@@ -714,11 +714,12 @@ int COsdSetup::showOsdSetup()
}
osd_menu->addItem(GenericMenuSeparatorLine);
#if 0
// round corners
mc = new CMenuOptionChooser(LOCALE_EXTRA_ROUNDED_CORNERS, &g_settings.rounded_corners, MENU_CORNERSETTINGS_TYPE_OPTIONS, MENU_CORNERSETTINGS_TYPE_OPTION_COUNT, true, this);
mc = new CMenuOptionChooser(LOCALE_EXTRA_ROUNDED_CORNERS, &g_settings.theme.rounded_corners, MENU_CORNERSETTINGS_TYPE_OPTIONS, MENU_CORNERSETTINGS_TYPE_OPTION_COUNT, true, this);
mc->setHint("", LOCALE_MENU_HINT_ROUNDED_CORNERS);
osd_menu->addItem(mc);
#endif
#if !HAVE_ARM_HARDWARE //FIXME: make it usable for AX51
// fade windows
mc = new CMenuOptionChooser(LOCALE_COLORMENU_FADE, &g_settings.widget_fade, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true );
@@ -994,6 +995,12 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
oj->OnAfterChangeOption.connect(slot_repaint);
oj->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT_SEPARATOR_ENABLE);
menu_colors->addItem(oj);
// round corners
oj = new CMenuOptionChooser(LOCALE_EXTRA_ROUNDED_CORNERS, &g_settings.theme.rounded_corners, MENU_CORNERSETTINGS_TYPE_OPTIONS, MENU_CORNERSETTINGS_TYPE_OPTION_COUNT, true, this);
oj->OnAfterChangeOption.connect(sigc::mem_fun(menu_colors, &CMenuWidget::hide));
oj->setHint("", LOCALE_MENU_HINT_ROUNDED_CORNERS);
menu_colors->addItem(oj);
}
/* for font size setup */
@@ -1560,7 +1567,7 @@ bool COsdSetup::changeNotify(const neutrino_locale_t OptionName, void * data)
#endif
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_EXTRA_ROUNDED_CORNERS)) {
osd_menu->hide();
g_settings.rounded_corners = * (int*) data;
g_settings.theme.rounded_corners = * (int*) data;
return true;
}
else if(ARE_LOCALES_EQUAL(OptionName, LOCALE_MISCSETTINGS_RADIOTEXT)) {