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

gui/miscsettings_menu.cpp: add option to enable/disable empty favorites in bouquet list

Browse Source
This commit is contained in:
[CST] Focus
2014-10-27 13:52:23 +03:00
parent 2d7b746685
commit 8772d219f1
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/channellist.cpp
View File

@@ -2378,7 +2378,7 @@ void CChannelList::editMode(bool enable)
channelsChanged = false; channelsChanged = false;
bouquet->zapitBouquet->getChannels(channels, tvmode); bouquet->zapitBouquet->getChannels(channels, tvmode);
saveChanges(bouquet->zapitBouquet->bUser); saveChanges(bouquet->zapitBouquet->bUser);
if ((*chanlist).empty()) if (!g_settings.show_empty_favorites && (*chanlist).empty())
CNeutrinoApp::getInstance()->MarkChannelsInit(); CNeutrinoApp::getInstance()->MarkChannelsInit();
} }
if (selected >= chanlist->size()) if (selected >= chanlist->size())

14
src/gui/miscsettings_menu.cpp
View File

@@ -479,8 +479,9 @@ int CMiscMenue::showMiscSettingsMenuChanlist()
CMenuWidget * ms_chanlist = new CMenuWidget(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_MISCSETUP_CHANNELLIST); CMenuWidget * ms_chanlist = new CMenuWidget(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_MISCSETUP_CHANNELLIST);
ms_chanlist->addIntroItems(LOCALE_MISCSETTINGS_CHANNELLIST); ms_chanlist->addIntroItems(LOCALE_MISCSETTINGS_CHANNELLIST);
bool tmp1 = g_settings.make_hd_list; bool make_hd_list = g_settings.make_hd_list;
bool tmp2 = g_settings.make_webtv_list; bool make_webtv_list = g_settings.make_webtv_list;
bool show_empty_favorites = g_settings.show_empty_favorites;
CMenuOptionChooser * mc; CMenuOptionChooser * mc;
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_MAKE_HDLIST , &g_settings.make_hd_list , OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_MAKE_HDLIST , &g_settings.make_hd_list , OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
@@ -514,10 +515,15 @@ int CMiscMenue::showMiscSettingsMenuChanlist()
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_NUMERIC_ADJUST, &g_settings.channellist_numeric_adjust, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_NUMERIC_ADJUST, &g_settings.channellist_numeric_adjust, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
mc->setHint("", LOCALE_MENU_HINT_NUMERIC_ADJUST); mc->setHint("", LOCALE_MENU_HINT_NUMERIC_ADJUST);
ms_chanlist->addItem(mc); ms_chanlist->addItem(mc);
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_EMPTY_FAVS, &g_settings.show_empty_favorites, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_EMPTY_FAVS);
ms_chanlist->addItem(mc);
int res = ms_chanlist->exec(NULL, ""); int res = ms_chanlist->exec(NULL, "");
delete ms_chanlist; delete ms_chanlist;
if (tmp1 != g_settings.make_hd_list|| tmp2 != g_settings.make_webtv_list) if (make_hd_list != g_settings.make_hd_list || make_webtv_list != g_settings.make_webtv_list || show_empty_favorites != g_settings.show_empty_favorites)
g_Zapit->reinitChannels(); g_RCInput->postMsg(NeutrinoMessages::EVT_SERVICESCHANGED, 0);
return res; return res;
} }

1
src/system/settings.h
View File

@@ -192,6 +192,7 @@ struct SNeutrinoSettings
int make_new_list; int make_new_list;
int make_removed_list; int make_removed_list;
int keep_channel_numbers; int keep_channel_numbers;
int show_empty_favorites;
int avsync; int avsync;
int clockrec; int clockrec;
int rounded_corners; int rounded_corners;