Commit cd794aec authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files

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

parent 0bb73cd8
......@@ -166,6 +166,11 @@
"o_video_view" = id;
};
SUPERCLASS = NSObject;
},
{
CLASS = VLCSimplePrefsWindow;
LANGUAGE = ObjC;
SUPERCLASS = NSWindow;
}
);
IBVersion = 1;
......
......@@ -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>
......
......@@ -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
@interface VLCSimplePrefsWindow : NSWindow
@end
\ No newline at end of file
......@@ -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
@implementation VLCSimplePrefsWindow
- (BOOL)acceptsFirstResponder
{
return YES;
}
- (void)changeFont:(id)sender
{
[[[VLCMain sharedInstance] getSimplePreferences] changeFont: sender];
}
@end
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