Changeset 3056

Timestamp:

12/18/05 13:37:05 (3 years ago)

Author:

timothy

Message:

Landing the patch by Stephen Buttler attached to #384.
Allows users to group windows together by their server connection. Creates a new special window rule called "Server Window" patterned off "Focused Window" and "New Window". When a chat view matches this rule it is placed in the window controller for that server connection.
Server window positions are remembered by their server address.

Files:

• trunk/Colloquy.xcodeproj/project.pbxproj (modified) (4 diffs)
• trunk/JVChatController.m (modified) (1 diff)
• trunk/JVInterfacePreferences.m (modified) (5 diffs)
• trunk/Resources/serverWindow.png (added)

trunk/Colloquy.xcodeproj/project.pbxproj

@@ -68 +68 @@
-                1C6C75460630AD5300698F55 /* AGRegex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C6C75450630AD5300698F55 /* AGRegex.framework */; };
-                1C6C75490630AD9500698F55 /* AGRegex.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1C6C75450630AD5300698F55 /* AGRegex.framework */; };
+                1C6E43C40955EFD7002D22E7 /* serverWindow.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C6E43C30955EFD7002D22E7 /* serverWindow.png */; };
-                1C6EA23E05A735D6006A559F /* JVChatRoomBrowser.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1C6EA23C05A735D6006A559F /* JVChatRoomBrowser.nib */; };
-                1C6EA24405A738DD006A559F /* JVChatRoomBrowser.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C6EA24205A738DD006A559F /* JVChatRoomBrowser.m */; };
@@ -540 +541 @@
-                1C6A46A50841951200572AB6 /* gearSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = gearSmall.png; path = Resources/gearSmall.png; sourceTree = "<group>"; };
-                1C6C75450630AD5300698F55 /* AGRegex.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGRegex.framework; path = Frameworks/AGRegex.framework; sourceTree = SOURCE_ROOT; };
+                1C6E43C30955EFD7002D22E7 /* serverWindow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = serverWindow.png; path = Resources/serverWindow.png; sourceTree = "<group>"; };
-                1C6EA23D05A735D6006A559F /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Languages/English.lproj/JVChatRoomBrowser.nib; sourceTree = "<group>"; };
-                1C6EA24105A738DD006A559F /* JVChatRoomBrowser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JVChatRoomBrowser.h; sourceTree = "<group>"; };
@@ -1612 +1614 @@
-                                1C6A42A608400E7900572AB6 /* targetWindow.png */,
-                                1C45BFA4086F4BD80079E014 /* newWindow.png */,
+                                1C6E43C30955EFD7002D22E7 /* serverWindow.png */,
-                                1C6A46A50841951200572AB6 /* gearSmall.png */,
-                                1C77822808FA4101006AD8E5 /* topicBackground.png */,
@@ -2167 +2170 @@
-                                1C77831208FA4EA2006AD8E5 /* topicToggleDown.png in Resources */,
-                                1C77831308FA4EA2006AD8E5 /* topicToggleUp.png in Resources */,
+                                1C6E43C40955EFD7002D22E7 /* serverWindow.png in Resources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

trunk/JVChatController.m

@@ -166 +166 @@
-                } else if( [[windowSet objectForKey:@"special"] isEqualToString:@"newWindow"] ) {
-                        windowController = [self newChatWindowController];
+                } else if( [[windowSet objectForKey:@"special"] isEqualToString:@"serverWindow"] ) {
+                        windowController = [self chatWindowControllerWithIdentifier:[[controller connection] server]];
-                } else if( [[windowSet objectForKey:@"identifier"] length] ) {
-                        windowController = [self chatWindowControllerWithIdentifier:[windowSet objectForKey:@"identifier"]];

trunk/JVInterfacePreferences.m

@@ -65 +65 @@
-        BOOL haveCurrentWindow = NO;
-        BOOL haveNewWindow = NO;
+        BOOL haveServerWindow = NO;
-
-        while( ( info = [enumerator nextObject] ) ) {
@@ -74 +75 @@
-                } else if( [value isEqualToString:@"currentWindow"] ) haveCurrentWindow = YES;
-                else if( [value isEqualToString:@"newWindow"] ) haveNewWindow = YES;
+                else if( [value isEqualToString:@"serverWindow"] ) haveServerWindow = YES;
-        }
-
@@ -90 +92 @@
-
-                [info setObject:@"newWindow" forKey:@"special"];
+                [info setObject:[NSString locallyUniqueString] forKey:@"identifier"];
+                [info setObject:[NSMutableArray array] forKey:@"rules"];
+        }
+
+        if( ! haveServerWindow ) {
+                info = [NSMutableDictionary dictionary];
+                [_windowSets addObject:info];
+                
+                [info setObject:@"serverWindow" forKey:@"special"];
-                [info setObject:[NSString locallyUniqueString] forKey:@"identifier"];
-                [info setObject:[NSMutableArray array] forKey:@"rules"];
@@ -164 +175 @@
-                if( [[info objectForKey:@"special"] isEqualToString:@"currentWindow"] ) return [NSImage imageNamed:@"targetWindow"];
-                else if( [[info objectForKey:@"special"] isEqualToString:@"newWindow"] ) return [NSImage imageNamed:@"newWindow"];
+                else if( [[info objectForKey:@"special"] isEqualToString:@"serverWindow"] ) return [NSImage imageNamed:@"serverWindow"];
-                else return [NSImage imageNamed:@"window"];
-        } else if( view == rulesTable ) {
@@ -179 +191 @@
-                else if( [[info objectForKey:@"special"] isEqualToString:@"newWindow"] )
-                        [(JVDetailCell *) cell setMainText:NSLocalizedString( @"New Window", "new window label, interface preferences" )];
+                else if( [[info objectForKey:@"special"] isEqualToString:@"serverWindow"] )
+                        [(JVDetailCell *) cell setMainText:NSLocalizedString( @"Server Window", "server window label, interface preferences" )];
-                else [(JVDetailCell *) cell setMainText:[info objectForKey:@"title"]];
-