Navigation

← Previous Changeset
Next Changeset →

Changeset 4831

Timestamp:

06/08/07 12:19:16 (1 year ago)

Author:

morris

Message:

Add ability to also set auto-reconnect in bookmarks

Files:

WiredClient/trunk/English.lproj/Preferences.nib/classes.nib (modified) (1 diff)
WiredClient/trunk/English.lproj/Preferences.nib/keyedobjects.nib (modified) (previous)
WiredClient/trunk/French.lproj/Preferences.nib/classes.nib (modified) (1 diff)
WiredClient/trunk/French.lproj/Preferences.nib/keyedobjects.nib (modified) (previous)
WiredClient/trunk/German.lproj/Preferences.nib/classes.nib (modified) (1 diff)
WiredClient/trunk/German.lproj/Preferences.nib/keyedobjects.nib (modified) (previous)
WiredClient/trunk/Japanese.lproj/Preferences.nib/classes.nib (modified) (1 diff)
WiredClient/trunk/Japanese.lproj/Preferences.nib/keyedobjects.nib (modified) (previous)
WiredClient/trunk/WCApplicationController.m (modified) (1 diff)
WiredClient/trunk/WCPreferences.h (modified) (1 diff)
WiredClient/trunk/WCPreferences.m (modified) (6 diffs)
WiredClient/trunk/WCPublicChat.m (modified) (1 diff)
WiredClient/trunk/WCServerConnection.m (modified) (1 diff)
WiredClient/trunk/WCSettings.h (modified) (1 diff)

Legend:

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

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

r4830	r4831
37	37	"_autoReconnectButton" = NSButton;
38	38	"_bookmarksAddressTextField" = NSTextField;
39		"_bookmarksAutoJoinButton" = NSButton;
	39	"_bookmarksAutoConnectButton" = NSButton;
	40	"_bookmarksAutoReconnectButton" = NSButton;
40	41	"_bookmarksLoginTextField" = NSTextField;
41	42	"_bookmarksNameTableColumn" = NSTableColumn;

WiredClient/trunk/French.lproj/Preferences.nib/classes.nib

r4830	r4831
37	37	"_autoReconnectButton" = NSButton;
38	38	"_bookmarksAddressTextField" = NSTextField;
39		"_bookmarksAutoJoinButton" = NSButton;
	39	"_bookmarksAutoConnectButton" = NSButton;
	40	"_bookmarksAutoReconnectButton" = NSButton;
40	41	"_bookmarksLoginTextField" = NSTextField;
41	42	"_bookmarksNameTableColumn" = NSTableColumn;

WiredClient/trunk/German.lproj/Preferences.nib/classes.nib

r4830	r4831
37	37	"_autoReconnectButton" = NSButton;
38	38	"_bookmarksAddressTextField" = NSTextField;
39		"_bookmarksAutoJoinButton" = NSButton;
	39	"_bookmarksAutoConnectButton" = NSButton;
	40	"_bookmarksAutoReconnectButton" = NSButton;
40	41	"_bookmarksLoginTextField" = NSTextField;
41	42	"_bookmarksNameTableColumn" = NSTableColumn;

WiredClient/trunk/Japanese.lproj/Preferences.nib/classes.nib

r4830	r4831
42	42	"_autoReconnectButton" = NSButton;
43	43	"_bookmarksAddressTextField" = NSTextField;
44		"_bookmarksAutoJoinButton" = NSButton;
	44	"_bookmarksAutoConnectButton" = NSButton;
	45	"_bookmarksAutoReconnectButton" = NSButton;
45	46	"_bookmarksLoginTextField" = NSTextField;
46	47	"_bookmarksNameTableColumn" = NSTableColumn;

WiredClient/trunk/WCApplicationController.m

r4799	r4831
399	399
400	400	while((bookmark = [enumerator nextObject])) {
401		if([[bookmark objectForKey:WCBookmarksAuto~~Join~~] boolValue])
	401	if([[bookmark objectForKey:WCBookmarksAutoConnect] boolValue])
402	402	[self _connectWithBookmark:bookmark];
403	403	}

WiredClient/trunk/WCPreferences.h

r4830	r4831
90	90	IBOutlet NSTextField *_bookmarksLoginTextField;
91	91	IBOutlet NSSecureTextField *_bookmarksPasswordTextField;
92		IBOutlet NSButton *_bookmarksAutoJoinButton;
	92	IBOutlet NSButton *_bookmarksAutoConnectButton;
	93	IBOutlet NSButton *_bookmarksAutoReconnectButton;
93	94	IBOutlet NSTextField *_bookmarksNickTextField;
94	95	IBOutlet NSTextField *_bookmarksStatusTextField;

WiredClient/trunk/WCPreferences.m

r4830	r4831
592	592	[_bookmarksLoginTextField setEnabled:YES];
593	593	[_bookmarksPasswordTextField setEnabled:YES];
	594	[_bookmarksAutoConnectButton setEnabled:YES];
	595	[_bookmarksAutoReconnectButton setEnabled:YES];
594	596	[_bookmarksNickTextField setEnabled:YES];
595	597	[_bookmarksStatusTextField setEnabled:YES];
596		~~[_bookmarksAutoJoinButton setEnabled:YES];~~
597	598
598	599	[_bookmarksNameTextField setStringValue:[bookmark objectForKey:WCBookmarksName]];
…	…
606	607	[_bookmarksPasswordTextField setStringValue:@""];
607	608
608		[_bookmarksAutoJoinButton setState:[[bookmark objectForKey:WCBookmarksAutoJoin] boolValue]];
	609	[_bookmarksAutoConnectButton setState:[[bookmark objectForKey:WCBookmarksAutoConnect] boolValue]];
	610	[_bookmarksAutoReconnectButton setState:[[bookmark objectForKey:WCBookmarksAutoReconnect] boolValue]];
609	611	[_bookmarksNickTextField setStringValue:[bookmark objectForKey:WCBookmarksNick]];
610	612	[_bookmarksStatusTextField setStringValue:[bookmark objectForKey:WCBookmarksStatus]];
…	…
614	616	[_bookmarksLoginTextField setEnabled:NO];
615	617	[_bookmarksPasswordTextField setEnabled:NO];
	618	[_bookmarksAutoConnectButton setEnabled:NO];
	619	[_bookmarksAutoReconnectButton setEnabled:NO];
616	620	[_bookmarksNickTextField setEnabled:NO];
617	621	[_bookmarksStatusTextField setEnabled:NO];
…	…
621	625	[_bookmarksLoginTextField setStringValue:@""];
622	626	[_bookmarksPasswordTextField setStringValue:@""];
	627	[_bookmarksAutoConnectButton setState:NSOffState];
	628	[_bookmarksAutoReconnectButton setState:NSOffState];
623	629	[_bookmarksNickTextField setStringValue:@""];
624	630	[_bookmarksStatusTextField setStringValue:@""];
…	…
644	650	[bookmark setObject:[_bookmarksAddressTextField stringValue] forKey:WCBookmarksAddress];
645	651	[bookmark setObject:[_bookmarksLoginTextField stringValue] forKey:WCBookmarksLogin];
	652	[bookmark setObject:[NSNumber numberWithBool:[_bookmarksAutoConnectButton state]] forKey:WCBookmarksAutoConnect];
	653	[bookmark setObject:[NSNumber numberWithBool:[_bookmarksAutoReconnectButton state]] forKey:WCBookmarksAutoReconnect];
646	654	[bookmark setObject:[_bookmarksNickTextField stringValue] forKey:WCBookmarksNick];
647	655	[bookmark setObject:[_bookmarksStatusTextField stringValue] forKey:WCBookmarksStatus];
648		~~[bookmark setObject:[NSNumber numberWithBool:[_bookmarksAutoJoinButton state]] forKey:WCBookmarksAutoJoin];~~
649	656
650	657	if(![[WCSettings bookmarkAtIndex:row] isEqualToDictionary:bookmark]) {
…	…
1233	1240	@"", WCBookmarksLogin,
1234	1241	[NSString UUIDString], WCBookmarksIdentifier,
	1242	[NSNumber numberWithBool:NO], WCBookmarksAutoConnect,
	1243	[NSNumber numberWithBool:NO], WCBookmarksAutoReconnect,
1235	1244	@"", WCBookmarksNick,
1236	1245	@"", WCBookmarksStatus,
1237		~~[NSNumber numberWithBool:NO], WCBookmarksAutoJoin,~~
1238	1246	NULL];
1239	1247	[WCSettings addBookmark:bookmark];

WiredClient/trunk/WCPublicChat.m

r4819	r4831
313	313
314	314	if([[self window] isVisible]) {
315		if(![WCSettings boolForKey:WCAutoReconnect]) {
	315	if(![WCSettings boolForKey:WCAutoReconnect] && ![[[self connection] bookmark] boolForKey:WCBookmarksAutoReconnect]) {
316	316	if(![[self connection] isDisconnecting]) {
317	317	[[self connection] triggerEvent:WCEventsError info1:error];

WiredClient/trunk/WCServerConnection.m

r4830	r4831
440	440	}
441	441
442		if(~~[WCSettings boolForKey:WCAutoReconnect] && _shouldAutoReconnect~~) {
	442	if(_shouldAutoReconnect && ([WCSettings boolForKey:WCAutoReconnect] \|\| [_bookmark boolForKey:WCBookmarksAutoReconnect])) {
443	443	time = (100.0 + (random() % 200)) / 10.0;
444	444

WiredClient/trunk/WCSettings.h

r4830	r4831
85	85	#define WCBookmarksNick @"Nick"
86	86	#define WCBookmarksStatus @"Status"
87		#define WCBookmarksAutoJoin @"AutoJoin"
	87	#define WCBookmarksAutoConnect @"AutoJoin"
	88	#define WCBookmarksAutoReconnect @"AutoReconnect"
88	89
89	90	#define WCChatStyle @"WCChatStyle"

Navigation

Changeset 4831

Legend:

Download in other formats: