OS X port :

* Reenabled fullscreen shortcut, due to popular requests,
* Fixed charset encoding in the Preferences window,
* New implementation of --loop.

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index 7700266fb59aab1bc4d5564898fd121acaea2007..af0d56153d4f9b627685930bd20c62c018aa232c 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
@@ -12,13 +12,13 @@
                <string>93 566 72 114 0 0 1600 1178 </string>
        </dict>
        <key>IBFramework Version</key>
-       <string>286.0</string>
+       <string>291.0</string>
        <key>IBOpenObjects</key>
        <array>
-               <integer>29</integer>
                <integer>636</integer>
+               <integer>29</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>6F21</string>
+       <string>6G30</string>
 </dict>
 </plist>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
index bf61ec01526ef8b80b31b7e0ad74eba57d737137..1d88f2a02ab518adda59245356418c196c467f5d 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib differ

diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index 2db12b74d56fb87673605db6f56675c3045e00e1..13c2f7a7b0379e18c8e7faa9c658d16b9257f015 100644 (file)
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -2,7 +2,7 @@
  * controls.m: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: controls.m,v 1.3 2002/12/25 02:23:36 massiot Exp $
+ * $Id: controls.m,v 1.4 2002/12/29 01:16:28 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -195,13 +195,12 @@
     if( p_intf->p_sys->b_loop )
     {
         [o_mi setState: NSOffState];
-        playlist_Delete( p_playlist, p_playlist->i_size - 1 );
+        config_PutInt( p_playlist, "loop", 0 );
     }
     else
     {
         [o_mi setState: NSOnState];
-        playlist_Add( p_playlist, "vlc:loop",
-                      PLAYLIST_APPEND, PLAYLIST_END );
+        config_PutInt( p_playlist, "loop", 1 );
     }
 
     p_intf->p_sys->b_loop = !p_intf->p_sys->b_loop;

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index e9142de1b0cdeed891e5fd362af6cc448ce45da6..0db9c0cc3f4af2e1b5e7fa126916d2ebc64f933f 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -2,7 +2,7 @@
  * intf.m: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: intf.m,v 1.12 2002/12/25 02:23:36 massiot Exp $
+ * $Id: intf.m,v 1.13 2002/12/29 01:16:28 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -529,6 +529,15 @@ static void Run( intf_thread_t *p_intf )
         [o_mi_channels setEnabled: FALSE];
         [o_mi_screen setEnabled: FALSE];
     }
+
+    if ( (p_intf->p_sys->b_loop = config_GetInt( p_intf, "loop" )) )
+    {
+        [o_mi_loop setState: NSOnState];
+    }
+    else
+    {
+        [o_mi_loop setState: NSOffState];
+    }
 }
 
 - (void)setupMenus

diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m
index 77dc505cad44ea0c8d019d93ad3cd9e230f8e534..695dc68f5b60c83315e9f61312813aa7b3b5f3c6 100644 (file)
--- a/modules/gui/macosx/prefs.m
+++ b/modules/gui/macosx/prefs.m
@@ -2,7 +2,7 @@
  * prefs.m: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: prefs.m,v 1.3 2002/12/25 02:23:36 massiot Exp $
+ * $Id: prefs.m,v 1.4 2002/12/29 01:16:28 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
  *
@@ -242,13 +242,13 @@
         [o_text_field setEditable: NO]; \
         [o_text_field setSelectable: NO]; \
         [o_text_field setStringValue: \
-                [NSString stringWithCString: label]]; \
+            [NSApp localizedString: label]]; \
         [o_view addSubview: [o_text_field autorelease]]; \
     }
 
 #define INPUT_FIELD( ctype, cname, label, w, msg, param ) \
     { \
-        s_rc.size.height = 23; \
+        s_rc.size.height = 25; \
         s_rc.size.width = w; \
         s_rc.origin.y += 10; \
         CHECK_VIEW_HEIGHT; \
@@ -285,7 +285,7 @@
             NSString *o_label;
             NSToolbarItem *o_tbi;
 
-            o_label = [NSString stringWithCString: p_item->psz_text];
+            o_label = [NSApp localizedString: p_item->psz_text];
             o_tbi = [[NSToolbarItem alloc] initWithItemIdentifier: o_label]; 
             [o_tbi setImage: [NSImage imageNamed: @"NSApplicationIcon"]];
             [o_tbi setLabel: o_label];
@@ -325,7 +325,7 @@
 
 #define MODULE_BUTTON( button, title, sel ) \
     { \
-        s_brc.size.height = 25; \
+        s_brc.size.height = 32; \
         s_brc.origin.x += s_brc.size.width + 10; \
         s_brc.size.width = s_crc.size.width - s_brc.origin.x - 10; \
         button = [[NSButton alloc] initWithFrame: s_brc]; \
@@ -338,21 +338,21 @@
         [o_cview addSubview: [button autorelease]]; \
     }
 
-            s_rc.size.height = 100;
+            s_rc.size.height = 107;
             s_rc.size.width = s_vrc.size.width - X_ORIGIN * 2 - 20;
             s_rc.origin.y += i_module_tag == 3 ? Y_ORIGIN : 20;
 
             CHECK_VIEW_HEIGHT;
 
             o_box = [[NSBox alloc] initWithFrame: s_rc];
-            [o_box setTitle: [NSString stringWithCString: p_item->psz_text]];
+            [o_box setTitle: [NSApp localizedString: p_item->psz_text]];
             [o_view addSubview: [o_box autorelease]];
             s_rc.origin.y += s_rc.size.height + 10;
             o_cview = [[VLCFlippedView alloc] initWithFrame: s_rc];
             [o_box setContentView: [o_cview autorelease]];
             s_crc = [o_cview bounds];
 
-            s_brc = NSMakeRect( 5, 10, 200, 23 ); 
+            s_brc = NSMakeRect( 5, 10, 200, 30 ); 
             o_modules = [[NSPopUpButton alloc] initWithFrame: s_brc];
             [o_modules setTag: i_module_tag++];
             [o_modules setTarget: self];
@@ -363,7 +363,7 @@
                            configureModule: );
 
             s_brc = NSMakeRect( 8, s_brc.origin.y + s_brc.size.height + 10, 
-                                194, 23 ); 
+                                194, 25 ); 
             o_text_field = [[VLCTextField alloc] initWithFrame: s_brc];
             [o_text_field setTag: i_module_tag++];
             [o_text_field setAlignment: NSLeftTextAlignment];
@@ -433,7 +433,7 @@
                 int i;
                 VLCComboBox *o_combo_box;
 
-                s_rc.size.height = 25;
+                s_rc.size.height = 27;
                 s_rc.size.width = 150;
                 s_rc.origin.y += 10;
 
@@ -485,7 +485,7 @@
         {
             VLCButton *o_btn_bool;
 
-            s_rc.size.height = 20;
+            s_rc.size.height = 27;
             s_rc.size.width = s_vrc.size.width - X_ORIGIN * 2 - 20;
             s_rc.origin.y += 10;
 
@@ -495,7 +495,7 @@
             [o_btn_bool setButtonType: NSSwitchButton];
             [o_btn_bool setIntValue: p_item->i_value];
             [o_btn_bool setTitle: 
-                [NSString stringWithCString: p_item->psz_text]]; 
+                  [NSApp localizedString: p_item->psz_text]];
             [o_btn_bool setTarget: self];
             [o_btn_bool setAction: @selector(configChanged:)];
             CONTROL_CONFIG( o_btn_bool, o_module_name, 

diff --git a/po/fr.po b/po/fr.po
index a1459d3b76a304750cf646ddb825782b5220ce6c..4ab0b7862601c73b871a9e7cbf9ea7108e2f747a 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -1582,7 +1582,7 @@ msgstr "Ouvrir un fichier"
 #: modules/gui/familiar/interface.c:106 modules/gui/familiar/interface.c:107
 #: modules/gui/macosx/intf.m:191 modules/gui/macosx/prefs.m:196
 msgid "Preferences"
-msgstr "_Préférences"
+msgstr "Préférences"
 
 #: modules/gui/familiar/interface.c:121
 msgid "Rewind"