* Events are even better, not yet perfect !

modules/gui/skins/controls/button.cpp

@@ -2,7 +2,7 @@
  * button.cpp: Button control
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: button.cpp,v 1.5 2003/04/11 21:19:49 videolan Exp $
+ * $Id: button.cpp,v 1.6 2003/04/15 20:33:58 karibu Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -170,6 +170,7 @@ bool ControlButton::MouseDown( int x, int y, int button )
             ParentWindow->Refresh( Left, Top, Width, Height );
             return true;
         }
+        fprintf( stderr, "button\n" );
     }
 
     return false;

modules/gui/skins/controls/image.cpp

@@ -2,7 +2,7 @@
  * image.cpp: Image control
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: image.cpp,v 1.3 2003/04/13 22:55:15 asmax Exp $
+ * $Id: image.cpp,v 1.4 2003/04/15 20:33:58 karibu Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -84,7 +84,7 @@ void ControlImage::Draw( int x, int y, int w, int h, Graphics *dest )
 {
     if( !Visible )
         return;
-       
+
     int xI, yI, wI, hI;
     if( GetIntersectRgn(x, y, w, h, Left, Top, Width, Height, xI, yI, wI, hI ) )
         Img[0]->DrawBitmap( xI-Left, yI-Top, wI, hI, xI-x, yI-y, dest );

modules/gui/skins/gtk2/gtk2_api.cpp

@@ -2,7 +2,7 @@
  * gtk2_api.cpp: Various gtk2-specific functions
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: gtk2_api.cpp,v 1.6 2003/04/15 17:55:49 ipkiss Exp $
+ * $Id: gtk2_api.cpp,v 1.7 2003/04/15 20:33:58 karibu Exp $
  *
  * Authors: Cyril Deguet  <asmax@videolan.org>
  *
@@ -65,7 +65,10 @@ void OSAPI_PostMessage( Window *win, unsigned int message, unsigned int param1,
     event->data.l[1] = param1;
     event->data.l[2] = param2;
 
-    fprintf( stderr, "======= message %i\n", message );
+    if( message == VLC_HIDE )
+    {
+        fprintf( stderr, "======= message %i\n", message );
+    }
 
     gdk_event_put( (GdkEvent *)event );
 
@@ -127,14 +130,7 @@ void OSAPI_GetMousePos( int &x, int &y )
 //---------------------------------------------------------------------------
 string OSAPI_GetWindowTitle( Window *win )
 {
-//    char *buffer = new char[MAX_PARAM_SIZE];
-//    GetWindowText( ((GTK2Window *)win)->GetHandle(), buffer, MAX_PARAM_SIZE );
-//    string Title = buffer;
-/* FIXME */
-string Title = "";
-//    delete buffer;
-
-    return Title;
+    return ( (GTK2Window *)win )->GetName();
 }
 //---------------------------------------------------------------------------
 bool OSAPI_RmDir( string path )

modules/gui/skins/gtk2/gtk2_bitmap.cpp

@@ -2,7 +2,7 @@
  * gtk2_bitmap.cpp: GTK2 implementation of the Bitmap class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: gtk2_bitmap.cpp,v 1.8 2003/04/15 01:19:11 ipkiss Exp $
+ * $Id: gtk2_bitmap.cpp,v 1.9 2003/04/15 20:33:58 karibu Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -172,12 +172,30 @@ void GTK2Bitmap::DrawBitmap( int x, int y, int w, int h, int xRef, int yRef,
 //---------------------------------------------------------------------------
 bool GTK2Bitmap::Hit( int x, int y)
 {
-/*    unsigned int c = GetPixel( bmpDC, x, y );
-    if( c == AlphaColor || c == CLR_INVALID )
+    if( x < 0 || x >= Width || y < 0 || y >= Height )
+        return false;
+
+    guchar *pixels;
+    int rowstride, offset;
+    gboolean has_alpha;
+
+    rowstride = gdk_pixbuf_get_rowstride( Bmp );
+    pixels    = gdk_pixbuf_get_pixels( Bmp );
+    has_alpha = gdk_pixbuf_get_has_alpha( Bmp );
+
+    offset = y * rowstride + ( x * (has_alpha ? 4 : 3) );
+
+    int r = pixels [offset];
+    int g = pixels [offset + 1];
+    int b = pixels [offset + 2];
+    unsigned int c = r + g * 256 + b * 65536;
+    /* If has_alpha == TRUE, then the alpha component is in
+       pixels [offset + 3] */
+
+    if( c == AlphaColor )
         return false;
     else
         return true;
-*/
 }
 //---------------------------------------------------------------------------
 int GTK2Bitmap::GetBmpPixel( int x, int y )

modules/gui/skins/gtk2/gtk2_event.cpp

@@ -2,7 +2,7 @@
  * gtk2_event.cpp: GTK2 implementation of the Event class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: gtk2_event.cpp,v 1.5 2003/04/15 17:55:49 ipkiss Exp $
+ * $Id: gtk2_event.cpp,v 1.6 2003/04/15 20:33:58 karibu Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -68,7 +68,6 @@ GTK2Event::~GTK2Event()
 //---------------------------------------------------------------------------
 bool GTK2Event::SendEvent()
 {
-    fprintf( stderr, "++++++++++++++++ %i\n", Message );
     if( Message != VLC_NOTHING )
     {
         // Find window matching with gwnd
@@ -120,11 +119,13 @@ GdkWindow *GTK2Event::GetWindowFromName( string name )
 {
     GTK2Window *win = (GTK2Window *)
         p_intf->p_sys->p_theme->GetWindow( name );
-    if( win == NULL ) 
+
+    if( win == NULL )
     {
         return NULL;
     }
-    else {
+    else
+    {
         return win->GetHandle();
     }
 }

modules/gui/skins/gtk2/gtk2_run.cpp

@@ -2,7 +2,7 @@
  * gtk2_run.cpp:
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: gtk2_run.cpp,v 1.6 2003/04/15 17:55:49 ipkiss Exp $
+ * $Id: gtk2_run.cpp,v 1.7 2003/04/15 20:33:58 karibu Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -69,25 +69,25 @@ int  SkinManage( intf_thread_t *p_intf );
 void GTK2Proc( GdkEvent *event, gpointer data )
 {
     // Get pointer to thread info
-    intf_thread_t *p_intf = (intf_thread_t *)data;
-    VlcProc *Proc = new VlcProc( p_intf );
+    unsigned int msg;
+    VlcProc *proc = (VlcProc *)data;
+    intf_thread_t *p_intf = proc->GetpIntf();
 
     list<Window *>::const_iterator win;
     GdkWindow *gwnd = ((GdkEventAny *)event)->window;
 
-    fprintf( stderr, "------ %li\n", (long int)gwnd );
-
-    // If doesn't exist, treat windows message normally
-//    if( p_intf == NULL )
-//        return DefWindowProc( hwnd, uMsg, wParam, lParam );
+    if( event->type == GDK_CLIENT_EVENT )
+        msg = ( (GdkEventClient *)event )->data.l[0];
+    else
+        msg = event->type;
 
     // Create event to dispatch in windows
     Event *evt = (Event *)new OSEvent( p_intf, ((GdkEventAny *)event)->window,
-                                       event->type, 0, (long)event );
+                                       msg, 0, (long)event );
 
-    if( IsVLCEvent( event->type ) )
+    if( IsVLCEvent( msg ) )
     {
-        if( !Proc->EventProc( evt ) )
+        if( !proc->EventProc( evt ) )
             return;      // Exit VLC !
     }
     else if( gwnd == NULL )
@@ -122,7 +122,6 @@ void GTK2Proc( GdkEvent *event, gpointer data )
     }
 
     delete (OSEvent *)evt;
-    delete Proc;
 
 #if 0
     // If Window is parent window
@@ -166,7 +165,10 @@ void GTK2Proc( GdkEvent *event, gpointer data )
 //---------------------------------------------------------------------------
 void OSRun( intf_thread_t *p_intf )
 {
-    gdk_event_handler_set( GTK2Proc, (gpointer)p_intf, NULL );
+    // Create VLC event object processing
+    VlcProc *proc = new VlcProc( p_intf );
+
+    gdk_event_handler_set( GTK2Proc, (gpointer)proc, NULL );
 
     // Main event loop
     GMainLoop *loop = g_main_loop_new( NULL, TRUE );

modules/gui/skins/gtk2/gtk2_theme.cpp

@@ -2,7 +2,7 @@
  * gtk2_theme.cpp: GTK2 implementation of the Theme class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: gtk2_theme.cpp,v 1.11 2003/04/15 16:42:02 karibu Exp $
+ * $Id: gtk2_theme.cpp,v 1.12 2003/04/15 20:33:58 karibu Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -242,15 +242,16 @@ void GTK2Theme::AddWindow( string name, int x, int y, bool visible,
         fadetime, alpha, movealpha, dragdrop ) ) ;*/
 
     GdkWindowAttr attr;
+    attr.title = (gchar *)name.c_str();
     attr.event_mask = GDK_ALL_EVENTS_MASK;
     attr.width = 0;
     attr.height = 0;
     attr.window_type = GDK_WINDOW_TOPLEVEL;
     attr.wclass = GDK_INPUT_OUTPUT;
     attr.override_redirect = TRUE;
-    
+
     gint mask = GDK_WA_NOREDIR;
-    
+
     // Create the window
     GdkWindow *gwnd = gdk_window_new( NULL, &attr, mask );
     if( !gwnd )
@@ -258,11 +259,11 @@ void GTK2Theme::AddWindow( string name, int x, int y, bool visible,
         msg_Err( p_intf, "CreateWindow failed" );
         return;
     }
-    
+
     gdk_window_show( gwnd );
-    
+
     WindowList.push_back( (Window *)new OSWindow( p_intf, gwnd, x, y, visible,
-        fadetime, alpha, movealpha, dragdrop ) ) ;
+        fadetime, alpha, movealpha, dragdrop, name ) ) ;
 
 }
 //---------------------------------------------------------------------------

modules/gui/skins/gtk2/gtk2_window.cpp

@@ -2,7 +2,7 @@
  * gtk2_window.cpp: GTK2 implementation of the Window class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: gtk2_window.cpp,v 1.14 2003/04/15 17:55:49 ipkiss Exp $
+ * $Id: gtk2_window.cpp,v 1.15 2003/04/15 20:33:58 karibu Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -64,7 +64,7 @@ SLWA SetLayeredWindowAttributes =
 //---------------------------------------------------------------------------
 GTK2Window::GTK2Window( intf_thread_t *p_intf, GdkWindow *gwnd, int x, int y,
     bool visible, int transition, int normalalpha, int movealpha,
-    bool dragdrop )
+    bool dragdrop, string name )
     : Window( p_intf, x, y, visible, transition, normalalpha, movealpha,
               dragdrop )
 {
@@ -72,6 +72,8 @@ GTK2Window::GTK2Window( intf_thread_t *p_intf, GdkWindow *gwnd, int x, int y,
     gWnd           = gwnd;
     gc = gdk_gc_new( gwnd );
 
+    Name        = name;
+
     LButtonDown = false;
     RButtonDown = false;
 /*
@@ -168,7 +170,6 @@ bool GTK2Window::ProcessOSEvent( Event *evt )
             RefreshFromImage( 0, 0, Width, Height );
             return true;
 
-
         case GDK_MOTION_NOTIFY:
             if( LButtonDown )
                 MouseMove( (int)( (GdkEventButton *)p2 )->x,
@@ -231,14 +232,6 @@ bool GTK2Window::ProcessOSEvent( Event *evt )
             OSAPI_PostMessage( this, WINDOW_LEAVE, 0, 0 );
             return true;
 /*
-        case WM_RBUTTONDOWN:
-            MouseDown( LOWORD( p2 ), HIWORD( p2 ), 2 );
-            return true;
-
-        case WM_RBUTTONUP:
-            MouseUp( LOWORD( p2 ), HIWORD( p2 ), 2 );
-            return true;
-
         case WM_LBUTTONDBLCLK:
             MouseDblClick( LOWORD( p2 ), HIWORD( p2 ), 1 );
             return true;
@@ -285,7 +278,6 @@ void GTK2Window::WindowManualMove()
     p_intf->p_sys->p_theme->MoveSkinMagnet( this,
         WindowX + x - CursorX, WindowY + y - CursorY );
 
-    fprintf( stderr, "---------\n" );
 }
 //---------------------------------------------------------------------------
 void GTK2Window::WindowManualMoveInit()

modules/gui/skins/gtk2/gtk2_window.h

@@ -2,7 +2,7 @@
  * gtk2_window.h: GTK2 implementation of the Window class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: gtk2_window.h,v 1.4 2003/04/15 01:19:11 ipkiss Exp $
+ * $Id: gtk2_window.h,v 1.5 2003/04/15 20:33:58 karibu Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -44,6 +44,7 @@ class GTK2Window : public Window
         int CursorY;
         int WindowX;
         int WindowY;
+        string Name;
 
         // Tooltip texts
         GdkWindow *ToolTipWindow;
@@ -60,7 +61,7 @@ class GTK2Window : public Window
         // Cosntructors
         GTK2Window( intf_thread_t *_p_intf, GdkWindow *gwnd, int x, int y,
             bool visible, int transition, int normalalpha, int movealpha,
-            bool dragdrop );
+            bool dragdrop, string name );
 
         // Destructors
         virtual ~GTK2Window();
@@ -84,6 +85,9 @@ class GTK2Window : public Window
 
         // Tooltip texts
         virtual void ChangeToolTipText( string text );
+
+        // Getters
+        string GetName() { return Name; }
 };
 //---------------------------------------------------------------------------
 

modules/gui/skins/src/vlcproc.h

@@ -2,7 +2,7 @@
  * vlcproc.h: VlcProc class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: vlcproc.h,v 1.3 2003/04/14 10:00:39 karibu Exp $
+ * $Id: vlcproc.h,v 1.4 2003/04/15 20:33:58 karibu Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -69,6 +69,9 @@ class VlcProc
         bool EventProc( Event *evt );
         bool EventProcEnd();
         bool IsClosing();
+
+        // Getters
+        intf_thread_t *GetpIntf() { return p_intf; };
 };
 //---------------------------------------------------------------------------
 

modules/gui/skins/src/window.cpp

@@ -2,7 +2,7 @@
  * window.cpp: Window class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: window.cpp,v 1.10 2003/04/15 16:42:02 karibu Exp $
+ * $Id: window.cpp,v 1.11 2003/04/15 20:33:58 karibu Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -309,9 +309,6 @@ void Window::RefreshAll()
 void Window::MouseDown( int x, int y, int button )
 {
     // Checking event in controls
-
-    fprintf( stderr, "  -> mousedown\n" );
-
     for( int i = ControlList.size() - 1; i >= 0 ; i-- )
     {
         if( ControlList[i]->MouseDown( x, y, button ) )
@@ -319,6 +316,7 @@ void Window::MouseDown( int x, int y, int button )
             return;
         }
     }
+
 }
 //---------------------------------------------------------------------------
 void Window::MouseMove( int x, int y, int button  )
@@ -384,8 +382,6 @@ void Window::MouseUp( int x, int y, int button )
         WindowMoving = false;
     }
 
-    fprintf( stderr, "  -> mouseup\n" );
-
     // Checking event in controls
     for( i = ControlList.size() - 1; i >= 0 ; i-- )
     {

po/de.po

@@ -913,28 +913,27 @@ msgstr ""
 "anhalten\n"
 "  vlc:quit                       VLC beenden\n"
 
-#: modules/misc/dummy/dummy.c:59 src/libvlc.h:444
+#: src/libvlc.h:444 modules/misc/dummy/dummy.c:59
 msgid "Interface"
 msgstr "Oberflche"
 
-#: modules/audio_output/coreaudio.c:224 modules/audio_output/file.c:108
-#: modules/demux/asf/asf.c:218 modules/demux/ogg.c:553 modules/demux/ogg.c:812
-#: modules/demux/ogg.c:985 modules/gui/gtk/gnome_interface.c:1133
-#: modules/gui/gtk/gtk_interface.c:1260 modules/gui/macosx/intf.m:337
-#: src/libvlc.h:461
+#: src/libvlc.h:461 modules/audio_output/coreaudio.c:224
+#: modules/audio_output/file.c:108 modules/demux/asf/asf.c:218
+#: modules/demux/ogg.c:553 modules/demux/ogg.c:812 modules/demux/ogg.c:985
+#: modules/gui/gtk/gnome_interface.c:1133 modules/gui/gtk/gtk_interface.c:1260
+#: modules/gui/macosx/intf.m:337
 msgid "Audio"
 msgstr "Ton"
 
-#: modules/demux/asf/asf.c:288 modules/demux/avi/avi.c:1040
+#: src/libvlc.h:477 modules/demux/asf/asf.c:288 modules/demux/avi/avi.c:1040
 #: modules/demux/ogg.c:612 modules/demux/ogg.c:652 modules/demux/ogg.c:717
 #: modules/demux/ogg.c:892 modules/gui/gtk/gnome_interface.c:1140
 #: modules/gui/gtk/gtk_interface.c:1337 modules/gui/macosx/intf.m:344
 #: modules/misc/dummy/dummy.c:77 modules/video_output/directx/directx.c:110
-#: src/libvlc.h:477
 msgid "Video"
 msgstr "Bild"
 
-#: modules/access/satellite/satellite.c:66 src/libvlc.h:497
+#: src/libvlc.h:497 modules/access/satellite/satellite.c:66
 msgid "Input"
 msgstr "Input"
 
@@ -946,10 +945,10 @@ msgstr "Dekoder"
 msgid "Encoders"
 msgstr "Encoder"
 
-#: modules/gui/gtk/gnome_interface.c:2149 modules/gui/gtk/gtk_interface.c:2468
-#: modules/gui/gtk/gtk_interface.c:3150 modules/gui/win32/strings.cpp:221
-#: modules/gui/wxwindows/open.cpp:177 modules/gui/wxwindows/streamout.cpp:129
-#: src/libvlc.h:539
+#: src/libvlc.h:539 modules/gui/gtk/gnome_interface.c:2149
+#: modules/gui/gtk/gtk_interface.c:2468 modules/gui/gtk/gtk_interface.c:3150
+#: modules/gui/win32/strings.cpp:221 modules/gui/wxwindows/open.cpp:177
+#: modules/gui/wxwindows/streamout.cpp:129
 msgid "Stream output"
 msgstr "Stream-Ausgabe"
 
@@ -957,24 +956,24 @@ msgstr "Stream-Ausgabe"
 msgid "CPU"
 msgstr "Prozessor"
 
-#: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:648
+#: src/libvlc.h:564 modules/gui/familiar/interface.c:610
+#: modules/gui/gtk/gnome_interface.c:648
 #: modules/gui/gtk/gnome_interface.c:2500
 #: modules/gui/gtk/gnome_interface.c:2525 modules/gui/gtk/gtk_interface.c:752
 #: modules/gui/gtk/gtk_interface.c:2813 modules/gui/macosx/intf.m:281
 #: modules/gui/macosx/intf.m:356 modules/gui/win32/strings.cpp:120
 #: modules/gui/win32/strings.cpp:180 modules/gui/wxwindows/interface.cpp:289
-#: src/libvlc.h:564
 msgid "Playlist"
 msgstr "Wiedergabeliste"
 
-#: modules/audio_filter/converter/a52tofloat32.c:85
+#: src/libvlc.h:571 modules/audio_filter/converter/a52tofloat32.c:85
 #: modules/audio_filter/converter/mpgatofixed32.c:60
 #: modules/codec/a52old/a52old.c:59 modules/codec/mpeg_video/parser.c:84
 #: modules/demux/mpeg/ts.c:118 modules/gui/familiar/familiar.c:70
 #: modules/gui/win32/win32.cpp:312 modules/misc/logger/logger.c:88
 #: modules/video_filter/motionblur.c:58 modules/video_filter/transform.c:63
 #: modules/video_filter/wall.c:66 modules/video_output/ggi.c:62
-#: modules/video_output/mga/xmga.c:104 src/libvlc.h:571
+#: modules/video_output/mga/xmga.c:104
 msgid "Miscellaneous"
 msgstr "Sonstiges"
 
@@ -1010,13 +1009,13 @@ msgstr "boolesch"
 msgid "Reverse stereo"
 msgstr "Stereo-Kanle umkehren"
 
-#: modules/audio_output/alsa.c:161 modules/audio_output/alsa.c:327
-#: modules/audio_output/directx.c:425 modules/audio_output/directx.c:462
-#: modules/audio_output/oss.c:195 modules/audio_output/oss.c:325
-#: modules/audio_output/sdl.c:114 modules/audio_output/sdl.c:177
-#: modules/audio_output/sdl.c:188 modules/audio_output/sdl.c:194
-#: modules/audio_output/waveout.c:359 src/audio_output/output.c:77
-#: src/audio_output/output.c:103 src/audio_output/output.c:132
+#: src/audio_output/output.c:77 src/audio_output/output.c:103
+#: src/audio_output/output.c:132 modules/audio_output/alsa.c:161
+#: modules/audio_output/alsa.c:327 modules/audio_output/directx.c:425
+#: modules/audio_output/directx.c:462 modules/audio_output/oss.c:195
+#: modules/audio_output/oss.c:325 modules/audio_output/sdl.c:114
+#: modules/audio_output/sdl.c:177 modules/audio_output/sdl.c:188
+#: modules/audio_output/sdl.c:194 modules/audio_output/waveout.c:359
 msgid "Stereo"
 msgstr "Stereo"
 
@@ -1112,9 +1111,9 @@ msgstr "[dvd:][Anschluss][@raw_device][@[Titel][,[Kapitel][,Ankerpunkt]]]"
 msgid "DVD input with menus support"
 msgstr "DVD Input mit Men-Untersttzung"
 
+#: modules/access/mms/mms.c:129 modules/access/v4l/v4l.c:69
 #: modules/access/file.c:69 modules/access/ftp.c:86 modules/access/http.c:80
-#: modules/access/mms/mms.c:129 modules/access/udp.c:72
-#: modules/access/v4l/v4l.c:69
+#: modules/access/udp.c:72
 msgid "caching value in ms"
 msgstr "zwischenspeichern des Werts in ms"
 
@@ -2192,9 +2191,9 @@ msgstr "Familiar Linux Gtk+ Oberfl
 msgid "VLC media player"
 msgstr "VLC Media Player"
 
-#: modules/gui/familiar/interface.c:124 modules/gui/skins/src/vlcproc.cpp:383
-#: modules/gui/wxwindows/open.cpp:574
+#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:574
 #: modules/gui/wxwindows/preferences.cpp:847
+#: modules/gui/skins/src/vlcproc.cpp:383
 msgid "Open file"
 msgstr "Datei ffnen"
 
@@ -2222,9 +2221,9 @@ msgstr "Stream abspielen"
 
 #: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:571
 #: modules/gui/gtk/gnome_interface.c:1068 modules/gui/gtk/gtk_interface.c:681
-#: modules/gui/gtk/gtk_interface.c:1168 modules/gui/macosx/controls.m:653
-#: modules/gui/macosx/intf.m:285 modules/gui/macosx/intf.m:323
-#: modules/gui/macosx/intf.m:370 modules/gui/win32/strings.cpp:104
+#: modules/gui/gtk/gtk_interface.c:1168 modules/gui/macosx/intf.m:285
+#: modules/gui/macosx/intf.m:323 modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/controls.m:653 modules/gui/win32/strings.cpp:104
 #: modules/gui/wxwindows/interface.cpp:284
 msgid "Stop"
 msgstr "Stopp"
@@ -2553,7 +2552,7 @@ msgstr "Leiser"
 
 #: modules/gui/gtk/gnome_interface.c:140 modules/gui/gtk/gnome_interface.c:964
 #: modules/gui/gtk/gtk_interface.c:471 modules/gui/gtk/gtk_interface.c:1308
-#: modules/gui/macosx/controls.m:700 modules/gui/macosx/intf.m:340
+#: modules/gui/macosx/intf.m:340 modules/gui/macosx/controls.m:700
 msgid "Mute"
 msgstr "Ton aus"
 
@@ -2580,8 +2579,8 @@ msgstr "Vollbildmodus"
 
 #: modules/gui/gtk/gnome_interface.c:183
 #: modules/gui/gtk/gnome_interface.c:1007 modules/gui/gtk/gtk_interface.c:558
-#: modules/gui/gtk/gtk_interface.c:1390 modules/gui/macosx/controls.m:724
-#: modules/gui/macosx/intf.m:350
+#: modules/gui/gtk/gtk_interface.c:1390 modules/gui/macosx/intf.m:350
+#: modules/gui/macosx/controls.m:724
 #: modules/video_filter/deinterlace/deinterlace.c:81
 msgid "Deinterlace"
 msgstr "Bild gltten"
@@ -2693,9 +2692,9 @@ msgstr "Vorherige Datei"
 #: modules/gui/gtk/gnome_interface.c:672
 #: modules/gui/gtk/gnome_interface.c:1097 modules/gui/gtk/gtk_interface.c:774
 #: modules/gui/gtk/gtk_interface.c:857 modules/gui/gtk/gtk_interface.c:901
-#: modules/gui/gtk/gtk_interface.c:1207 modules/gui/macosx/controls.m:661
-#: modules/gui/macosx/intf.m:287 modules/gui/macosx/intf.m:327
-#: modules/gui/macosx/intf.m:371 modules/gui/win32/strings.cpp:114
+#: modules/gui/gtk/gtk_interface.c:1207 modules/gui/macosx/intf.m:287
+#: modules/gui/macosx/intf.m:327 modules/gui/macosx/intf.m:371
+#: modules/gui/macosx/controls.m:661 modules/gui/win32/strings.cpp:114
 #: modules/gui/win32/strings.cpp:134 modules/gui/win32/strings.cpp:138
 #: modules/gui/wxwindows/interface.cpp:293
 msgid "Next"
@@ -3162,14 +3161,14 @@ msgstr "Das VideoLAN Team <videolan@videolan.org>"
 #: modules/gui/gtk/gtk_interface.c:1702 modules/gui/gtk/gtk_interface.c:2503
 #: modules/gui/gtk/gtk_interface.c:2754 modules/gui/gtk/gtk_interface.c:2985
 #: modules/gui/gtk/gtk_interface.c:3092 modules/gui/gtk/gtk_interface.c:3366
-#: modules/gui/gtk/preferences.c:605 modules/gui/macosx/open.m:151
-#: modules/gui/macosx/open.m:184 modules/gui/macosx/open.m:212
-#: modules/gui/macosx/prefs.m:582 modules/gui/win32/strings.cpp:13
+#: modules/gui/gtk/preferences.c:605 modules/gui/macosx/prefs.m:582
+#: modules/gui/macosx/open.m:151 modules/gui/macosx/open.m:184
+#: modules/gui/macosx/open.m:212 modules/gui/win32/strings.cpp:13
 #: modules/gui/win32/strings.cpp:26 modules/gui/win32/strings.cpp:154
 #: modules/gui/win32/strings.cpp:173 modules/gui/win32/strings.cpp:183
 #: modules/gui/win32/strings.cpp:214 modules/gui/win32/strings.cpp:233
-#: modules/gui/win32/strings.cpp:249 modules/gui/wxwindows/fileinfo.cpp:91
-#: modules/gui/wxwindows/messages.cpp:98 modules/gui/wxwindows/open.cpp:225
+#: modules/gui/win32/strings.cpp:249 modules/gui/wxwindows/open.cpp:225
+#: modules/gui/wxwindows/fileinfo.cpp:91 modules/gui/wxwindows/messages.cpp:98
 #: modules/gui/wxwindows/playlist.cpp:142
 #: modules/gui/wxwindows/preferences.cpp:243
 #: modules/gui/wxwindows/streamout.cpp:166
@@ -3206,8 +3205,8 @@ msgstr "Stream-Ausgaben-Einstellungen"
 
 #: modules/gui/gtk/gtk_interface.c:2510 modules/gui/gtk/gtk_interface.c:2761
 #: modules/gui/gtk/gtk_interface.c:2992 modules/gui/gtk/gtk_interface.c:3373
-#: modules/gui/gtk/preferences.c:617 modules/gui/macosx/open.m:152
-#: modules/gui/macosx/prefs.m:586 modules/gui/macosx/prefs.m:739
+#: modules/gui/gtk/preferences.c:617 modules/gui/macosx/prefs.m:586
+#: modules/gui/macosx/prefs.m:739 modules/gui/macosx/open.m:152
 #: modules/gui/win32/strings.cpp:27 modules/gui/win32/strings.cpp:174
 #: modules/gui/win32/strings.cpp:215 modules/gui/win32/strings.cpp:234
 #: modules/gui/win32/strings.cpp:250 modules/gui/wxwindows/open.cpp:227
@@ -3317,18 +3316,18 @@ msgstr "Nachrichten:"
 msgid "VLC - Controller"
 msgstr "VLC - Steuerung"
 
-#: modules/gui/macosx/controls.m:660 modules/gui/macosx/intf.m:282
-#: modules/gui/macosx/intf.m:326 modules/gui/macosx/intf.m:372
+#: modules/gui/macosx/intf.m:282 modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:372 modules/gui/macosx/controls.m:660
 msgid "Previous"
 msgstr "Vorheriges Objekt"
 
-#: modules/gui/macosx/controls.m:640 modules/gui/macosx/intf.m:283
-#: modules/gui/macosx/intf.m:325
+#: modules/gui/macosx/intf.m:283 modules/gui/macosx/intf.m:325
+#: modules/gui/macosx/controls.m:640
 msgid "Slower"
 msgstr "Langsamer"
 
-#: modules/gui/macosx/controls.m:639 modules/gui/macosx/intf.m:286
-#: modules/gui/macosx/intf.m:324
+#: modules/gui/macosx/intf.m:286 modules/gui/macosx/intf.m:324
+#: modules/gui/macosx/controls.m:639
 msgid "Faster"
 msgstr "Schneller"
 
@@ -3424,15 +3423,15 @@ msgstr "Alles ausw
 msgid "Controls"
 msgstr "Steuerung"
 
-#: modules/gui/macosx/controls.m:679 modules/gui/macosx/intf.m:328
+#: modules/gui/macosx/intf.m:328 modules/gui/macosx/controls.m:679
 msgid "Loop"
 msgstr "Wiederholen"
 
-#: modules/gui/macosx/controls.m:686 modules/gui/macosx/intf.m:329
+#: modules/gui/macosx/intf.m:329 modules/gui/macosx/controls.m:686
 msgid "Step Forward"
 msgstr "Ein Stck vorwrts"
 
-#: modules/gui/macosx/controls.m:687 modules/gui/macosx/intf.m:330
+#: modules/gui/macosx/intf.m:330 modules/gui/macosx/controls.m:687
 msgid "Step Backward"
 msgstr "Ein Stck rckwrts"
 
@@ -3440,19 +3439,19 @@ msgstr "Ein St
 msgid "Language"
 msgstr "Tonspur"
 
-#: modules/gui/macosx/controls.m:705 modules/gui/macosx/intf.m:345
+#: modules/gui/macosx/intf.m:345 modules/gui/macosx/controls.m:705
 msgid "Half Size"
 msgstr "Halbe Gre"
 
-#: modules/gui/macosx/controls.m:706 modules/gui/macosx/intf.m:346
+#: modules/gui/macosx/intf.m:346 modules/gui/macosx/controls.m:706
 msgid "Normal Size"
 msgstr "Normale Gre"
 
-#: modules/gui/macosx/controls.m:707 modules/gui/macosx/intf.m:347
+#: modules/gui/macosx/intf.m:347 modules/gui/macosx/controls.m:707
 msgid "Double Size"
 msgstr "Doppelte Gre"
 
-#: modules/gui/macosx/controls.m:704 modules/gui/macosx/intf.m:348
+#: modules/gui/macosx/intf.m:348 modules/gui/macosx/controls.m:704
 msgid "Fullscreen"
 msgstr "Vollbild"
 
@@ -3604,9 +3603,9 @@ msgstr "Untertitel-Datei laden:"
 msgid "Override"
 msgstr "berschreiben"
 
-#: modules/gui/macosx/controls.m:538 modules/gui/macosx/open.m:387
-#: modules/gui/macosx/open.m:566 modules/gui/macosx/open.m:804
-#: modules/gui/macosx/open.m:842
+#: modules/gui/macosx/open.m:387 modules/gui/macosx/open.m:566
+#: modules/gui/macosx/open.m:804 modules/gui/macosx/open.m:842
+#: modules/gui/macosx/controls.m:538
 msgid "Open"
 msgstr "ffnen"
 
@@ -4236,7 +4235,7 @@ msgstr "Bild-Men
 msgid "Input menu"
 msgstr "Input-Men"
 
-#: modules/gui/wxwindows/playlist.cpp:108 modules/gui/wxwindows/popup.cpp:127
+#: modules/gui/wxwindows/popup.cpp:127 modules/gui/wxwindows/playlist.cpp:108
 msgid "&Close"
 msgstr "&Schlieen"
 

po/en_GB.po

@@ -797,28 +797,27 @@ msgid ""
 "  vlc:quit                       quit VLC\n"
 msgstr ""
 
-#: modules/misc/dummy/dummy.c:59 src/libvlc.h:444
+#: src/libvlc.h:444 modules/misc/dummy/dummy.c:59
 msgid "Interface"
 msgstr ""
 
-#: modules/audio_output/coreaudio.c:224 modules/audio_output/file.c:108
-#: modules/demux/asf/asf.c:218 modules/demux/ogg.c:553 modules/demux/ogg.c:812
-#: modules/demux/ogg.c:985 modules/gui/gtk/gnome_interface.c:1133
-#: modules/gui/gtk/gtk_interface.c:1260 modules/gui/macosx/intf.m:337
-#: src/libvlc.h:461
+#: src/libvlc.h:461 modules/audio_output/coreaudio.c:224
+#: modules/audio_output/file.c:108 modules/demux/asf/asf.c:218
+#: modules/demux/ogg.c:553 modules/demux/ogg.c:812 modules/demux/ogg.c:985
+#: modules/gui/gtk/gnome_interface.c:1133 modules/gui/gtk/gtk_interface.c:1260
+#: modules/gui/macosx/intf.m:337
 msgid "Audio"
 msgstr ""
 
-#: modules/demux/asf/asf.c:288 modules/demux/avi/avi.c:1040
+#: src/libvlc.h:477 modules/demux/asf/asf.c:288 modules/demux/avi/avi.c:1040
 #: modules/demux/ogg.c:612 modules/demux/ogg.c:652 modules/demux/ogg.c:717
 #: modules/demux/ogg.c:892 modules/gui/gtk/gnome_interface.c:1140
 #: modules/gui/gtk/gtk_interface.c:1337 modules/gui/macosx/intf.m:344