mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 00:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

timerlist: restore display mode correctly on exit

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1340 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2011-03-26 13:36:32 +00:00
parent 899516db19
commit c9a9710d0b
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/timerlist.cpp
View File

@@ -258,6 +258,8 @@ CTimerList::CTimerList()
//buttonHeight = 7 + std::max(icol_h+2, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()); //buttonHeight = 7 + std::max(icol_h+2, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight());
buttonHeight = std::max(icol_h+4, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()); buttonHeight = std::max(icol_h+4, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight());
/* most probable default */
saved_dispmode = (int)CVFD::MODE_TVRADIO;
} }
CTimerList::~CTimerList() CTimerList::~CTimerList()
@@ -375,6 +377,7 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
} }
int ret = show(); int ret = show();
CVFD::getInstance()->setMode((CVFD::MODES)saved_dispmode);
return ret; return ret;
/* /*
@@ -862,6 +865,7 @@ void CTimerList::paint()
unsigned int page_nr = (listmaxshow == 0) ? 0 : (selected / listmaxshow); unsigned int page_nr = (listmaxshow == 0) ? 0 : (selected / listmaxshow);
liststart = page_nr * listmaxshow; liststart = page_nr * listmaxshow;
saved_dispmode = (int)CVFD::getInstance()->getMode();
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, g_Locale->getText(LOCALE_TIMERLIST_NAME)); CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, g_Locale->getText(LOCALE_TIMERLIST_NAME));
paintHead(); paintHead();

2
src/gui/timerlist.h
View File

@@ -80,6 +80,8 @@ class CTimerList : public CMenuTarget
void hide(); void hide();
int modifyTimer(); int modifyTimer();
int newTimer(); int newTimer();
/* todo: properly import the enum CVFD::MODES */
int saved_dispmode;
public: public:
CTimerList(); CTimerList();