mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-15 17:33:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Origin commit data
------------------
Commit: 283cd4640f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-02 (Thu, 02 Jun 2016)
This commit is contained in:
vanhofen
2016-06-02 21:13:16 +02:00
parent b3f31baf5f 878de7f24a
commit 5e86e01527
5 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/components/cc_frm_signalbars.cpp
View File

@@ -140,7 +140,7 @@ void CSignalBar::initSBarValue()
//create value label object with basic properties //create value label object with basic properties
if (sb_vlbl == NULL){ if (sb_vlbl == NULL){
sb_vlbl = new CComponentsLabel(); sb_vlbl = new CComponentsLabel();
sb_vlbl->setText(REF_PERCENT_TXT, sb_val_mode, sb_font); sb_vlbl->setText("0%", sb_val_mode, sb_font);
} }
sb_vlbl->doPaintBg(false); sb_vlbl->doPaintBg(false);

16
src/gui/components/cc_item_picture.cpp
View File

@@ -399,17 +399,15 @@ void CComponentsChannelLogo::setAltLogo(const char* picture_name)
void CComponentsChannelLogo::setChannel(const uint64_t& channelId, const std::string& channelName) void CComponentsChannelLogo::setChannel(const uint64_t& channelId, const std::string& channelName)
{ {
if (channel_id)
if (channel_id == channelId)
return;
channel_id = channelId;
if (!channel_name.empty())
if (channel_name == channelName)
return;
need_init = true; need_init = true;
if (channelId || !channelName.empty()){
if ((channel_id == channelId) && (channel_name == channelName))
need_init = false;
}
channel_id = channelId;
channel_name = channelName; channel_name = channelName;
int dummy; int dummy;
has_logo = g_PicViewer->GetLogoName(channel_id, channel_name, pic_name, &dummy, &dummy); has_logo = g_PicViewer->GetLogoName(channel_id, channel_name, pic_name, &dummy, &dummy);

23
src/gui/eventlist.cpp
View File

@@ -647,7 +647,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
oldIndex = -1; oldIndex = -1;
oldEventID = -1; oldEventID = -1;
bgRightBoxPaint = false; bgRightBoxPaint = false;
in_search = findEvents(); in_search = findEvents(channel_id, channelname);
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]);
} }
else if (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites || msg == CRCInput::RC_www) { else if (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites || msg == CRCInput::RC_www) {
@@ -1047,12 +1047,11 @@ int CEventListHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*
} }
/************************************************************************************************/ /************************************************************************************************/
bool CEventList::findEvents(void) bool CEventList::findEvents(t_channel_id channel_id, std::string channelname)
/************************************************************************************************/ /************************************************************************************************/
{ {
bool res = false; bool res = false;
int event = 0; int event = 0;
t_channel_id channel_id = 0;
if((m_search_keyword.empty() || m_search_keyword == m_search_autokeyword) && evtlist[selected].eventID != 0) if((m_search_keyword.empty() || m_search_keyword == m_search_autokeyword) && evtlist[selected].eventID != 0)
{ {
@@ -1143,14 +1142,11 @@ bool CEventList::findEvents(void)
} }
if(evtlist.empty()) if(evtlist.empty())
{ {
if ( evtlist.empty() ) CChannelEvent evt;
{ //evt.description = m_search_keyword + ": " + g_Locale->getText(LOCALE_EPGVIEWER_NOTFOUND);
CChannelEvent evt; evt.description = g_Locale->getText(LOCALE_EPGVIEWER_NOTFOUND);
//evt.description = m_search_keyword + ": " + g_Locale->getText(LOCALE_EPGVIEWER_NOTFOUND); evt.eventID = 0;
evt.description = g_Locale->getText(LOCALE_EPGVIEWER_NOTFOUND); evtlist.push_back(evt);
evt.eventID = 0;
evtlist.push_back(evt);
}
} }
if (current_event == (unsigned int)-1) if (current_event == (unsigned int)-1)
current_event = 0; current_event = 0;
@@ -1176,7 +1172,10 @@ bool CEventList::findEvents(void)
} }
} }
paintHead(0, search_head_name); if(event)
paintHead(0, search_head_name);
else
paintHead(channel_id, channelname);
paint(); paint();
showFunctionBar(true, channel_id); showFunctionBar(true, channel_id);
return(res); return(res);

2
src/gui/eventlist.h
View File

@@ -79,7 +79,7 @@ class CEventList : public CListHelpers
event_id_t oldEventID; event_id_t oldEventID;
bool bgRightBoxPaint; bool bgRightBoxPaint;
bool findEvents(void); bool findEvents(t_channel_id channel_id, std::string channelname);
// Eventfinder end // Eventfinder end
CFrameBuffer *frameBuffer; CFrameBuffer *frameBuffer;

2
src/gui/moviebrowser.cpp
View File

@@ -358,7 +358,7 @@ CMovieBrowser::CMovieBrowser(): configfile ('\t')
CMovieBrowser::~CMovieBrowser() CMovieBrowser::~CMovieBrowser()
{ {
//TRACE("[mb] del\n"); //TRACE("[mb] del\n");
hide();
m_dir.clear(); m_dir.clear();
m_dirNames.clear(); m_dirNames.clear();