- (void)dealloc
{
[o_currentlyShownCategoryView release];
- [o_sprefs_toolbar release];
[o_hotkeySettings release];
[o_hotkeyDescriptions release];
[o_hotkeysNonUseableKeys release];
- if( o_keyInTransition )
- [o_keyInTransition release];
+ [o_keyInTransition release];
[super dealloc];
}
if( base )
[o_temp_str appendString: [NSString stringWithUTF8String: base]];
else
- o_temp_str = @"Unset";
+ o_temp_str = [NSMutableString stringWithString:_NS("Not Set")];
return o_temp_str;
}
[self initStrings];
/* setup the toolbar */
- o_sprefs_toolbar = [[[NSToolbar alloc] initWithIdentifier: VLCSPrefsToolbarIdentifier] autorelease];
+ NSToolbar * o_sprefs_toolbar = [[[NSToolbar alloc] initWithIdentifier: VLCSPrefsToolbarIdentifier] autorelease];
[o_sprefs_toolbar setAllowsUserCustomization: NO];
[o_sprefs_toolbar setAutosavesConfiguration: NO];
[o_sprefs_toolbar setDisplayMode: NSToolbarDisplayModeIconAndLabel];
nil] retain];
}
+#define CreateToolbarItem( o_name, o_desc, o_img, sel ) \
+ o_toolbarItem = create_toolbar_item(o_itemIdent, o_name, o_desc, o_img, self, @selector(sel));
+static inline NSToolbarItem *
+create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_desc, NSString * o_img, id target, SEL selector )
+{
+ NSToolbarItem *o_toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: o_itemIdent] autorelease]; \
+
+ [o_toolbarItem setLabel: o_name];
+ [o_toolbarItem setPaletteLabel: o_desc];
+
+ [o_toolbarItem setToolTip: o_desc];
+ [o_toolbarItem setImage: [NSImage imageNamed: o_img]];
+
+ [o_toolbarItem setTarget: target];
+ [o_toolbarItem setAction: selector];
+
+ [o_toolbarItem setEnabled: YES];
+ [o_toolbarItem setAutovalidates: YES];
+
+ return o_toolbarItem;
+}
+
- (NSToolbarItem *) toolbar: (NSToolbar *)o_sprefs_toolbar
itemForItemIdentifier: (NSString *)o_itemIdent
willBeInsertedIntoToolbar: (BOOL)b_willBeInserted
{
NSToolbarItem *o_toolbarItem = nil;
-
- #define CreateToolbarItem( o_name, o_desc, o_img, sel ) \
- o_toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: o_itemIdent] autorelease]; \
- \
- [o_toolbarItem setLabel: o_name]; \
- [o_toolbarItem setPaletteLabel: o_desc]; \
- \
- [o_toolbarItem setToolTip: o_desc]; \
- [o_toolbarItem setImage: [NSImage imageNamed: o_img]]; \
- \
- [o_toolbarItem setTarget: self]; \
- [o_toolbarItem setAction: @selector( sel )]; \
- \
- [o_toolbarItem setEnabled: YES]; \
- [o_toolbarItem setAutovalidates: YES]
-
+
if( [o_itemIdent isEqual: VLCIntfSettingToolbarIdentifier] )
{
CreateToolbarItem( _NS("Interface"), _NS("Interface Settings"), @"spref_cone_Interface_64", showInterfaceSettings );
[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")];
[object removeAllItems];
p_item = config_FindConfig( VLC_OBJECT(p_intf), name );
- if( !p_item )
- {
- NSLog( @"serious problem, item not found" );
- return;
- }
+
+ /* serious problem, if no item found */
+ assert( p_item );
+
for( int i = 0; i < p_item->i_list; i++ )
{
NSMenuItem *mi;
[object removeAllItems];
p_item = config_FindConfig( VLC_OBJECT(p_intf), name );
- if( !p_item )
- {
- NSLog( @"serious problem, item not found" );
- return;
- }
+
+ /* serious problem, if no item found */
+ assert( p_item );
+
for( int i = 0; i < p_item->i_list; i++ )
{
NSMenuItem *mi;
[self setupButton: o_osd_font_color_pop forIntList: "quartztext-color"];
[self setupButton: o_osd_font_size_pop forIntList: "quartztext-rel-fontsize"];
- //[self setupButton: o_osd_font_effect_pop forIntList: "quartztext-effect"];
/********************
* hotkeys settings *
- (void)showSimplePrefs
{
/* we want to show the interface settings, if no category was chosen */
- if( [o_sprefs_toolbar selectedItemIdentifier] == nil )
+ if( [[o_sprefs_win toolbar] selectedItemIdentifier] == nil )
{
- [o_sprefs_toolbar setSelectedItemIdentifier: VLCIntfSettingToolbarIdentifier];
+ [[o_sprefs_win toolbar] setSelectedItemIdentifier: VLCIntfSettingToolbarIdentifier];
[self showInterfaceSettings];
}
}
}
-- (void)saveChangedSettings
+static inline void save_int_list( intf_thread_t * p_intf, id object, const char * name )
+{
+ NSNumber *p_valueobject;
+ module_config_t *p_item;
+ p_item = config_FindConfig( VLC_OBJECT(p_intf), name );
+ p_valueobject = (NSNumber *)[[object selectedItem] representedObject];
+ assert([p_valueobject isKindOfClass:[NSNumber class]]);
+ if( p_valueobject) config_PutInt( p_intf, name, [p_valueobject intValue] );
+}
+
+static inline void save_string_list( intf_thread_t * p_intf, id object, const char * name )
+{
+ NSString *p_stringobject;
+ module_config_t *p_item;
+ p_item = config_FindConfig( VLC_OBJECT(p_intf), name );
+ p_stringobject = (NSString *)[[object selectedItem] representedObject];
+ assert([p_stringobject isKindOfClass:[NSString class]]);
+ if( p_stringobject ) config_PutPsz( p_intf, name, [p_stringobject UTF8String] );
+}
+
+static inline void save_module_list( intf_thread_t * p_intf, id object, const char * name )
{
module_config_t *p_item;
- vlc_list_t *p_list;
module_t *p_parser;
+ vlc_list_t *p_list;
+
+ p_item = config_FindConfig( VLC_OBJECT(p_intf), name );
+
+ p_list = vlc_list_find( VLCIntf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ for( int i_module_index = 0; i_module_index < p_list->i_count; i_module_index++ )
+ {
+ p_parser = (module_t *)p_list->p_values[i_module_index].p_object;
+
+ if( p_item->i_type == CONFIG_ITEM_MODULE && module_IsCapable( p_parser, p_item->psz_type ) )
+ {
+ if( [[[object selectedItem] title] isEqualToString: _NS( module_GetLongName( p_parser ) )] )
+ {
+ config_PutPsz( p_intf, name, strdup( module_GetObjName( p_parser )));
+ break;
+ }
+ }
+ }
+ vlc_list_release( p_list );
+ if( [[[object selectedItem] title] isEqualToString: _NS( "Default" )] )
+ config_PutPsz( p_intf, name, "" );
+}
+
+- (void)saveChangedSettings
+{
char *psz_tmp;
int i;
- NSNumber *p_valueobject;
NSString *p_stringobject;
-#define SaveIntList( object, name ) \
- p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \
- p_valueobject = (NSNumber *)[[object selectedItem] representedObject]; \
- if( p_valueobject) config_PutInt( p_intf, name, [p_valueobject intValue] );
+#define SaveIntList( object, name ) save_int_list( p_intf, object, name )
-#define SaveStringList( object, name ) \
- p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \
- p_stringobject = (NSString *)[[object selectedItem] representedObject]; \
- if( p_stringobject ) config_PutPsz( p_intf, name, [p_stringobject UTF8String] );
+#define SaveStringList( object, name ) save_string_list( p_intf, object, name )
-#define SaveModuleList( object, name ) \
- p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \
- \
- p_list = vlc_list_find( VLCIntf, VLC_OBJECT_MODULE, FIND_ANYWHERE ); \
- for( int i_module_index = 0; i_module_index < p_list->i_count; i_module_index++ ) \
- { \
- p_parser = (module_t *)p_list->p_values[i_module_index].p_object; \
- \
- if( p_item->i_type == CONFIG_ITEM_MODULE && module_IsCapable( p_parser, p_item->psz_type ) ) \
- { \
- if( [[[object selectedItem] title] isEqualToString: _NS( module_GetLongName( p_parser ) )] ) \
- { \
- config_PutPsz( p_intf, name, strdup( module_GetObjName( p_parser ))); \
- break; \
- } \
- } \
- } \
- vlc_list_release( p_list ); \
- if( [[[object selectedItem] title] isEqualToString: _NS( "Default" )] ) \
- config_PutPsz( p_intf, name, "" )
+#define SaveModuleList( object, name ) save_module_list( p_intf, object, name )
/**********************
* interface settings *
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 )
{
SaveIntList( o_osd_font_color_pop, "quartztext-color" );
SaveIntList( o_osd_font_size_pop, "quartztext-rel-fontsize" );
- //SaveIntList( o_osd_font_effect_pop, "freetype-effect" );
i = config_SaveConfigFile( p_intf, NULL );
[self showSettingsForCategory: o_hotkeys_view];
}
-- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
+- (int)numberOfRowsInTableView:(NSTableView *)aTableView
{
return [o_hotkeySettings count];
}
-- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
+- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
{
if( [[aTableColumn identifier] isEqualToString: @"action"] )
return [o_hotkeyDescriptions objectAtIndex: rowIndex];
}
}
-- (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
{
[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