[vlc-commits] macosx/simple_prefs: move OSXStringKeyToString to StringUtility
Felix Paul Kühne
git at videolan.org
Fri Aug 24 18:34:27 CEST 2012
vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Aug 24 18:09:18 2012 +0200| [e0f1ce3923831e0acd5c0ad94da2403c0e4e4254] | committer: Felix Paul Kühne
macosx/simple_prefs: move OSXStringKeyToString to StringUtility
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e0f1ce3923831e0acd5c0ad94da2403c0e4e4254
---
modules/gui/macosx/StringUtility.h | 1 +
modules/gui/macosx/StringUtility.m | 37 ++++++++++++++++++++++++++++++
modules/gui/macosx/simple_prefs.h | 1 -
modules/gui/macosx/simple_prefs.m | 44 +++---------------------------------
4 files changed, 41 insertions(+), 42 deletions(-)
diff --git a/modules/gui/macosx/StringUtility.h b/modules/gui/macosx/StringUtility.h
index 2dfdd5a..be6ef4f 100644
--- a/modules/gui/macosx/StringUtility.h
+++ b/modules/gui/macosx/StringUtility.h
@@ -39,6 +39,7 @@
- (NSString *)localizedString:(const char *)psz;
- (char *)delocalizeString:(NSString *)psz;
- (NSString *)wrapString: (NSString *)o_in_string toWidth: (int)i_width;
+- (NSString *)OSXStringKeyToString:(NSString *)theString;
- (NSString *)VLCKeyToString:(NSString *)theString;
- (unsigned int)VLCModifiersToCocoa:(NSString *)theString;
diff --git a/modules/gui/macosx/StringUtility.m b/modules/gui/macosx/StringUtility.m
index 5b4352c..71d978c 100644
--- a/modules/gui/macosx/StringUtility.m
+++ b/modules/gui/macosx/StringUtility.m
@@ -145,6 +145,43 @@ static VLCStringUtility *_o_sharedInstance = nil;
return o_out_string;
}
+- (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"]];
+ /* 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
+ theString = [NSString stringWithString:_NS("Not Set")];
+ return theString;
+}
#pragma mark -
#pragma mark Key Shortcuts
diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h
index 09f54b3..a55b174 100644
--- a/modules/gui/macosx/simple_prefs.h
+++ b/modules/gui/macosx/simple_prefs.h
@@ -182,7 +182,6 @@
intf_thread_t *p_intf;
}
+ (VLCSimplePrefs *)sharedInstance;
-- (NSString *)OSXStringKeyToString:(NSString *)theString;
/* toolbar */
- (NSToolbarItem *) toolbar: (NSToolbar *)o_toolbar
diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 31157ce..e372a07 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -86,44 +86,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
[super dealloc];
}
-- (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"]];
- /* 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
- theString = [NSString stringWithString:_NS("Not Set")];
- return theString;
-}
-
- (void)awakeFromNib
{
[self initStrings];
@@ -1277,7 +1239,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
{
[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: [self OSXStringKeyToString:[o_hotkeySettings objectAtIndex: [o_hotkeys_listbox selectedRow]]]];
+ [o_hotkeys_change_keys_lbl setStringValue: [[VLCStringUtility sharedInstance] OSXStringKeyToString:[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]];
@@ -1346,7 +1308,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
if( [identifier isEqualToString: @"action"] )
return [o_hotkeyDescriptions objectAtIndex: rowIndex];
else if( [identifier isEqualToString: @"shortcut"] )
- return [self OSXStringKeyToString:[o_hotkeySettings objectAtIndex: rowIndex]];
+ return [[VLCStringUtility sharedInstance] OSXStringKeyToString:[o_hotkeySettings objectAtIndex: rowIndex]];
else
{
msg_Err( p_intf, "unknown TableColumn identifier (%s)!", [identifier UTF8String] );
@@ -1368,7 +1330,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
}
else
{
- [o_hotkeys_change_keys_lbl setStringValue: [self OSXStringKeyToString:theKey]];
+ [o_hotkeys_change_keys_lbl setStringValue: [[VLCStringUtility sharedInstance] OSXStringKeyToString:theKey]];
i_returnValue = [o_hotkeySettings indexOfObject: theKey];
i_returnValue2 = [o_hotkeySettings indexOfObject: [theKey stringByReplacingOccurrencesOfString:@"-" withString:@"+"]];
More information about the vlc-commits
mailing list