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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/components/cc_frm_scrollbar.cpp
	src/gui/eventlist.cpp
	src/gui/widget/progresswindow.cpp


Origin commit data
------------------
Commit: 9b97705a3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)
This commit is contained in:
vanhofen
2017-06-20 14:24:59 +02:00
parent a95ede2649 0f3b5e5eaf
commit c7c36aceb1
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,7 @@ void CComponentsScrollBar::initVarSbForm(const int& count, const fb_pixel_t& col
sb_down_obj = NULL;
sb_segments_obj = NULL;
setCorner(RADIUS_NONE, CORNER_ALL); //NI
corner_type = CORNER_NONE;
sb_up_icon = frameBuffer->getIconPath(NEUTRINO_ICON_BUTTON_UP) ;
sb_down_icon = frameBuffer->getIconPath(NEUTRINO_ICON_BUTTON_DOWN);

7
src/gui/eventlist.cpp
View File

@@ -318,7 +318,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
height = frameBuffer->getScreenHeightRel();
// Calculate header_height
header_height = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); //NI
header_height = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
footer_height = header_height;
const int pic_h = 39;
header_height = std::max(header_height, pic_h);
@@ -851,7 +851,6 @@ void CEventList::paintDescription(int index)
else
CEitManager::getInstance()->getActualEPGServiceKey(evtlist[index].channelID, &epgData );
//NI
infozone_text = "";
if (!epgData.info1.empty() && !epgData.info2.empty() && (epgData.info2.find(epgData.info1) != 0)) {
infozone_text += epgData.info1;
@@ -890,7 +889,7 @@ void CEventList::paintHead(t_channel_id _channel_id, std::string _channelname, s
if (header->isPainted())
header->getChannelLogoObject()->hide();
if (g_settings.channellist_show_channellogo) //NI
if (g_settings.channellist_show_channellogo)
header->setChannelLogo(_channel_id,_channelname);
header->setCaption(_channelname, CCHeaderTypes::CC_TITLE_LEFT);
@@ -991,7 +990,7 @@ void CEventList::paintFoot(t_channel_id channel_id)
CColorKeyHelper keyhelper; //user_menue.h
neutrino_msg_t dummy = CRCInput::RC_nokey;
const char * icon = NULL;
struct button_label buttons[7]; //NI
struct button_label buttons[7]; //NI //TODO dbt: add directly into footer object with setButtonLabels()
int btn_cnt = 0;
int tID = -1; //any value, not NULL

1
src/gui/widget/progresswindow.cpp
View File

@@ -130,7 +130,6 @@ CProgressBar* CProgressWindow::getProgressItem()
void CProgressWindow::initStatus(const unsigned int prog, const unsigned int max, const string &statusText, CProgressBar *pBar)
{
pBar->allowPaint(true);
unsigned int cur_perc = prog*100/(max+1);
pBar->setValues(prog, (int)max);
if (!statusText.empty() && (cur_statusText != statusText)){
showStatusMessageUTF(statusText);