X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fsimple_prefs.m;h=42ebc42c248c5bbaa15522ff6b8e0076dc0f8697;hb=8ce3a352594cb66830e532acf2d00d17847e3d48;hp=720308e16499e0cbe009ea39d76a8aa4f2e641ff;hpb=c30432e5f1d0fff1471c8abfddff28eac6facae0;p=vlc diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m index 720308e164..42ebc42c24 100644 --- a/modules/gui/macosx/simple_prefs.m +++ b/modules/gui/macosx/simple_prefs.m @@ -24,6 +24,7 @@ #import "simple_prefs.h" #import "prefs.h" #import +#import #import "misc.h" static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier"; @@ -48,24 +49,22 @@ static VLCSimplePrefs *_o_sharedInstance = nil; if (_o_sharedInstance) { [self dealloc]; } else { - p_intf = VLCIntf; _o_sharedInstance = [super init]; + p_intf = VLCIntf; } - + return _o_sharedInstance; } - (void)dealloc { [o_currentlyShownCategoryView release]; - [o_sprefs_toolbar release]; [o_hotkeySettings release]; [o_hotkeyDescriptions release]; [o_hotkeysNonUseableKeys release]; - if( o_keyInTransition ) - [o_keyInTransition release]; + [o_keyInTransition release]; [super dealloc]; } @@ -87,7 +86,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; if( base ) [o_temp_str appendString: [NSString stringWithUTF8String: base]]; else - o_temp_str = @"Unset"; + o_temp_str = [NSMutableString stringWithString:_NS("Not Set")]; return o_temp_str; } @@ -96,7 +95,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; [self initStrings]; /* setup the toolbar */ - o_sprefs_toolbar = [[[NSToolbar alloc] initWithIdentifier: VLCSPrefsToolbarIdentifier] autorelease]; + NSToolbar * o_sprefs_toolbar = [[[NSToolbar alloc] initWithIdentifier: VLCSPrefsToolbarIdentifier] autorelease]; [o_sprefs_toolbar setAllowsUserCustomization: NO]; [o_sprefs_toolbar setAutosavesConfiguration: NO]; [o_sprefs_toolbar setDisplayMode: NSToolbarDisplayModeIconAndLabel]; @@ -141,27 +140,34 @@ static VLCSimplePrefs *_o_sharedInstance = nil; nil] retain]; } +#define CreateToolbarItem( o_name, o_desc, o_img, sel ) \ + o_toolbarItem = create_toolbar_item(o_itemIdent, o_name, o_desc, o_img, self, @selector(sel)); +static inline NSToolbarItem * +create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_desc, NSString * o_img, id target, SEL selector ) +{ + NSToolbarItem *o_toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: o_itemIdent] autorelease]; \ + + [o_toolbarItem setLabel: o_name]; + [o_toolbarItem setPaletteLabel: o_desc]; + + [o_toolbarItem setToolTip: o_desc]; + [o_toolbarItem setImage: [NSImage imageNamed: o_img]]; + + [o_toolbarItem setTarget: target]; + [o_toolbarItem setAction: selector]; + + [o_toolbarItem setEnabled: YES]; + [o_toolbarItem setAutovalidates: YES]; + + return o_toolbarItem; +} + - (NSToolbarItem *) toolbar: (NSToolbar *)o_sprefs_toolbar itemForItemIdentifier: (NSString *)o_itemIdent willBeInsertedIntoToolbar: (BOOL)b_willBeInserted { NSToolbarItem *o_toolbarItem = nil; - - #define CreateToolbarItem( o_name, o_desc, o_img, sel ) \ - o_toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: o_itemIdent] autorelease]; \ - \ - [o_toolbarItem setLabel: o_name]; \ - [o_toolbarItem setPaletteLabel: o_desc]; \ - \ - [o_toolbarItem setToolTip: o_desc]; \ - [o_toolbarItem setImage: [NSImage imageNamed: o_img]]; \ - \ - [o_toolbarItem setTarget: self]; \ - [o_toolbarItem setAction: @selector( sel )]; \ - \ - [o_toolbarItem setEnabled: YES]; \ - [o_toolbarItem setAutovalidates: YES] - + if( [o_itemIdent isEqual: VLCIntfSettingToolbarIdentifier] ) { CreateToolbarItem( _NS("Interface"), _NS("Interface Settings"), @"spref_cone_Interface_64", showInterfaceSettings ); @@ -176,7 +182,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; } else if( [o_itemIdent isEqual: VLCOSDSettingToolbarIdentifier] ) { - CreateToolbarItem( _NS("Subtitles & OSD"), _NS("Subtitles & OSD Settings"), @"spref_cone_Subtitles_64", showOSDSettings ); + CreateToolbarItem( _NS("Subtitles & OSD"), _NS("Subtitles & On Screen Display Settings"), @"spref_cone_Subtitles_64", showOSDSettings ); } else if( [o_itemIdent isEqual: VLCInputSettingToolbarIdentifier] ) { @@ -244,6 +250,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; [o_input_cachelevel_custom_txt setStringValue: _NS("Use the complete preferences to configure custom caching values for each access module.")]; [o_input_dump_ckb setTitle: _NS("Dump")]; [o_input_httpproxy_txt setStringValue: _NS("HTTP Proxy")]; + [o_input_httpproxypwd_txt setStringValue: _NS("Password for HTTP Proxy")]; [o_input_mux_box setTitle: _NS("Codecs / Muxers")]; [o_input_net_box setTitle: _NS("Network")]; [o_input_postproc_txt setStringValue: _NS("Post-Processing Quality")]; @@ -257,15 +264,13 @@ static VLCSimplePrefs *_o_sharedInstance = nil; [o_intf_embedded_ckb setTitle: _NS("Add controls to the video window")]; [o_intf_fspanel_ckb setTitle: _NS("Show Fullscreen Controller")]; [o_intf_lang_txt setStringValue: _NS("Language")]; - [o_intf_meta_ckb setTitle: _NS("Fetch the metadata from the Internet")]; [o_intf_network_box setTitle: _NS("Privacy / Network Interaction")]; /* Subtitles and OSD */ [o_osd_encoding_txt setStringValue: _NS("Default Encoding")]; [o_osd_font_box setTitle: _NS("Display Settings")]; - [o_osd_font_btn setTitle: _NS("Browse...")]; + [o_osd_font_btn setTitle: _NS("Choose...")]; [o_osd_font_color_txt setStringValue: _NS("Font Color")]; - [o_osd_font_effect_txt setStringValue: _NS("Effect")]; [o_osd_font_size_txt setStringValue: _NS("Font Size")]; [o_osd_font_txt setStringValue: _NS("Font")]; [o_osd_lang_box setTitle: _NS("Subtitle Languages")]; @@ -273,17 +278,9 @@ static VLCSimplePrefs *_o_sharedInstance = nil; [o_osd_osd_box setTitle: _NS("On Screen Display")]; [o_osd_osd_ckb setTitle: _NS("Enable OSD")]; - /* generic stuff */ - [[o_sprefs_basicFull_matrix cellAtRow: 0 column: 0] setStringValue: _NS("Basic")]; - [[o_sprefs_basicFull_matrix cellAtRow: 0 column: 1] setStringValue: _NS("All")]; - [o_sprefs_cancel_btn setTitle: _NS("Cancel")]; - [o_sprefs_reset_btn setTitle: _NS("Reset Preferences")]; - [o_sprefs_save_btn setTitle: _NS("Save")]; - [o_sprefs_win setTitle: _NS("Preferences")]; - /* video */ [o_video_black_ckb setTitle: _NS("Black screens in Fullscreen mode")]; - [o_video_device_txt setStringValue: _NS("Display device")]; + [o_video_device_txt setStringValue: _NS("Fullscreen Video Device")]; [o_video_display_box setTitle: _NS("Display")]; [o_video_enable_ckb setTitle: _NS("Enable Video")]; [o_video_fullscreen_ckb setTitle: _NS("Fullscreen")]; @@ -296,72 +293,120 @@ static VLCSimplePrefs *_o_sharedInstance = nil; [o_video_snap_format_txt setStringValue: _NS("Format")]; [o_video_snap_prefix_txt setStringValue: _NS("Prefix")]; [o_video_snap_seqnum_ckb setTitle: _NS("Sequential numbering")]; + + /* generic stuff */ + [[o_sprefs_basicFull_matrix cellAtRow: 0 column: 0] setStringValue: _NS("Basic")]; + [[o_sprefs_basicFull_matrix cellAtRow: 0 column: 1] setStringValue: _NS("All")]; + [o_sprefs_cancel_btn setTitle: _NS("Cancel")]; + [o_sprefs_reset_btn setTitle: _NS("Reset All")]; + [o_sprefs_save_btn setTitle: _NS("Save")]; + [o_sprefs_win setTitle: _NS("Preferences")]; +} + +- (void)setupButton: (NSPopUpButton *)object forStringList: (const char *)name +{ + module_config_t *p_item; + + [object removeAllItems]; + p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); + + /* serious problem, if no item found */ + assert( p_item ); + + for( int i = 0; i < p_item->i_list; i++ ) + { + NSMenuItem *mi; + if( p_item->ppsz_list_text != NULL ) + mi = [[NSMenuItem alloc] initWithTitle: _NS( p_item->ppsz_list_text[i] ) action:NULL keyEquivalent: @""]; + else if( p_item->ppsz_list[i] && p_item->ppsz_list[i] == "" ) + { + [[object menu] addItem: [NSMenuItem separatorItem]]; + continue; + } + else if( p_item->ppsz_list[i] ) + mi = [[NSMenuItem alloc] initWithTitle: [NSString stringWithUTF8String: p_item->ppsz_list[i]] action:NULL keyEquivalent: @""]; + else NSLog( @"item %d of pref %s failed to be created", i, name); + [mi setRepresentedObject:[NSString stringWithUTF8String: p_item->ppsz_list[i]]]; + [[object menu] addItem: [mi autorelease]]; + if( p_item->value.psz && !strcmp( p_item->value.psz, p_item->ppsz_list[i] ) ) + [object selectItem:[object lastItem]]; + } + [object setToolTip: _NS( p_item->psz_longtext )]; +} + +- (void)setupButton: (NSPopUpButton *)object forIntList: (const char *)name +{ + module_config_t *p_item; + + [object removeAllItems]; + p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); + + /* serious problem, if no item found */ + assert( p_item ); + + for( int i = 0; i < p_item->i_list; i++ ) + { + NSMenuItem *mi; + if( p_item->ppsz_list_text != NULL) + mi = [[NSMenuItem alloc] initWithTitle: _NS( p_item->ppsz_list_text[i] ) action:NULL keyEquivalent: @""]; + else if( p_item->pi_list[i] ) + mi = [[NSMenuItem alloc] initWithTitle: [NSString stringWithFormat: @"%d", p_item->pi_list[i]] action:NULL keyEquivalent: @""]; + else NSLog( @"item %d of pref %s failed to be created", i, name); + [mi setRepresentedObject:[NSNumber numberWithInt: p_item->pi_list[i]]]; + [[object menu] addItem: [mi autorelease]]; + if( p_item->value.i == p_item->pi_list[i] ) + [object selectItem:[object lastItem]]; + } + [object setToolTip: _NS( p_item->psz_longtext )]; +} + +- (void)setupButton: (NSPopUpButton *)object forModuleList: (const char *)name +{ + module_config_t *p_item; + module_t *p_parser, **p_list; + int y = 0; + + [object removeAllItems]; + + p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); + p_list = module_list_get( NULL ); + if( !p_item ||!p_list ) + { + if( p_list ) vlc_list_release(p_list); + NSLog( @"serious problem, item or list not found" ); + return; + } + + [object addItemWithTitle: _NS("Default")]; + for( size_t i_index = 0; p_list[i_index]; i_index++ ) + { + p_parser = p_list[i_index]; + if( module_provides( p_parser, p_item->psz_type ) ) + { + [object addItemWithTitle: [NSString stringWithUTF8String: module_GetLongName( p_parser ) ?: ""]]; + if( p_item->value.psz && !strcmp( p_item->value.psz, module_get_object( p_parser ) ) ) + [object selectItem: [object lastItem]]; + } + } + module_list_free( p_list ); + [object setToolTip: _NS(p_item->psz_longtext)]; } - (void)resetControls { module_config_t *p_item; - vlc_list_t *p_list; - module_t *p_parser; int i, y = 0; char *psz_tmp; -#define SetupIntList( object, name ) \ - [object removeAllItems]; \ - p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \ - for( i = 0; i < p_item->i_list; i++ ) \ - { \ - if( p_item->ppsz_list_text[i] != NULL) \ - [object addItemWithTitle: _NS( p_item->ppsz_list_text[i] )]; \ - else \ - [object addItemWithTitle: [NSString stringWithUTF8String: p_item->ppsz_list[i]]]; \ - } \ - if( p_item->value.i < [object numberOfItems] ) \ - [object selectItemAtIndex: p_item->value.i]; \ - else \ - [object selectItemAtIndex: 0]; \ - [object setToolTip: _NS( p_item->psz_longtext )] - -#define SetupStringList( object, name ) \ - [object removeAllItems]; \ - y = 0; \ - p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \ - for( i = 0; p_item->ppsz_list[i] != nil; i++ ) \ - { \ - [object addItemWithTitle: _NS( p_item->ppsz_list_text[i] )]; \ - if( p_item->value.psz && !strcmp( p_item->value.psz, p_item->ppsz_list[i] ) ) \ - y = i; \ - } \ - [object selectItemAtIndex: y]; \ - [object setToolTip: _NS( p_item->psz_longtext )] + [[o_sprefs_basicFull_matrix cellAtRow:0 column:0] setState: NSOnState]; + [[o_sprefs_basicFull_matrix cellAtRow:0 column:1] setState: NSOffState]; -#define SetupModuleList( object, name ) \ - p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \ - p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE ); \ - [object removeAllItems]; \ - [object addItemWithTitle: _NS("Default")]; \ - for( int i_index = 0; i_index < p_list->i_count; i_index++ ) \ - { \ - p_parser = (module_t *)p_list->p_values[i_index].p_object ; \ - \ - if( module_IsCapable( p_parser, p_item->psz_type ) ) \ - { \ - [object addItemWithTitle: [NSString stringWithUTF8String: module_GetLongName( p_parser )]]; \ - \ - if( p_item->value.psz && !strcmp( p_item->value.psz, module_GetObjName( p_parser ) ) ) \ - [object selectItem: [object lastItem]]; \ - } \ - } \ - vlc_list_release( p_list ); \ - [object setToolTip: _NS(p_item->psz_longtext)] - /********************** * interface settings * **********************/ - SetupStringList( o_intf_lang_pop, "language" ); - SetupIntList( o_intf_art_pop, "album-art" ); + [self setupButton: o_intf_lang_pop forStringList: "language"]; + [self setupButton: o_intf_art_pop forIntList: "album-art"]; - [o_intf_meta_ckb setState: config_GetInt( p_intf, "fetch-meta" )]; [o_intf_fspanel_ckb setState: config_GetInt( p_intf, "macosx-fspanel" )]; [o_intf_embedded_ckb setState: config_GetInt( p_intf, "embedded-video" )]; @@ -374,36 +419,40 @@ static VLCSimplePrefs *_o_sharedInstance = nil; [o_audio_spdif_ckb setState: config_GetInt( p_intf, "spdif" )]; - SetupIntList( o_audio_dolby_pop, "force-dolby-surround" ); + [self setupButton: o_audio_dolby_pop forIntList: "force-dolby-surround"]; - [o_audio_lang_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "audio-language" )]]; + [o_audio_lang_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "audio-language" ) ?: ""]]; [o_audio_headphone_ckb setState: config_GetInt( p_intf, "headphone-dolby" )]; psz_tmp = config_GetPsz( p_intf, "audio-filter" ); if( psz_tmp ) - [o_audio_norm_ckb setState: (int)strstr( psz_tmp, "normvol" )]; + { + [o_audio_norm_ckb setState: (int)strstr( psz_tmp, "volnorm" )]; + [o_audio_norm_fld setEnabled: [o_audio_norm_ckb state]]; + [o_audio_norm_stepper setEnabled: [o_audio_norm_ckb state]]; + } [o_audio_norm_fld setFloatValue: config_GetFloat( p_intf, "norm-max-level" )]; - SetupModuleList( o_audio_visual_pop, "audio-visual" ); + [self setupButton: o_audio_visual_pop forModuleList: "audio-visual"]; /* Last.FM is optional */ - if( module_Exists( p_intf, "audioscrobbler" ) ) + if( module_exists( "audioscrobbler" ) ) { - [o_audio_lastuser_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "lastfm-username" )]]; - [o_audio_lastpwd_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "lastfm-password" )]]; + [o_audio_lastuser_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "lastfm-username" ) ?: ""]]; + [o_audio_lastpwd_sfld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "lastfm-password" ) ?: ""]]; if( config_ExistIntf( VLC_OBJECT( p_intf ), "audioscrobbler" ) ) { [o_audio_last_ckb setState: NSOnState]; [o_audio_lastuser_fld setEnabled: YES]; - [o_audio_lastpwd_fld setEnabled: YES]; + [o_audio_lastpwd_sfld setEnabled: YES]; } else { [o_audio_last_ckb setState: NSOffState]; [o_audio_lastuser_fld setEnabled: NO]; - [o_audio_lastpwd_fld setEnabled: NO]; + [o_audio_lastpwd_sfld setEnabled: NO]; } } else @@ -418,7 +467,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; [o_video_skipFrames_ckb setState: config_GetInt( p_intf, "skip-frames" )]; [o_video_black_ckb setState: config_GetInt( p_intf, "macosx-black" )]; - SetupModuleList( o_video_output_pop, "vout" ); + [self setupButton: o_video_output_pop forModuleList: "vout"]; [o_video_device_pop removeAllItems]; i = 0; @@ -437,29 +486,22 @@ static VLCSimplePrefs *_o_sharedInstance = nil; [o_video_device_pop selectItemAtIndex: 0]; [o_video_device_pop selectItemWithTag: config_GetInt( p_intf, "macosx-vdev" )]; - if( config_GetPsz( p_intf, "snapshot-path" ) != NULL ) - [o_video_snap_folder_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "snapshot-path" )]]; - [o_video_snap_prefix_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "snapshot-prefix" )]]; + [o_video_snap_folder_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "snapshot-path" ) ?: ""]]; + [o_video_snap_prefix_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "snapshot-prefix" ) ?: ""]]; [o_video_snap_seqnum_ckb setState: config_GetInt( p_intf, "snapshot-sequential" )]; - - p_item = config_FindConfig( VLC_OBJECT(p_intf), "snapshot-format" ); - for( i = 0; p_item->ppsz_list[i] != nil; i++ ) - { - [o_video_snap_format_pop addItemWithTitle: [NSString stringWithUTF8String: p_item->ppsz_list[i]]]; - if( p_item->value.psz && !strcmp( p_item->value.psz, p_item->ppsz_list[i] ) ) - y = i; - } - [o_video_snap_format_pop selectItemAtIndex: y]; + [self setupButton: o_video_snap_format_pop forStringList: "snapshot-format"]; /*************************** * input & codecs settings * ***************************/ [o_input_serverport_fld setIntValue: config_GetInt( p_intf, "server-port" )]; if( config_GetPsz( p_intf, "http-proxy" ) != NULL ) - [o_input_httpproxy_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "http-proxy" )]]; + [o_input_httpproxy_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "http-proxy" ) ?: ""]]; + if( config_GetPsz( p_intf, "http-proxy" ) != NULL ) + [o_input_httpproxypwd_sfld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "http-proxy-pwd" ) ?: ""]]; [o_input_postproc_fld setIntValue: config_GetInt( p_intf, "ffmpeg-pp-q" )]; - SetupIntList( o_input_avi_pop, "avi-index" ); + [self setupButton: o_input_avi_pop forIntList: "avi-index"]; [o_input_rtsp_ckb setState: config_GetInt( p_intf, "rtsp-tcp" )]; @@ -496,9 +538,9 @@ static VLCSimplePrefs *_o_sharedInstance = nil; int i_cache = config_GetInt( p_intf, "file-caching"); TestCaC( "udp-caching" ); - if( module_Exists (p_intf, "dvdread") ) + if( module_exists ("dvdread") ) TestCaC( "dvdread-caching" ); - if( module_Exists (p_intf, "dvdnav") ) + if( module_exists ("dvdnav") ) TestCaC( "dvdnav-caching" ); TestCaC( "tcp-caching" ); TestCaC( "fake-caching" ); @@ -508,7 +550,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; TestCaCi( "rtsp-caching", 4 ); TestCaCi( "ftp-caching", 2 ); TestCaCi( "http-caching", 4 ); - if(module_Exists (p_intf, "access_realrtsp")) + if(module_exists ("access_realrtsp")) TestCaCi( "realrtsp-caching", 10 ); TestCaCi( "mms-caching", 19 ); if( b_cache_equal ) @@ -527,28 +569,14 @@ static VLCSimplePrefs *_o_sharedInstance = nil; *********************/ [o_osd_osd_ckb setState: config_GetInt( p_intf, "osd" )]; - [o_osd_encoding_pop removeAllItems]; - y = 0; - p_item = config_FindConfig( VLC_OBJECT(p_intf), "subsdec-encoding" ); - for( i = 0; p_item->ppsz_list[i] != nil; i++ ) - { - if( p_item->ppsz_list[i] != "" ) - [o_osd_encoding_pop addItemWithTitle: _NS( p_item->ppsz_list[i] )]; - else - [o_osd_encoding_pop addItemWithTitle: @" "]; - - if( p_item->value.psz && !strcmp( p_item->value.psz, p_item->ppsz_list[i] ) ) - y = i; - } - [o_osd_encoding_pop selectItemAtIndex: y]; + [self setupButton: o_osd_encoding_pop forStringList: "subsdec-encoding"]; - [o_osd_lang_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "sub-language" )]]; - if( config_GetPsz( p_intf, "freetype-font" ) != NULL ) - [o_osd_font_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "freetype-font" )]]; + [o_osd_lang_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "sub-language" ) ?: ""]]; + if( config_GetPsz( p_intf, "quartztext-font" ) != NULL ) + [o_osd_font_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "quartztext-font" ) ?: ""]]; - SetupIntList( o_osd_font_color_pop, "freetype-color" ); - SetupIntList( o_osd_font_size_pop, "freetype-rel-fontsize" ); - SetupIntList( o_osd_font_effect_pop, "freetype-effect" ); + [self setupButton: o_osd_font_color_pop forIntList: "quartztext-color"]; + [self setupButton: o_osd_font_size_pop forIntList: "quartztext-rel-fontsize"]; /******************** * hotkeys settings * @@ -577,9 +605,9 @@ static VLCSimplePrefs *_o_sharedInstance = nil; - (void)showSimplePrefs { /* we want to show the interface settings, if no category was chosen */ - if( [o_sprefs_toolbar selectedItemIdentifier] == nil ) + if( [[o_sprefs_win toolbar] selectedItemIdentifier] == nil ) { - [o_sprefs_toolbar setSelectedItemIdentifier: VLCIntfSettingToolbarIdentifier]; + [[o_sprefs_win toolbar] setSelectedItemIdentifier: VLCIntfSettingToolbarIdentifier]; [self showInterfaceSettings]; } @@ -607,11 +635,12 @@ static VLCSimplePrefs *_o_sharedInstance = nil; else if( sender == o_sprefs_basicFull_matrix ) { [o_sprefs_win orderOut: self]; + [[o_sprefs_basicFull_matrix cellAtRow:0 column:0] setState: NSOffState]; + [[o_sprefs_basicFull_matrix cellAtRow:0 column:1] setState: NSOnState]; [[[VLCMain sharedInstance] getPreferences] showPrefs]; - [self resetControls]; } else - msg_Err( p_intf, "unknown buttonAction sender" ); + msg_Warn( p_intf, "unknown buttonAction sender" ); } - (void)sheetDidEnd:(NSWindow *)o_sheet @@ -621,53 +650,68 @@ static VLCSimplePrefs *_o_sharedInstance = nil; if( i_return == NSAlertAlternateReturn ) { config_ResetAll( p_intf ); - b_intfSettingChanged = b_videoSettingChanged = b_audioSettingChanged = YES; [self resetControls]; + config_SaveConfigFile( p_intf, NULL ); } } -- (void)saveChangedSettings +static inline void save_int_list( intf_thread_t * p_intf, id object, const char * name ) +{ + NSNumber *p_valueobject; + module_config_t *p_item; + p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); + p_valueobject = (NSNumber *)[[object selectedItem] representedObject]; + assert([p_valueobject isKindOfClass:[NSNumber class]]); + if( p_valueobject) config_PutInt( p_intf, name, [p_valueobject intValue] ); +} + +static inline void save_string_list( intf_thread_t * p_intf, id object, const char * name ) { + NSString *p_stringobject; module_config_t *p_item; - vlc_list_t *p_list; - module_t *p_parser; + p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); + p_stringobject = (NSString *)[[object selectedItem] representedObject]; + assert([p_stringobject isKindOfClass:[NSString class]]); + if( p_stringobject ) config_PutPsz( p_intf, name, [p_stringobject UTF8String] ); +} + +static inline void save_module_list( intf_thread_t * p_intf, id object, const char * name ) +{ + module_config_t *p_item; + module_t *p_parser, **p_list; + + p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); + + p_list = module_list_get( NULL ); + for( size_t i_module_index = 0; p_list[i_module_index]; i_module_index++ ) + { + p_parser = p_list[i_module_index]; + + if( p_item->i_type == CONFIG_ITEM_MODULE && module_provides( p_parser, p_item->psz_type ) ) + { + if( [[[object selectedItem] title] isEqualToString: _NS( module_GetLongName( p_parser ) )] ) + { + config_PutPsz( p_intf, name, strdup( module_get_object( p_parser ))); + break; + } + } + } + module_list_free( p_list ); + if( [[[object selectedItem] title] isEqualToString: _NS( "Default" )] ) + config_PutPsz( p_intf, name, "" ); +} + +- (void)saveChangedSettings +{ char *psz_tmp; int i; + NSString *p_stringobject; -#define SaveIntList( object, name ) \ - p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \ - if( [object indexOfSelectedItem] >= 0 ) \ - config_PutInt( p_intf, name, p_item->pi_list[[object indexOfSelectedItem]] ); \ - else \ - config_PutInt( p_intf, name, [object intValue] ) \ +#define SaveIntList( object, name ) save_int_list( p_intf, object, name ) -#define SaveStringList( object, name ) \ - p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \ - if( [object indexOfSelectedItem] >= 0 ) \ - config_PutPsz( p_intf, name, strdup( p_item->ppsz_list[[object indexOfSelectedItem]] ) ); \ - else \ - config_PutPsz( p_intf, name, strdup( [[VLCMain sharedInstance] delocalizeString: [object stringValue]] ) ) - -#define SaveModuleList( object, name ) \ - p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \ - \ - p_list = vlc_list_find( VLCIntf, VLC_OBJECT_MODULE, FIND_ANYWHERE ); \ - for( int i_module_index = 0; i_module_index < p_list->i_count; i_module_index++ ) \ - { \ - p_parser = (module_t *)p_list->p_values[i_module_index].p_object; \ - \ - if( p_item->i_type == CONFIG_ITEM_MODULE && module_IsCapable( p_parser, p_item->psz_type ) ) \ - { \ - if( [[[object selectedItem] title] isEqualToString: _NS( module_GetLongName( p_parser ) )] ) \ - { \ - config_PutPsz( p_intf, name, strdup( module_GetObjName( p_parser ))); \ - break; \ - } \ - } \ - } \ - vlc_list_release( p_list ); \ - if( [[[object selectedItem] title] isEqualToString: _NS( "Default" )] ) \ - config_PutPsz( p_intf, name, "" ) +#define SaveStringList( object, name ) save_string_list( p_intf, object, name ) + +#define SaveModuleList( object, name ) save_module_list( p_intf, object, name ) /********************** * interface settings * @@ -677,17 +721,18 @@ static VLCSimplePrefs *_o_sharedInstance = nil; SaveStringList( o_intf_lang_pop, "language" ); SaveIntList( o_intf_art_pop, "album-art" ); - config_PutInt( p_intf, "fetch-meta", [o_intf_meta_ckb state] ); config_PutInt( p_intf, "macosx-fspanel", [o_intf_fspanel_ckb state] ); config_PutInt( p_intf, "embedded-video", [o_intf_embedded_ckb state] ); /* okay, let's save our changes to vlcrc */ i = config_SaveConfigFile( p_intf, "main" ); - i = config_SaveConfigFile( p_intf, "macosx" ); + i = i + config_SaveConfigFile( p_intf, "macosx" ); if( i != 0 ) { msg_Err( p_intf, "An error occurred while saving the Interface settings using SimplePrefs (%i)", i ); + intf_UserFatal( p_intf, false, _("Interface Settings not saved"), + _("An error occured while saving your settings via SimplePrefs (%i)."), i ); i = 0; } @@ -708,37 +753,44 @@ static VLCSimplePrefs *_o_sharedInstance = nil; config_PutPsz( p_intf, "audio-language", [[o_audio_lang_fld stringValue] UTF8String] ); config_PutInt( p_intf, "headphone-dolby", [o_audio_headphone_ckb state] ); - psz_tmp = config_GetPsz( p_intf, "audio-filter" ); - if(! psz_tmp) - config_PutPsz( p_intf, "audio-filter", "volnorm" ); - else if( (int)strstr( psz_tmp, "normvol" ) == NO ) + if( [o_audio_norm_ckb state] == NSOnState ) { - /* work-around a GCC 4.0.1 bug */ - psz_tmp = (char *)[[NSString stringWithFormat: @"%s:volnorm", psz_tmp] UTF8String]; - config_PutPsz( p_intf, "audio-filter", psz_tmp ); + psz_tmp = config_GetPsz( p_intf, "audio-filter" ); + if(! psz_tmp) + config_PutPsz( p_intf, "audio-filter", "volnorm" ); + else if( (int)strstr( psz_tmp, "normvol" ) == NO ) + { + /* work-around a GCC 4.0.1 bug */ + psz_tmp = (char *)[[NSString stringWithFormat: @"%s:volnorm", psz_tmp] UTF8String]; + config_PutPsz( p_intf, "audio-filter", psz_tmp ); + } } else { - psz_tmp = (char *)[[[NSString stringWithUTF8String: psz_tmp] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@":volnorm"]] UTF8String]; - psz_tmp = (char *)[[[NSString stringWithUTF8String: psz_tmp] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@"volnorm:"]] UTF8String]; - psz_tmp = (char *)[[[NSString stringWithUTF8String: psz_tmp] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@"volnorm"]] UTF8String]; - config_PutPsz( p_intf, "audio-filter", psz_tmp ); + psz_tmp = config_GetPsz( p_intf, "audio-filter" ); + if( psz_tmp ) + { + psz_tmp = (char *)[[[NSString stringWithUTF8String: psz_tmp] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@":volnorm"]] UTF8String]; + psz_tmp = (char *)[[[NSString stringWithUTF8String: psz_tmp] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@"volnorm:"]] UTF8String]; + psz_tmp = (char *)[[[NSString stringWithUTF8String: psz_tmp] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@"volnorm"]] UTF8String]; + config_PutPsz( p_intf, "audio-filter", psz_tmp ); + } } config_PutFloat( p_intf, "norm-max-level", [o_audio_norm_fld floatValue] ); SaveModuleList( o_audio_visual_pop, "audio-visual" ); /* Last.FM is optional */ - if( module_Exists( p_intf, "audioscrobbler" ) ) + if( module_exists( "audioscrobbler" ) ) { [o_audio_last_ckb setEnabled: YES]; if( [o_audio_last_ckb state] == NSOnState ) - config_AddIntf( VLC_OBJECT( p_intf ), "audioscrobbler" ); + config_AddIntf( p_intf, "audioscrobbler" ); else - config_RemoveIntf( VLC_OBJECT( p_intf ), "audioscrobbler" ); + config_RemoveIntf( p_intf, "audioscrobbler" ); config_PutPsz( p_intf, "lastfm-username", [[o_audio_lastuser_fld stringValue] UTF8String] ); - config_PutPsz( p_intf, "lastfm-password", [[o_audio_lastpwd_fld stringValue] UTF8String] ); + config_PutPsz( p_intf, "lastfm-password", [[o_audio_lastpwd_sfld stringValue] UTF8String] ); } else [o_audio_last_ckb setEnabled: NO]; @@ -751,6 +803,9 @@ static VLCSimplePrefs *_o_sharedInstance = nil; if( i != 0 ) { msg_Err( p_intf, "An error occurred while saving the Audio settings using SimplePrefs (%i)", i ); + intf_UserFatal( p_intf, false, _("Audio Settings not saved"), + _("An error occured while saving your settings via SimplePrefs (%i)."), i ); + i = 0; } b_audioSettingChanged = NO; @@ -773,9 +828,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; config_PutPsz( p_intf, "snapshot-path", [[o_video_snap_folder_fld stringValue] UTF8String] ); config_PutPsz( p_intf, "snapshot-prefix", [[o_video_snap_prefix_fld stringValue] UTF8String] ); config_PutInt( p_intf, "snapshot-sequential", [o_video_snap_seqnum_ckb state] ); - - if( [o_video_snap_format_pop indexOfSelectedItem] >= 0 ) - config_PutPsz( p_intf, "snapshot-format", [[[o_video_snap_format_pop selectedItem] title] UTF8String] ); + SaveStringList( o_video_snap_format_pop, "snapshot-format" ); i = config_SaveConfigFile( p_intf, "main" ); i = i + config_SaveConfigFile( p_intf, "macosx" ); @@ -783,6 +836,8 @@ static VLCSimplePrefs *_o_sharedInstance = nil; if( i != 0 ) { msg_Err( p_intf, "An error occurred while saving the Video settings using SimplePrefs (%i)", i ); + intf_UserFatal( p_intf, false, _("Video Settings not saved"), + _("An error occured while saving your settings via SimplePrefs (%i)."), i ); i = 0; } b_videoSettingChanged = NO; @@ -795,6 +850,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; { config_PutInt( p_intf, "server-port", [o_input_serverport_fld intValue] ); config_PutPsz( p_intf, "http-proxy", [[o_input_httpproxy_fld stringValue] UTF8String] ); + config_PutPsz( p_intf, "http-proxy-pwd", [[o_input_httpproxypwd_sfld stringValue] UTF8String] ); config_PutInt( p_intf, "ffmpeg-pp-q", [o_input_postproc_fld intValue] ); SaveIntList( o_input_avi_pop, "avi-index" ); @@ -803,14 +859,14 @@ static VLCSimplePrefs *_o_sharedInstance = nil; #define CaCi( name, int ) config_PutInt( p_intf, name, int * [[o_input_cachelevel_pop selectedItem] tag] ) #define CaC( name ) CaCi( name, 1 ) - msg_Dbg( p_intf, "Adjusting all cache values at: %i", [[o_input_cachelevel_pop selectedItem] tag] ); + msg_Dbg( p_intf, "Adjusting all cache values to: %i", [[o_input_cachelevel_pop selectedItem] tag] ); CaC( "udp-caching" ); - if( module_Exists (p_intf, "dvdread" ) ) + if( module_exists ( "dvdread" ) ) { CaC( "dvdread-caching" ); i = i + config_SaveConfigFile( p_intf, "dvdread" ); } - if( module_Exists (p_intf, "dvdnav" ) ) + if( module_exists ( "dvdnav" ) ) { CaC( "dvdnav-caching" ); i = i + config_SaveConfigFile( p_intf, "dvdnav" ); @@ -820,7 +876,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; CaC( "screen-caching" ); CaCi( "rtsp-caching", 4 ); CaCi( "ftp-caching", 2 ); CaCi( "http-caching", 4 ); - if( module_Exists (p_intf, "access_realrtsp" ) ) + if( module_exists ( "access_realrtsp" ) ) { CaCi( "realrtsp-caching", 10 ); i = i + config_SaveConfigFile( p_intf, "access_realrtsp" ); @@ -860,10 +916,13 @@ static VLCSimplePrefs *_o_sharedInstance = nil; i = i + config_SaveConfigFile( p_intf, "access_ftp" ); i = i + config_SaveConfigFile( p_intf, "access_mms" ); i = i + config_SaveConfigFile( p_intf, "live555" ); + i = i + config_SaveConfigFile( p_intf, "avi" ); if( i != 0 ) { msg_Err( p_intf, "An error occurred while saving the Input settings using SimplePrefs (%i)", i ); + intf_UserFatal( p_intf, false, _("Input Settings not saved"), + _("An error occured while saving your settings via SimplePrefs (%i)."), i ); i = 0; } b_inputSettingChanged = NO; @@ -880,17 +939,18 @@ static VLCSimplePrefs *_o_sharedInstance = nil; config_PutPsz( p_intf, "subsdec-encoding", [[[o_osd_encoding_pop selectedItem] title] UTF8String] ); config_PutPsz( p_intf, "sub-language", [[o_osd_lang_fld stringValue] UTF8String] ); - config_PutPsz( p_intf, "freetype-font", [[o_osd_font_fld stringValue] UTF8String] ); + config_PutPsz( p_intf, "quartztext-font", [[o_osd_font_fld stringValue] UTF8String] ); - SaveIntList( o_osd_font_color_pop, "freetype-color" ); - SaveIntList( o_osd_font_size_pop, "freetype-rel-fontsize" ); - SaveIntList( o_osd_font_effect_pop, "freetype-effect" ); + SaveIntList( o_osd_font_color_pop, "quartztext-color" ); + SaveIntList( o_osd_font_size_pop, "quartztext-rel-fontsize" ); i = config_SaveConfigFile( p_intf, NULL ); if( i != 0 ) { msg_Err( p_intf, "An error occurred while saving the OSD/Subtitle settings using SimplePrefs (%i)", i ); + intf_UserFatal( p_intf, false, _("On Screen Display/Subtitle Settings not saved"), + _("An error occured while saving your settings via SimplePrefs (%i)."), i ); i = 0; } b_osdSettingChanged = NO; @@ -914,6 +974,8 @@ static VLCSimplePrefs *_o_sharedInstance = nil; if( i != 0 ) { msg_Err( p_intf, "An error occurred while saving the Hotkey settings using SimplePrefs (%i)", i ); + intf_UserFatal( p_intf, false, _("Hotkeys not saved"), + _("An error occured while saving your settings via SimplePrefs (%i)."), i ); i = 0; } b_hotkeyChanged = NO; @@ -963,7 +1025,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil; - (void)showInterfaceSettings { - msg_Dbg( p_intf, "showing interface settings" ); [self showSettingsForCategory: o_intf_view]; } @@ -975,16 +1036,22 @@ static VLCSimplePrefs *_o_sharedInstance = nil; if( sender == o_audio_vol_fld ) [o_audio_vol_sld setIntValue: [o_audio_vol_fld intValue]]; + if( sender == o_audio_norm_ckb ) + { + [o_audio_norm_stepper setEnabled: [o_audio_norm_ckb state]]; + [o_audio_norm_fld setEnabled: [o_audio_norm_ckb state]]; + } + if( sender == o_audio_last_ckb ) { if( [o_audio_last_ckb state] == NSOnState ) { - [o_audio_lastpwd_fld setEnabled: YES]; + [o_audio_lastpwd_sfld setEnabled: YES]; [o_audio_lastuser_fld setEnabled: YES]; } else { - [o_audio_lastpwd_fld setEnabled: NO]; + [o_audio_lastpwd_sfld setEnabled: NO]; [o_audio_lastuser_fld setEnabled: NO]; } } @@ -994,7 +1061,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil; - (void)showAudioSettings { - msg_Dbg( p_intf, "showing audio settings" ); [self showSettingsForCategory: o_audio_view]; } @@ -1040,38 +1106,42 @@ static VLCSimplePrefs *_o_sharedInstance = nil; - (void)showVideoSettings { - msg_Dbg( p_intf, "showing video settings" ); [self showSettingsForCategory: o_video_view]; } - (IBAction)osdSettingChanged:(id)sender { - if( sender == o_osd_font_btn ) - { - o_selectFolderPanel = [[NSOpenPanel alloc] init]; - [o_selectFolderPanel setCanChooseDirectories: NO]; - [o_selectFolderPanel setCanChooseFiles: YES]; - [o_selectFolderPanel setResolvesAliases: YES]; - [o_selectFolderPanel setAllowsMultipleSelection: NO]; - [o_selectFolderPanel setMessage: _NS("Choose the font to display your Subtitles with.")]; - [o_selectFolderPanel setCanCreateDirectories: NO]; - [o_selectFolderPanel setPrompt: _NS("Choose")]; - [o_selectFolderPanel setAllowedFileTypes: [NSArray arrayWithObjects: @"dfont", @"ttf", @"otf", @"FFIL", nil]]; - [o_selectFolderPanel beginSheetForDirectory: @"/System/Library/Fonts/" file: nil modalForWindow: o_sprefs_win - modalDelegate: self - didEndSelector: @selector(savePanelDidEnd:returnCode:contextInfo:) - contextInfo: o_osd_font_btn]; - } - else - b_osdSettingChanged = YES; + b_osdSettingChanged = YES; } - (void)showOSDSettings { - msg_Dbg( p_intf, "showing OSD settings" ); [self showSettingsForCategory: o_osd_view]; } +- (IBAction)showFontPicker:(id)sender +{ + char * font = config_GetPsz( p_intf, "quartztext-font" ); + NSString * fontFamilyName = font ? [NSString stringWithUTF8String: font] : nil; + free(font); + if( fontFamilyName ) + { + NSFontDescriptor * fd = [NSFontDescriptor fontDescriptorWithFontAttributes:nil]; + NSFont * font = [NSFont fontWithDescriptor:[fd fontDescriptorWithFamily:fontFamilyName] textTransform:nil]; + [[NSFontManager sharedFontManager] setSelectedFont:font isMultiple:NO]; + } + [[NSFontManager sharedFontManager] setDelegate: self]; + [o_sprefs_win makeFirstResponder: o_sprefs_win]; + [[NSFontPanel sharedFontPanel] orderFront:self]; +} + +- (void)changeFont:(id)sender +{ + NSFont * font = [sender convertFont:[[NSFontManager sharedFontManager] selectedFont]]; + [o_osd_font_fld setStringValue:[font familyName]]; + [self osdSettingChanged:self]; +} + - (IBAction)inputSettingChanged:(id)sender { if( sender == o_input_cachelevel_pop ) @@ -1087,7 +1157,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil; - (void)showInputSettings { - msg_Dbg( p_intf, "showing Input Settings" ); [self showSettingsForCategory: o_input_view]; } @@ -1142,7 +1211,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil; - (void)showHotkeySettings { - msg_Dbg( p_intf, "showing HotKey Settings" ); [self showSettingsForCategory: o_hotkeys_view]; } @@ -1164,7 +1232,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; } } -- (void)changeHotkeyTo: (int)i_theNewKey +- (BOOL)changeHotkeyTo: (int)i_theNewKey { int i_returnValue; i_returnValue = [o_hotkeysNonUseableKeys indexOfObject: [NSNumber numberWithInt: i_theNewKey]]; @@ -1173,6 +1241,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; [o_hotkeys_change_keys_lbl setStringValue: _NS("Invalid combination")]; [o_hotkeys_change_taken_lbl setStringValue: _NS("Regrettably, these keys cannot be assigned as hotkey shortcuts.")]; [o_hotkeys_change_ok_btn setEnabled: NO]; + return NO; } else { @@ -1194,6 +1263,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; [o_hotkeys_change_taken_lbl setStringValue: @""]; [o_hotkeys_change_ok_btn setEnabled: YES]; + return YES; } } @@ -1205,133 +1275,59 @@ static VLCSimplePrefs *_o_sharedInstance = nil; @implementation VLCHotkeyChangeWindow +- (BOOL)acceptsFirstResponder +{ + return YES; +} + +- (BOOL)becomeFirstResponder +{ + return YES; +} + - (BOOL)resignFirstResponder { /* We need to stay the first responder or we'll miss the user's input */ return NO; } -- (void)keyDown:(NSEvent *)o_theEvent +- (BOOL)performKeyEquivalent:(NSEvent *)o_theEvent { - int i_nonReadableKey = 0; + unichar key; + int i_key = 0; if( [o_theEvent modifierFlags] & NSControlKeyMask ) - i_nonReadableKey = i_nonReadableKey | KEY_MODIFIER_CTRL; + i_key |= KEY_MODIFIER_CTRL; if( [o_theEvent modifierFlags] & NSAlternateKeyMask ) - i_nonReadableKey = i_nonReadableKey | KEY_MODIFIER_ALT; + i_key |= KEY_MODIFIER_ALT; if( [o_theEvent modifierFlags] & NSShiftKeyMask ) - i_nonReadableKey = i_nonReadableKey | KEY_MODIFIER_SHIFT; + i_key |= KEY_MODIFIER_SHIFT; if( [o_theEvent modifierFlags] & NSCommandKeyMask ) - i_nonReadableKey = i_nonReadableKey | KEY_MODIFIER_COMMAND; + i_key |= KEY_MODIFIER_COMMAND; - if( [o_theEvent modifierFlags] & NSFunctionKeyMask ) + key = [[[o_theEvent charactersIgnoringModifiers] lowercaseString] characterAtIndex: 0]; + if( key ) { - unichar key = 0; - key = [[o_theEvent charactersIgnoringModifiers] characterAtIndex: 0]; - - switch( key ) - { - case 0x1b: - i_nonReadableKey = i_nonReadableKey | KEY_ESC; - break; - case NSF1FunctionKey: - i_nonReadableKey = i_nonReadableKey | KEY_F1; - break; - case NSF2FunctionKey: - i_nonReadableKey = i_nonReadableKey | KEY_F2; - break; - case NSF3FunctionKey: - i_nonReadableKey = i_nonReadableKey | KEY_F3; - break; - case NSF4FunctionKey: - i_nonReadableKey = i_nonReadableKey | KEY_F4; - break; - case NSF5FunctionKey: - i_nonReadableKey = i_nonReadableKey | KEY_F5; - break; - case NSF6FunctionKey: - i_nonReadableKey = i_nonReadableKey | KEY_F6; - break; - case NSF7FunctionKey: - i_nonReadableKey = i_nonReadableKey | KEY_F7; - break; - case NSF8FunctionKey: - i_nonReadableKey = i_nonReadableKey | KEY_F8; - break; - case NSF9FunctionKey: - i_nonReadableKey = i_nonReadableKey | KEY_F9; - break; - case NSF10FunctionKey: - i_nonReadableKey = i_nonReadableKey | KEY_F10; - break; - case NSF11FunctionKey: - i_nonReadableKey = i_nonReadableKey | KEY_F11; - break; - case NSF12FunctionKey: - i_nonReadableKey = i_nonReadableKey | KEY_F12; - break; - case NSInsertFunctionKey: - i_nonReadableKey = i_nonReadableKey | KEY_INSERT; - break; - case NSHomeFunctionKey: - i_nonReadableKey = i_nonReadableKey | KEY_HOME; - break; - case NSEndFunctionKey: - i_nonReadableKey = i_nonReadableKey | KEY_END; - break; - case NSPageUpFunctionKey: - i_nonReadableKey = i_nonReadableKey | KEY_PAGEUP; - break; - case NSPageDownFunctionKey: - i_nonReadableKey = i_nonReadableKey | KEY_PAGEDOWN; - break; - case NSMenuFunctionKey: - i_nonReadableKey = i_nonReadableKey | KEY_MENU; - break; - case NSTabCharacter: - i_nonReadableKey = i_nonReadableKey | KEY_TAB; - break; - case NSDeleteCharacter: - i_nonReadableKey = i_nonReadableKey | KEY_DELETE; - break; - case NSBackspaceCharacter: - i_nonReadableKey = i_nonReadableKey | KEY_BACKSPACE; - break; - case NSUpArrowFunctionKey: - i_nonReadableKey = i_nonReadableKey | KEY_UP; - break; - case NSDownArrowFunctionKey: - i_nonReadableKey = i_nonReadableKey | KEY_DOWN; - break; - case NSRightArrowFunctionKey: - i_nonReadableKey = i_nonReadableKey | KEY_RIGHT; - break; - case NSLeftArrowFunctionKey: - i_nonReadableKey = i_nonReadableKey | KEY_LEFT; - break; - case NSEnterCharacter: - i_nonReadableKey = i_nonReadableKey | KEY_ENTER; - break; - default: - { - msg_Warn( VLCIntf, "user pressed unknown function key" ); - i_nonReadableKey = 0; - break; - } - } - } - else - { - if( [[o_theEvent charactersIgnoringModifiers] isEqualToString: @" "] ) - i_nonReadableKey = i_nonReadableKey | KEY_SPACE; - else - i_nonReadableKey = i_nonReadableKey | StringToKey( (char *)[[[o_theEvent charactersIgnoringModifiers] lowercaseString] UTF8String] ); + i_key |= CocoaKeyToVLC( key ); + return [[[VLCMain sharedInstance] getSimplePreferences] changeHotkeyTo: i_key]; } + return FALSE; +} - [[[VLCMain sharedInstance] getSimplePreferences] changeHotkeyTo: i_nonReadableKey]; +@end + +@implementation VLCSimplePrefsWindow + +- (BOOL)acceptsFirstResponder +{ + return YES; } +- (void)changeFont:(id)sender +{ + [[[VLCMain sharedInstance] getSimplePreferences] changeFont: sender]; +} @end