/*****************************************************************************
* simple_prefs.m: Simple Preferences for Mac OS X
*****************************************************************************
-* Copyright (C) 2008 the VideoLAN team
+* Copyright (C) 2008-2011 the VideoLAN team
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne at videolan dot org>
#import <vlc_keys.h>
#import <vlc_interface.h>
#import <vlc_dialog.h>
+#import <vlc_modules.h>
#import "misc.h"
+#import "intf.h"
+#import "AppleRemote.h"
+#import <Sparkle/Sparkle.h> //for o_intf_last_update_lbl
static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier";
static NSString* VLCIntfSettingToolbarIdentifier = @"Intf Settings Item Identifier";
[o_hotkeySettings release];
[o_hotkeyDescriptions release];
+ [o_hotkeyNames release];
[o_hotkeysNonUseableKeys release];
[o_keyInTransition release];
[super dealloc];
}
-
-- (NSString *)OSXKeyToString:(int)val
+- (NSString *)OSXStringKeyToString:(NSString *)theString
{
- NSMutableString *o_temp_str = [[[NSMutableString alloc] init] autorelease];
- if( val & KEY_MODIFIER_CTRL )
- [o_temp_str appendString: [NSString stringWithUTF8String: "\xE2\x8C\x83"]];
- if( val & KEY_MODIFIER_ALT )
- [o_temp_str appendString: [NSString stringWithUTF8String: "\xE2\x8C\xA5"]];
- if( val & KEY_MODIFIER_SHIFT )
- [o_temp_str appendString: [NSString stringWithUTF8String: "\xE2\x87\xA7"]];
- if( val & KEY_MODIFIER_COMMAND )
- [o_temp_str appendString: [NSString stringWithUTF8String: "\xE2\x8C\x98"]];
-
- const char *base = KeyToString( val & ~KEY_MODIFIER );
- if( base )
- [o_temp_str appendString: [NSString stringWithUTF8String: base]];
+ if (![theString isEqualToString:@""]) {
+ theString = [theString stringByReplacingOccurrencesOfString:@"Command" withString: [NSString stringWithUTF8String: "\xE2\x8C\x98"]];
+ theString = [theString stringByReplacingOccurrencesOfString:@"Alt" withString: [NSString stringWithUTF8String: "\xE2\x8C\xA5"]];
+ theString = [theString stringByReplacingOccurrencesOfString:@"Shift" withString: [NSString stringWithUTF8String: "\xE2\x87\xA7"]];
+ theString = [theString stringByReplacingOccurrencesOfString:@"Ctrl" withString: [NSString stringWithUTF8String: "\xE2\x8C\x83"]];
+ theString = [theString stringByReplacingOccurrencesOfString:@"+" withString:@""];
+ theString = [theString stringByReplacingOccurrencesOfString:@"-" withString:@""];
+ theString = [theString capitalizedString];
+ }
else
- o_temp_str = [NSMutableString stringWithString:_NS("Not Set")];
- return o_temp_str;
+ theString = [NSString stringWithString:_NS("Not Set")];
+ return theString;
}
- (void)awakeFromNib
{
[self initStrings];
-
+
/* setup the toolbar */
NSToolbar * o_sprefs_toolbar = [[[NSToolbar alloc] initWithIdentifier: VLCSPrefsToolbarIdentifier] autorelease];
[o_sprefs_toolbar setAllowsUserCustomization: NO];
[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];
+ o_hotkeysNonUseableKeys = [[NSArray arrayWithObjects: @"Command-c", @"Command-x", @"Command-v", @"Command-a", @"Command-," , @"Command-h", @"Command-Alt-h", @"Command-Shift-o", @"Command-o", @"Command-d", @"Command-n", @"Command-s", @"Command-z", @"Command-l", @"Command-r", @"Command-3", @"Command-m", @"Command-w", @"Command-Shift-w", @"Command-Shift-c", @"Command-Shift-p", @"Command-i", @"Command-e", @"Command-Shift-e", @"Command-b", @"Command-Shift-m", @"Command-Ctrl-m", @"Command-?", @"Command-Alt-?", nil] retain];
}
#define CreateToolbarItem( o_name, o_desc, o_img, sel ) \
return o_toolbarItem;
}
-- (NSToolbarItem *) toolbar: (NSToolbar *)o_sprefs_toolbar
- itemForItemIdentifier: (NSString *)o_itemIdent
+- (NSToolbarItem *) toolbar: (NSToolbar *)o_sprefs_toolbar
+ itemForItemIdentifier: (NSString *)o_itemIdent
willBeInsertedIntoToolbar: (BOOL)b_willBeInserted
{
NSToolbarItem *o_toolbarItem = nil;
- (NSArray *)toolbarDefaultItemIdentifiers: (NSToolbar *)toolbar
{
- return [NSArray arrayWithObjects: VLCIntfSettingToolbarIdentifier, VLCAudioSettingToolbarIdentifier, VLCVideoSettingToolbarIdentifier,
+ return [NSArray arrayWithObjects: VLCIntfSettingToolbarIdentifier, VLCAudioSettingToolbarIdentifier, VLCVideoSettingToolbarIdentifier,
VLCOSDSettingToolbarIdentifier, VLCInputSettingToolbarIdentifier, VLCHotkeysSettingToolbarIdentifier, NSToolbarFlexibleSpaceItemIdentifier, nil];
}
- (NSArray *)toolbarAllowedItemIdentifiers: (NSToolbar *)toolbar
{
- return [NSArray arrayWithObjects: VLCIntfSettingToolbarIdentifier, VLCAudioSettingToolbarIdentifier, VLCVideoSettingToolbarIdentifier,
+ return [NSArray arrayWithObjects: VLCIntfSettingToolbarIdentifier, VLCAudioSettingToolbarIdentifier, VLCVideoSettingToolbarIdentifier,
VLCOSDSettingToolbarIdentifier, VLCInputSettingToolbarIdentifier, VLCHotkeysSettingToolbarIdentifier, NSToolbarFlexibleSpaceItemIdentifier, nil];
}
- (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar
{
- return [NSArray arrayWithObjects: VLCIntfSettingToolbarIdentifier, VLCAudioSettingToolbarIdentifier, VLCVideoSettingToolbarIdentifier,
+ return [NSArray arrayWithObjects: VLCIntfSettingToolbarIdentifier, VLCAudioSettingToolbarIdentifier, VLCVideoSettingToolbarIdentifier,
VLCOSDSettingToolbarIdentifier, VLCInputSettingToolbarIdentifier, VLCHotkeysSettingToolbarIdentifier, nil];
}
[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_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_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_font_box setTitle: _NS("Display Settings")];
[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_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_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")];
[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;
}
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);
+ else
+ msg_Err( p_intf, "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] ) )
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);
+ else
+ msg_Err( p_intf, "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] )
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" );
+ msg_Err( p_intf, "serious problem, item or list not found" );
return;
}
[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 );
}
[[o_sprefs_basicFull_matrix cellAtRow:0 column:0] setState: NSOnState];
[[o_sprefs_basicFull_matrix cellAtRow:0 column:1] setState: NSOffState];
-
+
/**********************
* interface settings *
**********************/
[self setupButton: o_intf_lang_pop forStringList: "language"];
[self setupButton: o_intf_art_pop forIntList: "album-art"];
- [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_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"];
+ 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 *
******************/
- [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"];
[self setupButton: o_audio_dolby_pop forIntList: "force-dolby-surround"];
[self setupField: o_audio_lang_fld forOption: "audio-language"];
- [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: (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" )];
-
[self setupButton: o_audio_visual_pop forModuleList: "audio-visual"];
/* Last.FM is optional */
/******************
* 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" )];
+ [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"];
while( i < y )
{
NSRect s_rect = [[[NSScreen screens] objectAtIndex: i] frame];
- [o_video_device_pop addItemWithTitle:
+ [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]];
[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"];
- [o_video_snap_seqnum_ckb setState: config_GetInt( p_intf, "snapshot-sequential" )];
+ [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" )];
- [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_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")]];
[self setupButton: o_input_avi_pop forIntList: "avi-index"];
- [o_input_rtsp_ckb setState: config_GetInt( p_intf, "rtsp-tcp" )];
+ [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:
+ [o_input_cachelevel_pop addItemsWithTitles:
[NSArray arrayWithObjects: _NS("Custom"), _NS("Lowest latency"), _NS("Low latency"), _NS("Normal"),
_NS("High latency"), _NS("Higher latency"), nil]];
[[o_input_cachelevel_pop itemAtIndex: 0] setTag: 0];
[[o_input_cachelevel_pop itemAtIndex: 3] setTag: 300];
[[o_input_cachelevel_pop itemAtIndex: 4] setTag: 400];
[[o_input_cachelevel_pop itemAtIndex: 5] setTag: 500];
-
+
#define TestCaC( name ) \
b_cache_equal = b_cache_equal && \
( i_cache == config_GetInt( p_intf, name ) )
/* Select the accurate value of the PopupButton */
bool b_cache_equal = true;
int i_cache = config_GetInt( p_intf, "file-caching");
-
+
TestCaC( "udp-caching" );
if( module_exists ("dvdread") )
TestCaC( "dvdread-caching" );
if( module_exists ("dvdnav") )
TestCaC( "dvdnav-caching" );
TestCaC( "tcp-caching" );
- TestCaC( "fake-caching" );
TestCaC( "cdda-caching" );
TestCaC( "screen-caching" );
TestCaC( "vcd-caching" );
/*********************
* subtitle settings *
*********************/
- [o_osd_osd_ckb setState: config_GetInt( p_intf, "osd" )];
-
+ [self setupButton: o_osd_osd_ckb forBoolValue: "osd"];
+
[self setupButton: o_osd_encoding_pop forStringList: "subsdec-encoding"];
[self setupField: o_osd_lang_fld forOption: "sub-language" ];
- [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"];
+ [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 *
[o_hotkeySettings release];
o_hotkeySettings = [[NSMutableArray alloc] init];
NSMutableArray *o_tempArray_desc = [[NSMutableArray alloc] init];
- i = 1;
+ NSMutableArray *o_tempArray_names = [[NSMutableArray alloc] init];
- while( i < 100 )
+ /* Get the main Module */
+ module_t *p_main = module_get_main();
+ assert( p_main );
+ unsigned confsize;
+ module_config_t *p_config;
+
+ p_config = module_config_get (p_main, &confsize);
+
+ for (size_t i = 0; i < confsize; i++)
{
- p_item = config_FindConfig( VLC_OBJECT(p_intf), p_hotkeys[i].psz_action );
- if( !p_item )
- break;
-
- [o_tempArray_desc addObject: _NS( p_item->psz_text )];
- [o_hotkeySettings addObject: [NSNumber numberWithInt: p_item->value.i]];
+ module_config_t *p_item = p_config + i;
- i++;
+ 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 ) )
+ {
+ [o_tempArray_desc addObject: _NS( p_item->psz_text )];
+ [o_tempArray_names addObject: [NSString stringWithUTF8String:p_item->psz_name]];
+ if (p_item->value.psz)
+ [o_hotkeySettings addObject: [NSString stringWithUTF8String:p_item->value.psz]];
+ else
+ [o_hotkeySettings addObject: [NSString string]];
+ }
}
+ module_config_free (p_config);
+ module_release (p_main);
+
[o_hotkeyDescriptions release];
o_hotkeyDescriptions = [[NSArray alloc] initWithArray: o_tempArray_desc copyItems: YES];
[o_tempArray_desc release];
+ [o_hotkeyNames release];
+ o_hotkeyNames = [[NSArray alloc] initWithArray: o_tempArray_names copyItems: YES];
+ [o_tempArray_names release];
[o_hotkeys_listbox reloadData];
}
[[o_sprefs_win toolbar] setSelectedItemIdentifier: VLCIntfSettingToolbarIdentifier];
[self showInterfaceSettings];
}
-
+
[self resetControls];
[o_sprefs_win center];
msg_Warn( p_intf, "unknown buttonAction sender" );
}
-- (void)sheetDidEnd:(NSWindow *)o_sheet
+- (void)sheetDidEnd:(NSWindow *)o_sheet
returnCode:(int)i_return
contextInfo:(void *)o_context
{
{
config_ResetAll( p_intf );
[self resetControls];
- config_SaveConfigFile( p_intf, NULL );
+ config_SaveConfigFile( p_intf );
}
}
p_item = config_FindConfig( VLC_OBJECT(p_intf), name );
p_stringobject = (NSString *)[[object selectedItem] representedObject];
assert([p_stringobject isKindOfClass:[NSString class]]);
- if( p_stringobject )
+ if( p_stringobject )
{
config_PutPsz( p_intf, name, [p_stringobject UTF8String] );
- [p_stringobject release];
}
}
- (void)saveChangedSettings
{
- char *psz_tmp;
- int i;
-
+ NSString *tmpString;
+ NSRange tmpRange;
+
#define SaveIntList( object, name ) save_int_list( p_intf, object, name )
-
+
#define SaveStringList( object, name ) save_string_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] );
-
- /* okay, let's save our changes to vlcrc */
- i = config_SaveConfigFile( p_intf, "main" );
- i = i + config_SaveConfigFile( p_intf, "macosx" );
-
- if( i != 0 )
+ 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-interfacestyle", [o_intf_style_dark_bcell state] );
+ if( [o_intf_enableGrowl_ckb state] == NSOnState )
{
- 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;
+ 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]];
b_intfSettingChanged = NO;
}
-
+
/******************
* audio settings *
******************/
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));
config_PutInt( p_intf, "spdif", [o_audio_spdif_ckb state] );
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" );
/* Last.FM is optional */
if( module_exists( "audioscrobbler" ) )
- {
+ {
[o_audio_last_ckb setEnabled: YES];
if( [o_audio_last_ckb state] == NSOnState )
config_AddIntf( p_intf, "audioscrobbler" );
}
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;
}
-
+
/******************
* video settings *
******************/
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;
}
-
+
/***************************
* input & codecs settings *
***************************/
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( "fake-caching" ); CaC( "cdda-caching" ); CaC( "file-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, "access_fake" );
- 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;
}
-
+
/**********************
* subtitles settings *
**********************/
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, "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" );
-
- 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;
}
-
+
/********************
* hotkeys settings *
********************/
if( b_hotkeyChanged )
{
- const struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys;
- i = 1;
- while( i < [o_hotkeySettings count] )
- {
- 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 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;
- }
+ for( NSUInteger i = 0; i < [o_hotkeySettings count]; i++ )
+ config_PutPsz( p_intf, [[o_hotkeyNames objectAtIndex:i] UTF8String], [[o_hotkeySettings objectAtIndex:i]UTF8String] );
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
NSRect o_win_rect, o_view_rect, o_old_view_rect;
o_win_rect = [o_sprefs_win frame];
o_view_rect = [o_new_category_view frame];
-
+
if( o_currentlyShownCategoryView != nil )
{
/* restore our window's height, if we've shown another category previously */
/* remove our previous category view */
[o_currentlyShownCategoryView removeFromSuperviewWithoutNeedingDisplay];
}
-
+
o_win_rect.size.height = o_win_rect.size.height + o_view_rect.size.height;
-
+
[o_sprefs_win displayIfNeeded];
[o_sprefs_win setFrame: o_win_rect display:YES animate: YES];
-
- [o_new_category_view setFrame: NSMakeRect( 0,
- [o_sprefs_controls_box frame].size.height,
- o_view_rect.size.width,
+
+ [o_new_category_view setFrame: NSMakeRect( 0,
+ [o_sprefs_controls_box frame].size.height,
+ o_view_rect.size.width,
o_view_rect.size.height )];
[o_new_category_view setNeedsDisplay: YES];
[o_new_category_view setAutoresizesSubviews: YES];
[[o_sprefs_win contentView] addSubview: o_new_category_view];
-
+
/* keep our current category for further reference */
[o_currentlyShownCategoryView release];
o_currentlyShownCategoryView = o_new_category_view;
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_selectFolderPanel setMessage: _NS("Choose the folder to save your video snapshots to.")];
[o_selectFolderPanel setCanCreateDirectories: YES];
[o_selectFolderPanel setPrompt: _NS("Choose")];
- [o_selectFolderPanel beginSheetForDirectory: nil file: nil modalForWindow: o_sprefs_win
- modalDelegate: self
+ [o_selectFolderPanel beginSheetForDirectory: nil file: nil modalForWindow: o_sprefs_win
+ modalDelegate: self
didEndSelector: @selector(savePanelDidEnd:returnCode:contextInfo:)
contextInfo: o_video_snap_folder_btn];
}
{
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
{
- char * font = config_GetPsz( p_intf, "quartztext-font" );
+ char * font = config_GetPsz( p_intf, "freetype-font" );
NSString * fontFamilyName = font ? [NSString stringWithUTF8String: font] : nil;
free(font);
if( fontFamilyName )
{
if( sender == o_hotkeys_change_btn || sender == o_hotkeys_listbox )
{
- [o_hotkeys_change_lbl setStringValue: [NSString stringWithFormat: _NS("Press new keys for\n\"%@\""),
+ [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: [self OSXKeyToString:[[o_hotkeySettings objectAtIndex: [o_hotkeys_listbox selectedRow]] intValue]]];
+ [o_hotkeys_change_keys_lbl setStringValue: [self OSXStringKeyToString:[o_hotkeySettings objectAtIndex: [o_hotkeys_listbox selectedRow]]]];
[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]];
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: [NSString string]];
+ NSString *tempString;
+ tempString = [o_keyInTransition stringByReplacingOccurrencesOfString:@"-" withString:@"+"];
+ i_returnValue = [o_hotkeySettings indexOfObject: tempString];
+ if( i_returnValue != NSNotFound )
+ [o_hotkeySettings replaceObjectAtIndex: i_returnValue withObject: [NSString string]];
[o_hotkeySettings replaceObjectAtIndex: [o_hotkeys_listbox selectedRow] withObject: [o_keyInTransition retain]];
}
else if( sender == o_hotkeys_clear_btn )
{
- [o_hotkeySettings replaceObjectAtIndex: [o_hotkeys_listbox selectedRow] withObject: [NSNumber numberWithInt: 0]];
+ [o_hotkeySettings replaceObjectAtIndex: [o_hotkeys_listbox selectedRow] withObject: [NSString string]];
[o_hotkeys_listbox reloadData];
b_hotkeyChanged = YES;
}
+
+ [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCMediaKeySupportSettingChanged"
+ object: nil
+ userInfo: nil];
}
- (void)showHotkeySettings
if( [[aTableColumn identifier] isEqualToString: @"action"] )
return [o_hotkeyDescriptions objectAtIndex: rowIndex];
else if( [[aTableColumn identifier] isEqualToString: @"shortcut"] )
- return [self OSXKeyToString: [[o_hotkeySettings objectAtIndex: rowIndex] intValue]];
+ return [self OSXStringKeyToString:[o_hotkeySettings objectAtIndex: rowIndex]];
else
{
msg_Err( p_intf, "unknown TableColumn identifier (%s)!", [[aTableColumn identifier] UTF8String] );
}
}
-- (BOOL)changeHotkeyTo: (int)i_theNewKey
+- (BOOL)changeHotkeyTo: (NSString *)theKey
{
- NSInteger i_returnValue;
- i_returnValue = [o_hotkeysNonUseableKeys indexOfObject: [NSNumber numberWithInt: i_theNewKey]];
- if( i_returnValue != NSNotFound || i_theNewKey == 0 )
+ NSInteger i_returnValue, i_returnValue2;
+ i_returnValue = [o_hotkeysNonUseableKeys indexOfObject: theKey];
+
+ if( i_returnValue != NSNotFound || [theKey isEqualToString:@""] )
{
[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.")];
}
else
{
- NSString *o_temp;
- if( o_keyInTransition )
- [o_keyInTransition release];
- o_keyInTransition = [[NSNumber numberWithInt: i_theNewKey] retain];
-
- o_temp = [self OSXKeyToString: i_theNewKey];
-
- [o_hotkeys_change_keys_lbl setStringValue: o_temp];
+ [o_hotkeys_change_keys_lbl setStringValue: [self OSXStringKeyToString:theKey]];
- i_returnValue = [o_hotkeySettings indexOfObject: o_keyInTransition];
+ i_returnValue = [o_hotkeySettings indexOfObject: theKey];
+ i_returnValue2 = [o_hotkeySettings indexOfObject: [theKey stringByReplacingOccurrencesOfString:@"-" withString:@"+"]];
if( i_returnValue != NSNotFound )
[o_hotkeys_change_taken_lbl setStringValue: [NSString stringWithFormat:
_NS("This combination is already taken by \"%@\"."),
[o_hotkeyDescriptions objectAtIndex: i_returnValue]]];
+ else if( i_returnValue2 != NSNotFound )
+ [o_hotkeys_change_taken_lbl setStringValue: [NSString stringWithFormat:
+ _NS("This combination is already taken by \"%@\"."),
+ [o_hotkeyDescriptions objectAtIndex: i_returnValue2]]];
+
else
[o_hotkeys_change_taken_lbl setStringValue: @""];
[o_hotkeys_change_ok_btn setEnabled: YES];
+ [o_keyInTransition release];
+ o_keyInTransition = theKey;
+ [o_keyInTransition retain];
return YES;
}
}
-
+
@end
/********************
- (BOOL)performKeyEquivalent:(NSEvent *)o_theEvent
{
- unichar key;
- int i_key = 0;
-
+ NSMutableString *tempString = [[[NSMutableString alloc] init] autorelease];
if( [o_theEvent modifierFlags] & NSControlKeyMask )
- i_key |= KEY_MODIFIER_CTRL;
-
+ [tempString appendString:@"Ctrl-"];
+
if( [o_theEvent modifierFlags] & NSAlternateKeyMask )
- i_key |= KEY_MODIFIER_ALT;
-
+ [tempString appendString:@"Alt-"];
+
if( [o_theEvent modifierFlags] & NSShiftKeyMask )
- i_key |= KEY_MODIFIER_SHIFT;
-
+ [tempString appendString:@"Shift-"];
+
if( [o_theEvent modifierFlags] & NSCommandKeyMask )
- i_key |= KEY_MODIFIER_COMMAND;
+ [tempString appendString:@"Command-"];
- key = [[[o_theEvent charactersIgnoringModifiers] lowercaseString] characterAtIndex: 0];
- if( key )
- {
- i_key |= CocoaKeyToVLC( key );
- return [[[VLCMain sharedInstance] simplePreferences] changeHotkeyTo: i_key];
+ if (![[[o_theEvent charactersIgnoringModifiers] lowercaseString] isEqualToString:@""]) {
+ [tempString appendString:[[o_theEvent charactersIgnoringModifiers] lowercaseString]];
+ return [[[VLCMain sharedInstance] simplePreferences] changeHotkeyTo: tempString];
}
- return FALSE;
+ return NO;
}
@end