-{
- IBClasses = (
- {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
- {CLASS = MPSlider; LANGUAGE = ObjC; SUPERCLASS = NSSlider; },
- {CLASS = NSDatePicker; LANGUAGE = ObjC; SUPERCLASS = NSControl; },
- {CLASS = VLBrushedMetalImageView; LANGUAGE = ObjC; SUPERCLASS = NSImageView; },
- {CLASS = VLCApplication; LANGUAGE = ObjC; SUPERCLASS = NSApplication; },
- {CLASS = VLCControllerWindow; LANGUAGE = ObjC; SUPERCLASS = NSWindow; },
- {CLASS = VLCPlaylistView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
- {
- ACTIONS = {advancedToggle = id; closePrefs = id; resetAll = id; savePrefs = id; };
- CLASS = VLCPrefs;
- LANGUAGE = ObjC;
- OUTLETS = {
- "o_advanced_ckb" = id;
- "o_cancel_btn" = id;
- "o_prefs_view" = id;
- "o_prefs_window" = id;
- "o_reset_btn" = id;
- "o_save_btn" = id;
- "o_title" = id;
- "o_tree" = id;
- };
- SUPERCLASS = NSObject;
- },
- {
- ACTIONS = {
- audioSettingChanged = id;
- buttonAction = id;
- inputSettingChanged = id;
- interfaceSettingChanged = id;
- osdSettingChanged = id;
- videoSettingChanged = id;
- };
- CLASS = VLCSimplePrefs;
- LANGUAGE = ObjC;
- OUTLETS = {
- "o_audio_dolby_pop" = id;
- "o_audio_dolby_txt" = id;
- "o_audio_effects_box" = id;
- "o_audio_enable_ckb" = id;
- "o_audio_general_box" = id;
- "o_audio_headphone_ckb" = id;
- "o_audio_lang_fld" = id;
- "o_audio_lang_txt" = id;
- "o_audio_last_box" = id;
- "o_audio_last_ckb" = id;
- "o_audio_lastpwd_fld" = id;
- "o_audio_lastpwd_txt" = id;
- "o_audio_lastuser_fld" = id;
- "o_audio_lastuser_txt" = id;
- "o_audio_norm_ckb" = id;
- "o_audio_norm_fld" = id;
- "o_audio_spdif_ckb" = id;
- "o_audio_view" = id;
- "o_audio_visual_pop" = id;
- "o_audio_visual_txt" = id;
- "o_audio_vol_fld" = id;
- "o_audio_vol_sld" = id;
- "o_audio_vol_txt" = id;
- "o_input_access_box" = id;
- "o_input_avi_pop" = id;
- "o_input_avi_txt" = id;
- "o_input_bandwidth_ckb" = id;
- "o_input_cachelevel_pop" = id;
- "o_input_cachelevel_txt" = id;
- "o_input_caching_box" = id;
- "o_input_dump_ckb" = id;
- "o_input_httpproxy_fld" = id;
- "o_input_httpproxy_txt" = id;
- "o_input_mux_box" = id;
- "o_input_net_box" = id;
- "o_input_postproc_fld" = id;
- "o_input_postproc_txt" = id;
- "o_input_record_ckb" = id;
- "o_input_rtsp_ckb" = id;
- "o_input_serverport_fld" = id;
- "o_input_serverport_txt" = id;
- "o_input_timeshift_ckb" = id;
- "o_input_view" = id;
- "o_intf_art_pop" = id;
- "o_intf_art_txt" = id;
- "o_intf_embedded_ckb" = id;
- "o_intf_fspanel_ckb" = id;
- "o_intf_lang_pop" = id;
- "o_intf_lang_txt" = id;
- "o_intf_meta_ckb" = id;
- "o_intf_network_box" = id;
- "o_intf_view" = id;
- "o_osd_encoding_pop" = id;
- "o_osd_encoding_txt" = id;
- "o_osd_font_box" = id;
- "o_osd_font_btn" = id;
- "o_osd_font_color_pop" = id;
- "o_osd_font_color_txt" = id;
- "o_osd_font_effect_pop" = id;
- "o_osd_font_effect_txt" = id;
- "o_osd_font_fld" = id;
- "o_osd_font_size_pop" = id;
- "o_osd_font_size_txt" = id;
- "o_osd_font_txt" = id;
- "o_osd_lang_box" = id;
- "o_osd_lang_fld" = id;
- "o_osd_lang_txt" = id;
- "o_osd_osd_box" = id;
- "o_osd_osd_ckb" = id;
- "o_osd_view" = id;
- "o_sprefs_basicFull_matrix" = id;
- "o_sprefs_basic_box" = id;
- "o_sprefs_cancel_btn" = id;
- "o_sprefs_controls_box" = id;
- "o_sprefs_reset_btn" = id;
- "o_sprefs_save_btn" = id;
- "o_sprefs_win" = id;
- "o_video_black_ckb" = id;
- "o_video_device_pop" = id;
- "o_video_device_txt" = id;
- "o_video_display_box" = id;
- "o_video_enable_ckb" = id;
- "o_video_fullscreen_ckb" = id;
- "o_video_onTop_ckb" = id;
- "o_video_output_pop" = id;
- "o_video_output_txt" = id;
- "o_video_skipFrames_ckb" = id;
- "o_video_snap_box" = id;
- "o_video_snap_folder_btn" = id;
- "o_video_snap_folder_fld" = id;
- "o_video_snap_folder_txt" = id;
- "o_video_snap_format_pop" = id;
- "o_video_snap_format_txt" = id;
- "o_video_snap_prefix_fld" = id;
- "o_video_snap_prefix_txt" = id;
- "o_video_snap_seqnum_ckb" = id;
- "o_video_view" = id;
- };
- SUPERCLASS = NSObject;
- }
- );
- IBVersion = 1;
-}
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBClasses</key>
+ <array>
+ <dict>
+ <key>CLASS</key>
+ <string>VLCHotkeyChangeWindow</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSWindow</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSApplication</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSResponder</string>
+ </dict>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>audioSettingChanged</key>
+ <string>id</string>
+ <key>buttonAction</key>
+ <string>id</string>
+ <key>hotkeySettingChanged</key>
+ <string>id</string>
+ <key>inputSettingChanged</key>
+ <string>id</string>
+ <key>interfaceSettingChanged</key>
+ <string>id</string>
+ <key>osdSettingChanged</key>
+ <string>id</string>
+ <key>videoSettingChanged</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>VLCSimplePrefs</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>o_audio_dolby_pop</key>
+ <string>id</string>
+ <key>o_audio_dolby_txt</key>
+ <string>id</string>
+ <key>o_audio_effects_box</key>
+ <string>id</string>
+ <key>o_audio_enable_ckb</key>
+ <string>id</string>
+ <key>o_audio_general_box</key>
+ <string>id</string>
+ <key>o_audio_headphone_ckb</key>
+ <string>id</string>
+ <key>o_audio_lang_fld</key>
+ <string>id</string>
+ <key>o_audio_lang_txt</key>
+ <string>id</string>
+ <key>o_audio_last_box</key>
+ <string>id</string>
+ <key>o_audio_last_ckb</key>
+ <string>id</string>
+ <key>o_audio_lastpwd_fld</key>
+ <string>id</string>
+ <key>o_audio_lastpwd_txt</key>
+ <string>id</string>
+ <key>o_audio_lastuser_fld</key>
+ <string>id</string>
+ <key>o_audio_lastuser_txt</key>
+ <string>id</string>
+ <key>o_audio_norm_ckb</key>
+ <string>id</string>
+ <key>o_audio_norm_fld</key>
+ <string>id</string>
+ <key>o_audio_spdif_ckb</key>
+ <string>id</string>
+ <key>o_audio_view</key>
+ <string>id</string>
+ <key>o_audio_visual_pop</key>
+ <string>id</string>
+ <key>o_audio_visual_txt</key>
+ <string>id</string>
+ <key>o_audio_vol_fld</key>
+ <string>id</string>
+ <key>o_audio_vol_sld</key>
+ <string>id</string>
+ <key>o_audio_vol_txt</key>
+ <string>id</string>
+ <key>o_currentlyShownCategoryView</key>
+ <string>id</string>
+ <key>o_hotkeys_change_btn</key>
+ <string>id</string>
+ <key>o_hotkeys_change_cancel_btn</key>
+ <string>id</string>
+ <key>o_hotkeys_change_keys_lbl</key>
+ <string>id</string>
+ <key>o_hotkeys_change_lbl</key>
+ <string>id</string>
+ <key>o_hotkeys_change_ok_btn</key>
+ <string>id</string>
+ <key>o_hotkeys_change_taken_lbl</key>
+ <string>id</string>
+ <key>o_hotkeys_change_win</key>
+ <string>id</string>
+ <key>o_hotkeys_clear_btn</key>
+ <string>id</string>
+ <key>o_hotkeys_lbl</key>
+ <string>id</string>
+ <key>o_hotkeys_listbox</key>
+ <string>id</string>
+ <key>o_hotkeys_view</key>
+ <string>id</string>
+ <key>o_input_access_box</key>
+ <string>id</string>
+ <key>o_input_avi_pop</key>
+ <string>id</string>
+ <key>o_input_avi_txt</key>
+ <string>id</string>
+ <key>o_input_bandwidth_ckb</key>
+ <string>id</string>
+ <key>o_input_cachelevel_pop</key>
+ <string>id</string>
+ <key>o_input_cachelevel_txt</key>
+ <string>id</string>
+ <key>o_input_caching_box</key>
+ <string>id</string>
+ <key>o_input_dump_ckb</key>
+ <string>id</string>
+ <key>o_input_httpproxy_fld</key>
+ <string>id</string>
+ <key>o_input_httpproxy_txt</key>
+ <string>id</string>
+ <key>o_input_mux_box</key>
+ <string>id</string>
+ <key>o_input_net_box</key>
+ <string>id</string>
+ <key>o_input_postproc_fld</key>
+ <string>id</string>
+ <key>o_input_postproc_txt</key>
+ <string>id</string>
+ <key>o_input_record_ckb</key>
+ <string>id</string>
+ <key>o_input_rtsp_ckb</key>
+ <string>id</string>
+ <key>o_input_serverport_fld</key>
+ <string>id</string>
+ <key>o_input_serverport_txt</key>
+ <string>id</string>
+ <key>o_input_timeshift_ckb</key>
+ <string>id</string>
+ <key>o_input_view</key>
+ <string>id</string>
+ <key>o_intf_art_pop</key>
+ <string>id</string>
+ <key>o_intf_art_txt</key>
+ <string>id</string>
+ <key>o_intf_embedded_ckb</key>
+ <string>id</string>
+ <key>o_intf_fspanel_ckb</key>
+ <string>id</string>
+ <key>o_intf_lang_pop</key>
+ <string>id</string>
+ <key>o_intf_lang_txt</key>
+ <string>id</string>
+ <key>o_intf_meta_ckb</key>
+ <string>id</string>
+ <key>o_intf_network_box</key>
+ <string>id</string>
+ <key>o_intf_view</key>
+ <string>id</string>
+ <key>o_osd_encoding_pop</key>
+ <string>id</string>
+ <key>o_osd_encoding_txt</key>
+ <string>id</string>
+ <key>o_osd_font_box</key>
+ <string>id</string>
+ <key>o_osd_font_btn</key>
+ <string>id</string>
+ <key>o_osd_font_color_pop</key>
+ <string>id</string>
+ <key>o_osd_font_color_txt</key>
+ <string>id</string>
+ <key>o_osd_font_effect_pop</key>
+ <string>id</string>
+ <key>o_osd_font_effect_txt</key>
+ <string>id</string>
+ <key>o_osd_font_fld</key>
+ <string>id</string>
+ <key>o_osd_font_size_pop</key>
+ <string>id</string>
+ <key>o_osd_font_size_txt</key>
+ <string>id</string>
+ <key>o_osd_font_txt</key>
+ <string>id</string>
+ <key>o_osd_lang_box</key>
+ <string>id</string>
+ <key>o_osd_lang_fld</key>
+ <string>id</string>
+ <key>o_osd_lang_txt</key>
+ <string>id</string>
+ <key>o_osd_osd_box</key>
+ <string>id</string>
+ <key>o_osd_osd_ckb</key>
+ <string>id</string>
+ <key>o_osd_view</key>
+ <string>id</string>
+ <key>o_sprefs_basicFull_matrix</key>
+ <string>id</string>
+ <key>o_sprefs_basic_box</key>
+ <string>id</string>
+ <key>o_sprefs_cancel_btn</key>
+ <string>id</string>
+ <key>o_sprefs_controls_box</key>
+ <string>id</string>
+ <key>o_sprefs_reset_btn</key>
+ <string>id</string>
+ <key>o_sprefs_save_btn</key>
+ <string>id</string>
+ <key>o_sprefs_win</key>
+ <string>id</string>
+ <key>o_video_black_ckb</key>
+ <string>id</string>
+ <key>o_video_device_pop</key>
+ <string>id</string>
+ <key>o_video_device_txt</key>
+ <string>id</string>
+ <key>o_video_display_box</key>
+ <string>id</string>
+ <key>o_video_enable_ckb</key>
+ <string>id</string>
+ <key>o_video_fullscreen_ckb</key>
+ <string>id</string>
+ <key>o_video_onTop_ckb</key>
+ <string>id</string>
+ <key>o_video_output_pop</key>
+ <string>id</string>
+ <key>o_video_output_txt</key>
+ <string>id</string>
+ <key>o_video_skipFrames_ckb</key>
+ <string>id</string>
+ <key>o_video_snap_box</key>
+ <string>id</string>
+ <key>o_video_snap_folder_btn</key>
+ <string>id</string>
+ <key>o_video_snap_folder_fld</key>
+ <string>id</string>
+ <key>o_video_snap_folder_txt</key>
+ <string>id</string>
+ <key>o_video_snap_format_pop</key>
+ <string>id</string>
+ <key>o_video_snap_format_txt</key>
+ <string>id</string>
+ <key>o_video_snap_prefix_fld</key>
+ <string>id</string>
+ <key>o_video_snap_prefix_txt</key>
+ <string>id</string>
+ <key>o_video_snap_seqnum_ckb</key>
+ <string>id</string>
+ <key>o_video_view</key>
+ <string>id</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>FirstResponder</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSObject</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ </dict>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>advancedToggle</key>
+ <string>id</string>
+ <key>closePrefs</key>
+ <string>id</string>
+ <key>resetAll</key>
+ <string>id</string>
+ <key>savePrefs</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>VLCPrefs</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>o_advanced_ckb</key>
+ <string>id</string>
+ <key>o_cancel_btn</key>
+ <string>id</string>
+ <key>o_prefs_view</key>
+ <string>id</string>
+ <key>o_prefs_window</key>
+ <string>id</string>
+ <key>o_reset_btn</key>
+ <string>id</string>
+ <key>o_save_btn</key>
+ <string>id</string>
+ <key>o_title</key>
+ <string>id</string>
+ <key>o_tree</key>
+ <string>id</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ </array>
+ <key>IBVersion</key>
+ <string>1</string>
+</dict>
+</plist>
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<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>
- <string>446.1</string>
- <key>IBGroupedObjects</key>
- <dict>
- <key>1</key>
- <array>
- <string>2352</string>
- <string>2353</string>
- </array>
- </dict>
- <key>IBLastGroupID</key>
- <string>3</string>
- <key>IBLockedObjects</key>
- <array>
- <integer>2203</integer>
- <integer>2208</integer>
- <integer>2206</integer>
- <integer>2199</integer>
- </array>
+ <string>644</string>
+ <key>IBLastKnownRelativeProjectPath</key>
+ <string>../../vlc.xcodeproj</string>
+ <key>IBOldestOS</key>
+ <integer>5</integer>
<key>IBOpenObjects</key>
<array>
- <integer>2265</integer>
- <integer>2523</integer>
<integer>2562</integer>
+ <integer>2410</integer>
<integer>2440</integer>
+ <integer>2523</integer>
+ <integer>2678</integer>
+ <integer>2668</integer>
<integer>2311</integer>
</array>
<key>IBSystem Version</key>
- <string>8S2167</string>
+ <string>9C31</string>
+ <key>targetFramework</key>
+ <string>IBCocoaFramework</string>
</dict>
</plist>
#define SET( foo, bar ) \
char *psz_##foo = input_item_Get##bar ( p_item->p_input ); \
[self setMeta: psz_##foo forLabel: o_##foo##_txt]; \
- free( psz_##foo );
+ FREENULL( psz_##foo );
/* fill the other fields */
SET( title, Title );
IBOutlet id o_audio_vol_sld;
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;
IBOutlet id o_input_avi_txt;
BOOL b_videoSettingChanged;
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 */
- (NSToolbarItem *) toolbar: (NSToolbar *)o_toolbar
- (void)showInputSettings;
/* 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
#import "simple_prefs.h"
#import "prefs.h"
+#import <vlc_keys.h>
static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier";
static NSString* VLCIntfSettingToolbarIdentifier = @"Intf Settings Item Identifier";
{
[o_currentlyShownCategoryView release];
[o_sprefs_toolbar release];
-
+
+ [o_hotkeySettings release];
+ [o_hotkeyDescriptions 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;
+}
+
- (void)awakeFromNib
{
[self initStrings];
{
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] )
{
- o_toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: o_itemIdent] autorelease];
-
- [o_toolbarItem setLabel: _NS("Interface")];
- [o_toolbarItem setPaletteLabel: _NS("Interface settings")];
-
- [o_toolbarItem setToolTip: _NS("Interface settings")];
- [o_toolbarItem setImage: [NSImage imageNamed: @"spref_cone_Interface_64"]];
-
- [o_toolbarItem setTarget: self];
- [o_toolbarItem setAction: @selector(showInterfaceSettings)];
-
- [o_toolbarItem setEnabled: YES];
- [o_toolbarItem setAutovalidates: YES];
+ CreateToolbarItem( _NS("Interface"), _NS("Interface Settings"), @"spref_cone_Interface_64", showInterfaceSettings );
}
else if( [o_itemIdent isEqual: VLCAudioSettingToolbarIdentifier] )
{
- o_toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: o_itemIdent] autorelease];
-
- [o_toolbarItem setLabel: _NS("Audio")];
- [o_toolbarItem setPaletteLabel: _NS("General Audio settings")];
-
- [o_toolbarItem setToolTip: _NS("General Audio settings")];
- [o_toolbarItem setImage: [NSImage imageNamed: @"spref_cone_Audio_64"]];
-
- [o_toolbarItem setTarget: self];
- [o_toolbarItem setAction: @selector(showAudioSettings)];
-
- [o_toolbarItem setEnabled: YES];
- [o_toolbarItem setAutovalidates: YES];
+ CreateToolbarItem( _NS("Audio"), _NS("General Audio Settings"), @"spref_cone_Audio_64", showAudioSettings );
}
else if( [o_itemIdent isEqual: VLCVideoSettingToolbarIdentifier] )
{
- o_toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: o_itemIdent] autorelease];
-
- [o_toolbarItem setLabel: _NS("Video")];
- [o_toolbarItem setPaletteLabel: _NS("General Video settings")];
-
- [o_toolbarItem setToolTip: _NS("General Video settings")];
- [o_toolbarItem setImage: [NSImage imageNamed: @"spref_cone_Video_64"]];
-
- [o_toolbarItem setTarget: self];
- [o_toolbarItem setAction: @selector(showVideoSettings)];
-
- [o_toolbarItem setEnabled: YES];
- [o_toolbarItem setAutovalidates: YES];
+ CreateToolbarItem( _NS("Video"), _NS("General Video Settings"), @"spref_cone_Video_64", showVideoSettings );
}
else if( [o_itemIdent isEqual: VLCOSDSettingToolbarIdentifier] )
{
- o_toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: o_itemIdent] autorelease];
-
- [o_toolbarItem setLabel: _NS("Subtitles & OSD")];
- [o_toolbarItem setPaletteLabel: _NS("Subtitles & OSD settings")];
-
- [o_toolbarItem setToolTip: _NS("Subtitles & OSD settings")];
- [o_toolbarItem setImage: [NSImage imageNamed: @"spref_cone_Subtitles_64"]];
-
- [o_toolbarItem setTarget: self];
- [o_toolbarItem setAction: @selector(showOSDSettings)];
-
- [o_toolbarItem setEnabled: YES];
- [o_toolbarItem setAutovalidates: YES];
+ CreateToolbarItem( _NS("Subtitles & OSD"), _NS("Subtitles & OSD Settings"), @"spref_cone_Subtitles_64", showOSDSettings );
}
else if( [o_itemIdent isEqual: VLCInputSettingToolbarIdentifier] )
{
- o_toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: o_itemIdent] autorelease];
-
- [o_toolbarItem setLabel: _NS("Input & Codecs")];
- [o_toolbarItem setPaletteLabel: _NS("Input & Codec settings")];
-
- [o_toolbarItem setToolTip: _NS("Input & Codec settings")];
- [o_toolbarItem setImage: [NSImage imageNamed: @"spref_cone_Input_64"]];
-
- [o_toolbarItem setTarget: self];
- [o_toolbarItem setAction: @selector(showInputSettings)];
-
- [o_toolbarItem setEnabled: YES];
- [o_toolbarItem setAutovalidates: YES];
+ CreateToolbarItem( _NS("Input & Codecs"), _NS("Input & Codec settings"), @"spref_cone_Input_64", showInputSettings );
+ }
+ else if( [o_itemIdent isEqual: VLCHotkeysSettingToolbarIdentifier] )
+ {
+ CreateToolbarItem( _NS("Hotkeys"), _NS("Hotkeys settings"), @"spref_cone_Hotkeys_64", showHotkeySettings );
}
return o_toolbarItem;
- (NSArray *)toolbarDefaultItemIdentifiers: (NSToolbar *)toolbar
{
return [NSArray arrayWithObjects: VLCIntfSettingToolbarIdentifier, VLCAudioSettingToolbarIdentifier, VLCVideoSettingToolbarIdentifier,
- VLCOSDSettingToolbarIdentifier, VLCInputSettingToolbarIdentifier, NSToolbarFlexibleSpaceItemIdentifier, nil];
+ VLCOSDSettingToolbarIdentifier, VLCInputSettingToolbarIdentifier, VLCHotkeysSettingToolbarIdentifier, NSToolbarFlexibleSpaceItemIdentifier, nil];
}
- (NSArray *)toolbarAllowedItemIdentifiers: (NSToolbar *)toolbar
{
return [NSArray arrayWithObjects: VLCIntfSettingToolbarIdentifier, VLCAudioSettingToolbarIdentifier, VLCVideoSettingToolbarIdentifier,
- VLCOSDSettingToolbarIdentifier, VLCInputSettingToolbarIdentifier, NSToolbarFlexibleSpaceItemIdentifier, nil];
+ VLCOSDSettingToolbarIdentifier, VLCInputSettingToolbarIdentifier, VLCHotkeysSettingToolbarIdentifier, NSToolbarFlexibleSpaceItemIdentifier, nil];
}
- (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar
{
return [NSArray arrayWithObjects: VLCIntfSettingToolbarIdentifier, VLCAudioSettingToolbarIdentifier, VLCVideoSettingToolbarIdentifier,
- VLCOSDSettingToolbarIdentifier, VLCInputSettingToolbarIdentifier, nil];
+ VLCOSDSettingToolbarIdentifier, VLCInputSettingToolbarIdentifier, VLCHotkeysSettingToolbarIdentifier, nil];
}
- (void)initStrings
/********************
* 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];
}
- (void)showSimplePrefs
/********************
* 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;
+ }
}
- (void)showSettingsForCategory: (id)o_new_category_view
[self showSettingsForCategory: o_input_view];
}
+- (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];
+}
+
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
+{
+ return [o_hotkeySettings count];
+}
+
+- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
+{
+ if( [[aTableColumn identifier] isEqualToString: @"action"] )
+ return [o_hotkeyDescriptions objectAtIndex: rowIndex];
+ else if( [[aTableColumn identifier] isEqualToString: @"shortcut"] )
+ return [o_hotkeySettings objectAtIndex: rowIndex];
+ else
+ {
+ NSLog(@"unknown TableColumn identifier (%@)!", [aTableColumn identifier] );
+ return NULL;
+ }
+}
+
+- (void)changeHotkeyTo: (NSString *)o_theNewKey
+{
+ int i_returnValue;
+ if( o_theNewKey == @"invalid" || o_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];
+ }
+ else
+ {
+ [o_hotkeys_change_keys_lbl setStringValue: o_theNewKey];
+
+ i_returnValue = [o_hotkeySettings indexOfObject: o_theNewKey];
+ 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
+ [o_hotkeys_change_taken_lbl setStringValue: @""];
+
+ [o_hotkeys_change_ok_btn setEnabled: YES];
+ }
+}
+
@end
+
+/********************
+ * hotkeys settings *
+ ********************/
+
+@implementation VLCHotkeyChangeWindow
+
+- (void)keyDown:(NSEvent *)o_theEvent
+{
+ NSMutableString *o_temp = [[NSMutableString alloc] init];
+
+ if( [o_theEvent modifierFlags] & NSShiftKeyMask )
+ [o_temp appendString: @"Shift+"];
+
+ if( [o_theEvent modifierFlags] & NSControlKeyMask )
+ [o_temp appendString: @"Ctrl+"];
+
+ if( [o_theEvent modifierFlags] & NSCommandKeyMask )
+ [o_temp appendString: @"Command+"];
+
+ if( [o_theEvent modifierFlags] & NSAlternateKeyMask )
+ [o_temp appendString: @"Alt+"];
+
+ if( [o_theEvent modifierFlags] & NSFunctionKeyMask )
+ {
+ unichar key = 0;
+ key = [[o_theEvent charactersIgnoringModifiers] characterAtIndex: 0];
+
+ switch( key )
+ {
+ case 0x1b:
+ [o_temp appendString: @"Esc"];
+ break;
+ case NSF1FunctionKey:
+ [o_temp appendString: @"F1"];
+ break;
+ case NSF2FunctionKey:
+ [o_temp appendString: @"F2"];
+ break;
+ case NSF3FunctionKey:
+ [o_temp appendString: @"F3"];
+ break;
+ case NSF4FunctionKey:
+ [o_temp appendString: @"F4"];
+ break;
+ case NSF5FunctionKey:
+ [o_temp appendString: @"F5"];
+ break;
+ case NSF6FunctionKey:
+ [o_temp appendString: @"F6"];
+ break;
+ case NSF7FunctionKey:
+ [o_temp appendString: @"F7"];
+ break;
+ case NSF8FunctionKey:
+ [o_temp appendString: @"F8"];
+ break;
+ case NSF9FunctionKey:
+ [o_temp appendString: @"F9"];
+ break;
+ case NSF10FunctionKey:
+ [o_temp appendString: @"F10"];
+ break;
+ case NSF11FunctionKey:
+ [o_temp appendString: @"F11"];
+ break;
+ case NSF12FunctionKey:
+ [o_temp appendString: @"F12"];
+ break;
+ case NSInsertFunctionKey:
+ [o_temp appendString: @"Insert"];
+ break;
+ case NSHomeFunctionKey:
+ [o_temp appendString: @"Home"];
+ break;
+ case NSEndFunctionKey:
+ [o_temp appendString: @"End"];
+ break;
+ case NSPageUpFunctionKey:
+ [o_temp appendString: @"Page Up"];
+ break;
+ case NSPageDownFunctionKey:
+ [o_temp appendString: @"Page Down"];
+ break;
+ case NSMenuFunctionKey:
+ [o_temp appendString: @"Menu"];
+ break;
+ case NSTabCharacter:
+ [o_temp appendString: @"Tab"];
+ break;
+ case NSDeleteCharacter:
+ [o_temp appendString: @"Delete"];
+ break;
+ case NSBackspaceCharacter:
+ [o_temp appendString: @"Backspace"];
+ break;
+ case NSUpArrowFunctionKey:
+ [o_temp appendString: @"Up"];
+ break;
+ case NSDownArrowFunctionKey:
+ [o_temp appendString: @"Down"];
+ break;
+ case NSRightArrowFunctionKey:
+ [o_temp appendString: @"Right"];
+ break;
+ case NSLeftArrowFunctionKey:
+ [o_temp appendString: @"Left"];
+ break;
+ case NSEnterCharacter:
+ [o_temp appendString: @"Enter"];
+ break;
+ default:
+ {
+ msg_Warn( VLCIntf, "user pressed unknown function key" );
+ o_temp = @"invalid";
+ break;
+ }
+ }
+ }
+ else
+ {
+ if( [[o_theEvent charactersIgnoringModifiers] isEqualToString: @" "] )
+ [o_temp appendString: @"Space"];
+ else
+ [o_temp appendString: [o_theEvent charactersIgnoringModifiers]];
+ }
+
+ /* FIXME: implement sanity checks here as we don't want the user to interfere with hard shortcuts in our main menu */
+ [[[VLCMain sharedInstance] getSimplePreferences] changeHotkeyTo: o_temp];
+
+ NSLog( @"user pressed %@", o_temp );
+
+ [o_temp release];
+}
+
+@end
\ No newline at end of file
projects / vlc / commitdiff