Navigation

← Previous Changeset
Next Changeset →

Changeset 3487

Timestamp:

12/25/06 22:29:15 (2 years ago)

Author:

timothy

Message:

New Buddy inspector for editing the new buddy list. Still need a new interface for adding new buddies.

Files:

trunk/Inspectors/JVBuddyInspector.h (modified) (2 diffs)
trunk/Inspectors/JVBuddyInspector.m (modified) (8 diffs)
trunk/Inspectors/JVConnectionInspector.m (modified) (1 diff)
trunk/Languages/English.lproj/JVBuddyInspector.nib/classes.nib (added)
trunk/Languages/English.lproj/JVBuddyInspector.nib/info.nib (modified) (3 diffs)
trunk/Languages/English.lproj/JVBuddyInspector.nib/keyedobjects.nib (added)
trunk/Models/JVBuddy.h (modified) (2 diffs)
trunk/Models/JVBuddy.m (modified) (3 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/Inspectors/JVBuddyInspector.h

r3418	r3487
13	13	IBOutlet NSTextField *nickname;
14	14	IBOutlet NSTextField *email;
15		~~IBOutlet NSPopUpButton *servers;~~
16		~~IBOutlet NSTableView *nicknames;~~
17		~~IBOutlet NSButton *removeNickname;~~
18		~~IBOutlet NSButton *addNickname;~~
19	15	IBOutlet NSPopUpButton *voices;
	16	IBOutlet NSTableView *identifiersTable;
	17	IBOutlet NSButton *removeIdentifier;
	18	IBOutlet NSButton *addIdentifier;
	19	IBOutlet NSButton *editIdentifier;
	20
	21	IBOutlet NSPanel *identifierEditPanel;
	22	IBOutlet NSTextField *identifierNickname;
	23	IBOutlet NSTextField *identifierRealName;
	24	IBOutlet NSTextField *identifierUsername;
	25	IBOutlet NSTextField *identifierHostname;
	26	IBOutlet NSMatrix *identifierConnections;
	27	IBOutlet NSTableView *identifierDomainsTable;
	28	IBOutlet NSButton *removeDomain;
	29	IBOutlet NSButton *addDomain;
	30	IBOutlet NSButton *identifierOkay;
	31
	32	MVChatUserWatchRule *_currentRule;
	33	NSMutableArray *_editDomains;
	34
20	35	JVBuddy *_buddy;
21		~~NSMutableArray *_activeUsers;~~
22	36	BOOL _nibLoaded;
	37	BOOL _identifierIsNew;
23	38	}
24	39	- (id) initWithBuddy:(JVBuddy *) buddy;
…	…
31	46	- (IBAction) changeSpeechVoice:(id) sender;
32	47
33		- (IBAction) changeServer:(id) sender;
	48	- (IBAction) addIdentifier:(id) sender;
	49	- (IBAction) editIdentifier:(id) sender;
	50	- (IBAction) removeIdentifier:(id) sender;
34	51
35		- (IBAction) add~~Nickname~~:(id) sender;
36		- (IBAction) remove~~Nickname~~:(id) sender;
	52	- (IBAction) addDomain:(id) sender;
	53	- (IBAction) removeDomain:(id) sender;
37	54
38		- (IBAction) editCard:(id) sender;
	55	- (IBAction) changeConnectionState:(id) sender;
	56
	57	- (IBAction) discardIdentifierChanges:(id) sender;
	58	- (IBAction) saveIdentifierChanges:(id) sender;
	59
	60	- (IBAction) changeCard:(id) sender;
39	61	@end

trunk/Inspectors/JVBuddyInspector.m

r3484	r3487
21	21	[[NSNotificationCenter defaultCenter] removeObserver:self];
22	22
23		[~~nicknames~~ setDataSource:nil];
24		[~~nicknames~~ setDelegate:nil];
	23	[identifiersTable setDataSource:nil];
	24	[identifiersTable setDelegate:nil];
25	25
26	26	[_buddy release];
	27	[_currentRule release];
	28	[_editDomains release];
	29
27	30	_buddy = nil;
	31	_currentRule = nil;
	32	_editDomains = nil;
28	33
29	34	[super dealloc];
…	…
38	43
39	44	- (NSSize) minSize {
40		return NSMakeSize( ~~250., 33~~0. );
	45	return NSMakeSize( 300., 350. );
41	46	}
42	47
…	…
50	55
51	56	- (void) willLoad {
52		~~NSEnumerator *enumerator = [[[MVConnectionsController defaultController] connections] objectEnumerator];~~
53		~~MVChatConnection *connection = nil;~~
54
55		~~while( ( connection = [enumerator nextObject] ) )~~
56		~~if( [connection type] == MVChatConnectionIRCType )~~
57		~~[servers addItemWithTitle:[connection server]];~~
58
59	57	while( [voices numberOfItems] > 2 )
60	58	[voices removeItemAtIndex:2];
61	59
62		enumerator = [[NSSpeechSynthesizer availableVoices] objectEnumerator];
	60	NSEnumerator *enumerator = [[NSSpeechSynthesizer availableVoices] objectEnumerator];
63	61	NSString *voiceIdentifier = nil;
64	62	while( ( voiceIdentifier = [enumerator nextObject] ) ) {
…	…
70	68	if( ! [voices selectedItem] ) [voices selectItemAtIndex:0];
71	69
72		[remove~~Nickname setTransparent~~:NO];
73		[~~removeNickname setHidden:YES~~];
	70	[removeIdentifier setEnabled:NO];
	71	[editIdentifier setEnabled:NO];
74	72
75	73	[picture setImage:[_buddy picture]];
…	…
79	77	[email setObjectValue:[_buddy primaryEmail]];
80	78
81		[self changeServer:servers];
	79	[identifiersTable setTarget:self];
	80	[identifiersTable setDoubleAction:@selector( editIdentifier: )];
82	81	}
83	82
…	…
90	89	#pragma mark -
91	90
92		- (IBAction) changeServer:(id) sender {
93		if( [[sender selectedItem] tag] ) {
94		[_activeUsers autorelease];
95		_activeUsers = [[_buddy users] mutableCopyWithZone:nil];
96		[_activeUsers sortUsingSelector:@selector( compareByNickname: )];
97		[[nicknames tableColumnWithIdentifier:@"nickname"] setEditable:NO];
98		[addNickname setEnabled:NO];
	91	- (IBAction) addIdentifier:(id) sender {
	92	[_currentRule release];
	93	_currentRule = [[MVChatUserWatchRule allocWithZone:nil] init];
	94
	95	[_editDomains release];
	96	_editDomains = [[NSMutableArray allocWithZone:nil] init];
	97
	98	[identifierDomainsTable reloadData];
	99
	100	[identifierNickname setStringValue:@""];
	101	[identifierRealName setStringValue:@""];
	102	[identifierUsername setStringValue:@""];
	103	[identifierHostname setStringValue:@""];
	104	[identifierDomainsTable setEnabled:NO];
	105	[addDomain setEnabled:NO];
	106	[identifierConnections selectCellWithTag:0];
	107
	108	[identifierOkay setEnabled:NO];
	109
	110	[identifierEditPanel makeFirstResponder:identifierNickname];
	111
	112	_identifierIsNew = YES;
	113	[[NSApplication sharedApplication] beginSheet:identifierEditPanel modalForWindow:[view window] modalDelegate:self didEndSelector:@selector( identifierSheetDidEnd:returnCode:contextInfo: ) contextInfo:nil];
	114	}
	115
	116	- (IBAction) editIdentifier:(id) sender {
	117	int index = [identifiersTable selectedRow];
	118	if( index == -1 ) return;
	119
	120	[_currentRule release];
	121	_currentRule = [[[_buddy watchRules] objectAtIndex:index] retain];
	122
	123	[_editDomains release];
	124	_editDomains = [[NSMutableArray allocWithZone:nil] init];
	125	if( [[_currentRule applicableServerDomains] count] ) {
	126	[_editDomains setArray:[_currentRule applicableServerDomains]];
	127	[identifierDomainsTable setEnabled:YES];
	128	[addDomain setEnabled:YES];
	129	[identifierConnections selectCellWithTag:1];
99	130	} else {
100		[_activeUsers autorelease];
101		_activeUsers = [[NSMutableArray allocWithZone:nil] initWithCapacity:[[_buddy users] count]];
102
103		NSEnumerator *enumerator = [[_buddy users] objectEnumerator];
104		MVChatUser *user = nil;
105
106		while( ( user = [enumerator nextObject] ) )
107		if( [[servers titleOfSelectedItem] caseInsensitiveCompare:[user serverAddress]] == NSOrderedSame )
108		[_activeUsers addObject:user];
109
110		[_activeUsers sortUsingSelector:@selector( compareByNickname: )];
111
112		[[nicknames tableColumnWithIdentifier:@"nickname"] setEditable:YES];
113		[addNickname setEnabled:YES];
114		}
115
116		[nicknames deselectAll:nil];
117		[nicknames reloadData];
118		}
119
120		#pragma mark -
121
122		- (IBAction) addNickname:(id) sender {
123		[_activeUsers addObject:[NSNull null]];
124		[nicknames noteNumberOfRowsChanged];
125		[nicknames selectRow:( [_activeUsers count] - 1 ) byExtendingSelection:NO];
126		[nicknames editColumn:0 row:( [_activeUsers count] - 1 ) withEvent:nil select:NO];
127		}
128
129		- (IBAction) removeNickname:(id) sender {
130		if( [nicknames selectedRow] == -1 \|\| [nicknames editedRow] != -1 ) return;
131		// [_buddy removeUser:[_activeUsers objectAtIndex:[nicknames selectedRow]]];
132		[_activeUsers removeObjectAtIndex:[nicknames selectedRow]];
133		[nicknames noteNumberOfRowsChanged];
134		}
135
136		#pragma mark -
137
138		- (IBAction) editCard:(id) sender {
139		[_buddy editInAddressBook];
	131	[identifierDomainsTable setEnabled:NO];
	132	[addDomain setEnabled:NO];
	133	[identifierConnections selectCellWithTag:0];
	134	}
	135
	136	[identifierDomainsTable reloadData];
	137
	138	if( [_currentRule nickname] )
	139	[identifierNickname setStringValue:[_currentRule nickname]];
	140	else [identifierNickname setStringValue:@""];
	141
	142	if( [_currentRule realName] )
	143	[identifierRealName setStringValue:[_currentRule realName]];
	144	else [identifierRealName setStringValue:@""];
	145
	146	if( [_currentRule username] )
	147	[identifierUsername setStringValue:[_currentRule username]];
	148	else [identifierUsername setStringValue:@""];
	149
	150	if( [_currentRule address] )
	151	[identifierHostname setStringValue:[_currentRule address]];
	152	else [identifierHostname setStringValue:@""];
	153
	154	[identifierOkay setEnabled:YES];
	155
	156	[identifierEditPanel makeFirstResponder:identifierNickname];
	157
	158	_identifierIsNew = NO;
	159	[[NSApplication sharedApplication] beginSheet:identifierEditPanel modalForWindow:[view window] modalDelegate:self didEndSelector:@selector( identifierSheetDidEnd:returnCode:contextInfo: ) contextInfo:nil];
	160	}
	161
	162	- (IBAction) removeIdentifier:(id) sender {
	163	int index = [identifiersTable selectedRow];
	164	if( index == -1 ) return;
	165
	166	MVChatUserWatchRule *rule = [[_buddy watchRules] objectAtIndex:index];
	167	[_buddy removeWatchRule:rule];
	168
	169	[_buddy unregisterWithConnections];
	170	[_buddy registerWithApplicableConnections];
	171
	172	[identifiersTable noteNumberOfRowsChanged];
	173	}
	174
	175	- (IBAction) discardIdentifierChanges:(id) sender {
	176	[[NSApplication sharedApplication] endSheet:identifierEditPanel returnCode:NO];
	177	[identifierEditPanel orderOut:sender];
	178	}
	179
	180	- (IBAction) saveIdentifierChanges:(id) sender {
	181	[[NSApplication sharedApplication] endSheet:identifierEditPanel returnCode:YES];
	182	[identifierEditPanel orderOut:sender];
	183	}
	184
	185	- (void) identifierSheetDidEnd:(NSWindow ) sheet returnCode:(int) returnCode contextInfo:(void ) contextInfo {
	186	if( returnCode ) {
	187	NSString *string = [identifierNickname stringValue];
	188	[_currentRule setNickname:( [string length] ? string : nil )];
	189
	190	string = [identifierRealName stringValue];
	191	[_currentRule setRealName:( [string length] ? string : nil )];
	192
	193	string = [identifierUsername stringValue];
	194	[_currentRule setUsername:( [string length] ? string : nil )];
	195
	196	string = [identifierHostname stringValue];
	197	[_currentRule setAddress:( [string length] ? string : nil )];
	198
	199	[_currentRule setApplicableServerDomains:( [_editDomains count] && [identifierConnections selectedTag] ? _editDomains : nil )];
	200
	201	if( _identifierIsNew )
	202	[_buddy addWatchRule:_currentRule];
	203
	204	[_buddy unregisterWithConnections];
	205	[_buddy registerWithApplicableConnections];
	206
	207	[identifiersTable reloadData];
	208	}
	209
	210	[_currentRule release];
	211	_currentRule = nil;
	212
	213	[_editDomains release];
	214	_editDomains = nil;
	215
	216	[identifierDomainsTable reloadData];
	217	}
	218
	219	- (IBAction) changeConnectionState:(id) sender {
	220	BOOL enabled = [identifierConnections selectedTag];
	221	[identifierDomainsTable setEnabled:enabled];
	222	[addDomain setEnabled:enabled];
	223	}
	224
	225	- (void) controlTextDidChange:(NSNotification *) notification {
	226	if( [[identifierNickname stringValue] length] \|\| [[identifierRealName stringValue] length] \|\|
	227	[[identifierUsername stringValue] length] \|\| [[identifierHostname stringValue] length] )
	228	[identifierOkay setEnabled:YES];
	229	else [identifierOkay setEnabled:NO];
	230	}
	231
	232	#pragma mark -
	233
	234	- (IBAction) addDomain:(id) sender {
	235	[_editDomains addObject:@""];
	236	[identifierDomainsTable noteNumberOfRowsChanged];
	237	[identifierDomainsTable selectRow:( [_editDomains count] - 1 ) byExtendingSelection:NO];
	238	[identifierDomainsTable editColumn:0 row:( [_editDomains count] - 1 ) withEvent:nil select:NO];
	239	}
	240
	241	- (IBAction) removeDomain:(id) sender {
	242	if( [identifierDomainsTable selectedRow] == -1 \|\| [identifierDomainsTable editedRow] != -1 ) return;
	243	[_editDomains removeObjectAtIndex:[identifierDomainsTable selectedRow]];
	244	[identifierDomainsTable noteNumberOfRowsChanged];
	245	}
	246
	247	#pragma mark -
	248
	249	- (IBAction) changeCard:(id) sender {
	250
140	251	}
141	252
…	…
163	274
164	275	- (IBAction) changeSpeechVoice:(id) sender {
165		NSString *voiceIdentifier = @"";
	276	NSString *voiceIdentifier = nil;
	277
166	278	if( [sender indexOfSelectedItem] != 0 ) {
167	279	voiceIdentifier = [[sender selectedItem] representedObject];
168		NSSpeechSynthesizer *synth = [[~~[NSSpeechSynthesizer alloc] initWithVoice:voiceIdentifier] autorelease~~];
	280	NSSpeechSynthesizer *synth = [[NSSpeechSynthesizer alloc] initWithVoice:voiceIdentifier];
169	281	[synth startSpeakingString:[[NSSpeechSynthesizer attributesForVoice:voiceIdentifier] objectForKey:NSVoiceDemoText]];
	282	[synth release];
170	283	}
171	284
…	…
175	288	#pragma mark -
176	289
177		- (int) numberOfRowsInTableView:(NSTableView *) view {
178		return [_activeUsers count];
179		}
180
181		- (id) tableView:(NSTableView ) view objectValueForTableColumn:(NSTableColumn ) column row:(int) row {
182		if( [[_activeUsers objectAtIndex:row] isMemberOfClass:[NSNull class]] ) return @"";
183		if( [[servers selectedItem] tag] )
184		return [NSString stringWithFormat:@"%@ (%@)", [[_activeUsers objectAtIndex:row] nickname], [[_activeUsers objectAtIndex:row] serverAddress]];
185		return [[_activeUsers objectAtIndex:row] nickname];
186		}
187
188		- (void) tableView:(NSTableView ) view setObjectValue:(id) object forTableColumn:(NSTableColumn ) column row:(int) row {
189		if( ! [(NSString *)object length] ) {
190		[_activeUsers removeObjectAtIndex:row];
191		[nicknames noteNumberOfRowsChanged];
192		return;
193		}
194
195		NSString *server = [servers titleOfSelectedItem];
196		MVChatUser *user = [MVChatUser wildcardUserWithNicknameMask:[NSString stringWithFormat:@"%@@%@", object, server] andHostMask:nil];
197
198		if( [[_activeUsers objectAtIndex:row] isMemberOfClass:[NSNull class]] ) {
199		// [_buddy addUser:user];
200		[_activeUsers replaceObjectAtIndex:row withObject:user];
201		} else {
202		// [_buddy replaceUser:[_activeUsers objectAtIndex:row] withUser:user];
203		[_activeUsers replaceObjectAtIndex:row withObject:user];
204		}
	290	- (int) numberOfRowsInTableView:(NSTableView *) tableView {
	291	if( [tableView isEqual:identifiersTable] )
	292	return [[_buddy watchRules] count];
	293	if( [tableView isEqual:identifierDomainsTable] )
	294	return [_editDomains count];
	295	return 0;
	296	}
	297
	298	- (id) tableView:(NSTableView ) tableView objectValueForTableColumn:(NSTableColumn ) column row:(int) row {
	299	if( [tableView isEqual:identifiersTable] ) {
	300	NSMutableString *description = [NSMutableString string];
	301	MVChatUserWatchRule *rule = [[_buddy watchRules] objectAtIndex:row];
	302	unsigned count = 0;
	303
	304	NSString *string = [rule nickname];
	305	if( [string length] ) {
	306	[description appendString:string];
	307	count++;
	308	}
	309
	310	string = [rule realName];
	311	if( [string length] ) {
	312	if( ! count ) [description appendString:string];
	313	count++;
	314	}
	315
	316	string = [rule username];
	317	if( [string length] ) {
	318	if( ! count ) [description appendString:string];
	319	count++;
	320	}
	321
	322	string = [rule address];
	323	if( [string length] ) {
	324	if( ! count ) [description appendString:string];
	325	count++;
	326	}
	327
	328	if( [[rule applicableServerDomains] count] )
	329	count++;
	330
	331	count--; // exclude the first rule criterion in the count
	332
	333	if( count == 1 )
	334	[description appendFormat:NSLocalizedString( @" (and 1 other criterion)", "one other buddy identifier criterion" ), count];
	335	else if( count > 1 )
	336	[description appendFormat:NSLocalizedString( @" (and %u other criteria)", "count of other buddy identifier criteria" ), count];
	337
	338	return description;
	339	}
	340
	341	if( [tableView isEqual:identifierDomainsTable] )
	342	return [_editDomains objectAtIndex:row];
	343
	344	return nil;
	345	}
	346
	347	- (void) tableView:(NSTableView ) tableView setObjectValue:(id) object forTableColumn:(NSTableColumn ) column row:(int) row {
	348	if( [tableView isEqual:identifierDomainsTable] )
	349	[_editDomains replaceObjectAtIndex:row withObject:object];
205	350	}
206	351
207	352	- (void) tableViewSelectionDidChange:(NSNotification *) notification {
208		[removeNickname setHidden:( [nicknames selectedRow] == -1 )];
209		[removeNickname highlight:NO];
	353	NSTableView *tableView = [notification object];
	354	if( [tableView isEqual:identifiersTable] ) {
	355	[removeIdentifier setEnabled:( [identifiersTable selectedRow] != -1 )];
	356	[editIdentifier setEnabled:( [identifiersTable selectedRow] != -1 )];
	357	} else if( [tableView isEqual:identifierDomainsTable] ) {
	358	[removeDomain setEnabled:( [identifierDomainsTable selectedRow] != -1 )];
	359	}
210	360	}
211	361	@end

trunk/Inspectors/JVConnectionInspector.m

r3382	r3487
307	307
308	308	- (void) ruleSheetDidEnd:(NSWindow ) sheet returnCode:(int) returnCode contextInfo:(void ) contextInfo {
309		~~// contextInfo: YES if we have to create a new rule, NO to change an existing one~~
310	309	if( returnCode ) {
311	310	NSString *user = nil;

trunk/Languages/English.lproj/JVBuddyInspector.nib/info.nib

r2965	r3487
4	4	<dict>
5	5	<key>IBDocumentLocation</key>
6		<string>~~99 265 356 240 0 0 1280 1002~~ </string>
	6	<string>126 141 356 240 0 0 1440 878 </string>
7	7	<key>IBEditorPositions</key>
8	8	<dict>
9	9	<key>51</key>
10		<string>~~477 493 326 377 0 0 1280 1002~~ </string>
	10	<string>547 402 345 395 0 0 1440 878 </string>
11	11	</dict>
12	12	<key>IBFramework Version</key>
13		<string>442.0</string>
	13	<string>454.0</string>
14	14	<key>IBGroupedObjects</key>
15	15	<dict>
16		<key>7</key>
	16	<key>13</key>
17	17	<array>
18		<string>67</string>
19		<string>61</string>
	18	<string>117</string>
	19	<string>113</string>
	20	</array>
	21	<key>14</key>
	22	<array>
	23	<string>144</string>
	24	<string>145</string>
	25	</array>
	26	<key>21</key>
	27	<array>
	28	<string>71</string>
	29	<string>209</string>
	30	<string>64</string>
	31	<string>210</string>
	32	<string>208</string>
20	33	</array>
21	34	<key>9</key>
…	…
26	39	</dict>
27	40	<key>IBLastGroupID</key>
28		<string>10</string>
	41	<string>26</string>
29	42	<key>IBLockedObjects</key>
30	43	<array/>
…	…
33	46	<key>IBOpenObjects</key>
34	47	<array>
	48	<integer>214</integer>
35	49	<integer>51</integer>
36	50	</array>
37	51	<key>IBSystem Version</key>
38		<string>~~8C46~~</string>
	52	<string>9A321</string>
39	53	</dict>
40	54	</plist>

trunk/Models/JVBuddy.h

r3484	r3487
42	42	- (void) registerWithApplicableConnections;
43	43	- (void) unregisterWithConnection:(MVChatConnection *) connection;
44		- (void) unregisterWith~~Applicable~~Connections;
	44	- (void) unregisterWithConnections;
45	45
46	46	- (MVChatUser *) activeUser;
…	…
61	61	- (NSArray *) users;
62	62
	63	- (NSArray *) watchRules;
63	64	- (void) addWatchRule:(MVChatUserWatchRule *) rule;
64	65	- (void) removeWatchRule:(MVChatUserWatchRule *) rule;

trunk/Models/JVBuddy.m

r3484	r3487
87	87
88	88	- (void) dealloc {
89		[self unregisterWith~~Applicable~~Connections];
	89	[self unregisterWithConnections];
90	90
91	91	[[NSNotificationCenter defaultCenter] removeObserver:self];
…	…
219	219	}
220	220
221		- (void) unregisterWith~~Applicable~~Connections {
	221	- (void) unregisterWithConnections {
222	222	NSEnumerator *enumerator = [_rules objectEnumerator];
223	223	MVChatUserWatchRule *rule = nil;
…	…
304	304	#pragma mark -
305	305
	306	- (NSArray *) watchRules {
	307	return _rules;
	308	}
	309
306	310	- (void) addWatchRule:(MVChatUserWatchRule *) rule {
307	311	if( [_rules containsObject:rule] ) return;

Download in other formats: