aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@gmail.com>2011-09-19 16:21:19 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-10-07 00:13:16 (GMT)
commit4d72813a4dcab436983a5e859a3f569454cc1532 (patch)
tree7991ce8a73f3df17612b6f80f769aff72bc434dd
parent2572f0f64cf80e6aaa54a8914d032e20d00a8db2 (diff)
Reorder menu
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--src/commands.c31
1 files changed, 18 insertions, 13 deletions
diff --git a/src/commands.c b/src/commands.c
index 0f72944..83de966 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -66,7 +66,7 @@ static menu_names_t menu_table[] = {
{ "favorites", MENU_FAVORITES, 0 },
};
-static int tvtime_num_builtin_menus( void )
+static inline int tvtime_num_builtin_menus( void )
{
return ( sizeof( menu_table ) / sizeof( menu_names_t ) );
}
@@ -1168,34 +1168,39 @@ commands_t *commands_new( config_t *cfg, videoinput_t *vidin,
menu_set_text( menu, 0, _("Setup") );
snprintf( string, sizeof( string ),
- TVTIME_ICON_STATIONMANAGEMENT " %s", _("Channel management") );
+ TVTIME_ICON_SCANFORSTATIONS " %s", _("Last Channel") );
menu_set_text( menu, 1, string );
- menu_set_enter_command( menu, 1, TVTIME_SHOW_MENU, "stations" );
+ menu_set_enter_command( menu, 1, TVTIME_CHANNEL_PREV, 0);
snprintf( string, sizeof( string ),
- TVTIME_ICON_INPUTCONF " %s", _("Input configuration") );
+ TVTIME_ICON_STATIONMANAGEMENT " %s", _("Channel management") );
menu_set_text( menu, 2, string );
- menu_set_enter_command( menu, 2, TVTIME_SHOW_MENU, "input" );
+ menu_set_enter_command( menu, 2, TVTIME_SHOW_MENU, "stations" );
snprintf( string, sizeof( string ),
- TVTIME_ICON_PICTURESETTINGS " %s", _("Picture settings") );
+ TVTIME_ICON_INPUTCONF " %s", _("Input configuration") );
menu_set_text( menu, 3, string );
- menu_set_enter_command( menu, 3, TVTIME_SHOW_MENU, "picture" );
+ menu_set_enter_command( menu, 3, TVTIME_SHOW_MENU, "input" );
snprintf( string, sizeof( string ),
- TVTIME_ICON_VIDEOPROCESSING " %s", _("Video processing") );
+ TVTIME_ICON_PICTURESETTINGS " %s", _("Picture settings") );
menu_set_text( menu, 4, string );
- menu_set_enter_command( menu, 4, TVTIME_SHOW_MENU, "processing" );
+ menu_set_enter_command( menu, 4, TVTIME_SHOW_MENU, "picture" );
snprintf( string, sizeof( string ),
- TVTIME_ICON_OUTPUTCONF " %s", _("Output configuration") );
+ TVTIME_ICON_VIDEOPROCESSING " %s", _("Video processing") );
menu_set_text( menu, 5, string );
- menu_set_enter_command( menu, 5, TVTIME_SHOW_MENU, "output" );
+ menu_set_enter_command( menu, 5, TVTIME_SHOW_MENU, "processing" );
snprintf( string, sizeof( string ),
- TVTIME_ICON_EXIT " %s", _("Exit menu") );
+ TVTIME_ICON_OUTPUTCONF " %s", _("Output configuration") );
menu_set_text( menu, 6, string );
- menu_set_enter_command( menu, 6, TVTIME_MENU_EXIT, 0 );
+ menu_set_enter_command( menu, 6, TVTIME_SHOW_MENU, "output" );
+
+ snprintf( string, sizeof( string ),
+ TVTIME_ICON_EXIT " %s", _("Quit") );
+ menu_set_text( menu, 7, string );
+ menu_set_enter_command( menu, 7, TVTIME_QUIT, 0);
commands_add_menu( cmd, menu );

Privacy Policy