Menu
▾
▴
[xine-cvs] CVS: gnome-xine/src menu.c,1.41,1.42
|
From: Darren S. <ds...@us...> - 2005-03-09 19:58:38
|
Update of /cvsroot/xine/gnome-xine/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21648/src Modified Files: menu.c Log Message: Move some video and audio items into their own top-level menu. Adjust a little for the new settings window layout. Index: menu.c =================================================================== RCS file: /cvsroot/xine/gnome-xine/src/menu.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- menu.c 13 Jan 2005 19:55:21 -0000 1.41 +++ menu.c 9 Mar 2005 19:58:25 -0000 1.42 @@ -213,9 +213,11 @@ JS_CB_ZOOM_IN, JS_CB_ZOOM_OUT, JS_CB_ZOOM_100, - JS_CB_AV_SETTINGS, + JS_CB_VIDEO_SETTINGS, JS_CB_POSTPROC_DEINTERLACE, JS_CB_POSTPROC_VIDEO, + JS_CB_AUDIO_SETTINGS, + JS_CB_EQUALISER, JS_CB_POSTPROC_AUDIO, /* Media */ JS_CB_MEDIAMARKS_ADD, @@ -245,9 +247,11 @@ [JS_CB_ZOOM_IN] = "set_zoom (get_zoom()+5);", [JS_CB_ZOOM_OUT] = "set_zoom (get_zoom()-5);", [JS_CB_ZOOM_100] = "set_zoom (100);", - [JS_CB_AV_SETTINGS] = "settings_show ();", + [JS_CB_VIDEO_SETTINGS] = "settings_show (0);", [JS_CB_POSTPROC_DEINTERLACE] = "deinterlace_show ();", [JS_CB_POSTPROC_VIDEO] = "postproc_video_show ();", + [JS_CB_AUDIO_SETTINGS] = "settings_show (1);", + [JS_CB_EQUALISER] = "settings_show (2);", [JS_CB_POSTPROC_AUDIO] = "postproc_audio_show ();", /* Media */ [JS_CB_MEDIAMARKS_ADD] = "mm_add_show ();", @@ -370,20 +374,12 @@ { N_("/View/Zoom _out"), NULL, JS(ZOOM_OUT), STOCK(ZOOM_OUT) }, { N_("/View/_Zoom 100%"), NULL, JS(ZOOM_100), STOCK(ZOOM_100) }, { "/View/sep5", NULL, NULL, 0, "<Separator>" }, - { N_("/View/_Deinterlace"), "<control>I", JSTOGGLE(DEINTERLACE), "<CheckItem>" }, { N_("/View/_Aspect ratio"), NULL, NULL, 0, "<Branch>" }, { N_("/View/Aspect ratio/_Auto"), NULL, ASPECT(AUTO), "<RadioItem>" }, { N_("/View/Aspect ratio/_Square"), NULL, ASPECT(SQUARE), "/View/Aspect ratio/Auto"}, { N_("/View/Aspect ratio/_4:3"), NULL, ASPECT(4_3), "/View/Aspect ratio/Auto"}, { N_("/View/Aspect ratio/_16:9"), NULL, ASPECT(ANAMORPHIC), "/View/Aspect ratio/Auto"}, { N_("/View/Aspect ratio/_2:1"), NULL, ASPECT(DVB), "/View/Aspect ratio/Auto"}, - { N_("/View/A\\/V _settings..."), NULL, JS(AV_SETTINGS), NULL }, - { N_("/View/_Post-processing"), NULL, NULL, 0, "<Branch>" }, - { N_("/View/Post-processing/_Deinterlace..."), NULL, JS(POSTPROC_DEINTERLACE), STOCK(PREFERENCES) }, - { N_("/View/Post-processing/_Video..."), NULL, JS(POSTPROC_VIDEO), STOCK(PREFERENCES) }, - { N_("/View/Post-processing/_Audio..."), NULL, JS(POSTPROC_AUDIO), STOCK(PREFERENCES) }, - { N_("/View/Post-processing/Enable _video"), NULL, JSTOGGLE(POSTPROC_VIDEO), "<CheckItem>" }, - { N_("/View/Post-processing/Enable _audio"), NULL, JSTOGGLE(POSTPROC_AUDIO), "<CheckItem>" }, { "/View/sep6", NULL, NULL, 0, "<Separator>" }, { N_("/View/_Visualisations"), NULL, NULL, 0, "<Branch>" }, { N_("/View/Visualisations/_None"), NULL, vis_none_cb, 0, "<RadioItem>"}, @@ -399,6 +395,19 @@ { N_("/View/Subtitles/Channel _5"), NULL, sub_cb, 5, "/View/Subtitles/Auto"}, { N_("/View/Subtitles/Channel _6"), NULL, sub_cb, 6, "/View/Subtitles/Auto"}, { N_("/View/Subtitles/Channel _7"), NULL, sub_cb, 7, "/View/Subtitles/Auto"}, + { N_("/V_ideo"), NULL, NULL, 0, "<Branch>" }, + { N_("/Video/_Settings..."), NULL, JS(VIDEO_SETTINGS), STOCK(SELECT_COLOR) }, + { N_("/Video/_Deinterlace"), "<control>I", JSTOGGLE(DEINTERLACE), "<CheckItem>" }, + { N_("/Video/_Post-processing"), NULL, JSTOGGLE(POSTPROC_VIDEO), "<CheckItem>" }, + { N_("/Video/_Configure"), NULL, NULL, 0, "<Branch>" }, + { N_("/Video/Configure/_Deinterlace..."), NULL, JS(POSTPROC_DEINTERLACE), STOCK(PREFERENCES) }, + { N_("/Video/Configure/_Post-processing..."), NULL, JS(POSTPROC_VIDEO), STOCK(PREFERENCES) }, + { N_("/_Audio"), NULL, NULL, 0, "<Branch>" }, + { N_("/Audio/_Settings..."), NULL, JS(AUDIO_SETTINGS), STOCK(PREFERENCES) }, + { N_("/Audio/_Equaliser..."), NULL, JS(EQUALISER), STOCK(PREFERENCES) }, + { N_("/Audio/_Post-processing"), NULL, JSTOGGLE(POSTPROC_AUDIO), "<CheckItem>" }, + { N_("/Audio/_Configure"), NULL, NULL, 0, "<Branch>" }, + { N_("/Audio/Configure/_Post-processing..."), NULL, JS(POSTPROC_AUDIO), STOCK(PREFERENCES) }, { N_("/_Media"), NULL, NULL, 0, "<Branch>" }, { N_("/Media/_Add media mark..."), "<control>D", JS(MEDIAMARKS_ADD), STOCK(NEW) }, { N_("/Media/_Manage media marks..."), "<control>B", JS(MEDIAMARKS_MANAGE), NULL }, @@ -469,17 +478,17 @@ fullscreen_menu_item[i] = GTK_CHECK_MENU_ITEM (gtk_item_factory_get_item (item_factory[i], "/View/Fullscreen mode")); - deinterlace_menu_item[i] = GTK_CHECK_MENU_ITEM (gtk_item_factory_get_item (item_factory[i], "/View/Deinterlace")); + deinterlace_menu_item[i] = GTK_CHECK_MENU_ITEM (gtk_item_factory_get_item (item_factory[i], "/Video/Deinterlace")); if (xine_config_lookup_entry (xine, "gui.post_plugins.deinterlace_enable", &entry)) deinterlace_menu_item[i]->active = entry.num_value; - pp_video_menu_item[i] = GTK_CHECK_MENU_ITEM (gtk_item_factory_get_item (item_factory[i], "/View/Post-processing/Enable video")); + pp_video_menu_item[i] = GTK_CHECK_MENU_ITEM (gtk_item_factory_get_item (item_factory[i], "/Video/Post-processing")); if (xine_config_lookup_entry (xine, "gui.post_plugins.video_enable", &entry)) pp_video_menu_item[i]->active = entry.num_value; - pp_audio_menu_item[i] = GTK_CHECK_MENU_ITEM (gtk_item_factory_get_item (item_factory[i], "/View/Post-processing/Enable audio")); + pp_audio_menu_item[i] = GTK_CHECK_MENU_ITEM (gtk_item_factory_get_item (item_factory[i], "/Audio/Post-processing")); if (xine_config_lookup_entry (xine, "gui.post_plugins.audio_enable", &entry)) pp_audio_menu_item[i]->active = entry.num_value; |