X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fsimple_prefs.m;h=3f014dbb95acbbf26368b2d33c7805131ef9b7df;hb=bc83685c2acc7181e7f49bc9b4c2ec17655c789c;hp=5e9a02f64a619de446e0b6044b6933dd0a0920e5;hpb=ff83b90d944e8c2834fd98dd41accb55978576e9;p=vlc diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m index 5e9a02f64a..3f014dbb95 100644 --- a/modules/gui/macosx/simple_prefs.m +++ b/modules/gui/macosx/simple_prefs.m @@ -24,6 +24,8 @@ #import "simple_prefs.h" #import "prefs.h" #import +#import +#import "misc.h" static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier"; static NSString* VLCIntfSettingToolbarIdentifier = @"Intf Settings Item Identifier"; @@ -47,10 +49,10 @@ static VLCSimplePrefs *_o_sharedInstance = nil; if (_o_sharedInstance) { [self dealloc]; } else { - p_intf = VLCIntf; _o_sharedInstance = [super init]; + p_intf = VLCIntf; } - + return _o_sharedInstance; } @@ -82,17 +84,11 @@ static VLCSimplePrefs *_o_sharedInstance = nil; if( val & KEY_MODIFIER_COMMAND ) [o_temp_str appendString: [NSString stringWithUTF8String: "\xE2\x8C\x98"]]; - unsigned int i_keys = sizeof(vlc_keys)/sizeof(key_descriptor_t); - for( unsigned int i = 0; i< i_keys; i++ ) - { - if( vlc_keys[i].i_key_code == (val& ~KEY_MODIFIER) ) - { - if( vlc_keys[i].psz_key_string ) - [o_temp_str appendString: [NSString stringWithUTF8String: vlc_keys[i].psz_key_string]]; - else - o_temp_str = @"Unset"; - } - } + const char *base = KeyToString( val & ~KEY_MODIFIER ); + if( base ) + [o_temp_str appendString: [NSString stringWithUTF8String: base]]; + else + o_temp_str = @"Unset"; return o_temp_str; } @@ -110,7 +106,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil; [o_sprefs_win setToolbar: o_sprefs_toolbar]; /* setup useful stuff */ - /* TODO: hard-code this instead of one-the-run generation */ o_hotkeysNonUseableKeys = [[NSArray arrayWithObjects: [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'c'], [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'x'], @@ -132,7 +127,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil; [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'2'], [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'3'], [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'m'], - [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'q'], [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'w'], [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'w'], [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'c'], @@ -183,7 +177,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] ) { @@ -217,16 +211,103 @@ 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_access_box setTitle: _NS("Access Filter")]; + [o_input_avi_txt setStringValue: _NS("Repair AVI Files")]; + [o_input_bandwidth_ckb setTitle: _NS("Bandwidth limiter")]; + [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_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")]; + [o_input_record_ckb setTitle: _NS("Record")]; + [o_input_rtsp_ckb setTitle: _NS("Use RTP over RTSP (TCP)")]; + [o_input_serverport_txt setStringValue: _NS("Default Server Port")]; + [o_input_timeshift_ckb setTitle: _NS("Timeshift")]; + + /* 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")]; + + /* 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_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")]; + [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")]; } - (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 ) \ +#define SetupIntList( object, name ) \ [object removeAllItems]; \ p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \ for( i = 0; i < p_item->i_list; i++ ) \ @@ -234,32 +315,56 @@ static VLCSimplePrefs *_o_sharedInstance = nil; 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]]]; \ + [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 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++ ) \ +#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 )] + +#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: _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 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]]; \ } \ - [object selectItemAtIndex: y] + } \ + vlc_list_release( p_list ); \ + [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]; + /********************** * 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" )]; @@ -274,7 +379,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; SetupIntList( o_audio_dolby_pop, "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" )]; @@ -282,21 +387,30 @@ static VLCSimplePrefs *_o_sharedInstance = nil; if( psz_tmp ) [o_audio_norm_ckb setState: (int)strstr( psz_tmp, "normvol" )]; [o_audio_norm_fld setFloatValue: config_GetFloat( p_intf, "norm-max-level" )]; - - // visualizer - msg_Warn( p_intf, "visualizer not implemented!" ); - + + SetupModuleList( o_audio_visual_pop, "audio-visual" ); + /* Last.FM is optional */ if( module_Exists( p_intf, "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_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 * @@ -307,17 +421,33 @@ 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" )]; - msg_Warn( p_intf, "vout module and display device selectors not implemented!" ); + SetupModuleList( o_video_output_pop, "vout" ); - 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_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 ) + { + 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_device_pop selectItemAtIndex: 0]; + [o_video_device_pop selectItemWithTag: config_GetInt( p_intf, "macosx-vdev" )]; + + [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]]]; + [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; } @@ -328,7 +458,9 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ***************************/ [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" ); @@ -373,20 +505,26 @@ static VLCSimplePrefs *_o_sharedInstance = nil; if( module_Exists (p_intf, "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")) 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 * @@ -408,13 +546,13 @@ static VLCSimplePrefs *_o_sharedInstance = nil; } [o_osd_encoding_pop selectItemAtIndex: y]; - [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" ); + SetupIntList( o_osd_font_color_pop, "quartztext-color" ); + SetupIntList( o_osd_font_size_pop, "quartztext-rel-fontsize" ); + //SetupIntList( o_osd_font_effect_pop, "quartztext-effect" ); /******************** * hotkeys settings * @@ -451,6 +589,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; [self resetControls]; + [o_sprefs_win center]; [o_sprefs_win makeKeyAndOrderFront: self]; } @@ -472,11 +611,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 @@ -494,6 +634,8 @@ static VLCSimplePrefs *_o_sharedInstance = nil; - (void)saveChangedSettings { module_config_t *p_item; + vlc_list_t *p_list; + module_t *p_parser; char *psz_tmp; int i; @@ -511,6 +653,27 @@ static VLCSimplePrefs *_o_sharedInstance = nil; 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, "" ) + /********************** * interface settings * **********************/ @@ -519,17 +682,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; } @@ -568,19 +732,22 @@ static VLCSimplePrefs *_o_sharedInstance = nil; } 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" ) ) - { + { + [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" ); @@ -590,6 +757,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; @@ -606,7 +776,8 @@ 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] ); @@ -621,6 +792,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; @@ -633,6 +806,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" ); @@ -641,7 +815,7 @@ 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" ) ) { @@ -702,6 +876,8 @@ static VLCSimplePrefs *_o_sharedInstance = nil; 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; @@ -718,17 +894,19 @@ 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" ); + //SaveIntList( o_osd_font_effect_pop, "freetype-effect" ); 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; @@ -752,6 +930,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; @@ -769,6 +949,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]; @@ -800,7 +981,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil; - (void)showInterfaceSettings { - msg_Dbg( p_intf, "showing interface settings" ); [self showSettingsForCategory: o_intf_view]; } @@ -808,16 +988,29 @@ 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_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]; } @@ -863,7 +1056,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil; - (void)showVideoSettings { - msg_Dbg( p_intf, "showing video settings" ); [self showSettingsForCategory: o_video_view]; } @@ -891,18 +1083,24 @@ static VLCSimplePrefs *_o_sharedInstance = nil; - (void)showOSDSettings { - msg_Dbg( p_intf, "showing OSD settings" ); [self showSettingsForCategory: o_osd_view]; } - (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]; } @@ -938,7 +1136,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; i_returnValue = [o_hotkeySettings indexOfObject: o_keyInTransition]; if( i_returnValue != NSNotFound ) - [o_hotkeySettings replaceObjectAtIndex: i_returnValue withObject: [[NSNumber numberWithInt: 0] retain]]; + [o_hotkeySettings replaceObjectAtIndex: i_returnValue withObject: [[NSNumber numberWithInt: 0] retain]]; [o_hotkeySettings replaceObjectAtIndex: [o_hotkeys_listbox selectedRow] withObject: [o_keyInTransition retain]]; @@ -957,7 +1155,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil; - (void)showHotkeySettings { - msg_Dbg( p_intf, "showing HotKey Settings" ); [self showSettingsForCategory: o_hotkeys_view]; } @@ -1004,7 +1201,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; if( i_returnValue != NSNotFound ) [o_hotkeys_change_taken_lbl setStringValue: [NSString stringWithFormat: _NS("This combination is already taken by \"%@\"."), - [self OSXKeyToString:[[o_hotkeyDescriptions objectAtIndex: i_returnValue] intValue]]]]; + [o_hotkeyDescriptions objectAtIndex: i_returnValue]]]; else [o_hotkeys_change_taken_lbl setStringValue: @""];