Changeset 142 for trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m

Timestamp:

06/14/03 09:54:54 (21 years ago)

Author:

Nicholas Riley

Message:

ICeCoffEE 1.4a1

File:

• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m (modified) (2 diffs)

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m

@@ -421 +421 @@
 
 // returns YES if menu contains useful items, NO otherwise
-BOOL ICCF_ConsolidateServicesMenu(NSMenu *menu) {
+BOOL ICCF_ConsolidateServicesMenu(NSMenu *menu, NSDictionary *serviceOptions) {
     [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;
     BOOL shouldKeepItem = NO, shouldKeepMenu = NO;
 
     while ( (menuItem = [enumerator nextObject]) != nil) {
-        if ( (submenu = [menuItem submenu]) != nil) {
-            shouldKeepItem = ICCF_ConsolidateServicesMenu(submenu);
+        if (serviceOptions != nil)
+            itemOptions = [serviceOptions 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]);
             if (shouldKeepItem && [submenu numberOfItems] == 1) { // consolidate
                 NSMenuItem *serviceItem = [[submenu itemAtIndex: 0] retain];
@@ -457 +462 @@
 NSMenuItem *ICCF_ContextualServicesMenuItem() {
     NSMenuItem *servicesItem = ICCF_ServicesMenuItem();
-    if (ICCF_ConsolidateServicesMenu([servicesItem submenu]))
+    if (ICCF_ConsolidateServicesMenu([servicesItem submenu], (NSDictionary *)ICCF_prefs.serviceOptions))
         return servicesItem;
     else