/*****************************************************************************
* simple_prefs.m: Simple Preferences for Mac OS X
*****************************************************************************
-* Copyright (C) 2008-2009 the VideoLAN team
+* Copyright (C) 2008-2011 the VideoLAN team
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne at videolan dot org>
[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")];
[o_input_serverport_txt setStringValue: _NS("Default Server Port")];
/* interface */
+ [o_intf_style_txt setStringValue: _NS("Interface style")];
+ [o_intf_style_dark_bcell setTitle: _NS("Dark")];
+ [o_intf_style_bright_bcell setTitle: _NS("Bright")];
[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_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: @""];
+ [o_intf_enableGrowl_ckb setStringValue: _NS("Enable Growl notifications (on playlist item change)")];
/* Subtitles and OSD */
[o_osd_encoding_txt setStringValue: _NS("Default Encoding")];
[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")];
+ [o_osd_opacity_txt setStringValue: _NS("Opacity")];
+ [o_osd_forcebold_ckb setTitle: _NS("Force Bold")];
+ [o_osd_moreoptions_txt setStringValue: _NS("More options on background, shadow and outline are available in the advanced preferences.")];
/* video */
[o_video_black_ckb setTitle: _NS("Black screens in Fullscreen mode")];
[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_basicFull_matrix cellAtRow: 0 column: 0] setTitle: _NS("Basic")];
+ [[o_sprefs_basicFull_matrix cellAtRow: 0 column: 1] setTitle: _NS("All")];
[o_sprefs_cancel_btn setTitle: _NS("Cancel")];
[o_sprefs_reset_btn setTitle: _NS("Reset All")];
[o_sprefs_save_btn setTitle: _NS("Save")];
[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.")];
+ psz_tmp = config_GetPsz( p_intf, "control" );
+ if (psz_tmp) {
+ [o_intf_enableGrowl_ckb setState: (NSInteger)strstr( psz_tmp, "growl")];
+ free( psz_tmp );
+ }
+ else
+ [o_intf_enableGrowl_ckb setState: NSOffState];
+ if (config_GetInt( p_intf, "macosx-interfacestyle" ))
+ [o_intf_style_dark_bcell setState: YES];
+ else
+ [o_intf_style_dark_bcell setState: NO];
/******************
* audio settings *
[self setupButton: o_audio_dolby_pop forIntList: "force-dolby-surround"];
[self setupField: o_audio_lang_fld forOption: "audio-language"];
- [self setupButton: o_audio_headphone_ckb forBoolValue: "headphone-dolby"];
-
- psz_tmp = config_GetPsz( p_intf, "audio-filter" );
- if( psz_tmp )
- {
- [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" )];
- [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 */
[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];
- }
-
+ [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"];
+ i = config_GetInt( p_intf, "freetype-opacity" );
+ [o_osd_opacity_fld setIntValue: i];
+ [o_osd_opacity_sld setIntValue: i];
+ [o_osd_opacity_sld setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, "freetype-opacity")]];
+ [o_osd_opacity_fld setToolTip: [o_osd_opacity_sld toolTip]];
+ [self setupButton: o_osd_forcebold_ckb forBoolValue: "freetype-bold"];
/********************
* hotkeys settings *
{
module_config_t *p_item = p_config + i;
- if( (p_item->i_type & CONFIG_ITEM) && p_item->psz_name != NULL
+ if( CONFIG_ITEM(p_item->i_type) && p_item->psz_name != NULL
&& !strncmp( p_item->psz_name , "key-", 4 )
&& !EMPTY_STR( p_item->psz_text ) )
{
{
config_ResetAll( p_intf );
[self resetControls];
- config_SaveConfigFile( p_intf, NULL );
+ config_SaveConfigFile( p_intf );
}
}
- (void)saveChangedSettings
{
- char *psz_tmp;
- int i;
+ NSString *tmpString;
+ NSRange tmpRange;
#define SaveIntList( object, name ) save_int_list( p_intf, object, name )
#define SaveModuleList( object, name ) save_module_list( p_intf, object, name )
+#define getString( name ) [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, name )]
+
/**********************
* interface settings *
**********************/
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] );
+ config_PutInt( p_intf, "macosx-mediakeys", [o_intf_mediakeys_ckb state] );
+ config_PutInt( p_intf, "macosx-interfacestyle", [o_intf_style_dark_bcell state] );
+ if( [o_intf_enableGrowl_ckb state] == NSOnState )
+ {
+ tmpString = getString( "control" );
+ tmpRange = [tmpString rangeOfString:@"growl"];
+ if( [tmpString length] > 0 && tmpRange.location == NSNotFound )
+ {
+ tmpString = [tmpString stringByAppendingString: @":growl"];
+ config_PutPsz( p_intf, "control", [tmpString UTF8String] );
+ }
+ else
+ config_PutPsz( p_intf, "control", "growl" );
+ }
+ else
+ {
+ tmpString = getString( "control" );
+ if(! [tmpString isEqualToString:@""] )
+ {
+ tmpString = [tmpString stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@":growl"]];
+ tmpString = [tmpString stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@"growl:"]];
+ tmpString = [tmpString stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@"growl"]];
+ config_PutPsz( p_intf, "control", [tmpString UTF8String] );
+ }
+ }
/* 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 = 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 );
- dialog_Fatal( p_intf, _("Interface Settings not saved"),
- _("An error occured while saving your settings via SimplePrefs (%i)."), i );
- i = 0;
- }
-
b_intfSettingChanged = NO;
}
SaveIntList( o_audio_dolby_pop, "force-dolby-surround" );
config_PutPsz( p_intf, "audio-language", [[o_audio_lang_fld stringValue] UTF8String] );
- config_PutInt( p_intf, "headphone-dolby", [o_audio_headphone_ckb state] );
-
- if( [o_audio_norm_ckb state] == NSOnState )
- {
- 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 = 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] );
SaveModuleList( o_audio_visual_pop, "audio-visual" );
}
else
[o_audio_last_ckb setEnabled: NO];
-
- /* okay, let's save our changes to vlcrc */
- i = config_SaveConfigFile( p_intf, "main" );
- i = i + config_SaveConfigFile( p_intf, "audioscrobbler" );
- i = i + config_SaveConfigFile( p_intf, "volnorm" );
-
- if( i != 0 )
- {
- 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;
}
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] );
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 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;
}
msg_Dbg( p_intf, "Adjusting all cache values to: %i", (int)[[o_input_cachelevel_pop selectedItem] tag] );
CaC( "udp-caching" );
if( module_exists ( "dvdread" ) )
- {
CaC( "dvdread-caching" );
- i = i + config_SaveConfigFile( p_intf, "dvdread" );
- }
if( module_exists ( "dvdnav" ) )
- {
CaC( "dvdnav-caching" );
- i = i + config_SaveConfigFile( p_intf, "dvdnav" );
- }
CaC( "tcp-caching" ); CaC( "vcd-caching" );
CaC( "cdda-caching" ); CaC( "file-caching" );
CaC( "screen-caching" );
CaCi( "rtsp-caching", 4 ); CaCi( "ftp-caching", 2 );
CaCi( "http-caching", 4 );
if( module_exists ( "access_realrtsp" ) )
- {
CaCi( "realrtsp-caching", 10 );
- i = i + config_SaveConfigFile( p_intf, "access_realrtsp" );
- }
CaCi( "mms-caching", 19 );
-
- i = config_SaveConfigFile( p_intf, "main" );
- 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" );
- i = i + config_SaveConfigFile( p_intf, "cdda" );
- i = i + config_SaveConfigFile( p_intf, "screen" );
- i = i + config_SaveConfigFile( p_intf, "vcd" );
- i = i + config_SaveConfigFile( p_intf, "access_ftp" );
- i = i + config_SaveConfigFile( p_intf, "access_mms" );
- i = i + config_SaveConfigFile( p_intf, "live555" );
- i = i + config_SaveConfigFile( p_intf, "avi" );
-
- if( i != 0 )
- {
- msg_Err( p_intf, "An error occurred while saving the Input settings using SimplePrefs (%i)", i );
- dialog_Fatal( p_intf, _("Input Settings not saved"),
- _("An error occured while saving your settings via SimplePrefs (%i)."), i );
- i = 0;
- }
b_inputSettingChanged = NO;
}
config_PutPsz( p_intf, "sub-language", [[o_osd_lang_fld stringValue] UTF8String] );
- 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 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;
- }
+ 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" );
+ config_PutInt( p_intf, "freetype-opacity", [o_osd_opacity_sld intValue] );
+ config_PutInt( p_intf, "freetype-bold", [o_osd_forcebold_ckb state] );
b_osdSettingChanged = NO;
}
********************/
if( b_hotkeyChanged )
{
- i = 0;
- while( i < [o_hotkeySettings count] )
- {
+ for( NSUInteger i = 0; i < [o_hotkeySettings count]; i++ )
config_PutPsz( p_intf, [[o_hotkeyNames objectAtIndex:i] UTF8String], [[o_hotkeySettings objectAtIndex:i]UTF8String] );
- i++;
- }
-
- i = config_SaveConfigFile( p_intf, "main" );
-
- if( i != 0 )
- {
- 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;
}
+
+ /* okay, let's save our changes to vlcrc */
+ config_SaveConfigFile( p_intf );
+
+ [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCMediaKeySupportSettingChanged"
+ object: nil
+ userInfo: nil];
}
- (void)showSettingsForCategory: (id)o_new_category_view
- (IBAction)interfaceSettingChanged:(id)sender
{
- if( sender == o_intf_mediakeys_ckb )
- [o_intf_mediakeys_bg_ckb setEnabled: [o_intf_mediakeys_ckb state]];
b_intfSettingChanged = YES;
}
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 )
{
if( contextInfo == o_video_snap_folder_btn )
{
- [o_video_snap_folder_fld setStringValue: [o_selectFolderPanel filename]];
+ [o_video_snap_folder_fld setStringValue: [[o_selectFolderPanel URL] path]];
b_videoSettingChanged = YES;
}
}
- (IBAction)osdSettingChanged:(id)sender
{
+ if( sender == o_osd_opacity_fld )
+ [o_osd_opacity_sld setIntValue: [o_osd_opacity_fld intValue]];
+
+ if( sender == o_osd_opacity_sld )
+ [o_osd_opacity_fld setIntValue: [o_osd_opacity_sld intValue]];
+
b_osdSettingChanged = YES;
}
- (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];
- }
+ char * font = config_GetPsz( p_intf, "freetype-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
[o_hotkeys_listbox reloadData];
b_hotkeyChanged = YES;
}
+
+ [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCMediaKeySupportSettingChanged"
+ object: nil
+ userInfo: nil];
}
- (void)showHotkeySettings
projects / vlc / blobdiff