Revision: 4782
http://skim-app.svn.sourceforge.net/skim-app/?rev=4782&view=rev
Author: hofman
Date: 2008-10-13 09:43:46 +0000 (Mon, 13 Oct 2008)
Log Message:
-----------
fix typo in variable names
Modified Paths:
--------------
trunk/SKMainWindowController_UI.m
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2008-10-12 22:13:04 UTC (rev 4781)
+++ trunk/SKMainWindowController_UI.m 2008-10-13 09:43:46 UTC (rev 4782)
@@ -66,10 +66,10 @@
#import "SKLineInspector.h"
#import "SKPDFOutline.h"
-static NSString *SKMainWindowLabelColumnIdentifer = @"label";
-static NSString *SKMainWindowNoteColumnIdentifer = @"note";
-static NSString *SKMainWindowTypeColumnIdentifer = @"type";
-static NSString *SKMainWindowImageColumnIdentifer = @"image";
+static NSString *SKMainWindowLabelColumnIdentifier = @"label";
+static NSString *SKMainWindowNoteColumnIdentifier = @"note";
+static NSString *SKMainWindowTypeColumnIdentifier = @"type";
+static NSString *SKMainWindowImageColumnIdentifier = @"image";
static NSString *noteToolImageNames[] = {@"ToolbarTextNoteMenu",
@"ToolbarAnchoredNoteMenu", @"ToolbarCircleNoteMenu", @"ToolbarSquareNoteMenu",
@"ToolbarHighlightNoteMenu", @"ToolbarUnderlineNoteMenu",
@"ToolbarStrikeOutNoteMenu", @"ToolbarLineNoteMenu", @"ToolbarInkNoteMenu"};
@@ -331,7 +331,7 @@
- (float)tableView:(NSTableView *)tv heightOfRow:(int)row {
if ([tv isEqual:thumbnailTableView]) {
NSSize thumbSize = [[thumbnails objectAtIndex:row] size];
- NSSize cellSize = NSMakeSize([[tv
tableColumnWithIdentifier:SKMainWindowImageColumnIdentifer] width],
+ NSSize cellSize = NSMakeSize([[tv
tableColumnWithIdentifier:SKMainWindowImageColumnIdentifier] width],
fminf(thumbSize.height,
roundedThumbnailSize));
if (thumbSize.height < [tv rowHeight])
return [tv rowHeight];
@@ -341,7 +341,7 @@
return fmaxf(1.0, fminf(cellSize.width, thumbSize.width) *
thumbSize.height / thumbSize.width);
} else if ([tv isEqual:snapshotTableView]) {
NSSize thumbSize = [[[[snapshotArrayController arrangedObjects]
objectAtIndex:row] thumbnail] size];
- NSSize cellSize = NSMakeSize([[tv
tableColumnWithIdentifier:SKMainWindowImageColumnIdentifer] width],
+ NSSize cellSize = NSMakeSize([[tv
tableColumnWithIdentifier:SKMainWindowImageColumnIdentifier] width],
fminf(thumbSize.height,
roundedSnapshotThumbnailSize));
if (thumbSize.height < [tv rowHeight])
return [tv rowHeight];
@@ -551,18 +551,18 @@
- (id)outlineView:(NSOutlineView *)ov objectValueForTableColumn:(NSTableColumn
*)tableColumn byItem:(id)item{
if ([ov isEqual:outlineView]) {
NSString *tcID = [tableColumn identifier];
- if([tcID isEqualToString:SKMainWindowLabelColumnIdentifer]) {
+ if([tcID isEqualToString:SKMainWindowLabelColumnIdentifier]) {
return [(SKPDFOutline *)item label];
- } else if([tcID isEqualToString:SKMainWindowPageColumnIdentifer]) {
+ } else if([tcID isEqualToString:SKMainWindowPageColumnIdentifier]) {
return [(SKPDFOutline *)item pageLabel];
}
} else if ([ov isEqual:noteOutlineView]) {
NSString *tcID = [tableColumn identifier];
- if ([tcID isEqualToString:SKMainWindowNoteColumnIdentifer])
+ if ([tcID isEqualToString:SKMainWindowNoteColumnIdentifier])
return [item type] ? (id)[item string] : (id)[item text];
- else if([tcID isEqualToString:SKMainWindowTypeColumnIdentifer])
+ else if([tcID isEqualToString:SKMainWindowTypeColumnIdentifier])
return [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber
numberWithBool:item == [pdfView activeAnnotation]],
SKAnnotationTypeImageCellActiveKey, [item type],
SKAnnotationTypeImageCellTypeKey, nil];
- else if([tcID isEqualToString:SKMainWindowPageColumnIdentifer])
+ else if([tcID isEqualToString:SKMainWindowPageColumnIdentifier])
return [[item page] displayLabel];
}
return nil;
@@ -570,7 +570,7 @@
- (void)outlineView:(NSOutlineView *)ov setObjectValue:(id)object
forTableColumn:(NSTableColumn *)tableColumn byItem:(id)item{
if ([ov isEqual:noteOutlineView]) {
- if ([[tableColumn identifier]
isEqualToString:SKMainWindowNoteColumnIdentifer]) {
+ if ([[tableColumn identifier]
isEqualToString:SKMainWindowNoteColumnIdentifier]) {
if ([item type] && [object isEqualToString:[item string]] == NO)
[item setString:object];
}
@@ -581,7 +581,7 @@
- (BOOL)outlineView:(NSOutlineView *)ov shouldEditTableColumn:(NSTableColumn
*)tableColumn item:(id)item{
if ([ov isEqual:noteOutlineView]) {
- if ([[tableColumn identifier]
isEqualToString:SKMainWindowNoteColumnIdentifer]) {
+ if ([[tableColumn identifier]
isEqualToString:SKMainWindowNoteColumnIdentifier]) {
if ([item type] == nil) {
if ([pdfView hideNotes] == NO) {
PDFAnnotation *annotation = [(SKNoteText *)item note];
@@ -611,11 +611,11 @@
NSSortDescriptor *pageIndexSortDescriptor = [[[NSSortDescriptor
alloc] initWithKey:SKNPDFAnnotationPageIndexKey ascending:ascending]
autorelease];
NSSortDescriptor *boundsSortDescriptor = [[[NSSortDescriptor
alloc] initWithKey:SKNPDFAnnotationBoundsKey ascending:ascending
selector:@selector(boundsCompare:)] autorelease];
NSMutableArray *sds = [NSMutableArray
arrayWithObjects:pageIndexSortDescriptor, boundsSortDescriptor, nil];
- if ([tcID isEqualToString:SKMainWindowTypeColumnIdentifer]) {
+ if ([tcID isEqualToString:SKMainWindowTypeColumnIdentifier]) {
[sds insertObject:[[[NSSortDescriptor alloc]
initWithKey:SKNPDFAnnotationTypeKey ascending:YES
selector:@selector(noteTypeCompare:)] autorelease] atIndex:0];
- } else if ([tcID isEqualToString:SKMainWindowNoteColumnIdentifer])
{
+ } else if ([tcID
isEqualToString:SKMainWindowNoteColumnIdentifier]) {
[sds insertObject:[[[NSSortDescriptor alloc]
initWithKey:SKNPDFAnnotationStringKey ascending:YES
selector:@selector(localizedCaseInsensitiveNumericCompare:)] autorelease]
atIndex:0];
- } else if ([tcID isEqualToString:SKMainWindowPageColumnIdentifer])
{
+ } else if ([tcID
isEqualToString:SKMainWindowPageColumnIdentifier]) {
if (oldTableColumn == nil)
ascending = NO;
}
@@ -848,7 +848,7 @@
- (void)autoSizeNoteRows:(id)sender {
float rowHeight = [noteOutlineView rowHeight];
- NSTableColumn *tableColumn = [noteOutlineView
tableColumnWithIdentifier:SKMainWindowNoteColumnIdentifer];
+ NSTableColumn *tableColumn = [noteOutlineView
tableColumnWithIdentifier:SKMainWindowNoteColumnIdentifier];
id cell = [tableColumn dataCell];
float indentation = [noteOutlineView indentationPerLevel];
float width = NSWidth([cell drawingRectForBounds:NSMakeRect(0.0, 0.0,
[tableColumn width] - indentation, rowHeight)]);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
