From: Felix Paul Kühne Date: Fri, 13 Jun 2008 16:45:58 +0000 (+0200) Subject: Add support for the http proxy password setting to the simple prefs and make sure... X-Git-Tag: 0.9.0-test0~147 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e783b74eca272d40c90c1bf3982894e074f11808;p=vlc Add support for the http proxy password setting to the simple prefs and make sure that the last.fm password isn't displayed as plain text --- diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib index 813db45c27..88b5dccea0 100644 --- a/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib +++ b/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib @@ -4,6 +4,14 @@ IBClasses + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + CLASS VLCHotkeyChangeWindow @@ -56,7 +64,7 @@ id o_audio_last_ckb id - o_audio_lastpwd_fld + o_audio_lastpwd_sfld id o_audio_lastpwd_txt id @@ -128,6 +136,10 @@ id o_input_httpproxy_txt id + o_input_httpproxypwd_sfld + id + o_input_httpproxypwd_txt + id o_input_mux_box id o_input_net_box @@ -262,11 +274,9 @@ CLASS - NSApplication + NSObject LANGUAGE ObjC - SUPERCLASS - NSResponder CLASS @@ -276,12 +286,6 @@ SUPERCLASS NSObject - - CLASS - NSObject - LANGUAGE - ObjC - ACTIONS diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib index 53e051167c..381fe051e3 100644 --- a/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib +++ b/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib @@ -3,24 +3,24 @@ IBFramework Version - 648 + 667 IBLastKnownRelativeProjectPath ../../vlc.xcodeproj IBOldestOS 5 IBOpenObjects - 2668 - 2678 - 2562 2311 - 2330 - 2523 2410 + 2678 + 2523 + 2668 + 2330 + 2563 2440 IBSystem Version - 9C7010 + 9D34 targetFramework IBCocoaFramework diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib index 81daca9ee2..d73c2c8575 100644 Binary files a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib differ diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h index 6f7d4643ce..04ff036106 100644 --- a/modules/gui/macosx/simple_prefs.h +++ b/modules/gui/macosx/simple_prefs.h @@ -37,7 +37,7 @@ IBOutlet id o_audio_lang_txt; IBOutlet id o_audio_last_box; IBOutlet id o_audio_last_ckb; - IBOutlet id o_audio_lastpwd_fld; + IBOutlet id o_audio_lastpwd_sfld; IBOutlet id o_audio_lastpwd_txt; IBOutlet id o_audio_lastuser_fld; IBOutlet id o_audio_lastuser_txt; @@ -74,6 +74,8 @@ IBOutlet id o_input_dump_ckb; IBOutlet id o_input_httpproxy_fld; IBOutlet id o_input_httpproxy_txt; + IBOutlet id o_input_httpproxypwd_sfld; + IBOutlet id o_input_httpproxypwd_txt; IBOutlet id o_input_mux_box; IBOutlet id o_input_net_box; IBOutlet id o_input_postproc_fld; diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m index 2f8e51cb90..54f6139bc5 100644 --- a/modules/gui/macosx/simple_prefs.m +++ b/modules/gui/macosx/simple_prefs.m @@ -244,6 +244,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")]; @@ -391,19 +392,19 @@ static VLCSimplePrefs *_o_sharedInstance = nil; 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_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 @@ -457,6 +458,8 @@ 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" )]]; + 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" ); @@ -738,7 +741,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; config_RemoveIntf( VLC_OBJECT( 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]; @@ -795,6 +798,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" ); @@ -979,12 +983,12 @@ static VLCSimplePrefs *_o_sharedInstance = nil; { 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]; } }