Revision: 3965
http://skim-app.svn.sourceforge.net/skim-app/?rev=3965&view=rev
Author: hofman
Date: 2008-06-04 10:40:15 -0700 (Wed, 04 Jun 2008)
Log Message:
-----------
Change method names for icon images, use small/tiny.
Modified Paths:
--------------
trunk/NSImage_SKExtensions.h
trunk/NSImage_SKExtensions.m
trunk/SKBookmark.m
trunk/SKBookmarkController.m
Modified: trunk/NSImage_SKExtensions.h
===================================================================
--- trunk/NSImage_SKExtensions.h 2008-06-04 16:57:39 UTC (rev 3964)
+++ trunk/NSImage_SKExtensions.h 2008-06-04 17:40:15 UTC (rev 3965)
@@ -122,13 +122,14 @@
+ (void)makeAdornImages;
+ (NSImage *)iconWithSize:(NSSize)iconSize forToolboxCode:(OSType)code;
-+ (NSImage *)imageWithIconForToolboxCode:(OSType)code;
++ (NSImage *)smallImageWithIconForToolboxCode:(OSType)code;
++ (NSImage *)tinyImageWithIconForToolboxCode:(OSType) code;
-+ (NSImage *)folderImage;
+ (NSImage *)smallFolderImage;
++ (NSImage *)tinyFolderImage;
-+ (NSImage *)missingFileImage;
+ (NSImage *)smallMissingFileImage;
++ (NSImage *)tinyMissingFileImage;
- (void)drawFlippedInRect:(NSRect)dstRect fromRect:(NSRect)srcRect
operation:(NSCompositingOperation)op fraction:(float)delta;
- (void)drawFlipped:(BOOL)isFlipped inRect:(NSRect)dstRect
fromRect:(NSRect)srcRect operation:(NSCompositingOperation)op
fraction:(float)delta;
Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m 2008-06-04 16:57:39 UTC (rev 3964)
+++ trunk/NSImage_SKExtensions.m 2008-06-04 17:40:15 UTC (rev 3965)
@@ -1351,7 +1351,7 @@
[toolbarSelectToolImage unlockFocus];
[toolbarSelectToolImage setName:SKImageNameToolbarSelectTool];
- toolbarNewFolderImage = [[self folderImage] copy];
+ toolbarNewFolderImage = [[self smallFolderImage] copy];
[toolbarNewFolderImage lockFocus];
[[self class] drawAddBadgeAtPoint:NSMakePoint(18.0, 18.0)];
[toolbarNewFolderImage unlockFocus];
@@ -1785,6 +1785,9 @@
[shadow1 release];
}
+static NSSize smallImageSize = {32.0, 32.0};
+static NSSize tinyImageSize = {16.0, 16.0};
+
+ (NSImage *)iconWithSize:(NSSize)iconSize forToolboxCode:(OSType) code {
IconRef iconref;
OSErr myErr = GetIconRef (kOnSystemDisk, kSystemIconsCreator, code,
&iconref);
@@ -1807,29 +1810,33 @@
return [image autorelease];
}
-+ (NSImage *)imageWithIconForToolboxCode:(OSType) code {
- return [self iconWithSize:NSMakeSize(32.0, 32.0) forToolboxCode:code];
++ (NSImage *)smallImageWithIconForToolboxCode:(OSType) code {
+ return [self iconWithSize:smallImageSize forToolboxCode:code];
}
-+ (NSImage *)folderImage {
++ (NSImage *)tinyImageWithIconForToolboxCode:(OSType) code {
+ return [self iconWithSize:tinyImageSize forToolboxCode:code];
+}
+
++ (NSImage *)smallFolderImage {
static NSImage *image = nil;
if(image == nil)
- image = [[self iconWithSize:NSMakeSize(32.0, 32.0)
forToolboxCode:kGenericFolderIcon] retain];
+ image = [[self smallImageWithIconForToolboxCode:kGenericFolderIcon]
retain];
return image;
}
-+ (NSImage *)smallFolderImage {
++ (NSImage *)tinyFolderImage {
static NSImage *image = nil;
if(image == nil)
- image = [[self iconWithSize:NSMakeSize(16.0, 16.0)
forToolboxCode:kGenericFolderIcon] retain];
+ image = [[self tinyImageWithIconForToolboxCode:kGenericFolderIcon]
retain];
return image;
}
-+ (NSImage *)missingFileImage {
++ (NSImage *)smallMissingFileImage {
static NSImage *image = nil;
if(image == nil){
- image = [[NSImage alloc] initWithSize:NSMakeSize(32.0, 32.0)];
- NSImage *genericDocImage = [self iconWithSize:NSMakeSize(32.0, 32.0)
forToolboxCode:kGenericDocumentIcon];
+ image = [[NSImage alloc] initWithSize:smallImageSize];
+ NSImage *genericDocImage = [self
smallImageWithIconForToolboxCode:kGenericDocumentIcon];
NSImage *questionMark = [self iconWithSize:NSMakeSize(20.0, 20.0)
forToolboxCode:kQuestionMarkIcon];
[image lockFocus];
[genericDocImage compositeToPoint:NSZeroPoint
operation:NSCompositeCopy fraction:0.7];
@@ -1839,11 +1846,11 @@
return image;
}
-+ (NSImage *)smallMissingFileImage {
++ (NSImage *)tinyMissingFileImage {
static NSImage *image = nil;
if(image == nil){
- image = [[NSImage alloc] initWithSize:NSMakeSize(16.0, 16.0)];
- NSImage *genericDocImage = [self iconWithSize:NSMakeSize(16.0, 16.0)
forToolboxCode:kGenericDocumentIcon];
+ image = [[NSImage alloc] initWithSize:tinyImageSize];
+ NSImage *genericDocImage = [self
tinyImageWithIconForToolboxCode:kGenericDocumentIcon];
NSImage *questionMark = [self iconWithSize:NSMakeSize(10.0, 10.0)
forToolboxCode:kQuestionMarkIcon];
[image lockFocus];
[genericDocImage compositeToPoint:NSZeroPoint
operation:NSCompositeCopy fraction:0.7];
Modified: trunk/SKBookmark.m
===================================================================
--- trunk/SKBookmark.m 2008-06-04 16:57:39 UTC (rev 3964)
+++ trunk/SKBookmark.m 2008-06-04 17:40:15 UTC (rev 3965)
@@ -268,19 +268,19 @@
}
- (NSImage *)icon {
- static NSMutableDictionary *smallIcons = nil;
+ static NSMutableDictionary *tinyIcons = nil;
NSString *filePath = [self path];
if (filePath == nil)
- return [NSImage smallMissingFileImage];
+ return [NSImage tinyMissingFileImage];
NSString *extension = [filePath pathExtension];
- NSImage *icon = [smallIcons objectForKey:extension];
+ NSImage *icon = [tinyIcons objectForKey:extension];
if (icon == nil) {
- if (smallIcons == nil)
- smallIcons = [[NSMutableDictionary alloc] init];
+ if (tinyIcons == nil)
+ tinyIcons = [[NSMutableDictionary alloc] init];
NSImage *image = [[NSWorkspace sharedWorkspace]
iconForFileType:extension];
if (image) {
NSRect sourceRect = {NSZeroPoint, [image size]};
@@ -290,7 +290,7 @@
[[NSGraphicsContext currentContext]
setImageInterpolation:NSImageInterpolationHigh];
[image drawInRect:targetRect fromRect:sourceRect
operation:NSCompositeCopy fraction:1.0];
[icon unlockFocus];
- [smallIcons setObject:icon forKey:extension];
+ [tinyIcons setObject:icon forKey:extension];
[icon release];
}
}
@@ -357,7 +357,7 @@
}
- (NSImage *)icon {
- return [NSImage smallFolderImage];
+ return [NSImage tinyFolderImage];
}
- (NSString *)label {
Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m 2008-06-04 16:57:39 UTC (rev 3964)
+++ trunk/SKBookmarkController.m 2008-06-04 17:40:15 UTC (rev 3965)
@@ -650,7 +650,7 @@
item = [[SKToolbarItem alloc]
initWithItemIdentifier:SKBookmarksDeleteToolbarItemIdentifier];
[item setLabels:NSLocalizedString(@"Delete", @"Toolbar item label")];
[item setToolTip:NSLocalizedString(@"Delete Selected Items", @"Tool tip
message")];
- [item setImage:[NSImage imageWithIconForToolboxCode:kToolbarDeleteIcon]];
+ [item setImage:[NSImage
smallImageWithIconForToolboxCode:kToolbarDeleteIcon]];
[item setTarget:self];
[item setAction:@selector(deleteBookmark:)];
[toolbarItems setObject:item
forKey:SKBookmarksDeleteToolbarItemIdentifier];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
