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

Timestamp:

06/11/07 01:21:55 (17 years ago)

Author:

Nicholas Riley

Message:

VERSION: Starting with 1.5d1.

ICeCoffEEKeyEquivalents.m: Support "collision font" for displaying key
equivalent conflicts.

ICeCoffEE.m: Increase debug ICCF_MAX_URL_LEN to 120 for testing. Set
icons in ICCF_ConsolidateServicesMenu (needs better caching).

ICeCoffEEServicePrefController.m: Display icons, proper key
equivalents (instead of #, what was I thinking?!) and conflicts. Fix
a dumb bug in ICCF_PropagateServiceStateChange. Ellipsize long menu
items rather than chopping them off. Fix key equivalent column
getting moved when expanding disclosure triangles.

ICeCoffEELabeledIconCell.[hm]: An IconRef-displaying text cell.

Info-APE Module.plist: Update version to 1.5d1.

ICeCoffEE.xcodeproj: Added files, no significant changes.

English.lproj/InfoPlist.strings: Update version to 1.5d1.

English.lproj/APEInfo.rtfd/TXT.rtf: Some overdue documentation
updates.

ICeCoffEEShared.[hm]: Enable debugging; we're now using
kICServiceShortcut (though not yet for customizable shortcuts) so
define its data type.

ICeCoffEETerminal.m: Remove some useless code to "extend to beginning
of string" which seems to have been stolen from the NSTextView
implementation and not well understood. Handle common uses of
parentheses in URLs; still need to do this for NSTextView.

ICeCoffEESetServicesMenu.[hm]: Needs renaming; now with icon
extraction functionality and semi-working code to create a service
info dictionary.

Info-APEManagerPrefPane.plist: Update version to 1.5d1.

File:

• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEKeyEquivalents.m (modified) (4 diffs)

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEKeyEquivalents.m

@@ -40 +40 @@
 static NSFont *menuItemCmdKeyFont = nil;
 static NSFont *menuItemFont = nil;
+static NSFont *collisionFont = nil;
 static NSParagraphStyle *keyEquivParaStyle;
 
@@ -47 +48 @@
     menuItemCmdKeyFont = [themeFont(kThemeMenuItemCmdKeyFont) retain];
     menuItemFont = [themeFont(kThemeMenuItemFont) retain];
+    collisionFont = [themeFont(kThemeSmallSystemFont) retain];
 
     NSMutableParagraphStyle *paraStyle = [[NSMutableParagraphStyle alloc] init];
@@ -108 +110 @@
 }
 
-NSAttributedString *ICCF_KeyEquivalentAttributedStringWithModifierFlags(NSString *self, unsigned int modifierFlags) {
+NSAttributedString *ICCF_KeyEquivalentAttributedStringWithModifierFlags(NSString *self, unsigned int modifierFlags, unsigned count) {
     initialize();
     NSString *keyEquivalentStringNoMask = keyEquivalentString(self);
@@ -128 +130 @@
         [astr release];
     }
+    if (count > 1) {
+        NSMutableAttributedString *astr = [keyEquivalentAttributedString mutableCopy];
+        [astr appendAttributedString: [[[NSAttributedString alloc]
+            initWithString: [NSString stringWithFormat: @" (%u)", count]
+                attributes: [NSDictionary dictionaryWithObjectsAndKeys: collisionFont, NSFontAttributeName, [NSColor redColor], NSForegroundColorAttributeName, nil]] autorelease]];
+        keyEquivalentAttributedString = [[astr copy] autorelease];
+        [astr release];
+    }
     return keyEquivalentAttributedString;
 }