mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'uncool/cst-next'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9113716171
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-01 (Fri, 01 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2016-01-01 14:10:48 +01:00
parent f290fecebd 710892b516
commit a28613ab99
36 changed files with 249 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gui/user_menue_setup.cpp
View File

@@ -263,37 +263,31 @@ int CUserMenuSetup::showSetup()
}
//check items of current button menu and set prefered menue name
void CUserMenuSetup::checkButtonItems()
//check button name for details like empty string and show an user message on issue
void CUserMenuSetup::checkButtonName()
{
//count of configured items
int used_items = getUsedItemsCount();
//warn if no items defined and reset menu name, if empty
if (used_items == 0){
if (used_items == 0)
{
if (!g_settings.usermenu[button]->title.empty()){
// DisplayInfoMessage(g_Locale->getText(LOCALE_USERMENU_MSG_WARNING_NO_ITEMS));
g_settings.usermenu[button]->title = "";
}
//exit function
return;
}
#if 0
//if found only 1 configured item, ensure that the caption of usermenu is the same like this
if (used_items == 1) {
bool dummy;
g_settings.usermenu[button]->title = CUserMenu::getUserMenuButtonName(button, dummy);
}
}
#endif
//check button name for details like empty string and show an user message on issue
void CUserMenuSetup::checkButtonName()
{
checkButtonItems();
//exit function, if no items found
if (getUsedItemsCount() == 0)
return;
if (button < USERMENU_ITEMS_COUNT && g_settings.usermenu[button]->title.empty())
{
std::string msg(g_Locale->getText(LOCALE_USERMENU_MSG_INFO_IS_EMPTY));
@@ -304,10 +298,8 @@ void CUserMenuSetup::checkButtonName()
}
}
//get count of used items
int CUserMenuSetup::getUsedItemsCount()
{
return ::split(g_settings.usermenu[button]->items, ',').size();
}