Author: adamfoxtp
Date: Fri Sep 12 18:31:11 2014
New Revision: 38079
URL: http://svn.gna.org/viewcvs/gnustep?rev=38079&view=rev
Log:
Display shortcuts for function keys in menus.
Modified:
plugins/themes/WinUXTheme/WinNSMenu.m
Modified: plugins/themes/WinUXTheme/WinNSMenu.m
URL:
http://svn.gna.org/viewcvs/gnustep/plugins/themes/WinUXTheme/WinNSMenu.m?rev=38079&r1=38078&r2=38079&view=diff
==============================================================================
--- plugins/themes/WinUXTheme/WinNSMenu.m (original)
+++ plugins/themes/WinUXTheme/WinNSMenu.m Fri Sep 12 18:31:11 2014
@@ -236,11 +236,14 @@
NSMapInsert(itemMap, (const void *)s, item);
}
+ NSCharacterSet *functionKeyCharacterSet = [NSCharacterSet
characterSetWithRange:NSMakeRange(NSF1FunctionKey, NSF35FunctionKey -
NSF1FunctionKey)];
+
// Don't attempt to display special characters in the title bar
if([[item keyEquivalent] length] > 0 &&
([[NSCharacterSet alphanumericCharacterSet] characterIsMember:[[item
keyEquivalent] characterAtIndex:0]] ||
[[NSCharacterSet punctuationCharacterSet]
characterIsMember:[[item keyEquivalent] characterAtIndex:0]] ||
- [[NSCharacterSet symbolCharacterSet] characterIsMember:[[item
keyEquivalent] characterAtIndex:0]] ))
+ [[NSCharacterSet symbolCharacterSet] characterIsMember:[[item
keyEquivalent] characterAtIndex:0]] ||
+ [functionKeyCharacterSet characterIsMember:[[item
keyEquivalent] characterAtIndex:0]]))
{
NSString *modifier = @"";
int mask = [item keyEquivalentModifierMask];
@@ -272,6 +275,11 @@
}
+ if ([keyEquivalent characterAtIndex:0] >= NSF1FunctionKey &&
[keyEquivalent characterAtIndex:0] <= NSF35FunctionKey)
+ {
+ keyEquivalent = [NSString stringWithFormat:@"F%d", [keyEquivalent
characterAtIndex:0] - NSF1FunctionKey + 1];
+ }
+
title = [NSString stringWithFormat: @"%@\t%@%@",
[item title],
modifier,
_______________________________________________
Gnustep-cvs mailing list
Gnustep-cvs@gna.org
https://mail.gna.org/listinfo/gnustep-cvs
