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

*neutrino: partial revert of r1985, but without clock

Browse Source 
User request: implementation of timerlist needs personalisation
see also: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/p137661-dikussion-neues-hauptmen%C3%BC-mit-timerliste/#post137661

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1995 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
thilo
2011-12-23 22:04:40 +00:00
parent a7558578c8
commit 9141258e3a
3 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/neutrino.cpp
View File

@@ -3555,13 +3555,20 @@ void CNeutrinoApp::radioMode( bool rezap)
} }
} }
//switching from current mode to next mode between tv or radio //switching from current mode to tv or radio mode or to optional parameter prev_mode
void CNeutrinoApp::switchTvRadioMode() void CNeutrinoApp::switchTvRadioMode(const int prev_mode)
{ {
if (prev_mode != mode_unknown){
if (prev_mode == mode_tv && mode != mode_tv )
tvMode();
else if(prev_mode == mode_radio && mode != mode_radio)
radioMode();
}else {
if (mode == mode_radio ) if (mode == mode_radio )
tvMode(); tvMode();
else if(mode == mode_tv) else if(mode == mode_tv)
radioMode(); radioMode();
}
} }
//switching clock on or off depends of current displayed or not //switching clock on or off depends of current displayed or not
@@ -3605,9 +3612,19 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
switchClockOnOff(); switchClockOnOff();
returnval = menu_return::RETURN_EXIT_ALL; returnval = menu_return::RETURN_EXIT_ALL;
} }
else if (actionKey=="tv_radio_switch")//used in mainmenu // else if (actionKey=="tv_radio_switch")//used in mainmenu
// {
// switchTvRadioMode();
// returnval = menu_return::RETURN_EXIT_ALL;
// }
else if (actionKey=="tv")//used in mainmenu
{ {
switchTvRadioMode(); switchTvRadioMode(mode_tv);
returnval = menu_return::RETURN_EXIT_ALL;
}
else if (actionKey=="radio")//used in mainmenu
{
switchTvRadioMode(mode_radio);
returnval = menu_return::RETURN_EXIT_ALL; returnval = menu_return::RETURN_EXIT_ALL;
} }
else if(actionKey=="scart") { else if(actionKey=="scart") {

2
src/neutrino.h
View File

@@ -206,7 +206,7 @@ public:
int getLastMode() { int getLastMode() {
return lastMode; return lastMode;
} }
void switchTvRadioMode(); void switchTvRadioMode(const int prev_mode = mode_unknown);
void switchClockOnOff(); void switchClockOnOff();
bool isMuted() { bool isMuted() {

10
src/neutrino_menue.cpp
View File

@@ -101,14 +101,16 @@ void CNeutrinoApp::InitMainMenu(CMenuWidget &mainMenu, CMenuWidget &mainSettings
dprintf(DEBUG_DEBUG, "init mainmenue\n"); dprintf(DEBUG_DEBUG, "init mainmenue\n");
mainMenu.addItem(GenericMenuSeparator); mainMenu.addItem(GenericMenuSeparator);
mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_TVMODE, true, NULL, this, "tv_radio_switch", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED), true); mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_TVMODE, true, NULL, this, "tv", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED), true);
mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_RADIOMODE, true, NULL, this, "radio", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
//games //games
if (g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME)) if (g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME))
mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_GAMES, true, NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME), "", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN)); mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_GAMES, true, NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME), "", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW));
//timer // //TODO: timer
mainMenu.addItem(new CMenuForwarder(LOCALE_TIMERLIST_NAME, true, NULL, new CTimerList(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); // mainMenu.addItem(new CMenuForwarder(LOCALE_TIMERLIST_NAME, true, NULL, new CTimerList(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW));
//multimedia menu //multimedia menu
mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_MEDIA, true, NULL, CMediaPlayerMenu::getInstance(), NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_MEDIA, true, NULL, CMediaPlayerMenu::getInstance(), NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));