Changeset 5542

Timestamp:

05/29/08 17:20:38 (5 months ago)

Author:

morris

Message:

Add an event when a private chat invitation is received

Files:

• WiredClient/trunk/English.lproj/Localizable.strings (modified) (8 diffs)
• WiredClient/trunk/French.lproj/Localizable.strings (modified) (1 diff)
• WiredClient/trunk/German.lproj/Localizable.strings (modified) (1 diff)
• WiredClient/trunk/Japanese.lproj/Localizable.strings (modified) (1 diff)
• WiredClient/trunk/WCApplicationController.m (modified) (4 diffs)
• WiredClient/trunk/WCPreferences.m (modified) (2 diffs)
• WiredClient/trunk/WCPublicChat.m (modified) (1 diff)
• WiredClient/trunk/WCSettings.h (modified) (1 diff)
• WiredClient/trunk/WCSettings.m (modified) (1 diff)

WiredClient/trunk/English.lproj/Localizable.strings

@@ -160 +160 @@
-"Broadcast from %@ on %@ at %@" = "Broadcast from %1$@ on %2$@ at %3$@";
-
+/* Event */
+"Broadcast Received" = "Broadcast Received";
+
-/* Growl event broadcast received title */
-"Broadcast received" = "Broadcast received";
-
-/* Event */
-"Broadcast Received" = "Broadcast Received";
-
-/* Messages item */
@@ -191 +191 @@
-"Chat" = "Chat";
-
+/* Event */
+"Chat Received" = "Chat Received";
+
-/* Growl event chat received title */
-"Chat received" = "Chat received";
-
-/* Event */
-"Chat Received" = "Chat Received";
-
-/* Wired Protocol error 522 title
@@ -361 +361 @@
-"General" = "General";
-
+/* Account type */
+"Group" = "Group";
+
-/* Group singular */
-"group" = "group";
-
-/* Account type */
-"Group" = "Group";
-
-/* Group plural */
@@ -431 +431 @@
-"Message received" = "Message received";
-
+/* Message plural */
+"messages" = "messages";
+
-/* Messages window title
-   Messages toolbar item */
-"Messages" = "Messages";
-
-/* Message plural */
-"messages" = "messages";
-
-/* Smiley */
@@ -488 +488 @@
-/* Chat window title */
-"Private Chat" = "Private Chat";
+
+/* Event */
+"Private Chat Invitation Received" = "Private Chat Invitation Received";
+
+/* Growl event private chat invitation received title */
+"Private chat invitation received" = "Private chat invitation received";
-
-/* Message dialog title (nick, server, time) */
@@ -664 +670 @@
-"Transfer Failed" = "Transfer Failed";
-
-/* Event */
-"Transfer Finished" = "Transfer Finished";
-
-/* Growl event transfer started title */
-"Transfer finished" = "Transfer finished";
-
+/* Event */
+"Transfer Finished" = "Transfer Finished";
+
-/* Error */
-"Transfer Not Supported" = "Transfer Not Supported";
-
-/* Event */
-"Transfer Started" = "Transfer Started";
-
-/* Growl event transfer started title */
-"Transfer started" = "Transfer started";
+
+/* Event */
+"Transfer Started" = "Transfer Started";
-
-/* Transfers window title
@@ -707 +713 @@
-"User" = "User";
-
-/* Event */
-"User Changed Nick" = "User Changed Nick";
-
-/* Growl event user changed nick title */
-"User changed nick" = "User changed nick";
-
+/* Event */
+"User Changed Nick" = "User Changed Nick";
+
-/* Growl event user changed status title */
-"User changed status" = "User changed status";
@@ -725 +731 @@
-"User Joined" = "User Joined";
-
-/* Event */
-"User Left" = "User Left";
-
-/* Growl event user left title */
-"User left" = "User left";
-
+/* Event */
+"User Left" = "User Left";
+
-/* User plural */
-"users" = "users";

WiredClient/trunk/French.lproj/Localizable.strings

@@ -278 +278 @@
-"Disconnected" = "Déconnecté";
-
+/* Event */
+"Private Chat Invitation Received" = "Private Chat Invitation Received";
+
+/* Growl event private chat invitation received title */
+"Private chat invitation received" = "Private chat invitation received";
+
-/* Disconnect dialog description */
-"Disconnecting will close any ongoing file transfers." = "La déconnexion entraîne l’arrêt des transferts.";

WiredClient/trunk/German.lproj/Localizable.strings

@@ -489 +489 @@
-"Private Chat" = "Privates Gespräch";
-
+/* Event */
+"Private Chat Invitation Received" = "Private Chat Invitation Received";
+
+/* Growl event private chat invitation received title */
+"Private chat invitation received" = "Private chat invitation received";
+
-/* Message dialog title (nick, server, time) */
-"Private message from %@ on %@ at %@" = "Private Nachricht von %1$@ auf %2$@ um %3$@";

WiredClient/trunk/Japanese.lproj/Localizable.strings

@@ -492 +492 @@
-"Private Chat" = "プライベートチャット";
-
+/* Event */
+"Private Chat Invitation Received" = "Private Chat Invitation Received";
+
+/* Growl event private chat invitation received title */
+"Private chat invitation received" = "Private chat invitation received";
+
-/* Message dialog title (nick, server, time) */
-"Private message from %@ on %@ at %@" = "%3$@  に %2$@ の %1$@ さんからプライベートメッセージが届きました";

WiredClient/trunk/WCApplicationController.m

@@ -52 +52 @@
-#define WCGrowlChatReceived                             @"Chat received"
-#define WCGrowlHighlightedChatReceived  @"Highlighted chat received"
+#define WCGrowlChatInvitationReceived   @"Private chat invitation received"
-#define WCGrowlMessageReceived                  @"Message received"
-#define WCGrowlNewsPosted                               @"News posted"
@@ -494 +495 @@
-                        [NSSound playSoundNamed:sound];
-        }
-   
+
-        if([event boolForKey:WCEventsBounceInDock])
-                [NSApp requestUserAttention:NSInformationalRequest];
@@ -595 +596 @@
-                        break;
-                
+                case WCEventsChatInvitationReceived:
+                        [GrowlApplicationBridge notifyWithTitle:NSLS(@"Private chat invitation received", @"Growl event private chat invitation received title")
+                                                                                description:[info1 nick]
+                                                                   notificationName:WCGrowlChatInvitationReceived
+                                                                                   iconData:[[info1 icon] TIFFRepresentation]
+                                                                                   priority:0.0
+                                                                                   isSticky:NO
+                                                                           clickContext:clickContext];
+                        break;
+                        
-                case WCEventsMessageReceived:
-                        [GrowlApplicationBridge notifyWithTitle:NSLS(@"Message received", @"Growl event message received title")
@@ -663 +674 @@
-                        WCGrowlChatReceived,
-                        WCGrowlHighlightedChatReceived,
+                        WCGrowlChatInvitationReceived,
-                        WCGrowlMessageReceived,
-                        WCGrowlNewsPosted,

WiredClient/trunk/WCPreferences.m

@@ -217 +217 @@
-                [NSNumber numberWithInt:WCEventsChatReceived],
-                [NSNumber numberWithInt:WCEventsHighlightedChatReceived],
+                [NSNumber numberWithInt:WCEventsChatInvitationReceived],
-                [NSNumber numberWithInt:WCEventsMessageReceived],
-                [NSNumber numberWithInt:WCEventsNewsPosted],
@@ -276 +277 @@
-                                        break;
-
+                                case WCEventsChatInvitationReceived:
+                                        [item setTitle:NSLS(@"Private Chat Invitation Received", @"Event")];
+                                        break;
+                                        
-                                case WCEventsMessageReceived:
-                                        [item setTitle:NSLS(@"Message Received", @"Event")];

WiredClient/trunk/WCPublicChat.m

@@ -457 +457 @@
-
-        [panel makeKeyAndOrderFront:self];
+
+        [[self connection] triggerEvent:WCEventsChatInvitationReceived info1:user];
-}
-

WiredClient/trunk/WCSettings.h

@@ -130 +130 @@
-#define WCEventsUserChangedStatus                                               13
-#define WCEventsHighlightedChatReceived                                 14
+#define WCEventsChatInvitationReceived                                  15
-#define WCEventsPlaySound                                                       @"WCEventsPlaySound"
-#define WCEventsSound                                                           @"WCEventsSound"

WiredClient/trunk/WCSettings.m

@@ -349 +349 @@
-                                [NSNumber numberWithInt:WCEventsHighlightedChatReceived],       WCEventsEvent,
-                                NULL],
-
+
+
+
+
-                        WCEvents,
-