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: add toggle item for tv and radio mode to main menue

Browse Source 
Note: this menu item is also personalized with red button,
probaly we should use other button

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2016 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
thilo
2011-12-28 00:19:52 +00:00
parent 9dc2ef58bc
commit cf9e6dee65
8 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -649,6 +649,7 @@ mainmenu.settings Einstellungen
mainmenu.shutdown Ausschalten mainmenu.shutdown Ausschalten
mainmenu.sleeptimer SleepTimer mainmenu.sleeptimer SleepTimer
mainmenu.tvmode TV-Modus mainmenu.tvmode TV-Modus
mainmenu.tvradio_switch TV-Radio Umschaltung
mainsettings.audio Audio mainsettings.audio Audio
mainsettings.head Einstellungen mainsettings.head Einstellungen
mainsettings.keybinding Tasten mainsettings.keybinding Tasten

1
data/locale/english.locale
View File

@@ -649,6 +649,7 @@ mainmenu.settings Settings
mainmenu.shutdown Shutdown mainmenu.shutdown Shutdown
mainmenu.sleeptimer SleepTimer mainmenu.sleeptimer SleepTimer
mainmenu.tvmode TV-Mode mainmenu.tvmode TV-Mode
mainmenu.tvradio_switch TV-Radio Switch
mainsettings.audio Audio mainsettings.audio Audio
mainsettings.head Settings mainsettings.head Settings
mainsettings.keybinding Key Setup mainsettings.keybinding Key Setup

10
src/neutrino.cpp
View File

@@ -3521,11 +3521,11 @@ 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(); switchTvRadioMode();
// returnval = menu_return::RETURN_EXIT_ALL; returnval = menu_return::RETURN_EXIT_ALL;
// } }
else if (actionKey=="tv")//used in mainmenu else if (actionKey=="tv")//used in mainmenu
{ {
switchTvRadioMode(mode_tv); switchTvRadioMode(mode_tv);

4
src/neutrino_menue.cpp
View File

@@ -150,6 +150,10 @@ void CNeutrinoApp::InitMenuMain()
CMenuItem *radioswitch = new CMenuForwarder(LOCALE_MAINMENU_RADIOMODE, true, NULL, this, "radio", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN); CMenuItem *radioswitch = new CMenuForwarder(LOCALE_MAINMENU_RADIOMODE, true, NULL, this, "radio", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
personalize.addItem(MENU_MAIN, radioswitch, &g_settings.personalize[SNeutrinoSettings::P_MAIN_RADIO_MODE]); personalize.addItem(MENU_MAIN, radioswitch, &g_settings.personalize[SNeutrinoSettings::P_MAIN_RADIO_MODE]);
//tv <-> radio toggle
CMenuItem *tvradio_switch = new CMenuForwarder(LOCALE_MAINMENU_TVRADIO_SWITCH, true, NULL, this, "tv_radio_switch", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
personalize.addItem(MENU_MAIN, tvradio_switch, &g_settings.personalize[SNeutrinoSettings::P_MAIN_TV_RADIO_MODE]);
//timer //timer
CMenuItem *timerlist = new CMenuForwarder(LOCALE_TIMERLIST_NAME, true, NULL, new CTimerList(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); CMenuItem *timerlist = new CMenuForwarder(LOCALE_TIMERLIST_NAME, true, NULL, new CTimerList(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
personalize.addItem(MENU_MAIN, timerlist, &g_settings.personalize[SNeutrinoSettings::P_MAIN_TIMER]); personalize.addItem(MENU_MAIN, timerlist, &g_settings.personalize[SNeutrinoSettings::P_MAIN_TIMER]);

1
src/system/locals.h
View File

@@ -676,6 +676,7 @@ typedef enum
LOCALE_MAINMENU_SHUTDOWN, LOCALE_MAINMENU_SHUTDOWN,
LOCALE_MAINMENU_SLEEPTIMER, LOCALE_MAINMENU_SLEEPTIMER,
LOCALE_MAINMENU_TVMODE, LOCALE_MAINMENU_TVMODE,
LOCALE_MAINMENU_TVRADIO_SWITCH,
LOCALE_MAINSETTINGS_AUDIO, LOCALE_MAINSETTINGS_AUDIO,
LOCALE_MAINSETTINGS_HEAD, LOCALE_MAINSETTINGS_HEAD,
LOCALE_MAINSETTINGS_KEYBINDING, LOCALE_MAINSETTINGS_KEYBINDING,

1
src/system/locals_intern.h
View File

@@ -676,6 +676,7 @@ const char * locale_real_names[] =
"mainmenu.shutdown", "mainmenu.shutdown",
"mainmenu.sleeptimer", "mainmenu.sleeptimer",
"mainmenu.tvmode", "mainmenu.tvmode",
"mainmenu.tvradio_switch",
"mainsettings.audio", "mainsettings.audio",
"mainsettings.head", "mainsettings.head",
"mainsettings.keybinding", "mainsettings.keybinding",

1
src/system/settings.cpp
View File

@@ -39,6 +39,7 @@ const struct personalize_settings_t personalize_settings[SNeutrinoSettings::P_SE
//main menu //main menu
{"personalize_tv_mode" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_tv_mode" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
{"personalize_tv_radio_mode" , CPersonalizeGui::PERSONALIZE_MODE_NOTVISIBLE}, //toggle
{"personalize_radio_mode" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_radio_mode" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
{"personalize_timer" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_timer" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
{"personalize_media" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_media" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},

1
src/system/settings.h
View File

@@ -138,6 +138,7 @@ struct SNeutrinoSettings
//main menu //main menu
P_MAIN_TV_MODE, P_MAIN_TV_MODE,
P_MAIN_TV_RADIO_MODE, //togglemode
P_MAIN_RADIO_MODE, P_MAIN_RADIO_MODE,
P_MAIN_TIMER, P_MAIN_TIMER,
P_MAIN_MEDIA, P_MAIN_MEDIA,