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

widget/menu.*: add keyval_ext type

Browse Source 
instead of adding unneeded default values to all menuchooser options
just to cater for two special cases, add an extra version that does
not need a locale setting but instead takes a char* instead.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@129 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2009-12-31 09:34:53 +00:00
parent 7a554d8f54
commit 7dcf8fe14d
12 changed files with 373 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/gui/timerlist.cpp
View File

@@ -893,20 +893,20 @@ std::string CTimerList::convertChannelId2String(const t_channel_id id) // UTF-8
#define TIMERLIST_REPEAT_OPTION_COUNT 7
const CMenuOptionChooser::keyval TIMERLIST_REPEAT_OPTIONS[TIMERLIST_REPEAT_OPTION_COUNT] =
{
{ CTimerd::TIMERREPEAT_ONCE , LOCALE_TIMERLIST_REPEAT_ONCE ,0},
{ CTimerd::TIMERREPEAT_DAILY , LOCALE_TIMERLIST_REPEAT_DAILY ,0},
{ CTimerd::TIMERREPEAT_WEEKLY , LOCALE_TIMERLIST_REPEAT_WEEKLY ,0},
{ CTimerd::TIMERREPEAT_BIWEEKLY , LOCALE_TIMERLIST_REPEAT_BIWEEKLY ,0},
{ CTimerd::TIMERREPEAT_FOURWEEKLY , LOCALE_TIMERLIST_REPEAT_FOURWEEKLY ,0},
{ CTimerd::TIMERREPEAT_MONTHLY , LOCALE_TIMERLIST_REPEAT_MONTHLY ,0},
{ CTimerd::TIMERREPEAT_WEEKDAYS , LOCALE_TIMERLIST_REPEAT_WEEKDAYS ,0}
{ CTimerd::TIMERREPEAT_ONCE, LOCALE_TIMERLIST_REPEAT_ONCE },
{ CTimerd::TIMERREPEAT_DAILY, LOCALE_TIMERLIST_REPEAT_DAILY },
{ CTimerd::TIMERREPEAT_WEEKLY, LOCALE_TIMERLIST_REPEAT_WEEKLY },
{ CTimerd::TIMERREPEAT_BIWEEKLY, LOCALE_TIMERLIST_REPEAT_BIWEEKLY },
{ CTimerd::TIMERREPEAT_FOURWEEKLY, LOCALE_TIMERLIST_REPEAT_FOURWEEKLY },
{ CTimerd::TIMERREPEAT_MONTHLY, LOCALE_TIMERLIST_REPEAT_MONTHLY },
{ CTimerd::TIMERREPEAT_WEEKDAYS, LOCALE_TIMERLIST_REPEAT_WEEKDAYS }
};
#define TIMERLIST_STANDBY_OPTION_COUNT 2
const CMenuOptionChooser::keyval TIMERLIST_STANDBY_OPTIONS[TIMERLIST_STANDBY_OPTION_COUNT] =
{
{ 0 , LOCALE_TIMERLIST_STANDBY_OFF ,0},
{ 1 , LOCALE_TIMERLIST_STANDBY_ON ,0}
{ 0, LOCALE_TIMERLIST_STANDBY_OFF },
{ 1, LOCALE_TIMERLIST_STANDBY_ON }
};
#if 1
@@ -916,23 +916,23 @@ const CMenuOptionChooser::keyval TIMERLIST_STANDBY_OPTIONS[TIMERLIST_STANDBY_OPT
#endif
const CMenuOptionChooser::keyval TIMERLIST_TYPE_OPTIONS[TIMERLIST_TYPE_OPTION_COUNT] =
{
{ CTimerd::TIMER_SHUTDOWN , LOCALE_TIMERLIST_TYPE_SHUTDOWN ,0},
{ CTimerd::TIMER_SHUTDOWN, LOCALE_TIMERLIST_TYPE_SHUTDOWN },
#if 0
{ CTimerd::TIMER_NEXTPROGRAM, LOCALE_TIMERLIST_TYPE_NEXTPROGRAM },
{ CTimerd::TIMER_NEXTPROGRAM, LOCALE_TIMERLIST_TYPE_NEXTPROGRAM },
#endif
{ CTimerd::TIMER_ZAPTO , LOCALE_TIMERLIST_TYPE_ZAPTO ,0},
{ CTimerd::TIMER_STANDBY , LOCALE_TIMERLIST_TYPE_STANDBY ,0},
{ CTimerd::TIMER_RECORD , LOCALE_TIMERLIST_TYPE_RECORD ,0},
{ CTimerd::TIMER_SLEEPTIMER , LOCALE_TIMERLIST_TYPE_SLEEPTIMER ,0},
{ CTimerd::TIMER_REMIND , LOCALE_TIMERLIST_TYPE_REMIND ,0},
{ CTimerd::TIMER_EXEC_PLUGIN, LOCALE_TIMERLIST_TYPE_EXECPLUGIN ,0}
{ CTimerd::TIMER_ZAPTO, LOCALE_TIMERLIST_TYPE_ZAPTO },
{ CTimerd::TIMER_STANDBY, LOCALE_TIMERLIST_TYPE_STANDBY },
{ CTimerd::TIMER_RECORD, LOCALE_TIMERLIST_TYPE_RECORD },
{ CTimerd::TIMER_SLEEPTIMER, LOCALE_TIMERLIST_TYPE_SLEEPTIMER },
{ CTimerd::TIMER_REMIND, LOCALE_TIMERLIST_TYPE_REMIND },
{ CTimerd::TIMER_EXEC_PLUGIN, LOCALE_TIMERLIST_TYPE_EXECPLUGIN }
};
#define MESSAGEBOX_NO_YES_OPTION_COUNT 2
const CMenuOptionChooser::keyval MESSAGEBOX_NO_YES_OPTIONS[MESSAGEBOX_NO_YES_OPTION_COUNT] =
{
{ 0, LOCALE_MESSAGEBOX_NO ,0},
{ 1, LOCALE_MESSAGEBOX_YES ,0}
{ 0, LOCALE_MESSAGEBOX_NO },
{ 1, LOCALE_MESSAGEBOX_YES }
};
int CTimerList::modifyTimer()