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

Merge branch 'master' into pu/fb-setmode

Browse Source
This commit is contained in:
Thilo Graf
2017-05-07 18:36:16 +02:00
parent 2b17db46ee c8f6888d8f
commit 9c4e0d1737
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/channellist.cpp
View File

@@ -119,7 +119,7 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
fheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight(); fheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight();
fdescrheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->getHeight(); fdescrheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->getHeight();
previous_channellist_additional = -1; previous_channellist_additional = g_settings.channellist_additional;
eventFont = SNeutrinoSettings::FONT_TYPE_CHANNELLIST_EVENT; eventFont = SNeutrinoSettings::FONT_TYPE_CHANNELLIST_EVENT;
dline = NULL; dline = NULL;
@@ -298,7 +298,7 @@ int CChannelList::doChannelMenu(void)
int shortcut = 0; int shortcut = 0;
static int old_selected = 0; static int old_selected = 0;
char cnt[5]; char cnt[5];
bool unlocked = true;
int ret = 0; int ret = 0;
if(g_settings.minimode) if(g_settings.minimode)
@@ -360,7 +360,8 @@ int CChannelList::doChannelMenu(void)
CBouquetList *blist = tvmode ? TVfavList : RADIOfavList; CBouquetList *blist = tvmode ? TVfavList : RADIOfavList;
bool fav_found = true; bool fav_found = true;
switch(select) { switch(select) {
case 0: // edit mode case 0: {// edit mode
bool unlocked = true;
if (g_settings.parentallock_prompt == PARENTALLOCK_PROMPT_CHANGETOLOCKED) { if (g_settings.parentallock_prompt == PARENTALLOCK_PROMPT_CHANGETOLOCKED) {
int pl_z = g_settings.parentallock_zaptime * 60; int pl_z = g_settings.parentallock_zaptime * 60;
if (g_settings.personalize[SNeutrinoSettings::P_MSER_BOUQUET_EDIT] == CPersonalizeGui::PERSONALIZE_MODE_PIN) { if (g_settings.personalize[SNeutrinoSettings::P_MSER_BOUQUET_EDIT] == CPersonalizeGui::PERSONALIZE_MODE_PIN) {
@@ -385,7 +386,7 @@ int CChannelList::doChannelMenu(void)
editMode(true); editMode(true);
ret = -1; ret = -1;
break; break;
case 1: // add to }case 1: // add to
if (!addChannelToBouquet()) if (!addChannelToBouquet())
return -1; return -1;
ret = 1; ret = 1;
@@ -484,7 +485,7 @@ void CChannelList::calcSize()
fheight = 1; /* avoid div-by-zero crash on invalid font */ fheight = 1; /* avoid div-by-zero crash on invalid font */
footerHeight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]->getHeight()+6; footerHeight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]->getHeight()+6;
minitv_is_active = ( (g_settings.channellist_additional == 2) && (CNeutrinoApp::getInstance()->getMode() != NeutrinoMessages::mode_ts) ); minitv_is_active = ( (g_settings.channellist_additional == SNeutrinoSettings::CHANNELLIST_ADDITIONAL_MODE_MINITV) && (CNeutrinoApp::getInstance()->getMode() != NeutrinoMessages::mode_ts) );
// calculate width // calculate width
full_width = minitv_is_active ? (frameBuffer->getScreenWidth()-2*DETAILSLINE_WIDTH) : frameBuffer->getScreenWidthRel(); full_width = minitv_is_active ? (frameBuffer->getScreenWidth()-2*DETAILSLINE_WIDTH) : frameBuffer->getScreenWidthRel();
@@ -947,7 +948,7 @@ int CChannelList::show()
void CChannelList::hide() void CChannelList::hide()
{ {
paint_events(-2); // cancel paint_events thread paint_events(-2); // cancel paint_events thread
if ((g_settings.channellist_additional == 2) || (previous_channellist_additional == 2)) // with miniTV if ((g_settings.channellist_additional == SNeutrinoSettings::CHANNELLIST_ADDITIONAL_MODE_MINITV) || (previous_channellist_additional == SNeutrinoSettings::CHANNELLIST_ADDITIONAL_MODE_MINITV)) // with miniTV
{ {
if (cc_minitv){ if (cc_minitv){
delete cc_minitv; cc_minitv = NULL; delete cc_minitv; cc_minitv = NULL;

2
src/gui/channellist.h
View File

@@ -67,7 +67,7 @@ enum {
class CFrameBuffer; class CFrameBuffer;
class CBouquet; class CBouquet;
class CChannelList : public CListHelpers class CChannelList : public CListHelpers, public sigc::trackable
{ {
private: private:
enum state_ enum state_

7
src/system/settings.h
View File

@@ -588,6 +588,13 @@ struct SNeutrinoSettings
int window_height; int window_height;
int eventlist_additional; int eventlist_additional;
int eventlist_epgplus; int eventlist_epgplus;
enum CHANNELLIST_ADDITIONAL_MODES
{
CHANNELLIST_ADDITIONAL_MODE_OFF = 0,
CHANNELLIST_ADDITIONAL_MODE_EPG = 1,
CHANNELLIST_ADDITIONAL_MODE_MINITV = 2
};
int channellist_additional; int channellist_additional;
int channellist_epgtext_align_right; int channellist_epgtext_align_right;
int channellist_foot; int channellist_foot;