Changeset 431 for trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEKeyEquivalents.m

Timestamp:

03/03/08 08:21:22 (16 years ago)

Author:

Nicholas Riley

Message:

Handle NSUserKeyEquivalents; disable conflict resolution; fix keyEquivalents invalidation crasher

File:

• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEKeyEquivalents.m (modified) (1 diff)

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEKeyEquivalents.m

@@ -140 +140 @@
     return keyEquivalentAttributedString;
 }
+
+// converts NSUserKeyEquivalents prefixes into modifier flags
+NSAttributedString *ICCF_KeyEquivalentAttributedString(NSString *self, unsigned count) {
+    unsigned modifierFlags = 0;
+    int i;
+    for (i = 0 ; i < [self length] - 1; i++) {
+        switch ([self characterAtIndex: i]) {
+            case '@': modifierFlags |= NSCommandKeyMask; break;
+            case '~': modifierFlags |= NSAlternateKeyMask; break;
+            case '^': modifierFlags |= NSControlKeyMask; break;
+            case '$': modifierFlags |= NSShiftKeyMask; break;
+            default:
+                return nil;
+        }
+    }
+    return ICCF_KeyEquivalentAttributedStringWithModifierFlags([self substringFromIndex: i], modifierFlags, count);
+}
+