Changeset 3996

Timestamp:

03/28/06 20:01:55 (3 years ago)

Author:

morris

Message:

Add Restore All Layouts To Default command

Files:

• WiredClient/trunk/English.lproj/Localizable.strings (modified) (6 diffs)
• WiredClient/trunk/English.lproj/MainMenu.nib/classes.nib (modified) (1 diff)
• WiredClient/trunk/English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• WiredClient/trunk/English.lproj/MainMenu.nib/objects.nib (modified) (previous)
• WiredClient/trunk/WCAccounts.m (modified) (1 diff)
• WiredClient/trunk/WCApplicationController.h (modified) (1 diff)
• WiredClient/trunk/WCApplicationController.m (modified) (2 diffs)
• WiredClient/trunk/WCConnectionController.h (modified) (3 diffs)
• WiredClient/trunk/WCConnectionController.m (modified) (4 diffs)
• WiredClient/trunk/WCConsole.m (modified) (1 diff)
• WiredClient/trunk/WCDock.h (modified) (1 diff)
• WiredClient/trunk/WCDock.m (modified) (4 diffs)
• WiredClient/trunk/WCMessages.m (modified) (1 diff)
• WiredClient/trunk/WCNews.m (modified) (1 diff)
• WiredClient/trunk/WCPublicChat.m (modified) (1 diff)
• WiredClient/trunk/WCSearch.m (modified) (1 diff)
• WiredClient/trunk/WCServerInfo.m (modified) (2 diffs)
• WiredClient/trunk/WCTrackers.m (modified) (1 diff)
• WiredClient/trunk/WCTransfers.m (modified) (1 diff)

WiredClient/trunk/English.lproj/Localizable.strings

@@ -164 +164 @@
-   Delete ignore dialog button title
-   Delete file button title
+   Restore all layouts to default dialog button title
-   Disconnect dialog button title
-   Delete account dialog button title
@@ -292 +293 @@
-"File or Folder Not Found" = "File or Folder Not Found";
-
+/* File plural */
+"files" = "files";
+
-/* Files toolbar item */
-"Files" = "Files";
-
-/* File plural */
-"files" = "files";
-
-/* Transfer finished (files, transferred, speed, time) */
@@ -365 +366 @@
-"Message Received" = "Message Received";
-
+/* Message plural */
+"messages" = "messages";
+
-/* Messages toolbar item
-   Messages window title */
-"Messages" = "Messages";
-
-/* Message plural */
-"messages" = "messages";
-
-/* News toolbar item
-   News window title */
@@ -382 +383 @@
-"No" = "No";
-
-
+
+
-   Restore layout to default dialog button title */
-"OK" = "OK";
@@ -409 +411 @@
-/* Ping received message (interval) */
-"Received ping reply after %.2fms" = "Received ping reply after %.2fms";
+
+/* Restore all layouts to default dialog title */
+"Restore All Layouts To Default?" = "Restore All Layouts To Default?";
-
-/* Restore layout to default dialog title */
@@ -500 +505 @@
-"The transfer of \"%@\" failed." = "The transfer of \"%@\" failed.";
-
-
-
+
+
+
+
+
+
-   Delete account dialog description
-
-
-
-
-
-
-
+
-"This cannot be undone." = "This cannot be undone.";
-
-/* WCWiredClientProtocolMismatch description */
-"This server uses a newer protocol version than this client supports. Protocol errors may occur during the connection." = "This server uses a newer protocol version than this client supports. Protocol errors may occur during the connection.";
+
+/* Restore all layouts to default dialog button description */
+"This will restore all windows for all connections to the previously saved default layout." = "This will restore all windows for all connections to the previously saved default layout.";
+
+/* Restore layout to default dialog button description */
+"This will restore all windows for the currently shown connection to the previously saved default layout." = "This will restore all windows for the currently shown connection to the previously saved default layout.";
+
+/* Make layout default dialog button description */
+"This will set the windows for the currently shown connection as the default layout." = "This will set the windows for the currently shown connection as the default layout.";
-
-/* Message to (nick) */

WiredClient/trunk/English.lproj/MainMenu.nib/classes.nib

@@ -49 +49 @@
-                preferences = id; 
-                previousConnection = id; 
+                restoreAllLayoutsToDefault = id; 
-                restoreLayoutToDefault = id; 
-                showDock = id; 

WiredClient/trunk/WCAccounts.m

@@ -251 +251 @@
-
-- (void)windowTemplateShouldLoad:(NSMutableDictionary *)windowTemplate {
-
+ restoreSize:YES visibility:![self isHidden]
-        [_accountsTableView setPropertiesFromDictionary:[windowTemplate objectForKey:@"WCAccountsTableView"]];
-}

WiredClient/trunk/WCApplicationController.h

@@ -62 +62 @@
-- (IBAction)makeLayoutDefault:(id)sender;
-- (IBAction)restoreLayoutToDefault:(id)sender;
+- (IBAction)restoreAllLayoutsToDefault:(id)sender;
-
-- (IBAction)manual:(id)sender;

WiredClient/trunk/WCApplicationController.m

@@ -302 +302 @@
-           selector == @selector(previousConnection:) ||
-           selector == @selector(makeLayoutDefault:) ||
-
+
+
-                return [[WCDock dock] validateMenuItem:item];
-        
@@ -512 +513 @@
-
-
+- (IBAction)restoreAllLayoutsToDefault:(id)sender {
+        [[WCDock dock] restoreAllLayoutsToDefault:sender];
+}
+
+
+
-#pragma mark -
-

WiredClient/trunk/WCConnectionController.h

@@ -33 +33 @@
-        
-        BOOL                                    _hidden;
+        BOOL                                    _wasVisible;
-        BOOL                                    _releasedWhenClosed;
-}
@@ -41 +42 @@
-
-- (NSDictionary *)windowTemplate;
+- (BOOL)isHidden;
-
-- (void)setName:(NSString *)name;
@@ -46 +48 @@
-- (void)setConnection:(WCServerConnection *)connection;
-- (WCServerConnection *)connection;
-- (void)setHidden:(BOOL)value;
-- (BOOL)isHidden;
-- (void)setReleasedWhenClosed:(BOOL)value;
-- (BOOL)isReleasedWhenClosed;

WiredClient/trunk/WCConnectionController.m

@@ -220 +220 @@
-
-- (void)_serverConnectionShouldHide:(NSNotification *)notification {
-
+
+
-
-        [[self window] orderOut:self];
@@ -228 +229 @@
-
-- (void)_serverConnectionShouldUnhide:(NSNotification *)notification {
-!_hidden
+_wasVisible
-                [[self window] orderFront:self];
+
+        _hidden = NO;
-}
-
@@ -267 +270 @@
-
-
+- (BOOL)isHidden {
+        return _hidden;
+}
+
+
+
-#pragma mark -
-
@@ -295 +304 @@
-- (WCServerConnection *)connection {
-        return _connection;
-}
-
-
-
-- (void)setHidden:(BOOL)value {
-        _hidden = value;
-}
-
-
-
-- (BOOL)isHidden {
-        return _hidden;
-}
-

WiredClient/trunk/WCConsole.m

@@ -136 +136 @@
-
-- (void)windowTemplateShouldLoad:(NSMutableDictionary *)windowTemplate {
-
+ restoreSize:YES visibility:![self isHidden]
-}
-

WiredClient/trunk/WCDock.h

@@ -65 +65 @@
-- (IBAction)makeLayoutDefault:(id)sender;
-- (IBAction)restoreLayoutToDefault:(id)sender;
+- (IBAction)restoreAllLayoutsToDefault:(id)sender;
-
-@end

WiredClient/trunk/WCDock.m

@@ -340 +340 @@
-                return ([[[NSApp keyWindow] windowController] isKindOfClass:[WCConnectionController class]] &&
-                                [WCSettings windowTemplateForKey:WCWindowTemplatesDefault] != NULL);
+        else if(selector == @selector(restoreAllLayoutsToDefault:))
+                return ([_shownConnections count] > 0 && [WCSettings windowTemplateForKey:WCWindowTemplatesDefault] != NULL);
-
-        return YES;
@@ -481 +483 @@
-                                                  alternateButton:NULL
-                                                          otherButton:NSLS(@"Cancel", @"Make layout default dialog button title")
-cannot be undone
+will set the windows for the currently shown connection as the default layout
-        
-        if([alert runModal] == NSAlertDefaultReturn) {
@@ -502 +504 @@
-                                                  alternateButton:NULL
-                                                          otherButton:NSLS(@"Cancel", @"Restore layout to default dialog button title")
-cannot be undone
+will restore all windows for the currently shown connection to the previously saved default layout
-
-        if([alert runModal] == NSAlertDefaultReturn) {
@@ -511 +513 @@
-                
-                [connection postNotificationName:WCServerConnectionShouldLoadWindowTemplate];
+        }
+}
+
+
+
+- (IBAction)restoreAllLayoutsToDefault:(id)sender {
+        NSAlert                         *alert;
+        WCServerConnection      *connection;
+        unsigned int            i, count;
+        
+        alert = [NSAlert alertWithMessageText:NSLS(@"Restore All Layouts To Default?", @"Restore all layouts to default dialog title")
+                                                        defaultButton:NSLS(@"OK", @"Restore all layouts to default dialog button title")
+                                                  alternateButton:NULL
+                                                          otherButton:NSLS(@"Cancel", @"Restore all layouts to default dialog button title")
+                                informativeTextWithFormat:NSLS(@"This will restore all windows for all connections to the previously saved default layout.", @"Restore all layouts to default dialog button description")];
+
+        if([alert runModal] == NSAlertDefaultReturn) {
+                count = [_shownConnections count];
+                
+                for(i = 0; i < count; i++) {
+                        connection = [_shownConnections objectAtIndex:i];
+                        
+                        [WCSettings setWindowTemplate:[WCSettings windowTemplateForKey:WCWindowTemplatesDefault]
+                                                                   forKey:[connection identifier]];
+                        
+                        [connection postNotificationName:WCServerConnectionShouldLoadWindowTemplate];
+                }
-        }
-}

WiredClient/trunk/WCMessages.m

@@ -495 +495 @@
-
-- (void)windowTemplateShouldLoad:(NSMutableDictionary *)windowTemplate {
-
+ restoreSize:YES visibility:![self isHidden]
-        [_conversationsSplitView setPropertiesFromDictionary:[windowTemplate objectForKey:@"WCMessagesConversationsSplitView"]];
-        [_messagesSplitView setPropertiesFromDictionary:[windowTemplate objectForKey:@"WCMessagesMessagesSplitView"]];

WiredClient/trunk/WCNews.m

@@ -181 +181 @@
-
-- (void)windowTemplateShouldLoad:(NSMutableDictionary *)windowTemplate {
-
+ restoreSize:YES visibility:![self isHidden]
-}
-

WiredClient/trunk/WCPublicChat.m

@@ -241 +241 @@
-
-- (void)windowTemplateShouldLoad:(NSMutableDictionary *)windowTemplate {
-
+ restoreSize:YES visibility:![self isHidden]
-        
-        [super windowTemplateShouldLoad:windowTemplate];

WiredClient/trunk/WCSearch.m

@@ -269 +269 @@
-
-- (void)windowTemplateShouldLoad:(NSMutableDictionary *)windowTemplate {
-
+ restoreSize:YES visibility:![self isHidden]
-        [_searchTableView setPropertiesFromDictionary:[windowTemplate objectForKey:@"WCSearchTableView"]];
-}

WiredClient/trunk/WCServerInfo.m

@@ -185 +185 @@
-
-- (void)windowTemplateShouldLoad:(NSMutableDictionary *)windowTemplate {
-
+ restoreSize:NO visibility:![self isHidden]
-}
-
@@ -191 +191 @@
-
-- (void)windowTemplateShouldSave:(NSMutableDictionary *)windowTemplate {
-WithoutFrameSize
+
-}
-

WiredClient/trunk/WCTrackers.m

@@ -452 +452 @@
-
-        tracker = [self _selectedTracker];
-
-
-
-
+
+
+
-                
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                }
+                
+                if(url) {
+                        if([[url scheme] isEqualToString:@"wired"]) {
+                                connection = [WCServerConnection serverConnectionWithURL:url];
+                                
+                                [connection showWindow:self];
+                                
+                                if(([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) == 0)
+                                        [connection connect];
+                        }
+                }
+        } else {
+                NSLog(@"expand %@", tracker);
-        }
-}

WiredClient/trunk/WCTransfers.m

@@ -1060 +1060 @@
-
-- (void)windowTemplateShouldLoad:(NSMutableDictionary *)windowTemplate {
-
+ restoreSize:YES visibility:![self isHidden]
-}
-