Revision: 3487
http://skim-app.svn.sourceforge.net/skim-app/?rev=3487&view=rev
Author: hofman
Date: 2008-03-15 07:38:12 -0700 (Sat, 15 Mar 2008)
Log Message:
-----------
Draw folder icons using icon services for bookmark folders.
Modified Paths:
--------------
trunk/Images/ToolbarNewFolder.tiff
trunk/Images/ToolbarNewSeparator.tiff
trunk/NSImage_SKExtensions.m
trunk/Skim.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/Images/ToolbarAddBadge.tiff
Added: trunk/Images/ToolbarAddBadge.tiff
===================================================================
(Binary files differ)
Property changes on: trunk/Images/ToolbarAddBadge.tiff
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/Images/ToolbarNewFolder.tiff
===================================================================
(Binary files differ)
Modified: trunk/Images/ToolbarNewSeparator.tiff
===================================================================
(Binary files differ)
Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m 2008-03-15 12:46:28 UTC (rev 3486)
+++ trunk/NSImage_SKExtensions.m 2008-03-15 14:38:12 UTC (rev 3487)
@@ -101,6 +101,8 @@
//static NSImage *toolbarMoveToolImage = nil;
static NSImage *toolbarMagnifyToolImage = nil;
static NSImage *toolbarSelectToolImage = nil;
+ static NSImage *toolbarNewFolderImage = nil;
+ static NSImage *smallFolderImage = nil;
NSShadow *shadow1 = [[NSShadow alloc] init];
[shadow1 setShadowBlurRadius:2.0];
@@ -945,6 +947,44 @@
[toolbarSelectToolImage unlockFocus];
[toolbarSelectToolImage setName:@"ToolbarSelectTool"];
+ IconRef iconRef;
+ OSErr err = GetIconRef(kOnSystemDisk, kSystemIconsCreator,
kGenericFolderIcon, &iconRef);
+ CGRect rect;
+
+ if (err == noErr) {
+ toolbarNewFolderImage = [[NSImage alloc] initWithSize:NSMakeSize(32.0,
32.0)];
+ [toolbarNewFolderImage lockFocus];
+ rect = CGRectMake(0.0, 0.0, 32.0, 32.0);
+ PlotIconRefInContext((CGContextRef)[[NSGraphicsContext currentContext]
graphicsPort],
+ &rect,
+ kAlignAbsoluteCenter, //kAlignNone,
+ kTransformNone,
+ NULL /*inLabelColor*/,
+ kPlotIconRefNormalFlags,
+ iconRef);
+ [[NSImage imageNamed:@"ToolbarAddBadge"] drawInRect:NSMakeRect(18.0,
18.0, 14.0, 14.0)
+ fromRect:NSMakeRect(0.0,
0.0, 14.0, 14.0)
+
operation:NSCompositeSourceOver
+ fraction:1.0];
+ [toolbarNewFolderImage unlockFocus];
+ [toolbarNewFolderImage setName:@"ToolbarNewFolder"];
+
+ smallFolderImage = [[NSImage alloc] initWithSize:NSMakeSize(16.0,
16.0)];
+ [smallFolderImage lockFocus];
+ rect = CGRectMake(0.0, 0.0, 16.0, 16.0);
+ PlotIconRefInContext((CGContextRef)[[NSGraphicsContext currentContext]
graphicsPort],
+ &rect,
+ kAlignAbsoluteCenter, //kAlignNone,
+ kTransformNone,
+ NULL /*inLabelColor*/,
+ kPlotIconRefNormalFlags,
+ iconRef);
+ [smallFolderImage unlockFocus];
+ [smallFolderImage setName:@"SmallFolder"];
+
+ err = ReleaseIconRef(iconRef);
+ }
+
[shadow1 release];
[shadow2 release];
}
Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj 2008-03-15 12:46:28 UTC (rev
3486)
+++ trunk/Skim.xcodeproj/project.pbxproj 2008-03-15 14:38:12 UTC (rev
3487)
@@ -195,6 +195,7 @@
CEE229390BFB7CE9002B746B /* ReleaseNotes.rtf in Resources */ =
{isa = PBXBuildFile; fileRef = CE54AA8E0BBC037400008750 /* ReleaseNotes.rtf */;
};
CEE22EA30BFB8672002B746B /* displayline in CopyFiles */ = {isa
= PBXBuildFile; fileRef = CE1E2F120BDB86A10011D9DD /* displayline */; };
CEE22EA40BFB8684002B746B /* skimnotes in CopyFiles */ = {isa =
PBXBuildFile; fileRef = CEF3BF750B99CA2900E12E3D /* skimnotes */; };
+ CEF2EE950D8C111600C04F4C /* ToolbarAddBadge.tiff in Resources
*/ = {isa = PBXBuildFile; fileRef = CEF2EE940D8C111600C04F4C /*
ToolbarAddBadge.tiff */; };
CEF3BF7E0B99CA4A00E12E3D /* Foundation.framework in Frameworks
*/ = {isa = PBXBuildFile; fileRef = 2A37F4C5FDCFA73011CA2CEA /*
Foundation.framework */; };
CEF3BF860B99CAD300E12E3D /* skimnotes.m in Sources */ = {isa =
PBXBuildFile; fileRef = CEF3BF850B99CAD300E12E3D /* skimnotes.m */; };
CEF3C0210B99FF8F00E12E3D /* libbz2.dylib in Frameworks */ =
{isa = PBXBuildFile; fileRef = F977319E0B939B7D002A7823 /* libbz2.dylib */; };
@@ -798,6 +799,7 @@
CEE106590BCBBE1200BF2D3E /* English */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path =
English.lproj/NotesDocument.nib; sourceTree = "<group>"; };
CEE107380BCBCA3200BF2D3E /* Dutch */ = {isa = PBXFileReference;
lastKnownFileType = wrapper.nib; name = Dutch; path =
Dutch.lproj/NotesDocument.nib; sourceTree = "<group>"; };
CEE11EF50BCC262800BF2D3E /* Italian */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.nib; name = Italian; path =
Italian.lproj/NotesDocument.nib; sourceTree = "<group>"; };
+ CEF2EE940D8C111600C04F4C /* ToolbarAddBadge.tiff */ = {isa =
PBXFileReference; lastKnownFileType = image.tiff; name = ToolbarAddBadge.tiff;
path = Images/ToolbarAddBadge.tiff; sourceTree = "<group>"; };
CEF3BF750B99CA2900E12E3D /* skimnotes */ = {isa =
PBXFileReference; explicitFileType = "compiled.mach-o.executable";
includeInIndex = 0; path = skimnotes; sourceTree = BUILT_PRODUCTS_DIR; };
CEF3BF850B99CAD300E12E3D /* skimnotes.m */ = {isa =
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc;
path = skimnotes.m; sourceTree = "<group>"; };
CEF7071E0B8F8EFC003A2771 /* English */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path =
English.lproj/SnapshotWindow.nib; sourceTree = "<group>"; };
@@ -1286,6 +1288,7 @@
CEAFFD9C0C40F2A800C3ECBB /* ToolbarLines.tiff
*/,
CE6DC8890D68C657003A072F /*
ToolbarMoveTool.tiff */,
CE6A5BB10D663771003B7CC3 /* ToolbarPrint.tiff
*/,
+ CEF2EE940D8C111600C04F4C /*
ToolbarAddBadge.tiff */,
CEBD51D60C9BF68100FBF6A4 /*
ToolbarNewSeparator.tiff */,
CEBD51D50C9BF68100FBF6A4 /*
ToolbarNewFolder.tiff */,
CEF84C620C78A89900A3AD51 /*
SmallPreferences.tiff */,
@@ -1619,6 +1622,7 @@
CE6DC7770D687252003A072F /*
PrintAccessoryView.nib in Resources */,
CE6DC88A0D68C657003A072F /*
ToolbarMoveTool.tiff in Resources */,
CE6DC9940D699F21003A072F /* TransitionMask.jpg
in Resources */,
+ CEF2EE950D8C111600C04F4C /*
ToolbarAddBadge.tiff in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
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: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
