[MPlayer-DOCS] r34785 - in trunk: DOCS/xml/de/skin.xml DOCS/xml/en/skin.xml Makefile gui/app.c gui/app.h gui/cfg.c gui/cfg.h gui/interface.c gui/skin/skin.c gui/ui/actions.c gui/ui/gmplayer.h gui/ui/gtk/menu.c gu...

Sat Mar 3 17:45:15 CET 2012

Author: ib
Date: Sat Mar  3 17:45:15 2012
New Revision: 34785

Log:
Rename sub window video window.

It was a bad idea to name the video window "sub window" at the time
the GUI was written. The term "sub window" does make sense from the
programmer's point of view, but it doesn't make any sense at all from
the user's point of view, because the sub window simply is the window
where the video will be displayed.

Moreover, since the term "sub" is generally short for "subtitles",
the renaming makes the code much easier to understand.

Modified:
   trunk/DOCS/xml/en/skin.xml
   trunk/help/help_mp-en.h

Changes in other areas also in this revision:
Added:
   trunk/gui/ui/video.c
      - copied, changed from r34780, trunk/gui/ui/sub.c
Deleted:
   trunk/gui/ui/sub.c
Modified:
   trunk/DOCS/xml/de/skin.xml
   trunk/Makefile
   trunk/gui/app.c
   trunk/gui/app.h
   trunk/gui/cfg.c
   trunk/gui/cfg.h
   trunk/gui/interface.c
   trunk/gui/skin/skin.c
   trunk/gui/ui/actions.c
   trunk/gui/ui/gmplayer.h
   trunk/gui/ui/gtk/menu.c
   trunk/gui/ui/gtk/preferences.c
   trunk/gui/ui/main.c
   trunk/gui/ui/playbar.c
   trunk/gui/ui/widgets.c
   trunk/gui/win32/dialogs.c
   trunk/gui/win32/dialogs.h
   trunk/gui/win32/gui.c
   trunk/gui/win32/gui.h
   trunk/gui/win32/interface.c
   trunk/gui/win32/preferences.c
   trunk/gui/win32/skinload.c
   trunk/gui/win32/skinload.h
   trunk/gui/win32/wincfg.c
   trunk/help/help_mp-de.h
   trunk/help/help_mp-zh_CN.h

Modified: trunk/DOCS/xml/en/skin.xml
==============================================================================

--- trunk/DOCS/xml/en/skin.xml	Sat Mar  3 15:03:18 2012	(r34784)
+++ trunk/DOCS/xml/en/skin.xml	Sat Mar  3 17:45:15 2012	(r34785)
@@ -20,7 +20,7 @@ for example), so it is up to you to crea
 <para>
 Currently there are four windows to be decorated: the
 <link linkend="skin-file-main">main window</link>, the
-<link linkend="skin-file-subwindow">subwindow</link>, the
+<link linkend="skin-file-subwindow">video window</link>, the
 <link linkend="skin-file-main">playbar</link>, and the
 <link linkend="skin-file-menu">skin menu</link>.
 
@@ -73,7 +73,7 @@ Currently there are four windows to be d
 </listitem>
 
 <listitem><para>
-  The <emphasis role="bold">subwindow</emphasis> is where the video appears. It
+  The <emphasis role="bold">video window</emphasis> is where the video appears. It
   can display a specified image if there is no movie loaded (it is quite boring
   to have an empty window :-)) <emphasis role="bold">Note:</emphasis>
   transparency is <emphasis role="bold">not allowed</emphasis> here.
@@ -142,7 +142,7 @@ You need the following files to build a 
   description files needed to draw labels).
 </para></listitem>
 <listitem><para>
-  The image to be displayed in the subwindow (optional).
+  The image to be displayed in the video window (optional).
 </para></listitem>
 <listitem><para>
   Two images for the skin menu (they are needed only if you want to create
@@ -206,7 +206,7 @@ where <replaceable>window name</replacea
   <emphasis role="bold">main</emphasis> - for the main window
 </para></listitem>
 <listitem><para>
-  <emphasis role="bold">sub</emphasis> - for the subwindow
+  <emphasis role="bold">video</emphasis> - for the video window
 </para></listitem>
 <listitem><para>
   <emphasis role="bold">playbar</emphasis> - for the playbar
@@ -218,8 +218,8 @@ where <replaceable>window name</replacea
 </para>
 
 <para>
-(The sub, playbar and menu blocks are optional - you do not need to decorate
-the subwindow, have a playbar or create a menu. A default menu is always
+(The video, playbar and menu blocks are optional - you do not need to decorate
+the video window, have a playbar or create a menu. A default menu is always
 available by a right mouse button click.)
 </para>
 
@@ -240,8 +240,8 @@ section = movieplayer
   ; ... items for main window ...
   end
 
-  window = sub
-  ; ... items for subwindow ...
+  window = video
+  ; ... items for video window ...
   end
 
   window = menu
@@ -266,7 +266,7 @@ and <literal>PNG</literal> are tried for
 </para>
 
 <para>
-Finally some words about positioning. The main window and the subwindow can be
+Finally some words about positioning. The main window and the video window can be
 placed in the different corners of the screen by giving <literal>X</literal>
 and <literal>Y</literal> coordinates. <literal>0</literal> is top or left,
 <literal>-1</literal> is center and <literal>-2</literal> is right or bottom, as
@@ -625,11 +625,11 @@ blocks.
 <!-- ********** -->
 
 <sect2 id="skin-file-subwindow">
-<title>Subwindow</title>
+<title>Video window</title>
 
 <para>
 The following entries can be used in the
-'<literal>window = sub</literal>' . . . '<literal>end</literal>' block.
+'<literal>window = video</literal>' . . . '<literal>end</literal>' block.
 </para>
 
 <variablelist>

Modified: trunk/help/help_mp-en.h
==============================================================================
--- trunk/help/help_mp-en.h	Sat Mar  3 15:03:18 2012	(r34784)
+++ trunk/help/help_mp-en.h	Sat Mar  3 17:45:15 2012	(r34785)
@@ -849,7 +849,7 @@ static const char help_text[]=
 #define MSGTR_PREFERENCES_PriorityNormal "normal"
 #define MSGTR_PREFERENCES_PriorityNormalAbove "above normal"
 #define MSGTR_PREFERENCES_PriorityNormalBelow "below normal"
-#define MSGTR_PREFERENCES_VideoInSubwin "Display videos in the sub window (DirectX only)"
+#define MSGTR_PREFERENCES_ShowInVideoWin "Display in the video window (DirectX only)"
 
 
 // ======================= video output drivers ========================
