# HG changeset patch # User ib # Date 1323364312 0 # Node ID 58aaa0d8cc82756a44abc72832bd4e1159b276d6 # Parent 60aabad1ff2a121712244218e971f0bf649d6cd2 Replace evSetURL by evLoadURL for consistency. Maintain evSetURL for legacy reasons. diff -r 60aabad1ff2a -r 58aaa0d8cc82 DOCS/xml/cs/skin.xml --- a/DOCS/xml/cs/skin.xml Thu Dec 08 16:37:42 2011 +0000 +++ b/DOCS/xml/cs/skin.xml Thu Dec 08 17:11:52 2011 +0000 @@ -938,7 +938,7 @@ - evSetURL + evLoadURL Zobrazí dialogové okno pro volbu URL. diff -r 60aabad1ff2a -r 58aaa0d8cc82 DOCS/xml/de/skin.xml --- a/DOCS/xml/de/skin.xml Thu Dec 08 16:37:42 2011 +0000 +++ b/DOCS/xml/de/skin.xml Thu Dec 08 17:11:52 2011 +0000 @@ -1058,7 +1058,7 @@ - evSetURL + evLoadURL Zeigt das URL-Dialog-Fenster. diff -r 60aabad1ff2a -r 58aaa0d8cc82 DOCS/xml/en/skin.xml --- a/DOCS/xml/en/skin.xml Thu Dec 08 16:37:42 2011 +0000 +++ b/DOCS/xml/en/skin.xml Thu Dec 08 17:11:52 2011 +0000 @@ -908,7 +908,7 @@ - evSetURL + evLoadURL Displays the URL dialog window. diff -r 60aabad1ff2a -r 58aaa0d8cc82 DOCS/xml/es/skin.xml --- a/DOCS/xml/es/skin.xml Thu Dec 08 16:37:42 2011 +0000 +++ b/DOCS/xml/es/skin.xml Thu Dec 08 17:11:52 2011 +0000 @@ -904,7 +904,7 @@ - evSetURL + evLoadURL Muestra la ventana de diálogo para URL. diff -r 60aabad1ff2a -r 58aaa0d8cc82 DOCS/xml/fr/skin.xml --- a/DOCS/xml/fr/skin.xml Thu Dec 08 16:37:42 2011 +0000 +++ b/DOCS/xml/fr/skin.xml Thu Dec 08 17:11:52 2011 +0000 @@ -883,7 +883,7 @@ - evSetURL + evLoadURL Ouvre la fenêtre de saisie d'URL. diff -r 60aabad1ff2a -r 58aaa0d8cc82 DOCS/xml/hu/skin.xml --- a/DOCS/xml/hu/skin.xml Thu Dec 08 16:37:42 2011 +0000 +++ b/DOCS/xml/hu/skin.xml Thu Dec 08 17:11:52 2011 +0000 @@ -911,7 +911,7 @@ - evSetURL + evLoadURL Megjeleníti az URL dialógus ablakot. diff -r 60aabad1ff2a -r 58aaa0d8cc82 DOCS/xml/pl/skin.xml --- a/DOCS/xml/pl/skin.xml Thu Dec 08 16:37:42 2011 +0000 +++ b/DOCS/xml/pl/skin.xml Thu Dec 08 17:11:52 2011 +0000 @@ -892,7 +892,7 @@ - evSetURL + evLoadURL Wyświetl okienko dialogowe URL. diff -r 60aabad1ff2a -r 58aaa0d8cc82 DOCS/xml/ru/skin.xml --- a/DOCS/xml/ru/skin.xml Thu Dec 08 16:37:42 2011 +0000 +++ b/DOCS/xml/ru/skin.xml Thu Dec 08 17:11:52 2011 +0000 @@ -940,7 +940,7 @@ - evSetURL + evLoadURL Отображает диалог ввода URL. diff -r 60aabad1ff2a -r 58aaa0d8cc82 gui/app.c --- a/gui/app.c Thu Dec 08 16:37:42 2011 +0000 +++ b/gui/app.c Thu Dec 08 17:11:52 2011 +0000 @@ -48,7 +48,8 @@ { evPlaylist, "evPlaylist" }, { evPlayVCD, "evPlayVCD" }, { evPlayDVD, "evPlayDVD" }, - { evSetURL, "evSetURL" }, + { evLoadURL, "evSetURL" }, // legacy + { evLoadURL, "evLoadURL" }, { evPlaySwitchToPause, "evPlaySwitchToPause" }, { evPauseSwitchToPlay, "evPauseSwitchToPlay" }, { evBackward10sec, "evBackward10sec" }, diff -r 60aabad1ff2a -r 58aaa0d8cc82 gui/app.h --- a/gui/app.h Thu Dec 08 16:37:42 2011 +0000 +++ b/gui/app.h Thu Dec 08 17:11:52 2011 +0000 @@ -39,7 +39,7 @@ #define evPlaylist 10 #define evPlayVCD 40 #define evPlayDVD 39 -#define evSetURL 5013 +#define evLoadURL 5013 #define evPlaySwitchToPause 16 #define evPauseSwitchToPlay 17 diff -r 60aabad1ff2a -r 58aaa0d8cc82 gui/ui/gtk/menu.c --- a/gui/ui/gtk/menu.c Thu Dec 08 16:37:42 2011 +0000 +++ b/gui/ui/gtk/menu.c Thu Dec 08 17:11:52 2011 +0000 @@ -431,7 +431,7 @@ #ifdef CONFIG_DVDREAD AddMenuItem( window1, (const char*)playdvd_xpm, SubMenu,MSGTR_MENU_PlayDVD, evPlayDVD ); #endif - AddMenuItem( window1, (const char*)url_xpm, SubMenu,MSGTR_MENU_PlayURL, evSetURL ); + AddMenuItem( window1, (const char*)url_xpm, SubMenu,MSGTR_MENU_PlayURL, evLoadURL ); AddMenuItem( window1, (const char*)sub_xpm, SubMenu,MSGTR_MENU_LoadSubtitle" ", evLoadSubtitle ); AddMenuItem( window1, (const char*)nosub_xpm, SubMenu,MSGTR_MENU_DropSubtitle,evDropSubtitle ); AddMenuItem( window1, (const char*)loadeaf_xpm, SubMenu,MSGTR_MENU_LoadExternAudioFile, evLoadAudioFile ); diff -r 60aabad1ff2a -r 58aaa0d8cc82 gui/ui/main.c --- a/gui/ui/main.c Thu Dec 08 16:37:42 2011 +0000 +++ b/gui/ui/main.c Thu Dec 08 17:11:52 2011 +0000 @@ -144,7 +144,7 @@ mplayer( MPLAYER_EXIT_GUI, EXIT_QUIT, 0 ); break; - case evSetURL: + case evLoadURL: gtkShow( evPlayNetwork,NULL ); break; diff -r 60aabad1ff2a -r 58aaa0d8cc82 gui/win32/skinload.c --- a/gui/win32/skinload.c Thu Dec 08 16:37:42 2011 +0000 +++ b/gui/win32/skinload.c Thu Dec 08 17:11:52 2011 +0000 @@ -59,7 +59,8 @@ { evPlaylist, "evPlaylist" }, { evPlayVCD, "evPlayVCD" }, { evPlayDVD, "evPlayDVD" }, - { evSetURL, "evSetURL" }, + { evLoadURL, "evSetURL" }, // legacy + { evLoadURL, "evLoadURL" }, { evPlaySwitchToPause, "evPlaySwitchToPause" }, { evPauseSwitchToPlay, "evPauseSwitchToPlay" }, { evBackward10sec, "evBackward10sec" }, diff -r 60aabad1ff2a -r 58aaa0d8cc82 gui/win32/skinload.h --- a/gui/win32/skinload.h Thu Dec 08 16:37:42 2011 +0000 +++ b/gui/win32/skinload.h Thu Dec 08 17:11:52 2011 +0000 @@ -146,7 +146,7 @@ #define evPlaylist 10 #define evPlayVCD 40 #define evPlayDVD 39 -#define evSetURL 5013 +#define evLoadURL 5013 #define evPlaySwitchToPause 16 #define evPauseSwitchToPlay 17