X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fsimple_prefs.m;h=4dbe968b6ad3ed50e0db5a9fd5a0295596c8a000;hb=8fe4188e7efdd897641a7a28711f32cc4cd6391e;hp=2155a20df11177eee519937eb38cfa3405831a1d;hpb=d95df6f6e9bdfe4d6b169a858a51efa0eded87cb;p=vlc diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m index 2155a20df1..4dbe968b6a 100644 --- a/modules/gui/macosx/simple_prefs.m +++ b/modules/gui/macosx/simple_prefs.m @@ -1,7 +1,7 @@ /***************************************************************************** * simple_prefs.m: Simple Preferences for Mac OS X ***************************************************************************** -* Copyright (C) 2008 the VideoLAN team +* Copyright (C) 2008-2009 the VideoLAN team * $Id$ * * Authors: Felix Paul Kühne @@ -24,6 +24,12 @@ #import "simple_prefs.h" #import "prefs.h" #import +#import +#import +#import "misc.h" +#import "intf.h" +#import "AppleRemote.h" +#import //for o_intf_last_update_lbl static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier"; static NSString* VLCIntfSettingToolbarIdentifier = @"Intf Settings Item Identifier"; @@ -47,20 +53,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]; + + [o_keyInTransition release]; [super dealloc]; } @@ -70,22 +78,22 @@ static VLCSimplePrefs *_o_sharedInstance = nil; { NSMutableString *o_temp_str = [[[NSMutableString alloc] init] autorelease]; if( val & KEY_MODIFIER_CTRL ) - [o_temp_str appendString: @"Ctrl+"]; + [o_temp_str appendString: [NSString stringWithUTF8String: "\xE2\x8C\x83"]]; if( val & KEY_MODIFIER_ALT ) - [o_temp_str appendString: @"Alt+"]; + [o_temp_str appendString: [NSString stringWithUTF8String: "\xE2\x8C\xA5"]]; if( val & KEY_MODIFIER_SHIFT ) - [o_temp_str appendString: @"Shift+"]; + [o_temp_str appendString: [NSString stringWithUTF8String: "\xE2\x87\xA7"]]; if( val & KEY_MODIFIER_COMMAND ) - [o_temp_str appendString: @"Command+"]; - - unsigned int i_keys = sizeof(vlc_keys)/sizeof(key_descriptor_t); - for( unsigned int i = 0; i< i_keys; i++ ) + [o_temp_str appendString: [NSString stringWithUTF8String: "\xE2\x8C\x98"]]; + + char *base = KeyToString( val & ~KEY_MODIFIER ); + if( base ) { - if( vlc_keys[i].i_key_code == (val& ~KEY_MODIFIER) ) - { - [o_temp_str appendString: [NSString stringWithUTF8String: vlc_keys[i].psz_key_string]]; - } + [o_temp_str appendString: [NSString stringWithUTF8String: base]]; + free( base ); } + else + o_temp_str = [NSMutableString stringWithString:_NS("Not Set")]; return o_temp_str; } @@ -94,13 +102,71 @@ 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]; [o_sprefs_toolbar setSizeMode: NSToolbarSizeModeRegular]; [o_sprefs_toolbar setDelegate: self]; [o_sprefs_win setToolbar: o_sprefs_toolbar]; + + /* setup useful stuff */ + o_hotkeysNonUseableKeys = [[NSArray arrayWithObjects: + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'c'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'x'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'v'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'a'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|','], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'h'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|'h'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'o'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'o'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'d'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'n'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'s'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'z'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'l'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'r'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'0'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'1'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'2'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'3'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'m'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'w'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'w'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'c'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'p'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'i'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'e'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'e'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'b'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'m'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_CTRL|'m'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'?'], + [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|'?'], + 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 @@ -108,22 +174,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; 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 ); @@ -138,7 +189,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] ) { @@ -172,7 +223,220 @@ static VLCSimplePrefs *_o_sharedInstance = nil; - (void)initStrings { - msg_Warn( p_intf, "localisation of the simple preferences is not implemented!" ); + /* audio */ + [o_audio_dolby_txt setStringValue: _NS("Force detection of Dolby Surround")]; + [o_audio_effects_box setTitle: _NS("Effects")]; + [o_audio_enable_ckb setTitle: _NS("Enable Audio")]; + [o_audio_general_box setTitle: _NS("General Audio")]; + [o_audio_headphone_ckb setTitle: _NS("Headphone surround effect")]; + [o_audio_lang_txt setStringValue: _NS("Preferred Audio language")]; + [o_audio_last_ckb setTitle: _NS("Enable Last.fm submissions")]; + [o_audio_lastpwd_txt setStringValue: _NS("Password")]; + [o_audio_lastuser_txt setStringValue: _NS("User name")]; + [o_audio_norm_ckb setTitle: _NS("Volume normalizer")]; + [o_audio_spdif_ckb setTitle: _NS("Use S/PDIF when available")]; + [o_audio_visual_txt setStringValue: _NS("Visualization")]; + [o_audio_vol_txt setStringValue: _NS("Default Volume")]; + + /* hotkeys */ + [o_hotkeys_change_btn setTitle: _NS("Change")]; + [o_hotkeys_change_win setTitle: _NS("Change Hotkey")]; + [o_hotkeys_change_cancel_btn setTitle: _NS("Cancel")]; + [o_hotkeys_change_ok_btn setTitle: _NS("OK")]; + [o_hotkeys_clear_btn setTitle: _NS("Clear")]; + [o_hotkeys_lbl setStringValue: _NS("Select an action to change the associated hotkey:")]; + [[[o_hotkeys_listbox tableColumnWithIdentifier: @"action"] headerCell] setStringValue: _NS("Action")]; + [[[o_hotkeys_listbox tableColumnWithIdentifier: @"shortcut"] headerCell] setStringValue: _NS("Shortcut")]; + + /* input */ + [o_input_avi_txt setStringValue: _NS("Repair AVI Files")]; + [o_input_cachelevel_txt setStringValue: _NS("Default Caching Level")]; + [o_input_caching_box setTitle: _NS("Caching")]; + [o_input_cachelevel_custom_txt setStringValue: _NS("Use the complete preferences to configure custom caching values for each access module.")]; + [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")]; + [o_input_rtsp_ckb setTitle: _NS("Use RTP over RTSP (TCP)")]; + [o_input_skipLoop_txt setStringValue: _NS("Skip the loop filter for H.264 decoding")]; + [o_input_serverport_txt setStringValue: _NS("Default Server Port")]; + + /* interface */ + [o_intf_art_txt setStringValue: _NS("Album art download policy")]; + [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_network_box setTitle: _NS("Privacy / Network Interaction")]; + [o_intf_appleremote_ckb setTitle: _NS("Control playback with the Apple Remote")]; + [o_intf_mediakeys_ckb setTitle: _NS("Control playback with media keys")]; + [o_intf_mediakeys_bg_ckb setTitle: _NS("...when VLC is in background")]; + [o_intf_update_ckb setTitle: _NS("Automatically check for updates")]; + [o_intf_last_update_lbl setStringValue: @""]; + + /* 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("Choose...")]; + [o_osd_font_color_txt setStringValue: _NS("Font Color")]; + [o_osd_font_size_txt setStringValue: _NS("Font Size")]; + [o_osd_font_txt setStringValue: _NS("Font")]; + [o_osd_lang_box setTitle: _NS("Subtitle Languages")]; + [o_osd_lang_txt setStringValue: _NS("Preferred Subtitle Language")]; + [o_osd_osd_box setTitle: _NS("On Screen Display")]; + [o_osd_osd_ckb setTitle: _NS("Enable OSD")]; + + /* video */ + [o_video_black_ckb setTitle: _NS("Black screens in Fullscreen mode")]; + [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")]; + [o_video_onTop_ckb setTitle: _NS("Always on top")]; + [o_video_output_txt setStringValue: _NS("Output module")]; + [o_video_skipFrames_ckb setTitle: _NS("Skip frames")]; + [o_video_snap_box setTitle: _NS("Video snapshots")]; + [o_video_snap_folder_btn setTitle: _NS("Browse...")]; + [o_video_snap_folder_txt setStringValue: _NS("Folder")]; + [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")]; +} + +/* TODO: move this part to core */ +#define config_GetLabel(a,b) __config_GetLabel(VLC_OBJECT(a),b) +static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_name ) +{ + module_config_t *p_config; + + p_config = config_FindConfig( p_this, psz_name ); + + /* sanity checks */ + if( !p_config ) + { + msg_Err( p_this, "option %s does not exist", psz_name ); + return NULL; + } + + if ( p_config->psz_longtext ) + return p_config->psz_longtext; + else if( p_config->psz_text ) + return p_config->psz_text; + else + msg_Warn( p_this, "option %s does not include any help", psz_name ); + + return NULL; +} + +- (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] && strcmp(p_item->ppsz_list[i],"") == 0 ) + { + [[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 ) module_list_free(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)setupButton: (NSButton *)object forBoolValue: (const char *)name +{ + [object setState: config_GetInt( p_intf, name )]; + [object setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, name )]]; +} + +- (void)setupField:(NSTextField *)o_object forOption:(const char *)psz_option +{ + char *psz_tmp = config_GetPsz( p_intf, psz_option ); + [o_object setStringValue: [NSString stringWithUTF8String: psz_tmp ?: ""]]; + [o_object setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, psz_option )]]; + free( psz_tmp ); } - (void)resetControls @@ -181,123 +445,125 @@ static VLCSimplePrefs *_o_sharedInstance = nil; 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] - - #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] - + [[o_sprefs_basicFull_matrix cellAtRow:0 column:0] setState: NSOnState]; + [[o_sprefs_basicFull_matrix cellAtRow:0 column:1] setState: NSOffState]; + /********************** * interface settings * **********************/ - SetupStringList( o_intf_lang_pop, "language" ); - SetupIntList( o_intf_art_pop, "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" )]; + [self setupButton: o_intf_lang_pop forStringList: "language"]; + [self setupButton: o_intf_art_pop forIntList: "album-art"]; + + [self setupButton: o_intf_fspanel_ckb forBoolValue: "macosx-fspanel"]; + [self setupButton: o_intf_embedded_ckb forBoolValue: "embedded-video"]; + [self setupButton: o_intf_appleremote_ckb forBoolValue: "macosx-appleremote"]; + [self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"]; + [self setupButton: o_intf_mediakeys_bg_ckb forBoolValue: "macosx-mediakeys-background"]; + [o_intf_mediakeys_bg_ckb setEnabled: [o_intf_mediakeys_ckb state]]; + if( [[SUUpdater sharedUpdater] lastUpdateCheckDate] != NULL ) + [o_intf_last_update_lbl setStringValue: [NSString stringWithFormat: _NS("Last check on: %@"), [[[SUUpdater sharedUpdater] lastUpdateCheckDate] descriptionWithLocale: [[NSUserDefaults standardUserDefaults] dictionaryRepresentation]]]]; + else + [o_intf_last_update_lbl setStringValue: _NS("No check was performed yet.")]; /****************** * audio settings * ******************/ - [o_audio_enable_ckb setState: config_GetInt( p_intf, "audio" )]; - [o_audio_vol_fld setIntValue: config_GetInt( p_intf, "volume" )]; - [o_audio_vol_sld setIntValue: config_GetInt( p_intf, "volume" )]; + [self setupButton: o_audio_enable_ckb forBoolValue: "audio"]; + i = (config_GetInt( p_intf, "volume" ) * 0.390625); + [o_audio_vol_fld setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, "volume")]]; + [o_audio_vol_fld setIntValue: i]; + [o_audio_vol_sld setToolTip: [o_audio_vol_fld toolTip]]; + [o_audio_vol_sld setIntValue: i]; - [o_audio_spdif_ckb setState: config_GetInt( p_intf, "spdif" )]; + [self setupButton: o_audio_spdif_ckb forBoolValue: "spdif"]; - SetupIntList( o_audio_dolby_pop, "force-dolby-surround" ); + [self setupButton: o_audio_dolby_pop forIntList: "force-dolby-surround"]; + [self setupField: o_audio_lang_fld forOption: "audio-language"]; - [o_audio_lang_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "audio-language" )]]; + [self setupButton: o_audio_headphone_ckb forBoolValue: "headphone-dolby"]; - [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: (NSInteger)strstr( psz_tmp, "volnorm" )]; + [o_audio_norm_fld setEnabled: [o_audio_norm_ckb state]]; + [o_audio_norm_stepper setEnabled: [o_audio_norm_ckb state]]; + free( psz_tmp ); + } [o_audio_norm_fld setFloatValue: config_GetFloat( p_intf, "norm-max-level" )]; - - // visualizer - msg_Warn( p_intf, "visualizer not implemented!" ); - + [o_audio_norm_fld setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, "norm-max-level")]]; + + [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" )]]; + [self setupField: o_audio_lastuser_fld forOption:"lastfm-username"]; + [self setupField: o_audio_lastpwd_sfld forOption:"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_sfld setEnabled: YES]; + } else + { [o_audio_last_ckb setState: NSOffState]; + [o_audio_lastuser_fld setEnabled: NO]; + [o_audio_lastpwd_sfld setEnabled: NO]; + } } + else + [o_audio_last_ckb setEnabled: NO]; /****************** * video settings * ******************/ - [o_video_enable_ckb setState: config_GetInt( p_intf, "video" )]; - [o_video_fullscreen_ckb setState: config_GetInt( p_intf, "fullscreen" )]; - [o_video_onTop_ckb setState: config_GetInt( p_intf, "video-on-top" )]; - [o_video_skipFrames_ckb setState: config_GetInt( p_intf, "skip-frames" )]; - [o_video_black_ckb setState: config_GetInt( p_intf, "macosx-black" )]; - - msg_Warn( p_intf, "vout module and display device selectors not implemented!" ); - - 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_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++ ) + [self setupButton: o_video_enable_ckb forBoolValue: "video"]; + [self setupButton: o_video_fullscreen_ckb forBoolValue: "fullscreen"]; + [self setupButton: o_video_onTop_ckb forBoolValue: "video-on-top"]; + [self setupButton: o_video_skipFrames_ckb forBoolValue: "skip-frames"]; + [self setupButton: o_video_black_ckb forBoolValue: "macosx-black"]; + + [self setupButton: o_video_output_pop forModuleList: "vout"]; + + [o_video_device_pop removeAllItems]; + i = 0; + y = [[NSScreen screens] count]; + [o_video_device_pop addItemWithTitle: _NS("Default")]; + [[o_video_device_pop lastItem] setTag: 0]; + while( i < y ) { - [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; + NSRect s_rect = [[[NSScreen screens] objectAtIndex: i] frame]; + [o_video_device_pop addItemWithTitle: + [NSString stringWithFormat: @"%@ %i (%ix%i)", _NS("Screen"), i+1, + (int)s_rect.size.width, (int)s_rect.size.height]]; + [[o_video_device_pop lastItem] setTag: (int)[[[NSScreen screens] objectAtIndex: i] displayID]]; + i++; } - [o_video_snap_format_pop selectItemAtIndex: y]; + [o_video_device_pop selectItemAtIndex: 0]; + [o_video_device_pop selectItemWithTag: config_GetInt( p_intf, "macosx-vdev" )]; + + [self setupField: o_video_snap_folder_fld forOption:"snapshot-path"]; + [self setupField: o_video_snap_prefix_fld forOption:"snapshot-prefix"]; + [self setupButton: o_video_snap_seqnum_ckb forBoolValue: "snapshot-sequential"]; + [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_postproc_fld setIntValue: config_GetInt( p_intf, "ffmpeg-pp-q" )]; + [o_input_serverport_fld setIntValue: config_GetInt( p_intf, "server-port")]; + [o_input_serverport_fld setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, "server-port")]]; + [self setupField: o_input_httpproxy_fld forOption:"http-proxy"]; + [self setupField: o_input_httpproxypwd_sfld forOption:"http-proxy-pwd"]; + [o_input_postproc_fld setIntValue: config_GetInt( p_intf, "postproc-q")]; + [o_input_postproc_fld setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, "postproc-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" )]; - - psz_tmp = config_GetPsz( p_intf, "access-filter" ); - if( psz_tmp ) - { - [o_input_record_ckb setState: (int)strstr( psz_tmp, "record" )]; - [o_input_dump_ckb setState: (int)strstr( psz_tmp, "dump" )]; - [o_input_bandwidth_ckb setState: (int)strstr( psz_tmp, "bandwidth" )]; - [o_input_timeshift_ckb setState: (int)strstr( psz_tmp, "timeshift" )]; - } + [self setupButton: o_input_rtsp_ckb forBoolValue: "rtsp-tcp"]; + [self setupButton: o_input_skipLoop_pop forIntList: "ffmpeg-skiploopfilter"]; [o_input_cachelevel_pop removeAllItems]; [o_input_cachelevel_pop addItemsWithTitles: @@ -323,58 +589,62 @@ 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" ); + TestCaC( "fake-caching" ); TestCaC( "cdda-caching" ); - TestCaC( "screen-caching" ); + TestCaC( "screen-caching" ); TestCaC( "vcd-caching" ); - TestCaCi( "rtsp-caching", 4 ); + 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 ) + { [o_input_cachelevel_pop selectItemWithTag: i_cache]; + [o_input_cachelevel_custom_txt setHidden: YES]; + } else + { [o_input_cachelevel_pop selectItemWithTitle: _NS("Custom")]; + [o_input_cachelevel_custom_txt setHidden: NO]; + } /********************* * subtitle settings * *********************/ - [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_osd_ckb forBoolValue: "osd"]; - [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" )]]; + [self setupButton: o_osd_encoding_pop forStringList: "subsdec-encoding"]; + [self setupField: o_osd_lang_fld forOption: "sub-language" ]; + + if( module_exists( "quartztext" ) ) + { + [self setupField: o_osd_font_fld forOption: "quartztext-font"]; + [self setupButton: o_osd_font_color_pop forIntList: "quartztext-color"]; + [self setupButton: o_osd_font_size_pop forIntList: "quartztext-rel-fontsize"]; + } + else + { + /* fallback on freetype */ + [self setupField: o_osd_font_fld forOption: "freetype-font"]; + [self setupButton: o_osd_font_color_pop forIntList: "freetype-color"]; + [self setupButton: o_osd_font_size_pop forIntList: "freetype-rel-fontsize"]; + /* selector button is useless in this case */ + [o_osd_font_btn setEnabled: NO]; + } - 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" ); /******************** * hotkeys settings * ********************/ - struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys; + const struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys; + [o_hotkeySettings release]; o_hotkeySettings = [[NSMutableArray alloc] init]; NSMutableArray *o_tempArray_desc = [[NSMutableArray alloc] init]; i = 1; @@ -386,10 +656,11 @@ static VLCSimplePrefs *_o_sharedInstance = nil; break; [o_tempArray_desc addObject: _NS( p_item->psz_text )]; - [o_hotkeySettings addObject: [self OSXKeyToString: p_item->value.i]]; + [o_hotkeySettings addObject: [NSNumber numberWithInt: p_item->value.i]]; i++; } + [o_hotkeyDescriptions release]; o_hotkeyDescriptions = [[NSArray alloc] initWithArray: o_tempArray_desc copyItems: YES]; [o_tempArray_desc release]; [o_hotkeys_listbox reloadData]; @@ -398,14 +669,15 @@ 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]; } [self resetControls]; + [o_sprefs_win center]; [o_sprefs_win makeKeyAndOrderFront: self]; } @@ -427,11 +699,12 @@ static VLCSimplePrefs *_o_sharedInstance = nil; else if( sender == o_sprefs_basicFull_matrix ) { [o_sprefs_win orderOut: self]; - [[[VLCMain sharedInstance] getPreferences] showPrefs]; - [self resetControls]; + [[o_sprefs_basicFull_matrix cellAtRow:0 column:0] setState: NSOffState]; + [[o_sprefs_basicFull_matrix cellAtRow:0 column:1] setState: NSOnState]; + [[[VLCMain sharedInstance] preferences] showPrefs]; } else - msg_Err( p_intf, "unknown buttonAction sender" ); + msg_Warn( p_intf, "unknown buttonAction sender" ); } - (void)sheetDidEnd:(NSWindow *)o_sheet @@ -441,30 +714,71 @@ 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; + 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] ); + [p_stringobject release]; + } +} + +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; -#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 SaveStringList( object, name ) save_string_list( p_intf, object, name ) + +#define SaveModuleList( object, name ) save_module_list( p_intf, object, name ) /********************** * interface settings * @@ -474,17 +788,30 @@ 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] ); + config_PutInt( p_intf, "macosx-appleremote", [o_intf_appleremote_ckb state] ); + config_PutInt( p_intf, "macosx-mediakeys", [o_intf_mediakeys_ckb state] ); + config_PutInt( p_intf, "macosx-mediakeys-background", [o_intf_mediakeys_bg_ckb state] ); + + /* activate stuff without restart */ + if( [o_intf_appleremote_ckb state] == YES ) + [[[VLCMain sharedInstance] appleRemoteController] startListening: [VLCMain sharedInstance]]; + else + [[[VLCMain sharedInstance] appleRemoteController] stopListening: [VLCMain sharedInstance]]; + [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCMediaKeySupportSettingChanged" + object: nil + userInfo: nil]; /* 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 occured while saving the Interface settings using SimplePrefs" ); + msg_Err( p_intf, "An error occurred while saving the Interface settings using SimplePrefs (%i)", i ); + dialog_Fatal( p_intf, _("Interface Settings not saved"), + _("An error occured while saving your settings via SimplePrefs (%i)."), i ); i = 0; } @@ -497,7 +824,8 @@ static VLCSimplePrefs *_o_sharedInstance = nil; if( b_audioSettingChanged ) { config_PutInt( p_intf, "audio", [o_audio_enable_ckb state] ); - config_PutInt( p_intf, "volume", [o_audio_vol_sld intValue] ); + config_PutInt( p_intf, "volume", ([o_audio_vol_sld intValue] * 2.56)); + NSLog( @"slider=%i, pref=%i", [o_audio_vol_sld intValue], config_GetInt( p_intf, "volume" )); config_PutInt( p_intf, "spdif", [o_audio_spdif_ckb state] ); SaveIntList( o_audio_dolby_pop, "force-dolby-surround" ); @@ -505,37 +833,49 @@ 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( (NSInteger)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 ); + free( 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 ) + { + char *psz_tmp2 = (char *)[[[NSString stringWithUTF8String: psz_tmp] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@":volnorm"]] UTF8String]; + psz_tmp2 = (char *)[[[NSString stringWithUTF8String: psz_tmp2] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@"volnorm:"]] UTF8String]; + psz_tmp2 = (char *)[[[NSString stringWithUTF8String: psz_tmp2] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@"volnorm"]] UTF8String]; + config_PutPsz( p_intf, "audio-filter", psz_tmp ); + free( psz_tmp ); + } } config_PutFloat( p_intf, "norm-max-level", [o_audio_norm_fld floatValue] ); - msg_Warn( p_intf, "visualizer not implemented!" ); + 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_lastuser_fld stringValue] UTF8String] ); + config_PutPsz( p_intf, "lastfm-password", [[o_audio_lastpwd_sfld stringValue] UTF8String] ); } + else + [o_audio_last_ckb setEnabled: NO]; /* okay, let's save our changes to vlcrc */ i = config_SaveConfigFile( p_intf, "main" ); @@ -544,7 +884,10 @@ static VLCSimplePrefs *_o_sharedInstance = nil; if( i != 0 ) { - msg_Err( p_intf, "An error occured while saving the Audio settings using SimplePrefs" ); + msg_Err( p_intf, "An error occurred while saving the Audio settings using SimplePrefs (%i)", i ); + dialog_Fatal( p_intf, _("Audio Settings not saved"), + _("An error occured while saving your settings via SimplePrefs (%i)."), i ); + i = 0; } b_audioSettingChanged = NO; @@ -561,21 +904,22 @@ static VLCSimplePrefs *_o_sharedInstance = nil; config_PutInt( p_intf, "skip-frames", [o_video_skipFrames_ckb state] ); config_PutInt( p_intf, "macosx-black", [o_video_black_ckb state] ); - msg_Warn( p_intf, "vout module and display device selectors not implemented!" ); + SaveModuleList( o_video_output_pop, "vout" ); + config_PutInt( p_intf, "macosx-vdev", [[o_video_device_pop selectedItem] tag] ); 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" ); if( i != 0 ) { - msg_Err( p_intf, "An error occured while saving the Video settings using SimplePrefs" ); + msg_Err( p_intf, "An error occurred while saving the Video settings using SimplePrefs (%i)", i ); + dialog_Fatal( p_intf, _("Video Settings not saved"), + _("An error occured while saving your settings via SimplePrefs (%i)."), i ); i = 0; } b_videoSettingChanged = NO; @@ -588,22 +932,24 @@ 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_PutInt( p_intf, "ffmpeg-pp-q", [o_input_postproc_fld intValue] ); + config_PutPsz( p_intf, "http-proxy-pwd", [[o_input_httpproxypwd_sfld stringValue] UTF8String] ); + config_PutInt( p_intf, "postproc-q", [o_input_postproc_fld intValue] ); SaveIntList( o_input_avi_pop, "avi-index" ); config_PutInt( p_intf, "rtsp-tcp", [o_input_rtsp_ckb state] ); + SaveIntList( o_input_skipLoop_pop, "ffmpeg-skiploopfilter" ); #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", (int)[[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" ); @@ -613,36 +959,16 @@ 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" ); } CaCi( "mms-caching", 19 ); - #define SaveAccessFilter( object, name ) \ - if( [object state] == NSOnState ) \ - { \ - if( b_first ) \ - { \ - [o_temp appendString: name]; \ - b_first = NO; \ - } \ - else \ - [o_temp appendFormat: @":%@", name]; \ - } - - BOOL b_first = YES; - NSMutableString *o_temp = [[NSMutableString alloc] init]; - SaveAccessFilter( o_input_record_ckb, @"record" ); - SaveAccessFilter( o_input_dump_ckb, @"dump" ); - SaveAccessFilter( o_input_bandwidth_ckb, @"bandwidth" ); - SaveAccessFilter( o_input_timeshift_ckb, @"timeshift" ); - config_PutPsz( p_intf, "access-filter", [o_temp UTF8String] ); - [o_temp release]; - i = config_SaveConfigFile( p_intf, "main" ); - i = i + config_SaveConfigFile( p_intf, "ffmpeg" ); + i = i + config_SaveConfigFile( p_intf, "avcodec" ); + i = i + config_SaveConfigFile( p_intf, "postproc" ); i = i + config_SaveConfigFile( p_intf, "access_http" ); i = i + config_SaveConfigFile( p_intf, "access_file" ); i = i + config_SaveConfigFile( p_intf, "access_tcp" ); @@ -653,10 +979,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 occured while saving the Input settings using SimplePrefs" ); + msg_Err( p_intf, "An error occurred while saving the Input settings using SimplePrefs (%i)", i ); + dialog_Fatal( p_intf, _("Input Settings not saved"), + _("An error occured while saving your settings via SimplePrefs (%i)."), i ); i = 0; } b_inputSettingChanged = NO; @@ -670,20 +999,33 @@ static VLCSimplePrefs *_o_sharedInstance = nil; config_PutInt( p_intf, "osd", [o_osd_osd_ckb state] ); if( [o_osd_encoding_pop indexOfSelectedItem] >= 0 ) - config_PutPsz( p_intf, "subsdec-encoding", [[[o_osd_encoding_pop selectedItem] title] UTF8String] ); + SaveStringList( o_osd_encoding_pop, "subsdec-encoding" ); + else + config_PutPsz( p_intf, "subsdec-encoding", "" ); config_PutPsz( p_intf, "sub-language", [[o_osd_lang_fld stringValue] UTF8String] ); - config_PutPsz( p_intf, "freetype-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" ); + + if( module_exists( "quartztext" ) ) + { + config_PutPsz( p_intf, "quartztext-font", [[o_osd_font_fld stringValue] UTF8String] ); + SaveIntList( o_osd_font_color_pop, "quartztext-color" ); + SaveIntList( o_osd_font_size_pop, "quartztext-rel-fontsize" ); + } + else + { + /* fallback on freetype */ + config_PutPsz( p_intf, "freetype-font", [[o_osd_font_fld stringValue] UTF8String] ); + SaveIntList( o_osd_font_color_pop, "freetype-color" ); + SaveIntList( o_osd_font_size_pop, "freetype-rel-fontsize" ); + } i = config_SaveConfigFile( p_intf, NULL ); if( i != 0 ) { - msg_Err( p_intf, "An error occured while saving the OSD/Subtitle settings using SimplePrefs" ); + msg_Err( p_intf, "An error occurred while saving the OSD/Subtitle settings using SimplePrefs (%i)", i ); + dialog_Fatal( p_intf, _("On Screen Display/Subtitle Settings not saved"), + _("An error occured while saving your settings via SimplePrefs (%i)."), i ); i = 0; } b_osdSettingChanged = NO; @@ -694,21 +1036,21 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ********************/ if( b_hotkeyChanged ) { - struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys; + const struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys; i = 1; - while( i < [o_hotkeySettings count] ) // FIXME: this is ugly! + while( i < [o_hotkeySettings count] ) { - /* FIXME: this does only work for single keys!!! */ - config_PutInt( p_intf, p_hotkeys[i].psz_action, StringToKey( (char *)[[o_hotkeySettings objectAtIndex: i] UTF8String] ) ); - + config_PutInt( p_intf, p_hotkeys[i].psz_action, [[o_hotkeySettings objectAtIndex: i-1] intValue] ); i++; } - + i = config_SaveConfigFile( p_intf, "main" ); - + if( i != 0 ) { - msg_Err( p_intf, "An error occured while saving the Hotkey settings using SimplePrefs" ); + msg_Err( p_intf, "An error occurred while saving the Hotkey settings using SimplePrefs (%i)", i ); + dialog_Fatal( p_intf, _("Hotkeys not saved"), + _("An error occured while saving your settings via SimplePrefs (%i)."), i ); i = 0; } b_hotkeyChanged = NO; @@ -726,6 +1068,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; /* restore our window's height, if we've shown another category previously */ o_old_view_rect = [o_currentlyShownCategoryView frame]; o_win_rect.size.height = o_win_rect.size.height - o_old_view_rect.size.height; + o_win_rect.origin.y = ( o_win_rect.origin.y + o_old_view_rect.size.height ) - o_view_rect.size.height; /* remove our previous category view */ [o_currentlyShownCategoryView removeFromSuperviewWithoutNeedingDisplay]; @@ -752,12 +1095,13 @@ static VLCSimplePrefs *_o_sharedInstance = nil; - (IBAction)interfaceSettingChanged:(id)sender { + if( sender == o_intf_mediakeys_ckb ) + [o_intf_mediakeys_bg_ckb setEnabled: [o_intf_mediakeys_ckb state]]; b_intfSettingChanged = YES; } - (void)showInterfaceSettings { - msg_Dbg( p_intf, "showing interface settings" ); [self showSettingsForCategory: o_intf_view]; } @@ -765,16 +1109,35 @@ static VLCSimplePrefs *_o_sharedInstance = nil; { if( sender == o_audio_vol_sld ) [o_audio_vol_fld setIntValue: [o_audio_vol_sld intValue]]; - + 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_sfld setEnabled: YES]; + [o_audio_lastuser_fld setEnabled: YES]; + } + else + { + [o_audio_lastpwd_sfld setEnabled: NO]; + [o_audio_lastuser_fld setEnabled: NO]; + } + } + b_audioSettingChanged = YES; } - (void)showAudioSettings { - msg_Dbg( p_intf, "showing audio settings" ); [self showSettingsForCategory: o_audio_view]; } @@ -808,11 +1171,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil; [o_video_snap_folder_fld setStringValue: [o_selectFolderPanel filename]]; b_videoSettingChanged = YES; } - else if( contextInfo == o_osd_font_btn ) - { - [o_osd_font_fld setStringValue: [o_selectFolderPanel filename]]; - b_osdSettingChanged = YES; - } } [o_selectFolderPanel release]; @@ -820,46 +1178,59 @@ 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 +{ + if( module_exists( "quartztext" ) ) + { + 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] setTarget: self]; + [[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 ) + { + if( [[[o_input_cachelevel_pop selectedItem] title] isEqualToString: _NS("Custom")] ) + [o_input_cachelevel_custom_txt setHidden: NO]; + else + [o_input_cachelevel_custom_txt setHidden: YES]; + } + b_inputSettingChanged = YES; } - (void)showInputSettings { - msg_Dbg( p_intf, "showing Input Settings" ); [self showSettingsForCategory: o_input_view]; } @@ -869,7 +1240,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; { [o_hotkeys_change_lbl setStringValue: [NSString stringWithFormat: _NS("Press new keys for\n\"%@\""), [o_hotkeyDescriptions objectAtIndex: [o_hotkeys_listbox selectedRow]]]]; - [o_hotkeys_change_keys_lbl setStringValue: [o_hotkeySettings objectAtIndex: [o_hotkeys_listbox selectedRow]]]; + [o_hotkeys_change_keys_lbl setStringValue: [self OSXKeyToString:[[o_hotkeySettings objectAtIndex: [o_hotkeys_listbox selectedRow]] intValue]]]; [o_hotkeys_change_taken_lbl setStringValue: @""]; [o_hotkeys_change_win setInitialFirstResponder: [o_hotkeys_change_win contentView]]; [o_hotkeys_change_win makeFirstResponder: [o_hotkeys_change_win contentView]]; @@ -882,14 +1253,22 @@ static VLCSimplePrefs *_o_sharedInstance = nil; } else if( sender == o_hotkeys_change_ok_btn ) { - int i_returnValue; + NSInteger i_returnValue; + if(! o_keyInTransition ) + { + [NSApp stopModal]; + [o_hotkeys_change_win close]; + msg_Err( p_intf, "internal error prevented the hotkey switch" ); + return; + } + b_hotkeyChanged = YES; - i_returnValue = [o_hotkeySettings indexOfObject: [o_hotkeys_change_keys_lbl stringValue]]; + i_returnValue = [o_hotkeySettings indexOfObject: o_keyInTransition]; if( i_returnValue != NSNotFound ) - [o_hotkeySettings replaceObjectAtIndex: i_returnValue withObject: @"Unset"]; + [o_hotkeySettings replaceObjectAtIndex: i_returnValue withObject: [[NSNumber numberWithInt: 0] retain]]; - [o_hotkeySettings replaceObjectAtIndex: [o_hotkeys_listbox selectedRow] withObject: [o_hotkeys_change_keys_lbl stringValue]]; + [o_hotkeySettings replaceObjectAtIndex: [o_hotkeys_listbox selectedRow] withObject: [o_keyInTransition retain]]; [NSApp stopModal]; [o_hotkeys_change_win close]; @@ -898,7 +1277,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; } else if( sender == o_hotkeys_clear_btn ) { - [o_hotkeySettings replaceObjectAtIndex: [o_hotkeys_listbox selectedRow] withObject: @"Unset"]; + [o_hotkeySettings replaceObjectAtIndex: [o_hotkeys_listbox selectedRow] withObject: [NSNumber numberWithInt: 0]]; [o_hotkeys_listbox reloadData]; b_hotkeyChanged = YES; } @@ -906,42 +1285,50 @@ static VLCSimplePrefs *_o_sharedInstance = nil; - (void)showHotkeySettings { - msg_Dbg( p_intf, "showing HotKey Settings" ); [self showSettingsForCategory: o_hotkeys_view]; } -- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView +- (int)numberOfRowsInTableView:(NSTableView *)aTableView { return [o_hotkeySettings count]; } -- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex +- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex { if( [[aTableColumn identifier] isEqualToString: @"action"] ) return [o_hotkeyDescriptions objectAtIndex: rowIndex]; else if( [[aTableColumn identifier] isEqualToString: @"shortcut"] ) - return [o_hotkeySettings objectAtIndex: rowIndex]; + return [self OSXKeyToString: [[o_hotkeySettings objectAtIndex: rowIndex] intValue]]; else { - NSLog(@"unknown TableColumn identifier (%@)!", [aTableColumn identifier] ); + msg_Err( p_intf, "unknown TableColumn identifier (%s)!", [[aTableColumn identifier] UTF8String] ); return NULL; } } -- (void)changeHotkeyTo: (NSString *)o_theNewKey +- (BOOL)changeHotkeyTo: (int)i_theNewKey { - int i_returnValue; - if( o_theNewKey == @"invalid" || o_theNewKey == @"" ) + NSInteger i_returnValue; + i_returnValue = [o_hotkeysNonUseableKeys indexOfObject: [NSNumber numberWithInt: i_theNewKey]]; + if( i_returnValue != NSNotFound || i_theNewKey == 0 ) { [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 { - [o_hotkeys_change_keys_lbl setStringValue: o_theNewKey]; + NSString *o_temp; + if( o_keyInTransition ) + [o_keyInTransition release]; + o_keyInTransition = [[NSNumber numberWithInt: i_theNewKey] retain]; + + o_temp = [self OSXKeyToString: i_theNewKey]; - i_returnValue = [o_hotkeySettings indexOfObject: o_theNewKey]; + [o_hotkeys_change_keys_lbl setStringValue: o_temp]; + + i_returnValue = [o_hotkeySettings indexOfObject: o_keyInTransition]; if( i_returnValue != NSNotFound ) [o_hotkeys_change_taken_lbl setStringValue: [NSString stringWithFormat: _NS("This combination is already taken by \"%@\"."), @@ -950,6 +1337,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; [o_hotkeys_change_taken_lbl setStringValue: @""]; [o_hotkeys_change_ok_btn setEnabled: YES]; + return YES; } } @@ -961,132 +1349,59 @@ static VLCSimplePrefs *_o_sharedInstance = nil; @implementation VLCHotkeyChangeWindow -- (void)keyDown:(NSEvent *)o_theEvent +- (BOOL)acceptsFirstResponder { - NSMutableString *o_temp = [[NSMutableString alloc] init]; - - if( [o_theEvent modifierFlags] & NSShiftKeyMask ) - [o_temp appendString: @"Shift+"]; - + 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; +} + +- (BOOL)performKeyEquivalent:(NSEvent *)o_theEvent +{ + unichar key; + int i_key = 0; + if( [o_theEvent modifierFlags] & NSControlKeyMask ) - [o_temp appendString: @"Ctrl+"]; - - if( [o_theEvent modifierFlags] & NSCommandKeyMask ) - [o_temp appendString: @"Command+"]; - + i_key |= KEY_MODIFIER_CTRL; + if( [o_theEvent modifierFlags] & NSAlternateKeyMask ) - [o_temp appendString: @"Alt+"]; - - if( [o_theEvent modifierFlags] & NSFunctionKeyMask ) - { - unichar key = 0; - key = [[o_theEvent charactersIgnoringModifiers] characterAtIndex: 0]; - - switch( key ) - { - case 0x1b: - [o_temp appendString: @"Esc"]; - break; - case NSF1FunctionKey: - [o_temp appendString: @"F1"]; - break; - case NSF2FunctionKey: - [o_temp appendString: @"F2"]; - break; - case NSF3FunctionKey: - [o_temp appendString: @"F3"]; - break; - case NSF4FunctionKey: - [o_temp appendString: @"F4"]; - break; - case NSF5FunctionKey: - [o_temp appendString: @"F5"]; - break; - case NSF6FunctionKey: - [o_temp appendString: @"F6"]; - break; - case NSF7FunctionKey: - [o_temp appendString: @"F7"]; - break; - case NSF8FunctionKey: - [o_temp appendString: @"F8"]; - break; - case NSF9FunctionKey: - [o_temp appendString: @"F9"]; - break; - case NSF10FunctionKey: - [o_temp appendString: @"F10"]; - break; - case NSF11FunctionKey: - [o_temp appendString: @"F11"]; - break; - case NSF12FunctionKey: - [o_temp appendString: @"F12"]; - break; - case NSInsertFunctionKey: - [o_temp appendString: @"Insert"]; - break; - case NSHomeFunctionKey: - [o_temp appendString: @"Home"]; - break; - case NSEndFunctionKey: - [o_temp appendString: @"End"]; - break; - case NSPageUpFunctionKey: - [o_temp appendString: @"Page Up"]; - break; - case NSPageDownFunctionKey: - [o_temp appendString: @"Page Down"]; - break; - case NSMenuFunctionKey: - [o_temp appendString: @"Menu"]; - break; - case NSTabCharacter: - [o_temp appendString: @"Tab"]; - break; - case NSDeleteCharacter: - [o_temp appendString: @"Delete"]; - break; - case NSBackspaceCharacter: - [o_temp appendString: @"Backspace"]; - break; - case NSUpArrowFunctionKey: - [o_temp appendString: @"Up"]; - break; - case NSDownArrowFunctionKey: - [o_temp appendString: @"Down"]; - break; - case NSRightArrowFunctionKey: - [o_temp appendString: @"Right"]; - break; - case NSLeftArrowFunctionKey: - [o_temp appendString: @"Left"]; - break; - case NSEnterCharacter: - [o_temp appendString: @"Enter"]; - break; - default: - { - msg_Warn( VLCIntf, "user pressed unknown function key" ); - o_temp = @"invalid"; - break; - } - } - } - else + i_key |= KEY_MODIFIER_ALT; + + if( [o_theEvent modifierFlags] & NSShiftKeyMask ) + i_key |= KEY_MODIFIER_SHIFT; + + if( [o_theEvent modifierFlags] & NSCommandKeyMask ) + i_key |= KEY_MODIFIER_COMMAND; + + key = [[[o_theEvent charactersIgnoringModifiers] lowercaseString] characterAtIndex: 0]; + if( key ) { - if( [[o_theEvent charactersIgnoringModifiers] isEqualToString: @" "] ) - [o_temp appendString: @"Space"]; - else - [o_temp appendString: [o_theEvent charactersIgnoringModifiers]]; + i_key |= CocoaKeyToVLC( key ); + return [[[VLCMain sharedInstance] simplePreferences] changeHotkeyTo: i_key]; } + return FALSE; +} - /* FIXME: implement sanity checks here as we don't want the user to interfere with hard shortcuts in our main menu */ - [[[VLCMain sharedInstance] getSimplePreferences] changeHotkeyTo: o_temp]; +@end - NSLog( @"user pressed %@", o_temp ); +@implementation VLCSimplePrefsWindow - [o_temp release]; +- (BOOL)acceptsFirstResponder +{ + return YES; } -@end \ No newline at end of file +- (void)changeFont:(id)sender +{ + [[[VLCMain sharedInstance] simplePreferences] changeFont: sender]; +} +@end