[vlc-devel] commit: macosx: forward-port 17a722aa10 so master is 10.4u compatible too ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Sep 21 23:15:38 2008 +0200| [cd794aec4506401a95574e3402e38937f5fa76eb] | committer: Felix Paul Kühne 

macosx: forward-port 17a722aa10 so master is 10.4u compatible too

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cd794aec4506401a95574e3402e38937f5fa76eb
---

 .../English.lproj/Preferences.nib/classes.nib      |    5 +++++
 .../English.lproj/Preferences.nib/info.nib         |    6 +++---
 .../English.lproj/Preferences.nib/keyedobjects.nib |  Bin 93377 -> 93391 bytes
 modules/gui/macosx/simple_prefs.h                  |    5 +++++
 modules/gui/macosx/simple_prefs.m                  |   16 +++++++++++++++-
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
index 35d4879..8c565d2 100644
--- a/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
+++ b/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
@@ -166,6 +166,11 @@
                 "o_video_view" = id;
             };
             SUPERCLASS = NSObject;
+        },
+                {
+            CLASS = VLCSimplePrefsWindow;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSWindow;
         }
     );
     IBVersion = 1;
diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
index ee7a989..18eea7a 100644
--- a/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
+++ b/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
@@ -23,12 +23,12 @@
 	<integer>5</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>2311</integer>
 		<integer>2330</integer>
-		<integer>1530</integer>
-		<integer>2668</integer>
 		<integer>2265</integer>
+		<integer>1530</integer>
 		<integer>2677</integer>
+		<integer>2311</integer>
+		<integer>2668</integer>
 		<integer>2562</integer>
 	</array>
 	<key>IBSystem Version</key>
diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib
index 38f371c..3d9b139 100644
Binary files a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib differ
diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h
index 558b5de..71da8d4 100644
--- a/modules/gui/macosx/simple_prefs.h
+++ b/modules/gui/macosx/simple_prefs.h
@@ -196,6 +196,7 @@
 - (IBAction)osdSettingChanged:(id)sender;
 - (IBAction)showFontPicker:(id)sender;
 - (void)showOSDSettings;
+- (void)changeFont:(id)sender;
 
 /* input & codecs */
 - (IBAction)inputSettingChanged:(id)sender;
@@ -213,3 +214,7 @@
 @interface VLCHotkeyChangeWindow : NSWindow
 
 @end
+
+ at interface VLCSimplePrefsWindow : NSWindow
+
+ at end
\ No newline at end of file
diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 17e8d64..3307153 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -1130,7 +1130,8 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
         NSFont * font = [NSFont fontWithDescriptor:[fd fontDescriptorWithFamily:fontFamilyName] textTransform:nil];
         [[NSFontManager sharedFontManager] setSelectedFont:font isMultiple:NO];
     }
-    [[NSFontManager sharedFontManager] setTarget:self];
+    [[NSFontManager sharedFontManager] setDelegate: self];
+    [o_sprefs_win makeFirstResponder: o_sprefs_win];
     [[NSFontPanel sharedFontPanel] orderFront:self];
 }
 
@@ -1317,3 +1318,16 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
 }
 
 @end
+
+ at implementation VLCSimplePrefsWindow
+
+- (BOOL)acceptsFirstResponder
+{
+    return YES;
+}
+
+- (void)changeFont:(id)sender
+{
+    [[[VLCMain sharedInstance] getSimplePreferences] changeFont: sender];
+}
+ at end