Changeset 319 for trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.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/ICeCoffEE.m (modified) (6 diffs)

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m

@@ -291 +291 @@
 // RFC-ordained max URL length, just to avoid passing IC/LS multi-megabyte documents
 #if ICCF_DEBUG
-const long ICCF_MAX_URL_LEN = 60; // XXX change later
+const long ICCF_MAX_URL_LEN = 120; // XXX change later
 #else
 const long ICCF_MAX_URL_LEN = 1024;
@@ -436 +436 @@
 
 // returns YES if menu contains useful items, NO otherwise
-BOOL ICCF_ConsolidateServicesMenu(NSMenu *menu, NSDictionary *serviceOptions) {
+BOOL ICCF_ConsolidateServicesMenu(NSMenu *menu, NSDictionary *serviceOptions, NSDictionary *serviceInfo) {
     [menu update]; // doesn't propagate to submenus, so we need to do this first
     NSEnumerator *enumerator = [[menu itemArray] objectEnumerator];
     NSMenuItem *menuItem;
     NSMenu *submenu;
-    NSDictionary *itemOptions = nil;
+    NSDictionary *itemOptions = nil, *itemInfo = nil;
     BOOL shouldKeepItem = NO, shouldKeepMenu = NO;
 
@@ -447 +447 @@
         if (serviceOptions != nil)
             itemOptions = [serviceOptions objectForKey: [menuItem title]];
+        if (serviceInfo != nil)
+            itemInfo = [serviceInfo objectForKey: [menuItem title]];
         if ([[itemOptions objectForKey: (NSString *)kICServiceHidden] boolValue]) {
             shouldKeepItem = NO;
         } else if ( (submenu = [menuItem submenu]) != nil) {
-            shouldKeepItem = ICCF_ConsolidateServicesMenu(submenu, [itemOptions objectForKey: (NSString *)kICServiceSubmenu]);
+            // XXX don't rely on nil-sending working
+            shouldKeepItem = ICCF_ConsolidateServicesMenu(submenu, [itemOptions objectForKey: (NSString *)kICServiceSubmenu], itemInfo);
             if (shouldKeepItem && [submenu numberOfItems] == 1) { // consolidate
                 NSMenuItem *serviceItem = [[submenu itemAtIndex: 0] retain];
                 [serviceItem setTitle:
                     [NSString stringWithFormat: @"%@ %@ %@", [menuItem title], [NSString stringWithCharacters: &UNICHAR_BLACK_RIGHT_POINTING_SMALL_TRIANGLE length: 1], [serviceItem title]]];
-
+                
                 int serviceIndex = [menu indexOfItem: menuItem];
                 [submenu removeItemAtIndex: 0]; // can't have item in two menus
@@ -461 +464 @@
                 [menu insertItem: serviceItem atIndex: serviceIndex];
                 [serviceItem release];
+                menuItem = serviceItem;
             }
         } else {
@@ -466 +470 @@
             shouldKeepItem = [menuItem isEnabled];
         }
-        if (shouldKeepItem) {
-            shouldKeepMenu = YES;
-        } else {
+        if (!shouldKeepItem) {
             [menu removeItem: menuItem];
-        }
+            continue;
+        }
+        shouldKeepMenu = YES;
+        
+        if (itemInfo == nil) continue;
+        NSString *bundlePath = (NSString *)[itemInfo objectForKey: (NSString *)kICServiceBundlePath];
+        if (bundlePath == NULL) continue;
+        IconRef serviceIcon = ICCF_CopyIconRefForPath(bundlePath);
+        if (serviceIcon == NULL) continue;
+        [menuItem _setIconRef: serviceIcon];
+        ReleaseIconRef(serviceIcon);
     }
 
@@ -478 +490 @@
 NSMenuItem *ICCF_ContextualServicesMenuItem() {
     NSMenuItem *servicesItem = ICCF_ServicesMenuItem();
-    if (ICCF_ConsolidateServicesMenu([servicesItem submenu], (NSDictionary *)ICCF_prefs.serviceOptions))
+    NSDictionary *servicesInfo = ICCF_GetServicesInfo(); // XXX cache/retain
+    if (ICCF_ConsolidateServicesMenu([servicesItem submenu], (NSDictionary *)ICCF_prefs.serviceOptions, servicesInfo))
         return servicesItem;
     else