Changeset 2141

Timestamp:

11/24/04 21:59:30 (4 years ago)

Author:

timothy

Message:

Same as r2139. Adds the Send File toolbar item to private chats.

Files:

• branches/overhaul/Colloquy.xcode/project.pbxproj (modified) (3 diffs)
• branches/overhaul/JVDirectChat.m (modified) (4 diffs)

branches/overhaul/Colloquy.xcode/project.pbxproj

@@ -2053 +2053 @@
-                                1C46785006D77F0900071DC6,
-                                1C46785106D77F0900071DC6,
+                                1CF627CB07558F79005DFCFA,
-                        );
-                        isa = PBXResourcesBuildPhase;
@@ -3904 +3905 @@
-                        sourceTree = "<group>";
-                };
+                1CF627CA07558F79005DFCFA = {
+                        isa = PBXFileReference;
+                        lastKnownFileType = image.tiff;
+                        name = fileSend.tif;
+                        path = "Resources/Toolbar Icons/fileSend.tif";
+                        refType = 4;
+                        sourceTree = "<group>";
+                };
+                1CF627CB07558F79005DFCFA = {
+                        fileRef = 1CF627CA07558F79005DFCFA;
+                        isa = PBXBuildFile;
+                        settings = {
+                        };
+                };
-                1CF6511406EA22480073DEA8 = {
-                        fileEncoding = 4;
@@ -5179 +5194 @@
-                                F5D04C03019489B801A35792,
-                                1CBECD660508C61B000001C8,
+                                1CF627CA07558F79005DFCFA,
-                        );
-                        isa = PBXGroup;

branches/overhaul/JVDirectChat.m

@@ -97 +97 @@
-static NSString *JVToolbarTextEncodingItemIdentifier = @"JVToolbarTextEncodingItem";
-static NSString *JVToolbarClearItemIdentifier = @"JVToolbarClearItem";
+static NSString *JVToolbarSendFileItemIdentifier = @"JVToolbarSendFileItem";
-
-@interface JVDirectChat (JVDirectChatPrivate) <ABImageClient>
@@ -1115 +1116 @@
-                [toolbarItem setTarget:self];
-                [toolbarItem setAction:@selector( clearDisplay: )];
+        } else if( [identifier isEqual:JVToolbarSendFileItemIdentifier] ) {
+                toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier:identifier] autorelease];
+
+                [toolbarItem setLabel:NSLocalizedString( @"Send File", "send file toolbar button name" )];
+                [toolbarItem setPaletteLabel:NSLocalizedString( @"Send File", "send file toolbar customize palette name" )];
+
+                [toolbarItem setToolTip:NSLocalizedString( @"Send File", "send file toolbar tooltip" )];
+                [toolbarItem setImage:[NSImage imageNamed:@"fileSend"]];
+
+                [toolbarItem setTarget:self];
+                [toolbarItem setAction:@selector( _sendFile: )];
-        } else return [super toolbar:toolbar itemForItemIdentifier:identifier willBeInsertedIntoToolbar:willBeInserted];
-        return toolbarItem;
@@ -1121 +1133 @@
-- (NSArray *) toolbarDefaultItemIdentifiers:(NSToolbar *) toolbar {
-        NSMutableArray *list = [NSMutableArray arrayWithArray:[super toolbarDefaultItemIdentifiers:toolbar]];
+        if( [self isMemberOfClass:[JVDirectChat class]] ) [list addObject:JVToolbarSendFileItemIdentifier];
-        [list addObject:NSToolbarFlexibleSpaceItemIdentifier];
-        [list addObject:JVToolbarTextEncodingItemIdentifier];
@@ -1128 +1141 @@
-- (NSArray *) toolbarAllowedItemIdentifiers:(NSToolbar *) toolbar {
-        NSMutableArray *list = [NSMutableArray arrayWithArray:[super toolbarAllowedItemIdentifiers:toolbar]];
+        if( [self isMemberOfClass:[JVDirectChat class]] ) [list addObject:JVToolbarSendFileItemIdentifier];
-        [list addObject:JVToolbarTextEncodingItemIdentifier];
-        [list addObject:JVToolbarClearItemIdentifier];