Mercurial > mplayer.hg

changeset 34324:58aaa0d8cc82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace evSetURL by evLoadURL for consistency. Maintain evSetURL for legacy reasons.
author ib
date Thu, 08 Dec 2011 17:11:52 +0000
parents 60aabad1ff2a
children fc74085e2487
files DOCS/xml/cs/skin.xml DOCS/xml/de/skin.xml DOCS/xml/en/skin.xml DOCS/xml/es/skin.xml DOCS/xml/fr/skin.xml DOCS/xml/hu/skin.xml DOCS/xml/pl/skin.xml DOCS/xml/ru/skin.xml gui/app.c gui/app.h gui/ui/gtk/menu.c gui/ui/main.c gui/win32/skinload.c gui/win32/skinload.h
diffstat 14 files changed, 16 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- 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 @@
 </varlistentry>
 
 <varlistentry>
-  <term><emphasis role="bold">evSetURL</emphasis></term>
+  <term><emphasis role="bold">evLoadURL</emphasis></term>
   <listitem><para>
   Zobrazí dialogové okno pro volbu URL.
   </para></listitem>
--- 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 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis role="bold">evSetURL</emphasis></term>
+        <term><emphasis role="bold">evLoadURL</emphasis></term>
         <listitem>
           <para>
             Zeigt das URL-Dialog-Fenster.
--- 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 @@
 </varlistentry>
 
 <varlistentry>
-  <term><emphasis role="bold">evSetURL</emphasis></term>
+  <term><emphasis role="bold">evLoadURL</emphasis></term>
   <listitem><para>
   Displays the URL dialog window.
   </para></listitem>
--- 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 @@
 </varlistentry>
 
 <varlistentry>
-  <term><emphasis role="bold">evSetURL</emphasis></term>
+  <term><emphasis role="bold">evLoadURL</emphasis></term>
   <listitem><para>
 Muestra la ventana de diálogo para URL.
     </para></listitem>
--- 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 @@
 </varlistentry>
 
 <varlistentry>
-  <term><emphasis role="bold">evSetURL</emphasis></term>
+  <term><emphasis role="bold">evLoadURL</emphasis></term>
   <listitem><para>
 Ouvre la fenêtre de saisie d'URL.
     </para></listitem>
--- 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 @@
 </varlistentry>
 
 <varlistentry>
-  <term><emphasis role="bold">evSetURL</emphasis></term>
+  <term><emphasis role="bold">evLoadURL</emphasis></term>
   <listitem><para>
   Megjeleníti az URL dialógus ablakot.
   </para></listitem>
--- 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 @@
 </varlistentry>
 
 <varlistentry>
-  <term><emphasis role="bold">evSetURL</emphasis></term>
+  <term><emphasis role="bold">evLoadURL</emphasis></term>
   <listitem><para>
 Wyświetl okienko dialogowe URL.
     </para></listitem>
--- 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 @@
 </varlistentry>
 
 <varlistentry>
-  <term><emphasis role="bold">evSetURL</emphasis></term>
+  <term><emphasis role="bold">evLoadURL</emphasis></term>
   <listitem><para>
   Отображает диалог ввода URL.
   </para></listitem>
--- 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"     },
--- 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
 
--- 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 );
--- 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;
 
--- 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"       },
--- 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