Commit 8f10d4fe authored by Christophe Massiot's avatar Christophe Massiot

* Resized elements in the open panel,

* modules/gui/macosx/vout.m: Only hide the menubar and cursor if fullscreen
  mode is on the primary screen,
* po/*: Updated po files.
parent 03ea4d81
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<key>IBEditorPositions</key> <key>IBEditorPositions</key>
<dict> <dict>
<key>29</key> <key>29</key>
<string>16 822 374 44 0 0 1280 1002 </string> <string>14 602 374 44 0 0 1152 746 </string>
<key>303</key> <key>303</key>
<string>60 509 104 66 0 0 1280 1002 </string> <string>60 509 104 66 0 0 1280 1002 </string>
<key>909</key> <key>909</key>
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>21</integer> <integer>21</integer>
<integer>636</integer>
<integer>29</integer> <integer>29</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* This header provides portable declarations for mutexes & conditions * This header provides portable declarations for mutexes & conditions
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2002 VideoLAN * Copyright (C) 1999, 2002 VideoLAN
* $Id: vlc_threads.h,v 1.21 2003/01/10 17:01:53 titer Exp $ * $Id: vlc_threads.h,v 1.22 2003/01/23 23:51:13 massiot Exp $
* *
* Authors: Jean-Marc Dressler <polux@via.ecp.fr> * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr> * Samuel Hocevar <sam@via.ecp.fr>
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
/* Thread priorities */ /* Thread priorities */
#ifdef SYS_DARWIN #ifdef SYS_DARWIN
# define VLC_THREAD_PRIORITY_LOW 31 # define VLC_THREAD_PRIORITY_LOW 32
# define VLC_THREAD_PRIORITY_INPUT 35 # define VLC_THREAD_PRIORITY_INPUT 35
# define VLC_THREAD_PRIORITY_AUDIO 36 # define VLC_THREAD_PRIORITY_AUDIO 36
# define VLC_THREAD_PRIORITY_VIDEO 31 # define VLC_THREAD_PRIORITY_VIDEO 31
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout.m: MacOS X video output plugin * vout.m: MacOS X video output plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2001-2003 VideoLAN * Copyright (C) 2001-2003 VideoLAN
* $Id: vout.m,v 1.15 2003/01/22 01:48:06 hartman Exp $ * $Id: vout.m,v 1.16 2003/01/23 23:51:13 massiot Exp $
* *
* Authors: Colin Delacroix <colin@zoy.org> * Authors: Colin Delacroix <colin@zoy.org>
* Florian G. Pflug <fgp@phlo.org> * Florian G. Pflug <fgp@phlo.org>
...@@ -542,18 +542,6 @@ static int CoToggleFullscreen( vout_thread_t *p_vout ) ...@@ -542,18 +542,6 @@ static int CoToggleFullscreen( vout_thread_t *p_vout )
p_vout->b_fullscreen = !p_vout->b_fullscreen; p_vout->b_fullscreen = !p_vout->b_fullscreen;
if( p_vout->b_fullscreen )
{
if ( p_vout->p_sys->p_fullscreen_state == NULL )
BeginFullScreen( &p_vout->p_sys->p_fullscreen_state, NULL, 0, 0,
NULL, NULL, fullScreenHideCursor | fullScreenAllowEvents );
}
else
{
if ( p_vout->p_sys->p_fullscreen_state != NULL )
EndFullScreen ( p_vout->p_sys->p_fullscreen_state, NULL );
p_vout->p_sys->p_fullscreen_state = NULL;
}
config_PutInt( p_vout, "fullscreen", p_vout->b_fullscreen ); config_PutInt( p_vout, "fullscreen", p_vout->b_fullscreen );
if( CoCreateWindow( p_vout ) ) if( CoCreateWindow( p_vout ) )
...@@ -977,6 +965,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -977,6 +965,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
NSScreen * o_screen; NSScreen * o_screen;
vout_thread_t * p_vout; vout_thread_t * p_vout;
id o_title; id o_title;
vlc_bool_t b_main_screen;
intf_thread_t * p_intf = [NSApp getIntf]; intf_thread_t * p_intf = [NSApp getIntf];
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
...@@ -991,22 +980,25 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -991,22 +980,25 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
if( var_Get( p_vout, "video-device", &val ) < 0 ) if( var_Get( p_vout, "video-device", &val ) < 0 )
{ {
o_screen = [NSScreen mainScreen]; o_screen = [NSScreen mainScreen];
b_main_screen = 1;
} }
else else
{ {
unsigned int i_index = 0; unsigned int i_index = 0;
NSArray *o_screens = [NSScreen screens]; NSArray *o_screens = [NSScreen screens];
if( !sscanf( val.psz_string, "Screen %d", &i_index ) || if( !sscanf( val.psz_string, _("Screen %d"), &i_index ) ||
[o_screens count] < i_index ) [o_screens count] < i_index )
{ {
o_screen = [NSScreen mainScreen]; o_screen = [NSScreen mainScreen];
b_main_screen = 1;
} }
else else
{ {
i_index--; i_index--;
o_screen = [o_screens objectAtIndex: i_index]; o_screen = [o_screens objectAtIndex: i_index];
config_PutInt( p_vout, "macosx-vdev", i_index ); config_PutInt( p_vout, "macosx-vdev", i_index );
b_main_screen = (i_index == 0);
} }
free( val.psz_string ); free( val.psz_string );
...@@ -1017,6 +1009,10 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -1017,6 +1009,10 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
NSRect screen_rect = [o_screen frame]; NSRect screen_rect = [o_screen frame];
screen_rect.origin.x = screen_rect.origin.y = 0; screen_rect.origin.x = screen_rect.origin.y = 0;
if ( b_main_screen && p_vout->p_sys->p_fullscreen_state == NULL )
BeginFullScreen( &p_vout->p_sys->p_fullscreen_state, NULL, 0, 0,
NULL, NULL, fullScreenHideCursor | fullScreenAllowEvents );
[p_vout->p_sys->o_window [p_vout->p_sys->o_window
initWithContentRect: screen_rect initWithContentRect: screen_rect
styleMask: NSBorderlessWindowMask styleMask: NSBorderlessWindowMask
...@@ -1033,6 +1029,10 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -1033,6 +1029,10 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
NSResizableWindowMask | NSResizableWindowMask |
NSTexturedBackgroundWindowMask; NSTexturedBackgroundWindowMask;
if ( p_vout->p_sys->p_fullscreen_state != NULL )
EndFullScreen ( p_vout->p_sys->p_fullscreen_state, NULL );
p_vout->p_sys->p_fullscreen_state = NULL;
[p_vout->p_sys->o_window [p_vout->p_sys->o_window
initWithContentRect: p_vout->p_sys->s_rect initWithContentRect: p_vout->p_sys->s_rect
styleMask: i_stylemask styleMask: i_stylemask
......
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
Caption = _( "VideoLAN Client" ); Caption = _( "VideoLAN Client" );
Caption = _( "ToolBar" ); Caption = _( "ToolBar" );
Caption = _( "ToolButtonSep1" ); Caption = _( "ToolButtonSep1" );
Caption = _( "ToolButton1" );
Caption = _( "ToolButtonSep2" ); Caption = _( "ToolButtonSep2" );
Caption = _( "ToolButtonSep3" );
Caption = _( "File read" ); Caption = _( "File read" );
Caption = _( "Channel:" ); Caption = _( "Channel:" );
Caption = _( "No server" ); Caption = _( "No server" );
...@@ -53,6 +53,8 @@ ...@@ -53,6 +53,8 @@
Caption = _( "&Hide interface" ); Caption = _( "&Hide interface" );
Hint = _( "Hide the main interface window" ); Hint = _( "Hide the main interface window" );
Caption = _( "&Playlist..." ); Caption = _( "&Playlist..." );
Caption = _( "&Add interface" );
Hint = _( "Spawn a new interface" );
Caption = _( "&Controls" ); Caption = _( "&Controls" );
Caption = _( "Audio device" ); Caption = _( "Audio device" );
Caption = _( "C&hannels" ); Caption = _( "C&hannels" );
...@@ -111,6 +113,10 @@ ...@@ -111,6 +113,10 @@
Hint = _( "Previous file" ); Hint = _( "Previous file" );
Caption = _( "Next" ); Caption = _( "Next" );
Hint = _( "Next file" ); Hint = _( "Next file" );
Caption = _( "&Stream output..." );
Hint = _( "Open the stream output" );
Caption = _( "&Add subtitles..." );
Hint = _( "Add a subtitle file" );
Caption = _( "Playlist" ); Caption = _( "Playlist" );
Hint = _( "Open the playlist window" ); Hint = _( "Open the playlist window" );
Caption = _( "Exit" ); Caption = _( "Exit" );
...@@ -203,3 +209,34 @@ ...@@ -203,3 +209,34 @@
Caption = _( "Save" ); Caption = _( "Save" );
Caption = _( "OK" ); Caption = _( "OK" );
Caption = _( "Cancel" ); Caption = _( "Cancel" );
/*
* from modules/gui/win32/sout.dfm:
*/
Caption = _( "Stream output" );
Caption = _( "Stream output MRL (Media Resource Locator)" );
Caption = _( "Port:" );
Caption = _( "Address:" );
Text = _( "file/ts://" );
Caption = _( "File" );
Caption = _( "UDP" );
Caption = _( "RTP" );
Caption = _( "Browse..." );
Text = _( "239.239.0.1" );
Caption = _( "PS" );
Caption = _( "TS" );
/*
* from modules/gui/win32/subtitles.dfm:
*/
Caption = _( "Add subtitles" );
Caption = _( "Select a subtitles file" );
Caption = _( "Delay:" );
Caption = _( "FPS:" );
Hint = _( "Set the delay (in seconds)" );
Text = _( "0.0" );
Hint = _( "Set the number of Frames Per Second" );
Text = _( "0.0" );
Caption = _( "Browse..." );
...@@ -108,6 +108,7 @@ modules/gui/macosx/prefs.m ...@@ -108,6 +108,7 @@ modules/gui/macosx/prefs.m
modules/gui/macosx/open.m modules/gui/macosx/open.m
modules/gui/macosx/playlist.m modules/gui/macosx/playlist.m
modules/gui/macosx/controls.m modules/gui/macosx/controls.m
modules/gui/macosx/vout.m
modules/gui/ncurses/ncurses.c modules/gui/ncurses/ncurses.c
modules/gui/qnx/qnx.c modules/gui/qnx/qnx.c
modules/gui/qt/qt.cpp modules/gui/qt/qt.cpp
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment