Changeset 4d8b3700b700a33d958027e7baddd63f34917b8e

Timestamp:

12/03/08 20:25:25 (7 months ago)

Author:

Felix Paul Kühne <fkuehne@videolan.org>

git-committer:

Felix Paul Kühne <fkuehne@videolan.org> 1205349925 +0100

git-parent:

[0274be8790164dccf71b9f4574b57a47e4a88c70]

git-author:

Felix Paul Kühne <fkuehne@videolan.org> 1205349925 +0100

Message:

Implemented the hotkey section of the Simple Preferences

plus a bit of code factorisation

Note that saving multi-key combinations will fail right now.

Files:

• extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib (modified) (1 diff)
• extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib (modified) (1 diff)
• extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib (modified) (previous)
• modules/gui/macosx/playlistinfo.m (modified) (1 diff)
• modules/gui/macosx/simple_prefs.h (modified) (3 diffs)
• modules/gui/macosx/simple_prefs.m (modified) (9 diffs)

extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
- Computer
+
-<plist version="1.0">
-<dict>
-    <key>IBDocumentLocation</key>
-    <string>391 94 505 518 0 0 1280 778 </string>
-    <key>IBEditorPositions</key>
-    <dict>
-        <key>2311</key>
-        <string>345 406 590 264 0 0 1280 778 </string>
-        <key>2330</key>
-        <string>345 266 590 502 0 0 1280 778 </string>
-        <key>2440</key>
-        <string>345 343 590 389 0 0 1280 778 </string>
-        <key>2523</key>
-        <string>345 351 590 373 0 0 1280 778 </string>
-        <key>2562</key>
-        <string>345 310 590 455 0 0 1280 778 </string>
-    </dict>
-    <key>IBFramework Version</key>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    <key>IBOpenObjects</key>
-    <array>
-
+
+
+
-        <integer>2523</integer>
-562
-440
+678
+668
-        <integer>2311</integer>
-    </array>
-    <key>IBSystem Version</key>
-
+
+
+
-</dict>
-</plist>

modules/gui/macosx/playlistinfo.m

@@ -190 +190 @@
-    char *psz_##foo = input_item_Get##bar ( p_item->p_input ); \
-    [self setMeta: psz_##foo forLabel: o_##foo##_txt]; \
-free
+FREENULL
-
-    /* fill the other fields */

modules/gui/macosx/simple_prefs.h

@@ -52 +52 @@
-    IBOutlet id o_audio_vol_txt;
-
+    IBOutlet id o_hotkeys_change_btn;
+    IBOutlet id o_hotkeys_change_lbl;
+    IBOutlet id o_hotkeys_change_keys_lbl;
+    IBOutlet id o_hotkeys_change_taken_lbl;
+    IBOutlet id o_hotkeys_change_win;
+    IBOutlet id o_hotkeys_change_cancel_btn;
+    IBOutlet id o_hotkeys_change_ok_btn;
+    IBOutlet id o_hotkeys_clear_btn;
+    IBOutlet id o_hotkeys_lbl;
+    IBOutlet id o_hotkeys_listbox;
+    IBOutlet id o_hotkeys_view;
+
-    IBOutlet id o_input_access_box;
-    IBOutlet id o_input_avi_pop;
@@ -136 +148 @@
-    BOOL b_osdSettingChanged;
-    BOOL b_inputSettingChanged;
+    BOOL b_hotkeyChanged;
-    id o_currentlyShownCategoryView;
-
-    NSToolbar *o_sprefs_toolbar;
-    NSOpenPanel *o_selectFolderPanel;
+    NSArray *o_hotkeyDescriptions;
+    NSMutableArray *o_hotkeySettings;
-
-    intf_thread_t *p_intf;
-}
-+ (VLCSimplePrefs *)sharedInstance;
+- (NSString *)OSXKeyToString:(int)val;
-
-/* toolbar */
@@ -184 +200 @@
-
-/* hotkeys */
+- (IBAction)hotkeySettingChanged:(id)sender;
+- (void)showHotkeySettings;
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView;
+- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex;
+- (void)changeHotkeyTo: (NSString *)o_theNewKey;
-
-@end
+
+@interface VLCHotkeyChangeWindow : NSWindow
+
+- (void)keyDown:(NSEvent *)theEvent;
+
+@end

modules/gui/macosx/simple_prefs.m

@@ -24 +24 @@
-#import "simple_prefs.h"
-#import "prefs.h"
+#import <vlc_keys.h>
-
-static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier";
@@ -58 +59 @@
-    [o_currentlyShownCategoryView release];
-    [o_sprefs_toolbar release];
-
+
+
+
+
-    [super dealloc];
+}
+
+
+- (NSString *)OSXKeyToString:(int)val
+{
+    NSMutableString *o_temp_str = [[[NSMutableString alloc] init] autorelease];
+    if( val & KEY_MODIFIER_CTRL )
+        [o_temp_str appendString: @"Ctrl+"];
+    if( val & KEY_MODIFIER_ALT )
+        [o_temp_str appendString: @"Alt+"];
+    if( val & KEY_MODIFIER_SHIFT )
+        [o_temp_str appendString: @"Shift+"];
+    if( val & KEY_MODIFIER_COMMAND )
+        [o_temp_str appendString: @"Command+"];
+    
+    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) )
+        {
+            [o_temp_str appendString: [NSString stringWithUTF8String: vlc_keys[i].psz_key_string]];
+        }
+    }
+    return o_temp_str;
-}
-
@@ -84 +112 @@
-    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] )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    }
-    else if( [o_itemIdent isEqual: VLCAudioSettingToolbarIdentifier] )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    }
-    else if( [o_itemIdent isEqual: VLCVideoSettingToolbarIdentifier] )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    }
-    else if( [o_itemIdent isEqual: VLCOSDSettingToolbarIdentifier] )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    }
-    else if( [o_itemIdent isEqual: VLCInputSettingToolbarIdentifier] )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    }
-
@@ -171 +158 @@
-{
-    return [NSArray arrayWithObjects: VLCIntfSettingToolbarIdentifier, VLCAudioSettingToolbarIdentifier, VLCVideoSettingToolbarIdentifier, 
-
+VLCHotkeysSettingToolbarIdentifier, 
-}
-
@@ -177 +164 @@
-{
-    return [NSArray arrayWithObjects: VLCIntfSettingToolbarIdentifier, VLCAudioSettingToolbarIdentifier, VLCVideoSettingToolbarIdentifier, 
-
+VLCHotkeysSettingToolbarIdentifier, 
-}
-
@@ -183 +170 @@
-{
-    return [NSArray arrayWithObjects: VLCIntfSettingToolbarIdentifier, VLCAudioSettingToolbarIdentifier, VLCVideoSettingToolbarIdentifier, 
-
+VLCHotkeysSettingToolbarIdentifier, 
-}
-
@@ -390 +377 @@
-     * hotkeys settings *
-     ********************/
+    struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys;
+    o_hotkeySettings = [[NSMutableArray alloc] init];
+    NSMutableArray *o_tempArray_desc = [[NSMutableArray alloc] init];
+    i = 1;
+
+    while( i < 100 )
+    {
+        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: [self OSXKeyToString: p_item->value.i]];
+
+        i++;
+    }
+    o_hotkeyDescriptions = [[NSArray alloc] initWithArray: o_tempArray_desc copyItems: YES];
+    [o_tempArray_desc release];
+    [o_hotkeys_listbox reloadData];
-}
-
@@ -687 +693 @@
-     * hotkeys settings *
-     ********************/
+    if( b_hotkeyChanged )
+    {
+        struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys;
+        i = 1;
+        while( i < [o_hotkeySettings count] ) // FIXME: this is ugly!
+        {
+            /* FIXME: this does only work for single keys!!! */
+            config_PutInt( p_intf, p_hotkeys[i].psz_action, StringToKey( (char *)[[o_hotkeySettings objectAtIndex: i] UTF8String] ) );
+
+            i++;
+        }        
+        
+        i = config_SaveConfigFile( p_intf, "main" );
+        
+        if( i != 0 )
+        {
+            msg_Err( p_intf, "An error occured while saving the Hotkey settings using SimplePrefs" );
+            i = 0;
+        }
+        b_hotkeyChanged = NO;
+    }
-}
-
@@ -837 +864 @@
-}
-
+- (IBAction)hotkeySettingChanged:(id)sender
+{
+    if( sender == o_hotkeys_change_btn || sender == o_hotkeys_listbox )
+    {
+        [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: [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]];
+        [NSApp runModalForWindow: o_hotkeys_change_win];
+    }
+    else if( sender == o_hotkeys_change_cancel_btn )
+    {
+        [NSApp stopModal];
+        [o_hotkeys_change_win close];
+    }
+    else if( sender == o_hotkeys_change_ok_btn )
+    {
+        int i_returnValue;
+        b_hotkeyChanged = YES;
+
+        i_returnValue = [o_hotkeySettings indexOfObject: [o_hotkeys_change_keys_lbl stringValue]];
+        if( i_returnValue != NSNotFound )
+            [o_hotkeySettings replaceObjectAtIndex: i_returnValue withObject: @"Unset"];        
+
+        [o_hotkeySettings replaceObjectAtIndex: [o_hotkeys_listbox selectedRow] withObject: [o_hotkeys_change_keys_lbl stringValue]];
+
+        [NSApp stopModal];
+        [o_hotkeys_change_win close];
+
+        [o_hotkeys_listbox reloadData];
+    }
+    else if( sender == o_hotkeys_clear_btn )
+    {
+        [o_hotkeySettings replaceObjectAtIndex: [o_hotkeys_listbox selectedRow] withObject: @"Unset"];
+        [o_hotkeys_listbox reloadData];
+        b_hotkeyChanged = YES;
+    }
+}
+
+- (void)showHotkeySettings
+{
+    msg_Dbg( p_intf, "showing HotKey Settings" );
+    [self showSettingsForCategory: o_hotkeys_view];
+}
+