# HG changeset patch
# User Darren Salt <[EMAIL PROTECTED]>
# Date 1170947290 0
# Node ID 6b7a13170fc6f50c240b5a663a2561bf2a2a8099
# Parent 8848f46699944a968424e44519cc610f2b2611e0
Move the windowed-mode blanking menu item into a new submenu in the View menu.
Remove a few menu separators.
Revert the post-proc menu item label changes.
diff -r 6b7a13170fc6f50c240b5a663a2561bf2a2a8099 -r
8848f46699944a968424e44519cc610f2b2611e0 ChangeLog
--- a/ChangeLog Thu Feb 08 15:08:10 2007 +0000
+++ b/ChangeLog Thu Feb 08 13:50:06 2007 +0000
@@ -33,6 +33,8 @@ 0.5.900:2007/??/??
demuxer for the logo image) at most once.
* Hopefully fixed a possible initialisation failure which would cause
various GDK "window != NULL" assertion failures and a segfault.
+ * Moved the windowed-mode blanking menu item into a new submenu in
+ the View menu.
0.5.11: 2007/02/01
[dsalt]
diff -r 6b7a13170fc6f50c240b5a663a2561bf2a2a8099 -r
8848f46699944a968424e44519cc610f2b2611e0 src/menu.c
--- a/src/menu.c Thu Feb 08 15:08:10 2007 +0000
+++ b/src/menu.c Thu Feb 08 13:50:06 2007 +0000
@@ -357,16 +357,17 @@ static const GtkActionEntry main_actions
{ "AspectMenu", NULL, N_("_Aspect ratio"),
NULL },
{ "VisMenu", NULL, N_("_Visualisations"),
NULL },
{ "SubsMenu", NULL, N_("_Subtitles"),
NULL },
+ { "ViewMisc", GTK_STOCK_PROPERTIES, N_("_Settings"),
NULL },
{ "VideoMenu", NULL, N_("V_ideo"),
NULL },
CB(VideoSettings, GTK_STOCK_PROPERTIES, /* Video */ N_("_Settings..."),
NULL),
{ "VideoConfigMenu", GTK_STOCK_PREFERENCES, N_("_Configure"),
NULL },
CB(DeinterlaceConf, NULL, N_("_Deinterlace..."),
NULL),
- CB(VideoPPConf, NULL, /* Video */
N_("_Post-processing..."),NULL),
+ CB(VideoPPConf, NULL, N_("_Video
post-processing..."),NULL),
{ "AudioMenu", NULL, N_("_Audio"),
NULL },
CB(AudioSettings, GTK_STOCK_PROPERTIES, /* Audio */ N_("_Settings..."),
NULL),
CB(AudioEq, GTK_STOCK_PROPERTIES, N_("_Equaliser..."),
NULL),
{ "AudioConfigMenu", GTK_STOCK_PREFERENCES, N_("_Configure"),
NULL },
- CB(AudioPPConf, NULL, /* Audio */
N_("_Post-processing..."),NULL),
+ CB(AudioPPConf, NULL, N_("_Audio
post-processing..."),NULL),
{ "MediaMenu", NULL, N_("_Media"),
NULL },
CB(MediaAdd, GTK_STOCK_NEW, N_("_Add media mark..."),
"<control>D"),
CB(MediaManage, GXINE_MEDIA_MARK, N_("_Manage media marks..."),
"<control>B"),
@@ -405,7 +406,7 @@ static GtkToggleActionEntry toggle_actio
CB(Deinterlace, NULL, N_("_Deinterlace"), "<control>I",
FALSE),
CB(VideoPP, NULL, N_("_Post-processing"), NULL,
FALSE),
CB(AudioPP, NULL, N_("_Post-processing"), NULL,
FALSE),
- CB(WMUnblank, NULL, N_("Prevent _blanking\nin windowed
mode"), NULL, FALSE),
+ CB(WMUnblank, NULL, N_("Prevent _blanking in windowed mode"),
NULL, FALSE),
};
static const char *const toggle_prefs[] = {
NULL, NULL, NULL, NULL, NULL,
@@ -532,7 +533,6 @@ static GtkWidget *add_menu_ui (GtkUIMana
"<menuitem action='VisNone' />\n"
"<placeholder name='VisItems' />\n"
"</menu>\n"
- "<separator />\n"
"<menu action='SubsMenu'>\n"
"<menuitem action='SubtitlesAuto' />\n"
"<menuitem action='SubtitlesNone' />\n"
@@ -553,6 +553,9 @@ static GtkWidget *add_menu_ui (GtkUIMana
"<menuitem action='Subtitles14' />\n"
"<menuitem action='Subtitles15' />\n"
"</menu>\n"
+ "<menu action='ViewMisc'>\n"
+ "<menuitem action='WMUnblank' />\n"
+ "</menu>\n"
"<separator />\n"
"<menuitem action='EngineLog' />\n"
"<menuitem action='JSConsole' />\n"
@@ -566,7 +569,6 @@ static GtkWidget *add_menu_ui (GtkUIMana
"<menuitem action='DeinterlaceConf' />\n"
"<menuitem action='VideoPPConf' />\n"
"</menu>\n"
- "<menuitem action='WMUnblank' />\n"
"</menu>\n"
"<menu action='AudioMenu'>\n"
"<menuitem action='AudioSettings' />\n"
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
