* Fix the state of the playlist and fullscreen button.

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
index fcb34e3ffae94ea5f1325b5b4357581026c2006c..a0015c851a6f81223af676fb519542d72e9d577f 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
@@ -42,7 +42,12 @@
             }; 
             CLASS = VLCControls; 
             LANGUAGE = ObjC; 
-            OUTLETS = {"o_main" = id; "o_open" = id; "o_volumeslider" = id; }; 
+            OUTLETS = {
+                "o_btn_fullscreen" = id; 
+                "o_main" = id; 
+                "o_open" = id; 
+                "o_volumeslider" = id; 
+            }; 
             SUPERCLASS = NSObject; 
         }, 
         {
@@ -73,7 +78,6 @@
                 "o_btn_fullscreen" = id; 
                 "o_btn_next" = id; 
                 "o_btn_play" = id; 
-                "o_btn_playlist" = id; 
                 "o_btn_prev" = id; 
                 "o_btn_rewind" = id; 
                 "o_btn_stop" = id; 
@@ -331,6 +335,7 @@
             CLASS = VLCPlaylist; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                "o_btn_playlist" = id; 
                 "o_ctx_menu" = id; 
                 "o_loop_ckb" = id; 
                 "o_mi_delete" = id; 

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index 9a2a5c4aa166df73878f09abcc20515e14d14cd0..e193c2d1edf773bae796e9b9567e6ea91fd30b6d 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
@@ -19,9 +19,9 @@
        <array/>
        <key>IBOpenObjects</key>
        <array>
+               <integer>1647</integer>
                <integer>21</integer>
                <integer>1617</integer>
-               <integer>1647</integer>
        </array>
        <key>IBSystem Version</key>
        <string>7C107</string>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
index 2a7cfe8d9c12bc546c0ac822bbf1729189b7e638..b6319db65f6ed07d360757a4c28c97172b2de3ea 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.h b/modules/gui/macosx/controls.h
index 8e767a54a30529746b291acdab59c70ff60e5876..b40a926216da774c9de69587e06debad79f789b7 100644 (file)
--- a/modules/gui/macosx/controls.h
+++ b/modules/gui/macosx/controls.h
@@ -2,7 +2,7 @@
  * controls.h: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: controls.h,v 1.7 2003/09/20 19:37:53 hartman Exp $
+ * $Id: controls.h,v 1.8 2003/12/11 19:34:47 hartman Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -31,6 +31,7 @@
     IBOutlet id o_open;
     IBOutlet id o_main;
 
+    IBOutlet id o_btn_fullscreen;
     IBOutlet id o_volumeslider;
 }
 

diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index fd715282eac31904f9a75293027a8a8c4df019ca..4bcbd8d05fac0adf3a853497df104c1d9220c08c 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-2003 VideoLAN
- * $Id: controls.m,v 1.57 2003/12/08 19:50:22 gbazin Exp $
+ * $Id: controls.m,v 1.58 2003/12/11 19:34:47 hartman Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -356,7 +356,10 @@
                         [o_window performZoom:self];
                 }
                 else
+                {
+                    [o_btn_fullscreen setState: ![o_window isFullscreen]];
                     [o_window toggleFullscreen];
+                }
                 break;
             }
         }

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index 5e56821560fa23f14620c44e81cae278519a74cd..0b33919536733621c58c12a521de77f602fff48e 100644 (file)
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -2,7 +2,7 @@
  * intf.h: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: intf.h,v 1.50 2003/12/11 16:00:09 hartman Exp $
+ * $Id: intf.h,v 1.51 2003/12/11 19:34:47 hartman Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -100,7 +100,6 @@ struct intf_sys_t
     float f_slider_old;         /* old slider val */ 
     IBOutlet id o_volumeslider; /* volume slider  */
 
-    IBOutlet id o_btn_playlist; /* btn playlist   */
     IBOutlet id o_btn_prev;     /* btn previous   */
     IBOutlet id o_btn_rewind;   /* btn rewind     */
     IBOutlet id o_btn_play;     /* btn play       */

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index ebd7e9911c623fe30b1cf189e6c475b3cc51ba22..100aad814691b1c2744b071fa5f4fa7821a97ea7 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-2003 VideoLAN
- * $Id: intf.m,v 1.104 2003/12/11 16:00:09 hartman Exp $
+ * $Id: intf.m,v 1.105 2003/12/11 19:34:47 hartman Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -432,7 +432,6 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
     [o_window setTitle: _NS("VLC - Controller")];
 
     /* button controls */
-    [o_btn_playlist setToolTip: _NS("Playlist")];
     [o_btn_prev setToolTip: _NS("Previous")];
     [o_btn_rewind setToolTip: _NS("Rewind")];
     [o_btn_play setToolTip: _NS("Play")];

diff --git a/modules/gui/macosx/playlist.h b/modules/gui/macosx/playlist.h
index 371a438f84d701586fc13140ff80f713d7c9f850..5df0787b1b1de486a89b7db88e7e22eac4a3e442 100644 (file)
--- a/modules/gui/macosx/playlist.h
+++ b/modules/gui/macosx/playlist.h
@@ -2,7 +2,7 @@
  * playlist.h: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: playlist.h,v 1.15 2003/11/17 23:36:12 bigben Exp $
+ * $Id: playlist.h,v 1.16 2003/12/11 19:34:46 hartman Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Derk-Jan Hartman <thedj@users.sourceforge.net>
@@ -39,6 +39,7 @@
     int i_moveRow;
     
     IBOutlet id o_window;
+    IBOutlet id o_btn_playlist;
     IBOutlet id o_table_view;
     
     IBOutlet id o_status_field;
@@ -60,6 +61,7 @@
 
 }
 
+- (void)initStrings;
 - (NSMenu *)menuForEvent:(NSEvent *)o_event;
 
 - (IBAction)toggleWindow:(id)sender;

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index c97252d83ca43ef143b7034e9e56522f57a55037..0801d4f8eee4079ef4e025df55c03936daf9380d 100644 (file)
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -2,7 +2,7 @@
  * playlist.m: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: playlist.m,v 1.47 2003/12/10 12:57:12 bigben Exp $
+ * $Id: playlist.m,v 1.48 2003/12/11 19:34:46 hartman Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Derk-Jan Hartman <thedj@users.sourceforge.net>
@@ -133,7 +133,11 @@
         [NSArray arrayWithObjects: NSFilenamesPboardType, nil]];
 
     [o_window setExcludedFromWindowsMenu: TRUE];
+    [self initStrings];
+}
 
+- (void)initStrings
+{
     [o_window setTitle: _NS("Playlist")];
     [o_mi_save_playlist setTitle: _NS("Save Playlist...")];
     [o_mi_play setTitle: _NS("Play")];
@@ -145,6 +149,7 @@
     [o_loop_ckb setTitle: _NS("Repeat Playlist")];
     [o_repeat_ckb setTitle: _NS("Repeat Item")];
     [o_search_button setTitle: _NS("Search")];
+    [o_btn_playlist setToolTip: _NS("Playlist")];
 }
 
 - (BOOL)tableView:(NSTableView *)o_tv 
@@ -178,10 +183,12 @@
     if( [o_window isVisible] )
     {
         [o_window orderOut:sender];
+        [o_btn_playlist setState:NSOffState];
     }
     else
     {
         [o_window makeKeyAndOrderFront:sender];
+        [o_btn_playlist setState:NSOnState];
     }
 }
 
@@ -599,5 +606,11 @@
     [self updateRowSelection];
 }
 
+/* Delegate method of NSWindow */
+- (void)windowWillClose:(NSNotification *)aNotification
+{
+    [o_btn_playlist setState: NSOffState];
+}
+
 @end