neutrino: add localized bouquet names

Origin commit data
------------------
Branch: ni/coolstream
Commit: ad7d094635
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-09-04 (Tue, 04 Sep 2018)

Origin message was:
------------------
- neutrino: add localized bouquet names

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-09-04 06:12:39 +02:00
parent 5a0442e1cb
commit 036a4eb0a3
11 changed files with 46 additions and 35 deletions

View File

@@ -86,15 +86,7 @@ CBouquetList::~CBouquetList()
CBouquet* CBouquetList::addBouquet(CZapitBouquet * zapitBouquet)
{
int BouquetKey= Bouquets.size();//FIXME not used ?
const char * bname;
if (zapitBouquet->bFav)
bname = g_Locale->getText(LOCALE_FAVORITES_BOUQUETNAME);
else if (zapitBouquet->bOther)
bname = g_Locale->getText(LOCALE_BOUQUETNAME_OTHER);
else
bname = zapitBouquet->Name.c_str();
CBouquet* tmp = new CBouquet(BouquetKey, bname, zapitBouquet->bLocked, !zapitBouquet->bUser);
CBouquet* tmp = new CBouquet(BouquetKey, zapitBouquet->bName.c_str(), zapitBouquet->bLocked, !zapitBouquet->bUser);
tmp->zapitBouquet = zapitBouquet;
Bouquets.push_back(tmp);
return tmp;
@@ -655,7 +647,7 @@ void CBouquetList::paintItem(int pos)
frameBuffer->paintBoxRel(x, ypos, width - SCROLLBAR_WIDTH, item_height, bgcolor, i_radius);
if (npos < (int) Bouquets.size())
lname = (Bouquets[npos]->zapitBouquet && Bouquets[npos]->zapitBouquet->bFav) ? g_Locale->getText(LOCALE_FAVORITES_BOUQUETNAME) : Bouquets[npos]->channelList->getName();
lname = Bouquets[npos]->channelList->getName();
if (i_selected)
{