Changeset 320 for trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEServices.m

Timestamp:

06/15/07 05:15:03 (17 years ago)

Author:

Nicholas Riley

Message:

ICeCoffEE.m: I was wrong in [319] about the selection extension stuff
being dumb; explain why in code, even though it's not fixed.
Implement some of the same parens support I did in Terminal. Update
for more robust service info dictionary format.

ICeCoffEEServicePrefController.m: Update for more robust service info
dictionary format.

ICeCoffEEServices.[hm]: Renamed from ICeCoffEESetServicesMenu.[hm],
since we do more now. Service info dictionary-creating code now makes
more sense and no longer has naming collision issues.

ICeCoffEEWebKit.m: Some preliminary Safari 3 compatibility stuff, not
quite working yet. An outstanding question - is it better to rely on
"public" WebCore API or private WebKit API? So far it seems the
latter is more stable.

English.lproj/APEInfo.rtfd: The Bored Zo has a name: use it. Remove
now-erroneous reference to SimpleText since TextEdit support is gone.

File:

• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEServices.m (moved) (moved from trunk/ICeCoffEE/ICeCoffEE/ICeCoffEESetServicesMenu.m ) (7 diffs)

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEServices.m

@@ -1 +1 @@
 //
-//  ICeCoffEESetServicesMenu.m
+//  ICeCoffEEServices.m
 //  ICeCoffEE APE
 //
@@ -7 +7 @@
 //
 
-#import "ICeCoffEESetServicesMenu.h"
+#import "ICeCoffEEServices.h"
 #import "ICeCoffEEShared.h"
-
-// XXX rename me to something like "ICeCoffEEServicesMenu.m"
 
 // an approximate clone of HIToolbox's CreateServicesLocalizedDictKey
@@ -57 +55 @@
 NSDictionary *ICCF_GetServicesInfo(void) {
     NSArray *services = CFServiceControllerCopyServicesEntries();
-    // NSLog(@"%@", services);
     
     NSEnumerator *e = [services objectEnumerator];
@@ -65 +62 @@
         // XXX once tested, redo all this with CF, and no autoreleasing
         // XXX items named the same as submenus (figure out how Cocoa itself does it, too)
-        // XXX use kICServiceSubmenu (recursion?)
         NSString *itemPath = (NSString *)preferredLocalization((CFDictionaryRef)[serviceEntry objectForKey: @"NSMenuItem"]);
         if (itemPath == nil) continue;
@@ -77 +73 @@
         NSMutableDictionary *itemDict = nil;
         while ( (itemComponent = (NSString *)[ce nextObject]) != nil) {
-            // itemDict is nil if just created
-            if (itemDict != nil && !bubbledUp) {
-                NSString *oldBundlePath = [levelDict objectForKey: (NSString *)kICServiceBundlePath];
+            // levelDict is nil if just created
+            if (levelDict != nil && !bubbledUp) {
+                NSString *oldBundlePath = [itemDict objectForKey: (NSString *)kICServiceBundlePath];
                 if ([oldBundlePath isEqualToString: bundlePath])
                     bubbledUp = YES;
                 else if (oldBundlePath != nil) {
                     [oldBundlePath retain];
-                    [levelDict removeObjectForKey: (NSString *)kICServiceBundlePath];
+                    [itemDict removeObjectForKey: (NSString *)kICServiceBundlePath];
                     NSEnumerator *be = [levelDict objectEnumerator];
                     while ( (itemDict = (NSMutableDictionary *)[be nextObject]) != nil)
@@ -91 +87 @@
                 }
             }
-            itemDict = [levelDict objectForKey: itemComponent];
+            if (levelDict == nil) {
+                levelDict = [[NSMutableDictionary alloc] init];
+                [itemDict setObject: levelDict forKey: (NSString *)kICServiceSubmenu];
+                [levelDict release];
+                itemDict = nil;
+            } else {
+                itemDict = [levelDict objectForKey: itemComponent];
+            }
             if (itemDict == nil) {
                 itemDict = [[NSMutableDictionary alloc] init];
@@ -99 +102 @@
                 }
                 [levelDict setObject: itemDict forKey: itemComponent];
-                levelDict = itemDict;
+                levelDict = nil;
                 [itemDict release];
-                itemDict = nil;
             } else {
-                levelDict = itemDict;
+                levelDict = [itemDict objectForKey: (NSString *)kICServiceSubmenu];
             }
         }
         
         if (!bubbledUp)
-            [levelDict setObject: bundlePath forKey: (NSString *)kICServiceBundlePath];
+            [itemDict setObject: bundlePath forKey: (NSString *)kICServiceBundlePath];
 
         NSString *keyEquivalent = (NSString *)preferredLocalization((CFDictionaryRef)[serviceEntry objectForKey: @"NSKeyEquivalent"]);
         if (keyEquivalent == nil) continue;
 
-        [levelDict setObject: keyEquivalent forKey: (NSString *)kICServiceShortcut];
+        [itemDict setObject: keyEquivalent forKey: (NSString *)kICServiceShortcut];
     }
     [services release];