/*****************************************************************************
* simple_prefs.m: Simple Preferences for Mac OS X
*****************************************************************************
-* Copyright (C) 2008-2011 the VideoLAN team
+* Copyright (C) 2008-2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne at videolan dot org>
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#import "CompatibilityFixes.h"
#import "simple_prefs.h"
#import "prefs.h"
#import <vlc_keys.h>
#import "misc.h"
#import "intf.h"
#import "AppleRemote.h"
-#import <Sparkle/Sparkle.h> //for o_intf_last_update_lbl
+
+#ifdef HAVE_SPARKLE_H
+# import <Sparkle/Sparkle.h> //for o_intf_last_update_lbl
+#endif
static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier";
static NSString* VLCIntfSettingToolbarIdentifier = @"Intf Settings Item Identifier";
- (NSString *)OSXStringKeyToString:(NSString *)theString
{
if (![theString isEqualToString:@""]) {
+ /* remove cruft */
+ if ([theString characterAtIndex:([theString length] - 1)] != 0x2b)
+ theString = [theString stringByReplacingOccurrencesOfString:@"+" withString:@""];
+ else
+ {
+ theString = [theString stringByReplacingOccurrencesOfString:@"+" withString:@""];
+ theString = [NSString stringWithFormat:@"%@+", theString];
+ }
+ if ([theString characterAtIndex:([theString length] - 1)] != 0x2d)
+ theString = [theString stringByReplacingOccurrencesOfString:@"-" withString:@""];
+ else
+ {
+ theString = [theString stringByReplacingOccurrencesOfString:@"-" withString:@""];
+ theString = [NSString stringWithFormat:@"%@-", theString];
+ }
+ /* modifiers */
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:@""];
+ /* show non-character keys correctly */
+ theString = [theString stringByReplacingOccurrencesOfString:@"Right" withString:[NSString stringWithUTF8String:"\xE2\x86\x92"]];
+ theString = [theString stringByReplacingOccurrencesOfString:@"Left" withString:[NSString stringWithUTF8String:"\xE2\x86\x90"]];
+ theString = [theString stringByReplacingOccurrencesOfString:@"Up" withString:[NSString stringWithUTF8String:"\xE2\x86\x91"]];
+ theString = [theString stringByReplacingOccurrencesOfString:@"Down" withString:[NSString stringWithUTF8String:"\xE2\x86\x93"]];
+ theString = [theString stringByReplacingOccurrencesOfString:@"Enter" withString:[NSString stringWithUTF8String:"\xe2\x86\xb5"]];
+ theString = [theString stringByReplacingOccurrencesOfString:@"Tab" withString:[NSString stringWithUTF8String:"\xe2\x87\xa5"]];
+ theString = [theString stringByReplacingOccurrencesOfString:@"Delete" withString:[NSString stringWithUTF8String:"\xe2\x8c\xab"]]; /* capitalize plain characters to suit the menubar's look */
theString = [theString capitalizedString];
}
else
[o_sprefs_toolbar setDelegate: self];
[o_sprefs_win setToolbar: o_sprefs_toolbar];
+ if (OSX_LION)
+ [o_sprefs_win setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary];
+ else
+ [o_intf_nativefullscreen_ckb setEnabled:NO];
+
/* setup useful stuff */
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];
}
[[[o_hotkeys_listbox tableColumnWithIdentifier: @"shortcut"] headerCell] setStringValue: _NS("Shortcut")];
/* input */
+ [o_input_record_box setTitle: _NS("Record directory or filename")];
+ [o_input_record_btn setTitle: _NS("Browse...")];
+ [o_input_record_btn setToolTip: _NS("Directory or filename where the records will be stored")];
[o_input_avi_txt setStringValue: _NS("Repair AVI Files")];
[o_input_cachelevel_txt setStringValue: _NS("Default Caching Level")];
[o_input_caching_box setTitle: _NS("Caching")];
[o_input_postproc_txt setStringValue: _NS("Post-Processing Quality")];
[o_input_rtsp_ckb setTitle: _NS("Use RTP over RTSP (TCP)")];
[o_input_skipLoop_txt setStringValue: _NS("Skip the loop filter for H.264 decoding")];
- [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_embedded_ckb setTitle: _NS("Show video within the main window")];
+ [o_intf_nativefullscreen_ckb setTitle: _NS("Use the native fullscreen mode on OS X Lion")];
[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_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)")];
+ [o_intf_enableGrowl_ckb setTitle: _NS("Enable Growl notifications (on playlist item change)")];
/* Subtitles and OSD */
[o_osd_encoding_txt setStringValue: _NS("Default Encoding")];
[o_video_snap_seqnum_ckb setTitle: _NS("Sequential numbering")];
/* generic stuff */
- [[o_sprefs_basicFull_matrix cellAtRow: 0 column: 0] setTitle: _NS("Basic")];
- [[o_sprefs_basicFull_matrix cellAtRow: 0 column: 1] setTitle: _NS("All")];
+ [o_sprefs_showAll_btn setTitle: _NS("Show All")];
[o_sprefs_cancel_btn setTitle: _NS("Cancel")];
[o_sprefs_reset_btn setTitle: _NS("Reset All")];
[o_sprefs_save_btn setTitle: _NS("Save")];
int i, y = 0;
char *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_art_pop forIntList: "album-art"];
[self setupButton: o_intf_fspanel_ckb forBoolValue: "macosx-fspanel"];
+ [self setupButton: o_intf_nativefullscreen_ckb forBoolValue: "macosx-nativefullscreenmode"];
[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"];
+#ifdef HAVE_SPARKLE_H
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
+#endif
[o_intf_last_update_lbl setStringValue: _NS("No check was performed yet.")];
psz_tmp = config_GetPsz( p_intf, "control" );
if (psz_tmp) {
else
[o_intf_enableGrowl_ckb setState: NSOffState];
if (config_GetInt( p_intf, "macosx-interfacestyle" ))
+ {
[o_intf_style_dark_bcell setState: YES];
+ [o_intf_style_bright_bcell setState: NO];
+ }
else
+ {
[o_intf_style_dark_bcell setState: NO];
+ [o_intf_style_bright_bcell setState: YES];
+ }
/******************
* audio settings *
/***************************
* input & codecs settings *
***************************/
- [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_record_fld forOption:"input-record-path"];
[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")];
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( "cdda-caching" );
- TestCaC( "screen-caching" );
- TestCaC( "vcd-caching" );
- TestCaCi( "rtsp-caching", 4 );
- TestCaCi( "ftp-caching", 2 );
- TestCaCi( "http-caching", 4 );
- if(module_exists ("access_realrtsp"))
- TestCaCi( "realrtsp-caching", 10 );
- TestCaCi( "mms-caching", 19 );
+ TestCaC( "network-caching" );
+ TestCaC( "disc-caching" );
+ TestCaC( "live-caching" );
if( b_cache_equal )
{
[o_input_cachelevel_pop selectItemWithTag: i_cache];
}
}
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];
@selector(sheetDidEnd: returnCode: contextInfo:), NULL, nil,
_NS("Beware this will reset the VLC media player preferences.\n"
"Are you sure you want to continue?") );
- else if( sender == o_sprefs_basicFull_matrix )
+ else if( sender == o_sprefs_showAll_btn )
{
[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] preferences] showPrefs];
}
else
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] );
+ config_PutInt( p_intf, "macosx-nativefullscreenmode", [o_intf_nativefullscreen_ckb state] );
if( [o_intf_enableGrowl_ckb state] == NSOnState )
{
tmpString = getString( "control" );
***************************/
if( b_inputSettingChanged )
{
- config_PutInt( p_intf, "server-port", [o_input_serverport_fld intValue] );
+ config_PutPsz( p_intf, "input-record-path", [[o_input_record_fld stringValue] UTF8String] );
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, "postproc-q", [o_input_postproc_fld intValue] );
#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 to: %i", (int)[[o_input_cachelevel_pop selectedItem] tag] );
- CaC( "udp-caching" );
- if( module_exists ( "dvdread" ) )
- CaC( "dvdread-caching" );
- if( module_exists ( "dvdnav" ) )
- CaC( "dvdnav-caching" );
- 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 );
- CaCi( "mms-caching", 19 );
+ CaC( "network-caching" );
+ CaC( "disc-caching" );
+ CaC( "live-caching" );
b_inputSettingChanged = NO;
}
********************/
if( b_hotkeyChanged )
{
- for( NSUInteger i = 0; i < [o_hotkeySettings count]; i++ )
+ NSUInteger hotKeyCount = [o_hotkeySettings count];
+ for( NSUInteger i = 0; i < hotKeyCount; i++ )
config_PutPsz( p_intf, [[o_hotkeyNames objectAtIndex:i] UTF8String], [[o_hotkeySettings objectAtIndex:i]UTF8String] );
b_hotkeyChanged = NO;
}
[o_video_snap_folder_fld setStringValue: [[o_selectFolderPanel URL] path]];
b_videoSettingChanged = YES;
}
+ else if( contextInfo == o_input_record_btn )
+ {
+ [o_input_record_fld setStringValue: [[o_selectFolderPanel URL] path]];
+ b_inputSettingChanged = YES;
+ }
}
[o_selectFolderPanel release];
else
[o_input_cachelevel_custom_txt setHidden: YES];
}
+ else if( sender == o_input_record_btn )
+ {
+ o_selectFolderPanel = [[NSOpenPanel alloc] init];
+ [o_selectFolderPanel setCanChooseDirectories: YES];
+ [o_selectFolderPanel setCanChooseFiles: YES];
+ [o_selectFolderPanel setResolvesAliases: YES];
+ [o_selectFolderPanel setAllowsMultipleSelection: NO];
+ [o_selectFolderPanel setMessage: _NS("Choose the directory or filename where the records will be stored.")];
+ [o_selectFolderPanel setCanCreateDirectories: YES];
+ [o_selectFolderPanel setPrompt: _NS("Choose")];
+ [o_selectFolderPanel beginSheetForDirectory: nil file: nil modalForWindow: o_sprefs_win
+ modalDelegate: self
+ didEndSelector: @selector(savePanelDidEnd:returnCode:contextInfo:)
+ contextInfo: o_input_record_btn];
+ return;
+ }
b_inputSettingChanged = YES;
}
- (BOOL)performKeyEquivalent:(NSEvent *)o_theEvent
{
NSMutableString *tempString = [[[NSMutableString alloc] init] autorelease];
+ NSString *keyString = [o_theEvent characters];
+ unichar key = [keyString characterAtIndex:0];
+
+ /* modifiers */
if( [o_theEvent modifierFlags] & NSControlKeyMask )
[tempString appendString:@"Ctrl-"];
-
if( [o_theEvent modifierFlags] & NSAlternateKeyMask )
[tempString appendString:@"Alt-"];
-
if( [o_theEvent modifierFlags] & NSShiftKeyMask )
[tempString appendString:@"Shift-"];
-
if( [o_theEvent modifierFlags] & NSCommandKeyMask )
[tempString appendString:@"Command-"];
- if (![[[o_theEvent charactersIgnoringModifiers] lowercaseString] isEqualToString:@""]) {
+ /* non character keys */
+ if( key == NSUpArrowFunctionKey )
+ [tempString appendString:@"Up"];
+ else if( key == NSDownArrowFunctionKey )
+ [tempString appendString:@"Down"];
+ else if( key == NSLeftArrowFunctionKey )
+ [tempString appendString:@"Left"];
+ else if( key == NSRightArrowFunctionKey )
+ [tempString appendString:@"Right"];
+ else if( key == NSF1FunctionKey )
+ [tempString appendString:@"F1"];
+ else if( key == NSF2FunctionKey )
+ [tempString appendString:@"F2"];
+ else if( key == NSF3FunctionKey )
+ [tempString appendString:@"F3"];
+ else if( key == NSF4FunctionKey )
+ [tempString appendString:@"F4"];
+ else if( key == NSF5FunctionKey )
+ [tempString appendString:@"F5"];
+ else if( key == NSF6FunctionKey )
+ [tempString appendString:@"F6"];
+ else if( key == NSF7FunctionKey )
+ [tempString appendString:@"F7"];
+ else if( key == NSF8FunctionKey )
+ [tempString appendString:@"F8"];
+ else if( key == NSF9FunctionKey )
+ [tempString appendString:@"F9"];
+ else if( key == NSF10FunctionKey )
+ [tempString appendString:@"F10"];
+ else if( key == NSF11FunctionKey )
+ [tempString appendString:@"F11"];
+ else if( key == NSF12FunctionKey )
+ [tempString appendString:@"F12"];
+ else if( key == NSInsertFunctionKey )
+ [tempString appendString:@"Insert"];
+ else if( key == NSHomeFunctionKey )
+ [tempString appendString:@"Home"];
+ else if( key == NSEndFunctionKey )
+ [tempString appendString:@"End"];
+ else if( key == NSPageUpFunctionKey )
+ [tempString appendString:@"Pageup"];
+ else if( key == NSPageDownFunctionKey )
+ [tempString appendString:@"Pagedown"];
+ else if( key == NSMenuFunctionKey )
+ [tempString appendString:@"Menu"];
+ else if( key == NSTabCharacter )
+ [tempString appendString:@"Tab"];
+ else if( key == NSCarriageReturnCharacter )
+ [tempString appendString:@"Enter"];
+ else if( key == NSEnterCharacter )
+ [tempString appendString:@"Enter"];
+ else if( key == NSDeleteCharacter )
+ [tempString appendString:@"Delete"];
+ else if( key == NSBackspaceCharacter )
+ [tempString appendString:@"Backspace"];
+ else if (![[[o_theEvent charactersIgnoringModifiers] lowercaseString] isEqualToString:@""]) //plain characters
[tempString appendString:[[o_theEvent charactersIgnoringModifiers] lowercaseString]];
- return [[[VLCMain sharedInstance] simplePreferences] changeHotkeyTo: tempString];
- }
- return NO;
+ else
+ return NO;
+
+ return [[[VLCMain sharedInstance] simplePreferences] changeHotkeyTo: tempString];
}
@end
projects / vlc / blobdiff