Navigation

← Previous Changeset
Next Changeset →

Changeset 877

Timestamp:

07/05/04 01:59:06 (5 years ago)

Author:

morris

Message:

add a new primitive FHHandler -images and make the fullscreen view only view images

Files:

Footagehead/trunk/FHController.m (modified) (4 diffs)
Footagehead/trunk/FHFullscreenWindow.h (modified) (3 diffs)
Footagehead/trunk/FHFullscreenWindow.m (modified) (7 diffs)
Footagehead/trunk/FHHandler.m (modified) (3 diffs)

Legend:

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

Footagehead/trunk/FHController.m

r876	r877
1		/* $Id: FHController.m,v 1.~~8 2004/07/04 23:37:37~~ morris Exp $ */
	1	/* $Id: FHController.m,v 1.9 2004/07/04 23:59:06 morris Exp $ */
2	2
3	3	/*
…	…
253	253	- (void)windowWillClose:(NSNotification *)notification {
254	254	if([notification object] == _fullscreenWindow) {
255		FHBrowserCell *cell;
	255	FHBrowserCell *cell;
	256	int row;
	257
	258	// --- get file
	259	row = [_fullscreenWindow position];
	260	row = [[_handler files] indexOfObject:[[_handler images] objectAtIndex:row]];
256	261
257	262	// --- select where fullscreen exited
258		cell = [_browserView cellAtRow:[_fullscreenWindow position] column:0];
259		[_browserView selectCell:cell];
	263	if(row >= 0) {
	264	cell = [_browserView cellAtRow:row column:0];
	265	[_browserView selectCell:cell];
	266	}
260	267
261	268	// --- clear self
…	…
798	805	if(image) {
799	806	if(!NSEqualSizes([image size], NSZeroSize)) {
800		~~// --- get files~~
801		~~files = [_handler files];~~
802		~~row = [files indexOfObject:file];~~
803
804	807	// --- hide cursor
805	808	[NSCursor setHiddenUntilMouseMoves:YES];
806	809
807	810	if(_fullscreenWindow) {
808		if(~~row~~ == [_fullscreenWindow position]) {
	811	if([[_handler images] indexOfObject:file] == [_fullscreenWindow position]) {
809	812	// --- display image
810	813	[_fullscreenImageView setImage:[image smoothedImage]];
…	…
820	823	}
821	824	} else {
822		if(~~row~~ == [_browserView selectedRow]) {
	825	if([[_handler files] indexOfObject:file] == [_browserView selectedRow]) {
823	826	// --- display image
824	827	[_imageView setImage:[image smoothedImage]];

Footagehead/trunk/FHFullscreenWindow.h

r867	r877
1		/* $Id: FHFullscreenWindow.h,v 1.~~4 2004/06/14 23:33:32~~ morris Exp $ */
	1	/* $Id: FHFullscreenWindow.h,v 1.5 2004/07/04 23:59:06 morris Exp $ */
2	2
3	3	/*
…	…
27	27	*/
28	28
29		@class FHController, FHImageView;
	29	@class FHController, FHFile, FHImageView;
30	30
31	31	@interface FHFullscreenWindow : NSWindow {
…	…
35	35
36	36
	37	- (FHFile *) file;
37	38	- (int) position;
38	39	- (NSTimer *) timer;

Footagehead/trunk/FHFullscreenWindow.m

r875	r877
1		/* $Id: FHFullscreenWindow.m,v 1.~~5 2004/07/04 22:38:10~~ morris Exp $ */
	1	/* $Id: FHFullscreenWindow.m,v 1.6 2004/07/04 23:59:06 morris Exp $ */
2	2
3	3	/*
…	…
40	40	// --- set position
41	41	_position = [[[self delegate] browserView] selectedRow];
	42	_position = [[[[self delegate] handler] images] indexOfObject:
	43	[[[[self delegate] handler] files] objectAtIndex:_position]];
42	44
43	45	if(_position < 0)
…	…
46	48	[[[self delegate] fullscreenImageView] setText:[NSString stringWithFormat:
47	49	@"%@ - %u/%u",
48		[[[[[self delegate] handler] ~~fil~~es] objectAtIndex:_position] name],
	50	[[[[[self delegate] handler] images] objectAtIndex:_position] name],
49	51	_position + 1,
50		[[[[self delegate] handler] ~~fil~~es] count]]];
	52	[[[[self delegate] handler] images] count]]];
51	53
52	54	// --- load image
53		[[self delegate] loadImage:[[[[self delegate] handler] ~~fil~~es] objectAtIndex:_position]];
	55	[[self delegate] loadImage:[[[[self delegate] handler] images] objectAtIndex:_position]];
54	56
55	57	// --- show window
…	…
77	79
78	80	- (void)sendEvent:(NSEvent *)event {
79		BOOL handled = NO, reload = NO;
	81	BOOL handled = NO, load = NO;
80	82
81	83	if([event type] == NSKeyDown && [[event characters] length] > 0) {
…	…
110	112	_position--;
111	113
112		reload = YES;
	114	load = YES;
113	115	handled = YES;
114	116	}
115	117	}
116		else if(_position + 1 < [[[[self delegate] handler] ~~fil~~es] count]) {
	118	else if(_position + 1 < [[[[self delegate] handler] images] count]) {
117	119	_position++;
118	120
119		reload = YES;
	121	load = YES;
120	122	handled = YES;
121	123	}
122	124	}
123	125	else if([event type] == NSLeftMouseDown) {
124		if(_position + 1 < [[[[self delegate] handler] ~~fil~~es] count]) {
	126	if(_position + 1 < [[[[self delegate] handler] images] count]) {
125	127	_position++;
126	128
127		reload = YES;
	129	load = YES;
128	130	handled = YES;
129	131	}
…	…
133	135	_position--;
134	136
135		reload = YES;
136		handled = YES;
137		}
138		}
139
140		// --- reload image
141		if(reload) {
	137	load = YES;
	138	handled = YES;
	139	}
	140	}
	141
	142	// --- load image
	143	if(load) {
142	144	[[[self delegate] fullscreenImageView] setText:[NSString stringWithFormat:
143	145	@"%@ - %u/%u",
144		[[[[[self delegate] handler] ~~fil~~es] objectAtIndex:_position] name],
	146	[[[[[self delegate] handler] images] objectAtIndex:_position] name],
145	147	_position + 1,
146		[[[[self delegate] handler] ~~fil~~es] count]]];
	148	[[[[self delegate] handler] images] count]]];
147	149
148		[[self delegate] loadImage:[[[[self delegate] handler] ~~fil~~es] objectAtIndex:_position]];
	150	[[self delegate] loadImage:[[[[self delegate] handler] images] objectAtIndex:_position]];
149	151
150	152	if(_timer)
…	…
172	174	[[[self delegate] fullscreenImageView] setText:[NSString stringWithFormat:
173	175	@"%@ - %u/%u",
174		[[[[[self delegate] handler] ~~fil~~es] objectAtIndex:_position] name],
	176	[[[[[self delegate] handler] images] objectAtIndex:_position] name],
175	177	_position + 1,
176		[[[[self delegate] handler] files] count]]];
177
178		[[self delegate] loadImage:[[[[self delegate] handler] files] objectAtIndex:_position]];
179
180		if(_timer) {
181		[_timer setFireDate:[NSDate distantFuture]];
182
183		if(_position + 1 == [[[[self delegate] handler] files] count])
184		[_timer invalidate];
185		}
	178	[[[[self delegate] handler] images] count]]];
	179
	180	[[self delegate] loadImage:[[[[self delegate] handler] images] objectAtIndex:_position]];
	181
	182	if(_position + 1 == [[[[self delegate] handler] images] count])
	183	[_timer invalidate];
	184	}
	185
	186
	187
	188	#pragma mark -
	189
	190	- (FHFile *)file {
	191	return [[[[self delegate] handler] images] objectAtIndex:_position];
186	192	}
187	193

Footagehead/trunk/FHHandler.m

r876	r877
1		/* $Id: FHHandler.m,v 1.~~3 2004/07/04 23:37:37~~ morris Exp $ */
	1	/* $Id: FHHandler.m,v 1.4 2004/07/04 23:59:06 morris Exp $ */
2	2
3	3	/*
…	…
29	29	#import "NSFileManagerAdditions.h"
30	30	#import "NSStringAdditions.h"
	31	#import "FHFile.h"
31	32	#import "FHHandler.h"
32	33
…	…
161	162
162	163	- (NSArray *)images {
163		return [NSArray array];
	164	NSEnumerator *enumerator;
	165	NSArray *files;
	166	FHFile *file;
	167
	168	// --- check for existing
	169	if(_images)
	170	return _images;
	171
	172	// --- get images
	173	_images = [[NSMutableArray alloc] initWithCapacity:20];
	174	files = [self files];
	175	enumerator = [files objectEnumerator];
	176
	177	while((file = [enumerator nextObject])) {
	178	if(![file isDirectory])
	179	[_images addObject:file];
	180	}
	181
	182	return _images;
164	183	}
165	184

Navigation

Changeset 877

Legend:

Footagehead/trunk/FHController.m

Footagehead/trunk/FHFullscreenWindow.h

Footagehead/trunk/FHFullscreenWindow.m

Footagehead/trunk/FHHandler.m

Download in other formats: