Changeset 15999

Timestamp:

05/19/2006 02:14:55 PM (3 years ago)

Author:

gbooker

Message:

Two things:
More updates to the Question Asking interface; it should be useful now.
Change the URL Handling to prompt the user if they wish to assign the URLs ta Adium or not. The user selects yes, no, or never ask again. It is still all or nothing, but a step in the right direction.
Refs #158

Files:

• trunk/Frameworks/Adium Framework/ESTextAndButtonsWindowController.h (modified) (1 diff)
• trunk/Frameworks/Adium Framework/ESTextAndButtonsWindowController.m (modified) (3 diffs)
• trunk/Source/AdiumURLHandling.m (modified) (4 diffs)
• trunk/Source/AIAdium.m (modified) (2 diffs)
• trunk/Source/AIInterfaceController.h (modified) (1 diff)
• trunk/Source/AIInterfaceController.m (modified) (2 diffs)
• trunk/Source/GBQuestionHandlerPlugin.m (modified) (3 diffs)

trunk/Frameworks/Adium Framework/ESTextAndButtonsWindowController.h

@@ -70 +70 @@
-                                                                 target:(id)inTarget
-                                                           userInfo:(id)inUserInfo;
++ (id)controller;
-
-
-
-  
-  
-
-  
-
-  
-
+vo
+  
+       
+       
+  
+       
+  
+       
+  
-
-- (IBAction)pressedButton:(id)sender;
-
+- (void)show;
-- (void)setAllowsCloseWithoutResponse:(BOOL)inAllowsCloseWithoutResponse;
-- (void)setImage:(NSImage *)image;

trunk/Frameworks/Adium Framework/ESTextAndButtonsWindowController.m

@@ -82 +82 @@
-
-        } else {
-
-
+
-        }
-        
@@ -111 +110 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-        [title release];
@@ -147 +170 @@
-        allowsCloseWithoutResponse = YES;
-        [self configureWindow];
-
-
+
+
+
+
+
+
-}
-

trunk/Source/AdiumURLHandling.m

@@ -27 +27 @@
-#import <Adium/AIContentMessage.h>
-#import <Adium/AIService.h>
+#import "ESTextAndButtonsWindowController.h"
+
+#define URLHandlingGroup @"URL Handling Group"
+#define DONTPROMPTFORURL @"Don't Prompt for URL"
-
-@interface AdiumURLHandling(PRIVATE)
-+ (void)_setHelperAppForKey:(ConstStr255Param)key withInstance:(ICInstance)ICInst;
++ (BOOL)_checkHelperAppForKey:(ConstStr255Param)key withInstance:(ICInstance)ICInst;
-+ (void)_openChatToContactWithName:(NSString *)name onService:(NSString *)serviceIdentifier withMessage:(NSString *)body;
-+ (void)_openAIMGroupChat:(NSString *)roomname onExchange:(int)exchange;
+- (void)promptUser;
-@end
-
@@ -49 +55 @@
-                //Bracket multiple calls with ICBegin() for efficiency as per documentation
-                ICBegin(ICInst, icReadWritePerm);
+                BOOL alreadySet = YES;
-
-                //Configure the protocols we want.
-[self _set
-[self _set
-[self _set
-[self _set
-[self _set
-[self _set
-[self _set
+alreadySet &= [self _check
+alreadySet &= [self _check
+alreadySet &= [self _check
+alreadySet &= [self _check
+alreadySet &= [self _check
+alreadySet &= [self _check
+alreadySet &= [self _check
-         
+                if(!alreadySet)
+                {
+                        //Ask the user
+                        AdiumURLHandling *instance = [[AdiumURLHandling alloc] init];
+                        [instance promptUser];
+                        [instance release];
+                }
-                //Adium xtras
-                [self _setHelperAppForKey:(kICHelper "adiumxtra") withInstance:ICInst];
@@ -248 +262 @@
-}
-
++ (BOOL)_checkHelperAppForKey:(ConstStr255Param)key withInstance:(ICInstance)ICInst
+{
+        OSErr           Err;
+        ICAppSpec       Spec;
+        ICAttr          Junk;
+        long            TheSize;
+        
+        TheSize = sizeof(Spec);
+        
+        // Get the current aim helper app, to fill the Spec and TheSize variables
+        Err = ICGetPref(ICInst, key, &Junk, &Spec, &TheSize);
+        
+        //Set the name and creator codes
+        return Spec.fCreator == 'AdIM';
+}
+
-+ (void)_openChatToContactWithName:(NSString *)UID onService:(NSString *)serviceID withMessage:(NSString *)message
-{
@@ -296 +326 @@
-                NSBeep();
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-@end

trunk/Source/AIAdium.m

@@ -201 +201 @@
-    signal(SIGPIPE, SIG_IGN);
-        
-        [AdiumURLHandling registerURLTypes];
-        
-        [[NSAppleEventManager sharedAppleEventManager] setEventHandler:self 
-                                                                                                   andSelector:@selector(handleURLEvent:withReplyEvent:)
@@ -281 +279 @@
-        //Finish initing
-        pool = [[NSAutoreleasePool alloc] init];
+        [AdiumURLHandling registerURLTypes];            //Asks the user questions so must load after components
-        [menuController controllerDidLoad];                     //Loaded by nib
-        [accountController controllerDidLoad];          //** Before contactController so accounts and services are available for contact creation

trunk/Source/AIInterfaceController.h

@@ -233 +233 @@
-
-//Question Display
-
+
+
+
+
-                  defaultButton:(NSString *)inDefaultButton alternateButton:(NSString *)inAlternateButton otherButton:(NSString *)inOtherButton
-                                 target:(id)inTarget selector:(SEL)inSelector userInfo:(id)inUserInfo;

trunk/Source/AIInterfaceController.m

@@ -777 +777 @@
-//Question Display -----------------------------------------------------------------------------------------------------
-#pragma mark Question Display
-
+Attributed
-                  defaultButton:(NSString *)inDefaultButton alternateButton:(NSString *)inAlternateButton otherButton:(NSString *)inOtherButton
-                                 target:(id)inTarget selector:(SEL)inSelector userInfo:(id)inUserInfo
@@ -805 +805 @@
-}
-
+- (void)displayQuestion:(NSString *)inTitle withDescription:(NSString *)inDesc withWindowTitle:(NSString *)inWindowTitle
+                  defaultButton:(NSString *)inDefaultButton alternateButton:(NSString *)inAlternateButton otherButton:(NSString *)inOtherButton
+                                 target:(id)inTarget selector:(SEL)inSelector userInfo:(id)inUserInfo
+{
+        [self displayQuestion:inTitle
+withAttributedDescription:[[[NSAttributedString alloc] initWithString:inDesc] autorelease]
+                  withWindowTitle:inWindowTitle
+                        defaultButton:inDefaultButton
+                  alternateButton:inAlternateButton
+                          otherButton:inOtherButton
+                                   target:inTarget
+                                 selector:inSelector
+                                 userInfo:inUserInfo];
+}
-//Synchronized Flashing ------------------------------------------------------------------------------------------------
-#pragma mark Synchronized Flashing

trunk/Source/GBQuestionHandlerPlugin.m

@@ -26 +26 @@
-
-@interface GBQuestionHandlerPlugin (privateFunctions)
-void
+BOOL
-@end
-
@@ -94 +94 @@
-        NSString *selectorString = [userInfo objectForKey:@"Selector"];
-        id target = [userInfo objectForKey:@"Target"];
+        BOOL    ret = YES;
-        
-        if(target != nil || selectorString != nil)
@@ -103 +104 @@
-                }
-        }
-
-
-
+
+
+
+
+
+
+
+
+
-}
-
-void
+BOOL
-{
+        BOOL ret = NO;
-        if([errorQueue count] != 0)
-        {
-                NSDictionary *info = [errorQueue objectAtIndex:0];
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                [errorQueue removeObjectAtIndex:0];
+                ret = YES;
-        }
-        else if ([questionQueue count] != 0)
-        {
-                NSDictionary *info = [questionQueue objectAtIndex:0];
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                [questionQueue removeObjectAtIndex:0];
+                ret = YES;
-        }
+        return ret;
-}
-