#import "simple_prefs.h"
#import "prefs.h"
#import <vlc_keys.h>
+#import <vlc_interface.h>
+#import "misc.h"
static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier";
static NSString* VLCIntfSettingToolbarIdentifier = @"Intf Settings Item Identifier";
if (_o_sharedInstance) {
[self dealloc];
} else {
- p_intf = VLCIntf;
_o_sharedInstance = [super init];
+ p_intf = VLCIntf;
}
-
+
return _o_sharedInstance;
}
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 = _NS("Not Set");
return o_temp_str;
}
[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'],
[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'],
}
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] )
{
[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_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_meta_ckb setTitle: _NS("Fetch the metadata from the Internet")];
[o_intf_network_box setTitle: _NS("Privacy / Network Interaction")];
/* Subtitles and OSD */
[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_osd_box setTitle: _NS("On Screen Display")];
[o_osd_osd_ckb setTitle: _NS("Enable OSD")];
- /* 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 Preferences")];
- [o_sprefs_save_btn setTitle: _NS("Save")];
- [o_sprefs_win setTitle: _NS("Preferences")];
-
/* video */
[o_video_black_ckb setTitle: _NS("Black screens in Fullscreen mode")];
- [o_video_device_txt setStringValue: _NS("Display device")];
+ [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_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
+- (void)setupButton: (NSPopUpButton *)object forStringList: (const char *)name
+{
+ module_config_t *p_item;
+
+ [object removeAllItems];
+ p_item = config_FindConfig( VLC_OBJECT(p_intf), name );
+
+ /* serious problem, if no item found */
+ assert( p_item );
+
+ for( int i = 0; i < p_item->i_list; i++ )
+ {
+ NSMenuItem *mi;
+ if( p_item->ppsz_list_text != NULL )
+ mi = [[NSMenuItem alloc] initWithTitle: _NS( p_item->ppsz_list_text[i] ) action:NULL keyEquivalent: @""];
+ else if( p_item->ppsz_list[i] && p_item->ppsz_list[i] == "" )
+ {
+ [[object menu] addItem: [NSMenuItem separatorItem]];
+ continue;
+ }
+ 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);
+ [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] ) )
+ [object selectItem:[object lastItem]];
+ }
+ [object setToolTip: _NS( p_item->psz_longtext )];
+}
+
+- (void)setupButton: (NSPopUpButton *)object forIntList: (const char *)name
+{
+ module_config_t *p_item;
+
+ [object removeAllItems];
+ p_item = config_FindConfig( VLC_OBJECT(p_intf), name );
+
+ /* serious problem, if no item found */
+ assert( p_item );
+
+ for( int i = 0; i < p_item->i_list; i++ )
+ {
+ NSMenuItem *mi;
+ if( p_item->ppsz_list_text != NULL)
+ 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);
+ [mi setRepresentedObject:[NSNumber numberWithInt: p_item->pi_list[i]]];
+ [[object menu] addItem: [mi autorelease]];
+ if( p_item->value.i == p_item->pi_list[i] )
+ [object selectItem:[object lastItem]];
+ }
+ [object setToolTip: _NS( p_item->psz_longtext )];
+}
+
+- (void)setupButton: (NSPopUpButton *)object forModuleList: (const char *)name
{
module_config_t *p_item;
vlc_list_t *p_list;
module_t *p_parser;
+ int y = 0;
+
+ [object removeAllItems];
+
+ p_item = config_FindConfig( VLC_OBJECT(p_intf), name );
+ p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ if( !p_item ||!p_list )
+ {
+ if( p_list ) vlc_list_release(p_list);
+ NSLog( @"serious problem, item or list not found" );
+ return;
+ }
+
+ [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( p_parser && module_IsCapable( p_parser, p_item->psz_type ) )
+ {
+ [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]];
+ }
+ }
+ vlc_list_release( p_list );
+ [object setToolTip: _NS(p_item->psz_longtext)];
+}
+
+- (void)resetControls
+{
+ module_config_t *p_item;
int i, y = 0;
char *psz_tmp;
- #define SetupIntList( object, name ) \
- [object removeAllItems]; \
- p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \
- for( i = 0; i < p_item->i_list; i++ ) \
- { \
- 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]]]; \
- } \
- if( p_item->value.i < [object numberOfItems] ) \
- [object selectItemAtIndex: p_item->value.i]; \
- else \
- [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++ ) \
- { \
- [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 )]
+ [[o_sprefs_basicFull_matrix cellAtRow:0 column:0] setState: NSOnState];
+ [[o_sprefs_basicFull_matrix cellAtRow:0 column:1] setState: NSOffState];
- #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: [NSString stringWithUTF8String: module_GetLongName( p_parser )]]; \
- \
- if( p_item->value.psz && !strcmp( p_item->value.psz, module_GetObjName( p_parser ) ) ) \
- [object selectItem: [object lastItem]]; \
- } \
- } \
- vlc_list_release( p_list ); \
- [object setToolTip: _NS(p_item->psz_longtext)]
-
/**********************
* interface settings *
**********************/
- SetupStringList( o_intf_lang_pop, "language" );
- SetupIntList( o_intf_art_pop, "album-art" );
+ [self setupButton: o_intf_lang_pop forStringList: "language"];
+ [self setupButton: o_intf_art_pop forIntList: "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" )];
[o_audio_spdif_ckb setState: config_GetInt( p_intf, "spdif" )];
- SetupIntList( o_audio_dolby_pop, "force-dolby-surround" );
+ [self setupButton: o_audio_dolby_pop forIntList: "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" )];
[o_audio_norm_ckb setState: (int)strstr( psz_tmp, "normvol" )];
[o_audio_norm_fld setFloatValue: config_GetFloat( p_intf, "norm-max-level" )];
- SetupModuleList( o_audio_visual_pop, "audio-visual" );
+ [self setupButton: o_audio_visual_pop forModuleList: "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 *
[o_video_skipFrames_ckb setState: config_GetInt( p_intf, "skip-frames" )];
[o_video_black_ckb setState: config_GetInt( p_intf, "macosx-black" )];
- SetupModuleList( o_video_output_pop, "vout" );
+ [self setupButton: o_video_output_pop forModuleList: "vout"];
- msg_Warn( p_intf, "display device selector not implemented!" );
[o_video_device_pop removeAllItems];
-
- 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_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++ )
+ i = 0;
+ y = [[NSScreen screens] count];
+ [o_video_device_pop addItemWithTitle: _NS("Default")];
+ [[o_video_device_pop lastItem] setTag: 0];
+ while( i < y )
{
- [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;
+ 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_snap_format_pop selectItemAtIndex: y];
+ [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" )];
+ [self setupButton: o_video_snap_format_pop forStringList: "snapshot-format"];
/***************************
* input & codecs settings *
***************************/
[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" );
+ [self setupButton: o_input_avi_pop forIntList: "avi-index"];
[o_input_rtsp_ckb setState: config_GetInt( p_intf, "rtsp-tcp" )];
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 *
*********************/
[o_osd_osd_ckb setState: config_GetInt( p_intf, "osd" )];
- [o_osd_encoding_pop removeAllItems];
- y = 0;
- p_item = config_FindConfig( VLC_OBJECT(p_intf), "subsdec-encoding" );
- for( i = 0; p_item->ppsz_list[i] != nil; i++ )
- {
- if( p_item->ppsz_list[i] != "" )
- [o_osd_encoding_pop addItemWithTitle: _NS( p_item->ppsz_list[i] )];
- else
- [o_osd_encoding_pop addItemWithTitle: @" "];
-
- if( p_item->value.psz && !strcmp( p_item->value.psz, p_item->ppsz_list[i] ) )
- y = i;
- }
- [o_osd_encoding_pop selectItemAtIndex: y];
+ [self setupButton: o_osd_encoding_pop forStringList: "subsdec-encoding"];
- [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" );
+ [self setupButton: o_osd_font_color_pop forIntList: "quartztext-color"];
+ [self setupButton: o_osd_font_size_pop forIntList: "quartztext-rel-fontsize"];
/********************
* hotkeys settings *
[self resetControls];
+ [o_sprefs_win center];
[o_sprefs_win makeKeyAndOrderFront: self];
}
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
module_t *p_parser;
char *psz_tmp;
int i;
+ NSNumber *p_valueobject;
+ NSString *p_stringobject;
#define SaveIntList( object, name ) \
p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \
- if( [object indexOfSelectedItem] >= 0 ) \
- config_PutInt( p_intf, name, p_item->pi_list[[object indexOfSelectedItem]] ); \
- else \
- config_PutInt( p_intf, name, [object intValue] ) \
+ p_valueobject = (NSNumber *)[[object selectedItem] representedObject]; \
+ if( p_valueobject) config_PutInt( p_intf, name, [p_valueobject intValue] );
#define SaveStringList( object, name ) \
p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \
- if( [object indexOfSelectedItem] >= 0 ) \
- config_PutPsz( p_intf, name, strdup( p_item->ppsz_list[[object indexOfSelectedItem]] ) ); \
- else \
- config_PutPsz( p_intf, name, strdup( [[VLCMain sharedInstance] delocalizeString: [object stringValue]] ) )
+ p_stringobject = (NSString *)[[object selectedItem] representedObject]; \
+ if( p_stringobject ) config_PutPsz( p_intf, name, [p_stringobject UTF8String] );
#define SaveModuleList( object, name ) \
p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \
} \
vlc_list_release( p_list ); \
if( [[[object selectedItem] title] isEqualToString: _NS( "Default" )] ) \
- config_PutPsz( p_intf, name, "Default" )
+ config_PutPsz( p_intf, name, "" )
/**********************
* interface settings *
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;
}
/* 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" );
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;
config_PutInt( p_intf, "macosx-black", [o_video_black_ckb state] );
SaveModuleList( o_video_output_pop, "vout" );
- msg_Warn( p_intf, "display device selector not implemented!" );
+ 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] );
config_PutInt( p_intf, "snapshot-sequential", [o_video_snap_seqnum_ckb state] );
-
- if( [o_video_snap_format_pop indexOfSelectedItem] >= 0 )
- config_PutPsz( p_intf, "snapshot-format", [[[o_video_snap_format_pop selectedItem] title] UTF8String] );
+ 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 );
+ 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;
{
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" );
#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" ) )
{
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;
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" );
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;
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;
/* 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];
- (void)showInterfaceSettings
{
- msg_Dbg( p_intf, "showing interface settings" );
[self showSettingsForCategory: o_intf_view];
}
{
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];
}
- (void)showVideoSettings
{
- msg_Dbg( p_intf, "showing video settings" );
[self showSettingsForCategory: o_video_view];
}
- (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];
}
- (void)showHotkeySettings
{
- msg_Dbg( p_intf, "showing HotKey Settings" );
[self showSettingsForCategory: o_hotkeys_view];
}
}
}
-- (void)changeHotkeyTo: (int)i_theNewKey
+- (BOOL)changeHotkeyTo: (int)i_theNewKey
{
int i_returnValue;
i_returnValue = [o_hotkeysNonUseableKeys indexOfObject: [NSNumber numberWithInt: i_theNewKey]];
[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.")];
[o_hotkeys_change_ok_btn setEnabled: NO];
+ return NO;
}
else
{
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: @""];
[o_hotkeys_change_ok_btn setEnabled: YES];
+ return YES;
}
}
@implementation VLCHotkeyChangeWindow
+- (BOOL)acceptsFirstResponder
+{
+ return YES;
+}
+
+- (BOOL)becomeFirstResponder
+{
+ return YES;
+}
+
- (BOOL)resignFirstResponder
{
/* We need to stay the first responder or we'll miss the user's input */
return NO;
}
-- (void)keyDown:(NSEvent *)o_theEvent
+- (BOOL)performKeyEquivalent:(NSEvent *)o_theEvent
{
- int i_nonReadableKey = 0;
+ unichar key;
+ int i_key = 0;
if( [o_theEvent modifierFlags] & NSControlKeyMask )
- i_nonReadableKey = i_nonReadableKey | KEY_MODIFIER_CTRL;
+ i_key |= KEY_MODIFIER_CTRL;
if( [o_theEvent modifierFlags] & NSAlternateKeyMask )
- i_nonReadableKey = i_nonReadableKey | KEY_MODIFIER_ALT;
+ i_key |= KEY_MODIFIER_ALT;
if( [o_theEvent modifierFlags] & NSShiftKeyMask )
- i_nonReadableKey = i_nonReadableKey | KEY_MODIFIER_SHIFT;
+ i_key |= KEY_MODIFIER_SHIFT;
if( [o_theEvent modifierFlags] & NSCommandKeyMask )
- i_nonReadableKey = i_nonReadableKey | KEY_MODIFIER_COMMAND;
+ i_key |= KEY_MODIFIER_COMMAND;
- if( [o_theEvent modifierFlags] & NSFunctionKeyMask )
- {
- unichar key = 0;
- key = [[o_theEvent charactersIgnoringModifiers] characterAtIndex: 0];
-
- switch( key )
- {
- case 0x1b:
- i_nonReadableKey = i_nonReadableKey | KEY_ESC;
- break;
- case NSF1FunctionKey:
- i_nonReadableKey = i_nonReadableKey | KEY_F1;
- break;
- case NSF2FunctionKey:
- i_nonReadableKey = i_nonReadableKey | KEY_F2;
- break;
- case NSF3FunctionKey:
- i_nonReadableKey = i_nonReadableKey | KEY_F3;
- break;
- case NSF4FunctionKey:
- i_nonReadableKey = i_nonReadableKey | KEY_F4;
- break;
- case NSF5FunctionKey:
- i_nonReadableKey = i_nonReadableKey | KEY_F5;
- break;
- case NSF6FunctionKey:
- i_nonReadableKey = i_nonReadableKey | KEY_F6;
- break;
- case NSF7FunctionKey:
- i_nonReadableKey = i_nonReadableKey | KEY_F7;
- break;
- case NSF8FunctionKey:
- i_nonReadableKey = i_nonReadableKey | KEY_F8;
- break;
- case NSF9FunctionKey:
- i_nonReadableKey = i_nonReadableKey | KEY_F9;
- break;
- case NSF10FunctionKey:
- i_nonReadableKey = i_nonReadableKey | KEY_F10;
- break;
- case NSF11FunctionKey:
- i_nonReadableKey = i_nonReadableKey | KEY_F11;
- break;
- case NSF12FunctionKey:
- i_nonReadableKey = i_nonReadableKey | KEY_F12;
- break;
- case NSInsertFunctionKey:
- i_nonReadableKey = i_nonReadableKey | KEY_INSERT;
- break;
- case NSHomeFunctionKey:
- i_nonReadableKey = i_nonReadableKey | KEY_HOME;
- break;
- case NSEndFunctionKey:
- i_nonReadableKey = i_nonReadableKey | KEY_END;
- break;
- case NSPageUpFunctionKey:
- i_nonReadableKey = i_nonReadableKey | KEY_PAGEUP;
- break;
- case NSPageDownFunctionKey:
- i_nonReadableKey = i_nonReadableKey | KEY_PAGEDOWN;
- break;
- case NSMenuFunctionKey:
- i_nonReadableKey = i_nonReadableKey | KEY_MENU;
- break;
- case NSTabCharacter:
- i_nonReadableKey = i_nonReadableKey | KEY_TAB;
- break;
- case NSDeleteCharacter:
- i_nonReadableKey = i_nonReadableKey | KEY_DELETE;
- break;
- case NSBackspaceCharacter:
- i_nonReadableKey = i_nonReadableKey | KEY_BACKSPACE;
- break;
- case NSUpArrowFunctionKey:
- i_nonReadableKey = i_nonReadableKey | KEY_UP;
- break;
- case NSDownArrowFunctionKey:
- i_nonReadableKey = i_nonReadableKey | KEY_DOWN;
- break;
- case NSRightArrowFunctionKey:
- i_nonReadableKey = i_nonReadableKey | KEY_RIGHT;
- break;
- case NSLeftArrowFunctionKey:
- i_nonReadableKey = i_nonReadableKey | KEY_LEFT;
- break;
- case NSEnterCharacter:
- i_nonReadableKey = i_nonReadableKey | KEY_ENTER;
- break;
- default:
- {
- msg_Warn( VLCIntf, "user pressed unknown function key" );
- i_nonReadableKey = 0;
- break;
- }
- }
- }
- else
+ key = [[[o_theEvent charactersIgnoringModifiers] lowercaseString] characterAtIndex: 0];
+ if( key )
{
- if( [[o_theEvent charactersIgnoringModifiers] isEqualToString: @" "] )
- i_nonReadableKey = i_nonReadableKey | KEY_SPACE;
- else
- i_nonReadableKey = i_nonReadableKey | StringToKey( (char *)[[[o_theEvent charactersIgnoringModifiers] lowercaseString] UTF8String] );
+ i_key |= CocoaKeyToVLC( key );
+ return [[[VLCMain sharedInstance] getSimplePreferences] changeHotkeyTo: i_key];
}
-
- [[[VLCMain sharedInstance] getSimplePreferences] changeHotkeyTo: i_nonReadableKey];
+ return FALSE;
}
@end
projects / vlc / blobdiff