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 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/epgplus.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 429d510ef1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-05-08 16:23:25 +02:00
parent fed7126cbc 11b4748125
commit d766040099
5 changed files with 101 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/channellist.cpp
View File

@@ -364,10 +364,12 @@ int CChannelList::doChannelMenu(void)
CBouquetList *blist = tvmode ? TVfavList : RADIOfavList;
bool fav_found = true;
switch(select) {
case 0: {// edit mode
case 0: // edit mode
{
bool unlocked = true;
if (g_settings.parentallock_prompt == PARENTALLOCK_PROMPT_CHANGETOLOCKED) {
int pl_z = g_settings.parentallock_zaptime * 60;
if (g_settings.personalize[SNeutrinoSettings::P_MSER_BOUQUET_EDIT] == CPersonalizeGui::PERSONALIZE_MODE_PIN) {
unlocked = false;
} else if (bouquet && bouquet->zapitBouquet && bouquet->zapitBouquet->bLocked) {
@@ -388,9 +390,11 @@ int CChannelList::doChannelMenu(void)
}
if (unlocked)
editMode(true);
ret = -1;
break;
}case 1: // add to
}
case 1: // add to
if (!addChannelToBouquet())
return -1;
ret = 1;

1
src/gui/epgplus.cpp
View File

@@ -243,6 +243,7 @@ void EpgPlus::TimeLine::paintMark(time_t _startTime, int pduration, int px, int
// paint new mark
CProgressBar pbbar = CProgressBar(px, this->y + this->font->getHeight(), pwidth, this->font->getHeight());
//NI pbbar.setActiveColor(COL_MENUCONTENTSELECTED_PLUS_0);
pbbar.setType(CProgressBar::PB_TIMESCALE);
time_t currentTime;
time(&currentTime);

3
src/gui/movieplayer.cpp
View File

@@ -27,7 +27,10 @@
#include <config.h>
#endif
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
#endif
#include <stdint.h>
#include <global.h>
#include <neutrino.h>

6
src/gui/widget/navibar.cpp
View File

@@ -31,8 +31,8 @@
using namespace std;
CNaviBar::CNaviBar( const int& x,
const int& y,
CNaviBar::CNaviBar( const int& x_pos,
const int& y_pos,
const int& dx,
const int& dy,
CComponentsForm* parent,
@@ -40,7 +40,7 @@ CNaviBar::CNaviBar( const int& x,
fb_pixel_t& color_frame,
fb_pixel_t& color_body,
fb_pixel_t& color_shadow)
: CComponentsFrmChain( x, y, dx, dy,
: CComponentsFrmChain( x_pos, y_pos, dx, dy,
NULL,
CC_DIR_X,
parent,

8
src/gui/widget/navibar.h
View File

@@ -53,9 +53,9 @@ class CNaviBar : public CComponentsFrmChain
public:
/**CNaviBar Constructor
* @param[in] x
* @param[in] x_pos
* @li expects type int, x position
* @param[in] y
* @param[in] y_ypos
* @li expects type int, y position
* @param[in] dx
* @li expects type int, width
@@ -74,8 +74,8 @@ class CNaviBar : public CComponentsFrmChain
*
* @see class CComponentsFrmChain()
*/
CNaviBar( const int& x,
const int& y,
CNaviBar( const int& x_pos,
const int& y_pos,
const int& dx,
const int& dy,
CComponentsForm* parent = NULL,