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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/hdd_menu.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-02 23:21:37 +02:00
parent 6458ea748a 463700033b
commit 0a0c8a13bf
39 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/channellist.cpp
View File

@@ -1714,7 +1714,7 @@ void CChannelList::showChannelLogo()
header->getChannelLogoObject()->paint();
}
else
header->setChannelLogo(0, string());
header->setChannelLogo(0, std::string());
}
#define NUM_LIST_BUTTONS_SORT 9
@@ -2161,7 +2161,7 @@ void CChannelList::paintHead()
if (bouquet && bouquet->zapitBouquet && bouquet->zapitBouquet->bLocked != g_settings.parentallock_defaultlocked)
header->setIcon(NEUTRINO_ICON_LOCK);
string header_txt = !edit_state ? name : string(g_Locale->getText(LOCALE_CHANNELLIST_EDIT)) + ": " + name;
std::string header_txt = !edit_state ? name : std::string(g_Locale->getText(LOCALE_CHANNELLIST_EDIT)) + ": " + name;
fb_pixel_t header_txt_col = (edit_state ? COL_RED : COL_MENUHEAD_TEXT);
header->setColorBody(COL_MENUHEAD_PLUS_0);