Navigation

← Previous Changeset
Next Changeset →

Changeset 2308

Timestamp:

02/13/05 20:43:50 (4 years ago)

Author:

timothy

Message:

Major changes, refactoring and cleanup.
* Broke up a few monolith classes into more suitable MVC based ones.
* Greatly improved transcript access by removing the use of XPtah.
* Should fix the race condition finally were the WebView? would start blank.
* Renamed the panel classes to include a sufix "Panel".
* Reloading the style will respect the scrollback limit.
* Added some checks in the incremental transcript writting code to prevent possiable corruption.
* Added some new classes JVChatEvent and JVChatsession to match items in the transcripts.

Files:

trunk/Colloquy.pch (modified) (1 diff)
trunk/Colloquy.xcode/project.pbxproj (modified) (23 diffs)
trunk/JVAppearancePreferences.h (modified) (2 diffs)
trunk/JVAppearancePreferences.m (modified) (9 diffs)
trunk/JVBehaviorPreferences.m (modified) (6 diffs)
trunk/JVChatConsolePanel.h (moved) (moved from trunk/JVChatConsole.h) (2 diffs)
trunk/JVChatConsolePanel.m (moved) (moved from trunk/JVChatConsole.m) (6 diffs)
trunk/JVChatController.h (modified) (2 diffs)
trunk/JVChatController.m (modified) (21 diffs)
trunk/JVChatEvent.h (added)
trunk/JVChatEvent.m (added)
trunk/JVChatMemberInspector.m (modified) (1 diff)
trunk/JVChatMessage.h (modified) (5 diffs)
trunk/JVChatMessage.m (modified) (19 diffs)
trunk/JVChatRoomBrowser.m (modified) (3 diffs)
trunk/JVChatRoomInspector.h (modified) (2 diffs)
trunk/JVChatRoomInspector.m (modified) (4 diffs)
trunk/JVChatRoomMember.h (modified) (4 diffs)
trunk/JVChatRoomMember.m (modified) (5 diffs)
trunk/JVChatRoomPanel.h (moved) (moved from trunk/JVChatRoom.h) (2 diffs)
trunk/JVChatRoomPanel.m (moved) (moved from trunk/JVChatRoom.m) (14 diffs)
trunk/JVChatSession.h (added)
trunk/JVChatSession.m (added)
trunk/JVChatTranscript.h (added)
trunk/JVChatTranscript.m (added)
trunk/JVChatTranscriptPanel.h (copied) (copied from trunk/JVChatTranscript.h) (2 diffs)
trunk/JVChatTranscriptPanel.m (copied) (copied from trunk/JVChatTranscript.m) (34 diffs)
trunk/JVChatWindowController.m (modified) (6 diffs)
trunk/JVConnectionInspector.h (modified) (2 diffs)
trunk/JVConnectionInspector.m (modified) (1 diff)
trunk/JVDirectChatPanel.h (moved) (moved from trunk/JVDirectChat.h) (5 diffs)
trunk/JVDirectChatPanel.m (moved) (moved from trunk/JVDirectChat.m) (44 diffs)
trunk/JVEmoticonSet.h (added)
trunk/JVEmoticonSet.m (added)
trunk/JVStyle.h (modified) (4 diffs)
trunk/JVStyle.m (modified) (7 diffs)
trunk/JVStyleView.h (moved) (moved from trunk/JVWebView.h) (1 diff)
trunk/JVStyleView.m (moved) (moved from trunk/JVWebView.m) (4 diffs)
trunk/JVTranscriptCriterionController.m (modified) (1 diff)
trunk/JVTranscriptFindWindowController.h (modified) (2 diffs)
trunk/JVTranscriptFindWindowController.m (modified) (9 diffs)
trunk/KAIgnoreRule.m (modified) (2 diffs)
trunk/MVApplicationController.m (modified) (1 diff)
trunk/MVConnectionsController.m (modified) (3 diffs)
trunk/Plug-Ins/Standard Commands/JVStandardCommands.m (modified) (6 diffs)
trunk/Resources/ChatPlugIn.scriptSuite (modified) (8 diffs)
trunk/Resources/Colloquy.scriptSuite (modified) (13 diffs)
trunk/Resources/Colloquy.scriptTerminology (modified) (4 diffs)
trunk/Resources/JVChatRoom.nib/classes.nib (modified) (1 diff)
trunk/Resources/JVChatRoom.nib/keyedobjects.nib (modified) (previous)
trunk/Resources/JVChatTranscript.nib/classes.nib (modified) (1 diff)
trunk/Resources/JVChatTranscript.nib/info.nib (modified) (1 diff)
trunk/Resources/JVChatTranscript.nib/keyedobjects.nib (modified) (previous)
trunk/Resources/JVDirectChat.nib/classes.nib (modified) (1 diff)
trunk/Resources/JVDirectChat.nib/keyedobjects.nib (modified) (previous)
trunk/Resources/cc.javelin.colloquy.plist (modified) (1 diff)
trunk/Resources/template.html (modified) (1 diff)

Legend:

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

trunk/Colloquy.pch

r1823 r2308

3 3 #import <WebKit/WebKit.h>
4 4 #import <AGRegex/AGRegex.h>
5
6 #define WebKitVersion146 0
5 7 #endif

trunk/Colloquy.xcode/project.pbxproj

r2307	r2308
174	174	name = "Chat Core (Framework) (from Chat Core.xcode)";
175	175	targetProxy = 0A60C2B70630DA2C00DC6280;
176		};
177		~~0A7DC5FD07BF0BF900E7432E = {~~
178		~~fileEncoding = 4;~~
179		~~isa = PBXFileReference;~~
180		~~lastKnownFileType = sourcecode.c.h;~~
181		~~path = NSScannerAdditions.h;~~
182		~~refType = 4;~~
183		~~sourceTree = "<group>";~~
184		};
185		~~0A7DC5FF07BF0BF900E7432E = {~~
186		~~fileRef = 0A7DC5FD07BF0BF900E7432E;~~
187		~~isa = PBXBuildFile;~~
188		~~settings = {~~
189		};
190	176	};
191	177	//0A0
…	…
911	897	isa = PBXFileReference;
912	898	lastKnownFileType = sourcecode.c.h;
913		path = JV~~Web~~View.h;
	899	path = JVStyleView.h;
914	900	refType = 4;
915	901	sourceTree = "<group>";
…	…
919	905	isa = PBXFileReference;
920	906	lastKnownFileType = sourcecode.c.objc;
921		path = JV~~Web~~View.m;
	907	path = JVStyleView.m;
922	908	refType = 4;
923	909	sourceTree = "<group>";
…	…
1128	1114	GCC_PREFIX_HEADER = "Plug-Ins/Standard Commands/Standard Commands.pch";
1129	1115	GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
1130		HEADER_SEARCH_PATHS = "\"Plug-Ins/Standard Commands\"";
	1116	HEADER_SEARCH_PATHS = ". \"Plug-Ins/Standard Commands\"";
1131	1117	INFOPLIST_FILE = "Resources/Info-StandardCommands.plist";
1132	1118	MACOSX_DEPLOYMENT_TARGET = 10.3;
…	…
1258	1244	sourceTree = "<group>";
1259	1245	};
	1246	1C5EF35807B45C1F004E66D3 = {
	1247	fileEncoding = 4;
	1248	isa = PBXFileReference;
	1249	lastKnownFileType = sourcecode.c.h;
	1250	path = JVChatEvent.h;
	1251	refType = 4;
	1252	sourceTree = "<group>";
	1253	};
	1254	1C5EF35907B45C1F004E66D3 = {
	1255	fileEncoding = 4;
	1256	isa = PBXFileReference;
	1257	lastKnownFileType = sourcecode.c.objc;
	1258	path = JVChatEvent.m;
	1259	refType = 4;
	1260	sourceTree = "<group>";
	1261	};
	1262	1C5EF35B07B45C1F004E66D3 = {
	1263	fileRef = 1C5EF35907B45C1F004E66D3;
	1264	isa = PBXBuildFile;
	1265	settings = {
	1266	};
	1267	};
	1268	1C5EF36907B45FBF004E66D3 = {
	1269	fileEncoding = 4;
	1270	isa = PBXFileReference;
	1271	lastKnownFileType = sourcecode.c.h;
	1272	path = JVChatSession.h;
	1273	refType = 4;
	1274	sourceTree = "<group>";
	1275	};
	1276	1C5EF36A07B45FBF004E66D3 = {
	1277	fileEncoding = 4;
	1278	isa = PBXFileReference;
	1279	lastKnownFileType = sourcecode.c.objc;
	1280	path = JVChatSession.m;
	1281	refType = 4;
	1282	sourceTree = "<group>";
	1283	};
	1284	1C5EF36C07B45FBF004E66D3 = {
	1285	fileRef = 1C5EF36A07B45FBF004E66D3;
	1286	isa = PBXBuildFile;
	1287	settings = {
	1288	};
	1289	};
1260	1290	1C6075E005138ED600A8FE6E = {
1261	1291	isa = PBXFileReference;
…	…
1265	1295	refType = 2;
1266	1296	sourceTree = SOURCE_ROOT;
	1297	};
	1298	1C6690D107BFA037008400F7 = {
	1299	fileEncoding = 4;
	1300	isa = PBXFileReference;
	1301	lastKnownFileType = sourcecode.c.h;
	1302	path = NSScannerAdditions.h;
	1303	refType = 4;
	1304	sourceTree = "<group>";
	1305	};
	1306	1C66913707BFA76D008400F7 = {
	1307	fileEncoding = 4;
	1308	isa = PBXFileReference;
	1309	lastKnownFileType = sourcecode.c.h;
	1310	path = JVEmoticonSet.h;
	1311	refType = 4;
	1312	sourceTree = "<group>";
	1313	};
	1314	1C66913807BFA76D008400F7 = {
	1315	fileEncoding = 4;
	1316	isa = PBXFileReference;
	1317	lastKnownFileType = sourcecode.c.objc;
	1318	path = JVEmoticonSet.m;
	1319	refType = 4;
	1320	sourceTree = "<group>";
	1321	};
	1322	1C66913A07BFA76D008400F7 = {
	1323	fileRef = 1C66913807BFA76D008400F7;
	1324	isa = PBXBuildFile;
	1325	settings = {
	1326	};
1267	1327	};
1268	1328	1C6A112806BC0C9E00A66340 = {
…	…
2069	2129	buildActionMask = 2147483647;
2070	2130	files = (
2071		~~0A7DC5FF07BF0BF900E7432E,~~
2072	2131	);
2073	2132	isa = PBXHeadersBuildPhase;
…	…
2699	2758	1C0A4CF70799BEA70093B702,
2700	2759	1C9014C107A2D798002942A7,
	2760	1CF79CBF07AC77E600696918,
	2761	1C5EF35B07B45C1F004E66D3,
	2762	1C5EF36C07B45FBF004E66D3,
	2763	1C66913A07BFA76D008400F7,
2701	2764	);
2702	2765	isa = PBXSourcesBuildPhase;
…	…
3304	3367	sourceTree = SOURCE_ROOT;
3305	3368	};
	3369	1CC00D2407B06C8800A301F2 = {
	3370	children = (
	3371	1C2462A305F9205900505752,
	3372	1C2462A205F9205900505752,
	3373	1CB37178060CC81C00F6A81F,
	3374	1CB37177060CC81C00F6A81F,
	3375	F5F9AF5801711CD401A84BDE,
	3376	F5F9AF5901711CD401A84BDE,
	3377	1C9437090639F86700618CD9,
	3378	1C9437080639F86700618CD9,
	3379	F592CABF01824AE801EE70DE,
	3380	F592CAC001824AE801EE70DE,
	3381	F599994901890E4601EE70DE,
	3382	F599994A01890E4601EE70DE,
	3383	1CC6FD63054B70BC0075807C,
	3384	1CC6FD62054B70BC0075807C,
	3385	1CABFCB00657F10900801C15,
	3386	1CABFCAF0657F10900801C15,
	3387	F5E2538503882A8501000102,
	3388	F5E2538403882A8501000102,
	3389	1C06052406471FFB002438AF,
	3390	1C06052306471FFB002438AF,
	3391	1CBB23DA04F03CA7000001C8,
	3392	1CBB23D904F03CA7000001C8,
	3393	1C06077A064A5DE8002438AF,
	3394	1C060779064A5DE8002438AF,
	3395	1C0A4CF50799BEA70093B702,
	3396	1C0A4CF40799BEA70093B702,
	3397	);
	3398	isa = PBXGroup;
	3399	name = Views;
	3400	path = "";
	3401	refType = 4;
	3402	sourceTree = "<group>";
	3403	};
3306	3404	1CC478470427BB2C00000102 = {
3307	3405	children = (
…	…
3576	3674	isa = PBXFileReference;
3577	3675	lastKnownFileType = sourcecode.c.h;
3578		path = JVDirectChat.h;
	3676	path = JVDirectChatPanel.h;
3579	3677	refType = 4;
3580	3678	sourceTree = "<group>";
…	…
3584	3682	isa = PBXFileReference;
3585	3683	lastKnownFileType = sourcecode.c.objc;
3586		path = JVDirectChat.m;
	3684	path = JVDirectChatPanel.m;
3587	3685	refType = 4;
3588	3686	sourceTree = "<group>";
…	…
4069	4167	isa = PBXFileReference;
4070	4168	lastKnownFileType = sourcecode.c.h;
4071		path = JVChatTranscript.h;
	4169	path = JVChatTranscriptPanel.h;
4072	4170	refType = 4;
4073	4171	sourceTree = "<group>";
…	…
4077	4175	isa = PBXFileReference;
4078	4176	lastKnownFileType = sourcecode.c.objc;
4079		path = JVChatTranscript.m;
	4177	path = JVChatTranscriptPanel.m;
4080	4178	refType = 4;
4081	4179	sourceTree = "<group>";
…	…
4231	4329	isa = PBXFileReference;
4232	4330	lastKnownFileType = sourcecode.c.h;
4233		path = JVChatRoom.h;
	4331	path = JVChatRoomPanel.h;
4234	4332	refType = 4;
4235	4333	sourceTree = "<group>";
…	…
4239	4337	isa = PBXFileReference;
4240	4338	lastKnownFileType = sourcecode.c.objc;
4241		path = JVChatRoom.m;
	4339	path = JVChatRoomPanel.m;
4242	4340	refType = 4;
4243	4341	sourceTree = "<group>";
…	…
4263	4361	isa = PBXFileReference;
4264	4362	lastKnownFileType = sourcecode.c.h;
4265		path = JVChatConsole.h;
	4363	path = JVChatConsolePanel.h;
4266	4364	refType = 4;
4267	4365	sourceTree = "<group>";
…	…
4271	4369	isa = PBXFileReference;
4272	4370	lastKnownFileType = sourcecode.c.objc;
4273		path = JVChatConsole.m;
	4371	path = JVChatConsolePanel.m;
4274	4372	refType = 4;
4275	4373	sourceTree = "<group>";
…	…
4466	4564	sourceTree = "<group>";
4467	4565	};
	4566	1CF79CBC07AC77E600696918 = {
	4567	fileEncoding = 4;
	4568	isa = PBXFileReference;
	4569	lastKnownFileType = sourcecode.c.h;
	4570	path = JVChatTranscript.h;
	4571	refType = 4;
	4572	sourceTree = "<group>";
	4573	};
	4574	1CF79CBD07AC77E600696918 = {
	4575	fileEncoding = 4;
	4576	isa = PBXFileReference;
	4577	lastKnownFileType = sourcecode.c.objc;
	4578	path = JVChatTranscript.m;
	4579	refType = 4;
	4580	sourceTree = "<group>";
	4581	};
	4582	1CF79CBF07AC77E600696918 = {
	4583	fileRef = 1CF79CBD07AC77E600696918;
	4584	isa = PBXBuildFile;
	4585	settings = {
	4586	};
	4587	};
4468	4588	1CF8030C070C893500C9B54C = {
4469	4589	isa = PBXFileReference;
…	…
4540	4660	1CABFD0D0658629200801C15,
4541	4661	1CABFD0C0658629200801C15,
	4662	1C66913807BFA76D008400F7,
	4663	1C66913707BFA76D008400F7,
	4664	1CF79CBD07AC77E600696918,
	4665	1CF79CBC07AC77E600696918,
	4666	1C5EF36A07B45FBF004E66D3,
	4667	1C5EF36907B45FBF004E66D3,
4542	4668	1CD733CA05A0E2470080F952,
4543	4669	1CD733C905A0E2470080F952,
	4670	1C5EF35907B45C1F004E66D3,
	4671	1C5EF35807B45C1F004E66D3,
4544	4672	CB742C000630E08200CF2B0E,
4545	4673	CB742BFF0630E08200CF2B0E,
…	…
4682	4810	children = (
4683	4811	F5394BBA0378DD7601A35792,
	4812	1CFAFE9A053C1B3D00C702F9,
	4813	1CC00D2407B06C8800A301F2,
4684	4814	1CFAFED8053C1BC500C702F9,
4685		~~1CFAFE9A053C1B3D00C702F9,~~
4686	4815	1CABFD090658622600801C15,
4687	4816	1CFAFED5053C1BA500C702F9,
…	…
4709	4838	1C0730D206777678008D8AD9,
4710	4839	1C0730D106777678008D8AD9,
4711		~~1CB37178060CC81C00F6A81F,~~
4712		~~1CB37177060CC81C00F6A81F,~~
4713		~~F5E2538503882A8501000102,~~
4714		~~F5E2538403882A8501000102,~~
4715		~~F5F9AF5801711CD401A84BDE,~~
4716		~~F5F9AF5901711CD401A84BDE,~~
4717		~~1C2462A305F9205900505752,~~
4718		~~1C2462A205F9205900505752,~~
4719		~~1C9437090639F86700618CD9,~~
4720		~~1C9437080639F86700618CD9,~~
4721		~~1C06052406471FFB002438AF,~~
4722		~~1C06052306471FFB002438AF,~~
4723		~~F592CABF01824AE801EE70DE,~~
4724		~~F592CAC001824AE801EE70DE,~~
4725		~~F599994901890E4601EE70DE,~~
4726		~~F599994A01890E4601EE70DE,~~
4727		~~1CBB23DA04F03CA7000001C8,~~
4728		~~1CBB23D904F03CA7000001C8,~~
4729		~~1C06077A064A5DE8002438AF,~~
4730		~~1C060779064A5DE8002438AF,~~
4731		~~1C0A4CF50799BEA70093B702,~~
4732		~~1C0A4CF40799BEA70093B702,~~
4733		~~1CC6FD63054B70BC0075807C,~~
4734		~~1CC6FD62054B70BC0075807C,~~
4735	4840	1C6A112906BC0C9E00A66340,
4736	4841	1C6A112806BC0C9E00A66340,
…	…
4741	4846	1CABF8760656414100801C15,
4742	4847	1CABF8750656414100801C15,
4743		~~1CABFCB00657F10900801C15,~~
4744		~~1CABFCAF0657F10900801C15,~~
4745	4848	1C4671E406D7759100071DC6,
4746	4849	1C4671E306D7759100071DC6,
4747	4850	);
4748	4851	isa = PBXGroup;
4749		name = "Other Sources";
	4852	name = "Other Sources & Additions";
4750	4853	path = "";
4751	4854	refType = 4;
…	…
4999	5102	1C18CD100528DBBA000001C8,
5000	5103	F5E98623018B412B01EE70DE,
5001		~~0A7DC5FD07BF0BF900E7432E,~~
5002	5104	F56CD5440191182601EE70DE,
	5105	1C6690D107BFA037008400F7,
5003	5106	1CF4E51D0698E9FB00986498,
5004	5107	1C3D55A305A4CB2B00F25F5E,

trunk/JVAppearancePreferences.h

r1823	r2308
21	21	BOOL _alertDisplayed;
22	22	JVStyle *_style;
23		~~NSSet *_emoticonBundles;~~
24	23	NSMutableArray *_styleOptions;
25	24	NSString *_userStyle;
…	…
36	35
37	36	- (IBAction) changeDefaultChatStyle:(id) sender;
38
39		~~- (IBAction) noGraphicEmoticons:(id) sender;~~
40	37	- (IBAction) changeDefaultEmoticons:(id) sender;
41	38

trunk/JVAppearancePreferences.m

r2281	r2308
4	4	#import "JVAppearancePreferences.h"
5	5	#import "JVStyle.h"
6		#import "JV~~ChatTranscrip~~t.h"
	6	#import "JVEmoticonSet.h"
7	7	#import "JVFontPreviewField.h"
8	8	#import "JVColorWellCell.h"
…	…
23	23	- (void) setDrawsBackground:(BOOL) draws;
24	24	- (BOOL) drawsBackground;
25		~~@end~~
26
27		~~#pragma mark -~~
28
29		~~@interface JVChatTranscript (JVChatTranscriptPrivate)~~
30		~~+ (void) _scanForEmoticons;~~
31	25	@end
32	26
…	…
38	32	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( colorWellDidChangeColor: ) name:JVColorWellCellColorDidChangeNotification object:nil];
39	33	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( updateChatStylesMenu ) name:JVStylesScannedNotification object:nil];
40		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( updateEmoticonsMenu ) name:JV~~ChatEmoticon~~sScannedNotification object:nil];
	34	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( updateEmoticonsMenu ) name:JVEmoticonSetsScannedNotification object:nil];
41	35	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( reloadStyles: ) name:NSApplicationDidBecomeActiveNotification object:[NSApplication sharedApplication]];
42
43		~~[JVChatTranscript _scanForEmoticons];~~
44	36
45	37	_style = nil;
46	38	_styleOptions = nil;
47	39	_userStyle = nil;
48		~~_emoticonBundles = [JVChatEmoticonBundles retain];~~
49	40	}
50	41	return self;
…	…
54	45	[[NSNotificationCenter defaultCenter] removeObserver:self];
55	46
56		~~[_emoticonBundles release];~~
57	47	[_style release];
58
59		~~_emoticonBundles = nil;~~
60	48	_style = nil;
61	49
…	…
91	79
92	80	- (void) selectEmoticonsWithIdentifier:(NSString *) identifier {
93		[~~[NSUserDefaults standardUserDefaults] setObject:identifier forKey:[NSString stringWithFormat:@"JVChatDefaultEmoticons %@", [_style identifier]~~]];
	81	[_style setDefaultEmoticonSet:[JVEmoticonSet emoticonSetWithIdentifier:identifier]];
94	82	[self updateEmoticonsMenu];
95	83	[self updatePreview];
…	…
206	194	[preview displayIfNeeded];
207	195	[[preview window] enableFlushWindow];
208		}
209
210		~~- (IBAction) noGraphicEmoticons:(id) sender {~~
211		~~[self selectEmoticonsWithIdentifier:@""];~~
212	196	}
213	197
…	…
288	272
289	273	- (void) updateEmoticonsMenu {
290		NSEnumerator *enumerator = [[[~~_emoticonBundles~~ allObjects] sortedArrayUsingSelector:@selector( compare: )] objectEnumerator];
	274	NSEnumerator *enumerator = [[[[JVEmoticonSet emoticonSets] allObjects] sortedArrayUsingSelector:@selector( compare: )] objectEnumerator];
291	275	NSMenu *menu = nil;
292	276	NSMenuItem *menuItem = nil;
293		NSString *style = [_style identifier];
294		NSString *defaultEmoticons = [[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"JVChatDefaultEmoticons %@", style]];
295		NSBundle *emoticon = [NSBundle bundleWithIdentifier:defaultEmoticons];
296
297		if( ! emoticon && [defaultEmoticons length] ) {
298		[[NSUserDefaults standardUserDefaults] removeObjectForKey:[NSString stringWithFormat:@"JVChatDefaultEmoticons %@", style]];
299		defaultEmoticons = [[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"JVChatDefaultEmoticons %@", style]];
300		}
	277	JVEmoticonSet *defaultEmoticon = [_style defaultEmoticonSet];
	278	JVEmoticonSet *emoticon = nil;
301	279
302	280	menu = [[[NSMenu alloc] initWithTitle:@""] autorelease];
303	281
304		menuItem = [[[NSMenuItem alloc] initWithTitle:NSLocalizedString( @"Text Only", "text only emoticons menu item title" ) action:@selector( noGraphicEmoticons: ) keyEquivalent:@""] autorelease];
	282	emoticon = [JVEmoticonSet textOnlyEmoticonSet];
	283	menuItem = [[[NSMenuItem alloc] initWithTitle:[emoticon displayName] action:@selector( changeDefaultEmoticons: ) keyEquivalent:@""] autorelease];
305	284	[menuItem setTarget:self];
306		if( ! [defaultEmoticons length] ) [menuItem setState:NSOnState];
	285	[menuItem setRepresentedObject:[emoticon identifier]];
	286	if( [defaultEmoticon isEqual:emoticon] ) [menuItem setState:NSOnState];
307	287	[menu addItem:menuItem];
308	288
…	…
313	293	menuItem = [[[NSMenuItem alloc] initWithTitle:[emoticon displayName] action:@selector( changeDefaultEmoticons: ) keyEquivalent:@""] autorelease];
314	294	[menuItem setTarget:self];
315		[menuItem setRepresentedObject:[emoticon bundleIdentifier]];
316		if( [defaultEmoticons isEqualToString:[emoticon bundleIdentifier]] )
317		[menuItem setState:NSOnState];
	295	[menuItem setRepresentedObject:[emoticon identifier]];
	296	if( [defaultEmoticon isEqual:emoticon] ) [menuItem setState:NSOnState];
318	297	[menu addItem:menuItem];
319	298	}
…	…
323	302
324	303	- (void) updatePreview {
325		NSBundle *emoticon = nil;
326		NSString *emoticonStyle = @"";
327		NSString *emoticonSetting = [[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"JVChatDefaultEmoticons %@", [_style identifier]]];
328		if( [emoticonSetting length] ) {
329		emoticon = [NSBundle bundleWithIdentifier:emoticonSetting];
330		emoticonStyle = ( emoticon ? [[NSURL fileURLWithPath:[emoticon pathForResource:@"emoticons" ofType:@"css"]] absoluteString] : @"" );
331		}
	304	JVEmoticonSet *emoticon = [_style defaultEmoticonSet];
332	305
333	306	NSString *shell = [NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"template" ofType:@"html"]];
334	307	NSString *html = [_style transformXML:[NSString stringWithContentsOfFile:[_style previewTranscriptFilePath]] withParameters:nil];
335		html = [NSString stringWithFormat:shell, @"Preview", ~~emoticonStyle~~, [[_style mainStyleSheetLocation] absoluteString], [[_style variantStyleSheetLocationWithName:[_style defaultVariantName]] absoluteString], [[_style baseLocation] absoluteString], [_style contentsOfHeaderFile], html];
	308	html = [NSString stringWithFormat:shell, @"Preview", [[emoticon styleSheetLocation] absoluteString], [[_style mainStyleSheetLocation] absoluteString], [[_style variantStyleSheetLocationWithName:[_style defaultVariantName]] absoluteString], [[_style baseLocation] absoluteString], [_style contentsOfHeaderFile], html];
336	309
337	310	[WebCoreCache empty];

trunk/JVBehaviorPreferences.m

r1823	r2308
1	1	#import "JVBehaviorPreferences.h"
2	2	#import "JVChatController.h"
3		#import "JVChatRoom.h"
	3	#import "JVChatRoomPanel.h"
4	4
5	5	@implementation JVBehaviorPreferences
…	…
26	26	[[newConsoles menu] setAutoenablesItems:NO];
27	27
28		int value = [[NSUserDefaults standardUserDefaults] integerForKey:@"JVChatRoomPreferredOpenMode"] & ~32;
	28	int value = [[NSUserDefaults standardUserDefaults] integerForKey:@"JVChatRoomPanelPreferredOpenMode"] & ~32;
29	29	int index = [newRooms indexOfItemWithTag:value];
30	30	if( index >= 0 ) [newRooms selectItemAtIndex:index];
31	31	[self changePreferredWindow:newRooms];
32	32
33		value = [[NSUserDefaults standardUserDefaults] integerForKey:@"JVDirectChatPreferredOpenMode"] & ~32;
	33	value = [[NSUserDefaults standardUserDefaults] integerForKey:@"JVDirectChatPanelPreferredOpenMode"] & ~32;
34	34	index = [newChats indexOfItemWithTag:value];
35	35	if( index >= 0 ) [newChats selectItemAtIndex:index];
36	36	[self changePreferredWindow:newChats];
37	37
38		value = [[NSUserDefaults standardUserDefaults] integerForKey:@"JVChatTranscriptPreferredOpenMode"] & ~32;
	38	value = [[NSUserDefaults standardUserDefaults] integerForKey:@"JVChatTranscriptPanelPreferredOpenMode"] & ~32;
39	39	index = [newTranscripts indexOfItemWithTag:value];
40	40	if( index >= 0 ) [newTranscripts selectItemAtIndex:index];
41	41	[self changePreferredWindow:newTranscripts];
42	42
43		value = [[NSUserDefaults standardUserDefaults] integerForKey:@"JVChatConsolePreferredOpenMode"] & ~32;
	43	value = [[NSUserDefaults standardUserDefaults] integerForKey:@"JVChatConsolePanelPreferredOpenMode"] & ~32;
44	44	index = [newConsoles indexOfItemWithTag:value];
45	45	if( index >= 0 ) [newConsoles selectItemAtIndex:index];
…	…
78	78	}
79	79
80
81	80	#pragma mark -
82	81
…	…
84	83	[[NSUserDefaults standardUserDefaults] setBool:(BOOL)[sender state] forKey:@"JVSortRoomMembersByStatus"];
85	84
86		NSEnumerator *enumerator = [[[JVChatController defaultManager] chatViewControllersOfClass:[JVChatRoom class]] objectEnumerator];
87		JVChatRoom *room = nil;
	85	NSEnumerator *enumerator = [[[JVChatController defaultManager] chatViewControllersOfClass:[JVChatRoomPanel class]] objectEnumerator];
	86	JVChatRoomPanel *room = nil;
88	87	while( ( room = [enumerator nextObject] ) )
89	88	[room resortMembers];
…	…
97	96	- (IBAction) changePreferredWindow:(id) sender {
98	97	NSString *key = nil;
99
100		if( sender == newRooms ) key = @"JVChatRoomPreferredOpenMode";
101		else if( sender == newChats ) key = @"JVDirectChatPreferredOpenMode";
102		else if( sender == newTranscripts ) key = @"JVChatTranscriptPreferredOpenMode";
103		else if( sender == newConsoles ) key = @"JVChatConsolePreferredOpenMode";
	98
	99	if( sender == newRooms ) key = @"JVChatRoomPanelPreferredOpenMode";
	100	else if( sender == newChats ) key = @"JVDirectChatPanelPreferredOpenMode";
	101	else if( sender == newTranscripts ) key = @"JVChatTranscriptPanelPreferredOpenMode";
	102	else if( sender == newConsoles ) key = @"JVChatConsolePanelPreferredOpenMode";
104	103	else return;
105
	104
106	105	int new = [[sender selectedItem] tag];
107	106	BOOL groupByServer = (BOOL) [[NSUserDefaults standardUserDefaults] integerForKey:key] & 32;
108
	107
109	108	if( [[sender selectedItem] tag] == 32 ) {
110	109	NSMenuItem *item = [sender selectedItem];
…	…
123	122	[item setEnabled:YES];
124	123	}
125
	124
126	125	if( groupByServer ) new \|= 32;
127
	126
128	127	[[NSUserDefaults standardUserDefaults] setInteger:new forKey:key];
129	128	}

trunk/JVChatConsolePanel.h

r1823	r2308
4	4	@class MVChatConnection;
5	5
6		@interface JVChatConsole : NSObject <JVChatViewController> {
	6	@interface JVChatConsolePanel : NSObject <JVChatViewController> {
7	7	@protected
8	8	IBOutlet NSView *contents;
…	…
31	31	@end
32	32
33		@interface JVChatConsole ~~(JVChatConsole~~Scripting) <JVChatListItemScripting>
	33	@interface JVChatConsolePanel (JVChatConsolePanelScripting) <JVChatListItemScripting>
34	34	- (NSNumber *) uniqueIdentifier;
35	35	@end

trunk/JVChatConsolePanel.m

r2286	r2308
3	3	#import <ChatCore/NSMethodSignatureAdditions.h>
4	4
5		#import "JVChatConsole.h"
	5	#import "JVChatConsolePanel.h"
6	6	#import "JVChatController.h"
7	7	#import "MVTextView.h"
…	…
12	12	static NSString *JVToolbarClearItemIdentifier = @"JVToolbarClearItem";
13	13
14		@implementation JVChatConsole
	14	@implementation JVChatConsolePanel
15	15	- (id) initWithConnection:(MVChatConnection *) connection {
16	16	if( ( self = [self init] ) ) {
…	…
24	24	_connection = [connection retain];
25	25	_verbose = [[NSUserDefaults standardUserDefaults] boolForKey:@"JVChatVerboseConsoleMessages"];
26		_ignorePRIVMSG = [[NSUserDefaults standardUserDefaults] boolForKey:@"JVChatConsoleIgnoreUserChatMessages"];
	26	_ignorePRIVMSG = [[NSUserDefaults standardUserDefaults] boolForKey:@"JVChatConsolePanelIgnoreUserChatMessages"];
27	27
28	28	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _gotRawMessage: ) name:MVChatConnectionGotRawMessageNotification object:connection];
…	…
103	103
104	104	- (NSView *) view {
105		if( ! _nibLoaded ) _nibLoaded = [NSBundle loadNibNamed:@"JVChatConsole" owner:self];
	105	if( ! _nibLoaded ) _nibLoaded = [NSBundle loadNibNamed:@"JVChatConsolePanel" owner:self];
106	106	return contents;
107	107	}
…	…
572	572	#pragma mark -
573	573
574		@implementation JVChatConsole ~~(JVChatConsole~~Private)
	574	@implementation JVChatConsolePanel (JVChatConsolePanelPrivate)
575	575	- (void) _gotRawMessage:(NSNotification *) notification {
576	576	if( _paused ) return;
…	…
585	585	#pragma mark -
586	586
587		@implementation JVChatConsole ~~(JVChatConsole~~Scripting)
	587	@implementation JVChatConsolePanel (JVChatConsolePanelScripting)
588	588	- (NSNumber *) uniqueIdentifier {
589	589	return [NSNumber numberWithUnsignedInt:(unsigned long) self];

trunk/JVChatController.h

r2163	r2308
5	5	@class MVChatUser;
6	6	@class JVChatWindowController;
7		@class JVChatRoom;
8		@class JVDirectChat;
9		@class JVChatTranscript;
10		@class JVChatConsole;
	7	@class JVChatRoomPanel;
	8	@class JVDirectChatPanel;
	9	@class JVChatTranscriptPanel;
	10	@class JVChatConsolePanel;
11	11

r1823	r2308
3	3	#import <WebKit/WebKit.h>
4	4	#import <AGRegex/AGRegex.h>
	5
	6	#define WebKitVersion146 0
5	7	#endif