From: Felix Paul Kühne Date: Fri, 18 Apr 2008 12:50:48 +0000 (+0200) Subject: Improved functionality, thanks to the feedback by Robert Swain. X-Git-Tag: 0.9.0-test0~1428 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2aff0b64902f7e164b7cc12f956aa06bfbb6ae7e;p=vlc Improved functionality, thanks to the feedback by Robert Swain. Fixed the last.fm settings (items weren't enabled properly) and added an additional note to the Caching level selector explaining the 'Custom' entry. --- 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 e5d4b3bfcf..813db45c27 100644 --- a/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib +++ b/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib @@ -12,14 +12,6 @@ SUPERCLASS NSWindow - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - ACTIONS @@ -122,6 +114,8 @@ id o_input_bandwidth_ckb id + o_input_cachelevel_custom_txt + id o_input_cachelevel_pop id o_input_cachelevel_txt @@ -266,6 +260,14 @@ SUPERCLASS NSObject + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + CLASS FirstResponder 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 42d86259f7..53e051167c 100644 --- a/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib +++ b/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib @@ -3,7 +3,7 @@ IBFramework Version - 644 + 648 IBLastKnownRelativeProjectPath ../../vlc.xcodeproj IBOldestOS @@ -11,16 +11,16 @@ IBOpenObjects 2668 + 2678 2562 - 2410 - 2440 2311 - 2523 2330 - 2678 + 2523 + 2410 + 2440 IBSystem Version - 9C31 + 9C7010 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 4028e9080e..81daca9ee2 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 1579799ee7..d6a58cdab9 100644 --- a/modules/gui/macosx/simple_prefs.h +++ b/modules/gui/macosx/simple_prefs.h @@ -69,6 +69,7 @@ IBOutlet id o_input_bandwidth_ckb; IBOutlet id o_input_cachelevel_pop; IBOutlet id o_input_cachelevel_txt; + IBOutlet id o_input_cachelevel_custom_txt; IBOutlet id o_input_caching_box; IBOutlet id o_input_dump_ckb; IBOutlet id o_input_httpproxy_fld; diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m index 64237617ce..3e5666444b 100644 --- a/modules/gui/macosx/simple_prefs.m +++ b/modules/gui/macosx/simple_prefs.m @@ -241,6 +241,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; [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_mux_box setTitle: _NS("Codecs / Muxers")]; @@ -393,9 +394,17 @@ static VLCSimplePrefs *_o_sharedInstance = nil; [o_audio_lastpwd_fld 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]; + } else + { [o_audio_last_ckb setState: NSOffState]; + [o_audio_lastuser_fld setEnabled: NO]; + [o_audio_lastpwd_fld setEnabled: NO]; + } } else [o_audio_last_ckb setEnabled: NO]; @@ -503,9 +512,15 @@ static VLCSimplePrefs *_o_sharedInstance = nil; 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 * @@ -715,7 +730,8 @@ static VLCSimplePrefs *_o_sharedInstance = nil; /* 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" ); else @@ -724,6 +740,8 @@ static VLCSimplePrefs *_o_sharedInstance = nil; config_PutPsz( p_intf, "lastfm-username", [[o_audio_lastuser_fld stringValue] UTF8String] ); config_PutPsz( p_intf, "lastfm-password", [[o_audio_lastuser_fld stringValue] UTF8String] ); } + else + [o_audio_last_ckb setEnabled: NO]; /* okay, let's save our changes to vlcrc */ i = config_SaveConfigFile( p_intf, "main" ); @@ -953,10 +971,24 @@ 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_fld setEnabled: YES]; + [o_audio_lastuser_fld setEnabled: YES]; + } + else + { + [o_audio_lastpwd_fld setEnabled: NO]; + [o_audio_lastuser_fld setEnabled: NO]; + } + } + b_audioSettingChanged = YES; } @@ -1042,6 +1074,14 @@ static VLCSimplePrefs *_o_sharedInstance = nil; - (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; }