Changeset 4455

Timestamp:

01/30/07 18:29:03 (2 years ago)

Author:

morris

Message:

Don't close the chat window when disconnecting

Files:

• WiredClient/trunk/English.lproj/PublicChat.nib/info.nib (modified) (1 diff)
• WiredClient/trunk/English.lproj/PublicChat.nib/keyedobjects.nib (modified) (previous)
• WiredClient/trunk/English.lproj/ReleaseNotes.rtf (modified) (2 diffs)
• WiredClient/trunk/WCConnection.h (modified) (1 diff)
• WiredClient/trunk/WCConnectionController.h (modified) (1 diff)
• WiredClient/trunk/WCConnectionController.m (modified) (4 diffs)
• WiredClient/trunk/WCLink.h (modified) (1 diff)
• WiredClient/trunk/WCLink.m (modified) (1 diff)
• WiredClient/trunk/WCPublicChat.m (modified) (4 diffs)
• WiredClient/trunk/WCServerConnection.h (modified) (2 diffs)
• WiredClient/trunk/WCServerConnection.m (modified) (4 diffs)
• WiredClient/trunk/WCTrackerConnection.m (modified) (1 diff)

WiredClient/trunk/English.lproj/PublicChat.nib/info.nib

@@ -23 +23 @@
-        </array>
-        <key>IBSystem Version</key>
-I
+L
-</dict>
-</plist>

WiredClient/trunk/English.lproj/ReleaseNotes.rtf

@@ -1 @@
-2
+1
-{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;}
-{\colortbl;\red255\green255\blue255;\red126\green126\blue126;}
@@ -33 +33 @@
-- Fix a problem with transfer queueing when adding multiple transfers at the same time\
-- Don't scroll chat to bottom after changing preferences\
+- Don't close the chat window when disconnecting\
-- Localization updates
-\f0\b \cf2 \

WiredClient/trunk/WCConnection.h

@@ -130 +130 @@
-
-- (void)connect;
-close
+disconnect
-- (void)terminate;
-

WiredClient/trunk/WCConnectionController.h

@@ -52 +52 @@
-- (BOOL)isReleasedWhenClosed;
-
+- (BOOL)beginConfirmDisconnectSheetModalForWindow:(NSWindow *)window modalDelegate:(id)delegate didEndSelector:(SEL)selector contextInfo:(void *)contextInfo;
+
-- (void)windowTemplateShouldLoad:(NSMutableDictionary *)windowTemplate;
-- (void)windowTemplateShouldSave:(NSMutableDictionary *)windowTemplate;

WiredClient/trunk/WCConnectionController.m

@@ -337 +337 @@
-#pragma mark -
-
+- (BOOL)beginConfirmDisconnectSheetModalForWindow:(NSWindow *)window modalDelegate:(id)delegate didEndSelector:(SEL)selector contextInfo:(void *)contextInfo {
+        if([WCSettings boolForKey:WCConfirmDisconnect] && [[self connection] isConnected]) {
+                NSBeginAlertSheet(NSLS(@"Are you sure you want to disconnect?", @"Disconnect dialog title"),
+                                                  NSLS(@"Disconnect", @"Disconnect dialog button"),
+                                                  NSLS(@"Cancel", @"Disconnect dialog button title"),
+                                                  NULL,
+                                                  window,
+                                                  delegate,
+                                                  selector,
+                                                  NULL,
+                                                  contextInfo,
+                                                  NSLS(@"Disconnecting will close any ongoing file transfers.", @"Disconnect dialog description"));
+                
+                return NO;
+        }
+        
+        return YES;
+}
+
+
+
+#pragma mark -
+
-- (void)windowTemplateShouldLoad:(NSMutableDictionary *)windowTemplate {
-}
@@ -343 +366 @@
-
-- (void)windowTemplateShouldSave:(NSMutableDictionary *)windowTemplate {
+}
+
+
+
+- (void)disconnectSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo {
+        if(returnCode == NSAlertDefaultReturn)
+                [[self connection] disconnect];
-}
-
@@ -359 +389 @@
-        connected = [[self connection] isConnected];
-        
-
+
+
+
-                return !connected;
-        else if(selector == @selector(files:) || selector == @selector(postNews:) || selector == @selector(broadcast:))
@@ -370 +402 @@
-
-- (IBAction)disconnect:(id)sender {
-
+
+
+
+
+
+
+
+
-}
-

WiredClient/trunk/WCLink.h

@@ -58 +58 @@
-
-- (void)connect;
-close
+disconnect
-- (void)terminate;
-- (void)sendCommand:(NSString *)command;

WiredClient/trunk/WCLink.m

@@ -145 +145 @@
-
-
-close
+disconnect
-        _closing = YES;
-        _reading = NO;

WiredClient/trunk/WCPublicChat.m

@@ -214 +214 @@
-
-- (BOOL)windowShouldClose:(id)sender {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-}
-
@@ -316 +304 @@
-                
-                if([[self window] isVisible]) {
-
-
+
+
+
+
-
-                        [self printEvent:[NSSWF:NSLS(@"Lost connection to %@", @"Disconnected chat message"), [[self connection] name]]];
@@ -472 +462 @@
-
-
-disconnect
+terminate
-        if(returnCode == NSAlertDefaultReturn)
-                [self close];
@@ -537 +527 @@
-- (BOOL)validateToolbarItem:(NSToolbarItem *)item {
-        SEL                     selector;
+        BOOL            connected;
-        
-        selector = [item action];
+        connected = [[self connection] isConnected];
-        
-        if(selector == @selector(disconnect:))
-[NSApp isActive]
+(connected && ![[self connection] isDisconnecting] && [NSApp isActive])
-        else if(selector == @selector(files:))
-[[self connection] isConnected]
+connected
-
-        return YES;

WiredClient/trunk/WCServerConnection.h

@@ -66 +66 @@
-        BOOL                                                                                    _dismissingWindow;
-        BOOL                                                                                    _closingWindow;
+        BOOL                                                                                    _disconnecting;
-        BOOL                                                                                    _reconnecting;
-        BOOL                                                                                    _hidden;
@@ -147 +148 @@
-- (void)unhide;
-
+- (BOOL)isDisconnecting;
-- (BOOL)isReconnecting;
-- (BOOL)isHidden;

WiredClient/trunk/WCServerConnection.m

@@ -430 +430 @@
-                _loginFailed = YES;
-                
-close
+disconnect
-        }
-}
@@ -877 +877 @@
-        _sentLogin              = NO;
-        _loginFailed    = NO;
+        _disconnecting  = NO;
-        
-        [self _connect];
@@ -883 +884 @@
-
-
-
-
+
+
+
+
-}
-
@@ -944 +947 @@
-
-#pragma mark -
+
+- (BOOL)isDisconnecting {
+        return _disconnecting;
+}
+
+
-
-- (BOOL)isReconnecting {

WiredClient/trunk/WCTrackerConnection.m

@@ -336 +336 @@
-
-
-close
-close
+disconnect
+disconnect
-}
-