Revision: 5903
http://skim-app.svn.sourceforge.net/skim-app/?rev=5903&view=rev
Author: hofman
Date: 2009-10-17 17:12:45 +0000 (Sat, 17 Oct 2009)
Log Message:
-----------
make download button icons in controller class
Modified Paths:
--------------
trunk/Dutch.lproj/DownloadsWindow.xib
trunk/English.lproj/DownloadsWindow.xib
trunk/French.lproj/DownloadsWindow.xib
trunk/German.lproj/DownloadsWindow.xib
trunk/Italian.lproj/DownloadsWindow.xib
trunk/NSImage_SKExtensions.h
trunk/NSImage_SKExtensions.m
trunk/SKDownloadController.h
trunk/SKDownloadController.m
trunk/Spanish.lproj/DownloadsWindow.xib
trunk/ru.lproj/DownloadsWindow.xib
trunk/zh_TW.lproj/DownloadsWindow.xib
Modified: trunk/Dutch.lproj/DownloadsWindow.xib
===================================================================
--- trunk/Dutch.lproj/DownloadsWindow.xib 2009-10-17 16:59:10 UTC (rev
5902)
+++ trunk/Dutch.lproj/DownloadsWindow.xib 2009-10-17 17:12:45 UTC (rev
5903)
@@ -190,28 +190,6 @@
<reference key="NSControlView" ref="889590966"/>
<int key="NSButtonFlags">141836543</int>
<int key="NSButtonFlags2">6</int>
-
<object class="NSImage" key="NSNormalImage">
-
<int key="NSImageFlags">549650432</int>
-
<string key="NSSize">{1, 1}</string>
-
<object class="NSMutableArray"
key="NSReps">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<object class="NSArray">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<integer value="0"/>
-
<object
class="NSBitmapImageRep">
-
<object
class="NSData" key="NSTIFFRepresentation">
-
<bytes
key="NS.bytes">TU0AKgAAAAoAAAANAQAAAwAAAAEAAQAAAQEAAwAAAAEAAQAAAQIAAwAAAAIACAAIAQMAAwAAAAEAAQAA
-AQYAAwAAAAEAAQAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAAQAA
-ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
-
</object>
-
</object>
-
</object>
-
</object>
-
<object class="NSColor" key="NSColor"
id="783009583">
-
<int key="NSColorSpace">3</int>
-
<bytes
key="NSWhite">MCAwAA</bytes>
-
</object>
-
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
@@ -244,25 +222,6 @@
<reference key="NSControlView" ref="889590966"/>
<int key="NSButtonFlags">141836543</int>
<int key="NSButtonFlags2">6</int>
-
<object class="NSImage" key="NSNormalImage">
-
<int key="NSImageFlags">549650432</int>
-
<string key="NSSize">{1, 1}</string>
-
<object class="NSMutableArray"
key="NSReps">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<object class="NSArray">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<integer value="0"/>
-
<object
class="NSBitmapImageRep">
-
<object
class="NSData" key="NSTIFFRepresentation">
-
<bytes
key="NS.bytes">TU0AKgAAAAoAAAANAQAAAwAAAAEAAQAAAQEAAwAAAAEAAQAAAQIAAwAAAAIACAAIAQMAAwAAAAEAAQAA
-AQYAAwAAAAEAAQAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAAQAA
-ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
-
</object>
-
</object>
-
</object>
-
</object>
-
<reference key="NSColor"
ref="783009583"/>
-
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
Modified: trunk/English.lproj/DownloadsWindow.xib
===================================================================
--- trunk/English.lproj/DownloadsWindow.xib 2009-10-17 16:59:10 UTC (rev
5902)
+++ trunk/English.lproj/DownloadsWindow.xib 2009-10-17 17:12:45 UTC (rev
5903)
@@ -12,7 +12,6 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="10"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -70,6 +69,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{360, 283}</string>
<reference key="NSSuperview" ref="725253566"/>
+
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
<nil key="NSNextResponder"/>
@@ -186,28 +186,6 @@
<reference key="NSControlView" ref="540499767"/>
<int key="NSButtonFlags">141836543</int>
<int key="NSButtonFlags2">6</int>
-
<object class="NSImage" key="NSNormalImage">
-
<int key="NSImageFlags">549650432</int>
-
<string key="NSSize">{1, 1}</string>
-
<object class="NSMutableArray"
key="NSReps">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<object class="NSArray">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<integer value="0"/>
-
<object
class="NSBitmapImageRep">
-
<object
class="NSData" key="NSTIFFRepresentation">
-
<bytes
key="NS.bytes">TU0AKgAAAAoAAAANAQAAAwAAAAEAAQAAAQEAAwAAAAEAAQAAAQIAAwAAAAIACAAIAQMAAwAAAAEAAQAA
-AQYAAwAAAAEAAQAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAAQAA
-ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
-
</object>
-
</object>
-
</object>
-
</object>
-
<object class="NSColor" key="NSColor"
id="621497696">
-
<int key="NSColorSpace">3</int>
-
<bytes
key="NSWhite">MCAwAA</bytes>
-
</object>
-
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
@@ -239,25 +217,6 @@
<reference key="NSControlView" ref="540499767"/>
<int key="NSButtonFlags">141836543</int>
<int key="NSButtonFlags2">6</int>
-
<object class="NSImage" key="NSNormalImage">
-
<int key="NSImageFlags">549650432</int>
-
<string key="NSSize">{1, 1}</string>
-
<object class="NSMutableArray"
key="NSReps">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<object class="NSArray">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<integer value="0"/>
-
<object
class="NSBitmapImageRep">
-
<object
class="NSData" key="NSTIFFRepresentation">
-
<bytes
key="NS.bytes">TU0AKgAAAAoAAAANAQAAAwAAAAEAAQAAAQEAAwAAAAEAAQAAAQIAAwAAAAIACAAIAQMAAwAAAAEAAQAA
-AQYAAwAAAAEAAQAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAAQAA
-ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
-
</object>
-
</object>
-
</object>
-
</object>
-
<reference key="NSColor"
ref="621497696"/>
-
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
@@ -294,6 +253,7 @@
</object>
<string
key="NSFrame">{{1, 1}, {360, 283}}</string>
<reference key="NSSuperview" ref="929537651"/>
+
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="540499767"/>
<reference key="NSDocView" ref="540499767"/>
<object
class="NSColor" key="NSBGColor">
@@ -312,6 +272,7 @@
<int
key="NSvFlags">-2147483392</int>
<string
key="NSFrame">{{346, 1}, {15, 272}}</string>
<reference key="NSSuperview" ref="929537651"/>
+
<reference key="NSWindow"/>
<reference key="NSTarget" ref="929537651"/>
<string
key="NSAction">_doScroller:</string>
<double
key="NSPercent">0.80000000000000004</double>
@@ -321,6 +282,7 @@
<int
key="NSvFlags">-2147483392</int>
<string
key="NSFrame">{{-100, -100}, {480, 15}}</string>
<reference key="NSSuperview" ref="929537651"/>
+
<reference key="NSWindow"/>
<int
key="NSsFlags">1</int>
<reference key="NSTarget" ref="929537651"/>
<string
key="NSAction">_doScroller:</string>
@@ -329,6 +291,7 @@
</object>
<string
key="NSFrame">{{-1, 32}, {362, 285}}</string>
<reference
key="NSSuperview" ref="560536664"/>
+ <reference
key="NSWindow"/>
<reference
key="NSNextKeyView" ref="725253566"/>
<int
key="NSsFlags">530</int>
<reference
key="NSVScroller" ref="769180550"/>
@@ -346,6 +309,7 @@
<int
key="NSvFlags">289</int>
<string
key="NSFrame">{{291, 5}, {49, 25}}</string>
<reference key="NSSuperview" ref="1009127222"/>
+
<reference key="NSWindow"/>
<bool
key="NSEnabled">YES</bool>
<object
class="NSButtonCell" key="NSCell" id="953259606">
<int key="NSCellFlags">67239424</int>
@@ -373,6 +337,7 @@
<int
key="NSvFlags">292</int>
<string
key="NSFrame">{{8, 10}, {16, 16}}</string>
<reference key="NSSuperview" ref="1009127222"/>
+
<reference key="NSWindow"/>
<bool
key="NSEnabled">YES</bool>
<object
class="NSButtonCell" key="NSCell" id="196332728">
<int key="NSCellFlags">67239424</int>
@@ -397,12 +362,14 @@
</object>
<string
key="NSFrameSize">{360, 32}</string>
<reference
key="NSSuperview" ref="560536664"/>
+ <reference
key="NSWindow"/>
<string
key="NSClassName">BDSKGradientView</string>
<string
key="NSExtension">NSView</string>
</object>
</object>
<string key="NSFrameSize">{360,
316}</string>
<reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440,
878}}</string>
<string key="NSMinSize">{213, 129}</string>
Modified: trunk/French.lproj/DownloadsWindow.xib
===================================================================
--- trunk/French.lproj/DownloadsWindow.xib 2009-10-17 16:59:10 UTC (rev
5902)
+++ trunk/French.lproj/DownloadsWindow.xib 2009-10-17 17:12:45 UTC (rev
5903)
@@ -186,28 +186,6 @@
<reference key="NSControlView" ref="882221996"/>
<int key="NSButtonFlags">141836543</int>
<int key="NSButtonFlags2">6</int>
-
<object class="NSImage" key="NSNormalImage">
-
<int key="NSImageFlags">549650432</int>
-
<string key="NSSize">{1, 1}</string>
-
<object class="NSMutableArray"
key="NSReps">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<object class="NSArray">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<integer value="0"/>
-
<object
class="NSBitmapImageRep">
-
<object
class="NSData" key="NSTIFFRepresentation">
-
<bytes
key="NS.bytes">TU0AKgAAAAoAAAANAQAAAwAAAAEAAQAAAQEAAwAAAAEAAQAAAQIAAwAAAAIACAAIAQMAAwAAAAEAAQAA
-AQYAAwAAAAEAAQAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAAQAA
-ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
-
</object>
-
</object>
-
</object>
-
</object>
-
<object class="NSColor" key="NSColor"
id="407336883">
-
<int key="NSColorSpace">3</int>
-
<bytes
key="NSWhite">MCAwAA</bytes>
-
</object>
-
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
@@ -239,25 +217,6 @@
<reference key="NSControlView" ref="882221996"/>
<int key="NSButtonFlags">141836543</int>
<int key="NSButtonFlags2">6</int>
-
<object class="NSImage" key="NSNormalImage">
-
<int key="NSImageFlags">549650432</int>
-
<string key="NSSize">{1, 1}</string>
-
<object class="NSMutableArray"
key="NSReps">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<object class="NSArray">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<integer value="0"/>
-
<object
class="NSBitmapImageRep">
-
<object
class="NSData" key="NSTIFFRepresentation">
-
<bytes
key="NS.bytes">TU0AKgAAAAoAAAANAQAAAwAAAAEAAQAAAQEAAwAAAAEAAQAAAQIAAwAAAAIACAAIAQMAAwAAAAEAAQAA
-AQYAAwAAAAEAAQAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAAQAA
-ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
-
</object>
-
</object>
-
</object>
-
</object>
-
<reference key="NSColor"
ref="407336883"/>
-
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
Modified: trunk/German.lproj/DownloadsWindow.xib
===================================================================
--- trunk/German.lproj/DownloadsWindow.xib 2009-10-17 16:59:10 UTC (rev
5902)
+++ trunk/German.lproj/DownloadsWindow.xib 2009-10-17 17:12:45 UTC (rev
5903)
@@ -187,28 +187,6 @@
<reference key="NSControlView"
ref="1004335941"/>
<int key="NSButtonFlags">141836543</int>
<int key="NSButtonFlags2">6</int>
-
<object class="NSImage" key="NSNormalImage">
-
<int key="NSImageFlags">549650432</int>
-
<string key="NSSize">{1, 1}</string>
-
<object class="NSMutableArray"
key="NSReps">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<object class="NSArray">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<integer value="0"/>
-
<object
class="NSBitmapImageRep">
-
<object
class="NSData" key="NSTIFFRepresentation">
-
<bytes
key="NS.bytes">TU0AKgAAAAoAAAANAQAAAwAAAAEAAQAAAQEAAwAAAAEAAQAAAQIAAwAAAAIACAAIAQMAAwAAAAEAAQAA
-AQYAAwAAAAEAAQAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAAQAA
-ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
-
</object>
-
</object>
-
</object>
-
</object>
-
<object class="NSColor" key="NSColor"
id="592507746">
-
<int key="NSColorSpace">3</int>
-
<bytes
key="NSWhite">MCAwAA</bytes>
-
</object>
-
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
@@ -240,25 +218,6 @@
<reference key="NSControlView"
ref="1004335941"/>
<int key="NSButtonFlags">141836543</int>
<int key="NSButtonFlags2">6</int>
-
<object class="NSImage" key="NSNormalImage">
-
<int key="NSImageFlags">549650432</int>
-
<string key="NSSize">{1, 1}</string>
-
<object class="NSMutableArray"
key="NSReps">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<object class="NSArray">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<integer value="0"/>
-
<object
class="NSBitmapImageRep">
-
<object
class="NSData" key="NSTIFFRepresentation">
-
<bytes
key="NS.bytes">TU0AKgAAAAoAAAANAQAAAwAAAAEAAQAAAQEAAwAAAAEAAQAAAQIAAwAAAAIACAAIAQMAAwAAAAEAAQAA
-AQYAAwAAAAEAAQAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAAQAA
-ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
-
</object>
-
</object>
-
</object>
-
</object>
-
<reference key="NSColor"
ref="592507746"/>
-
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
Modified: trunk/Italian.lproj/DownloadsWindow.xib
===================================================================
--- trunk/Italian.lproj/DownloadsWindow.xib 2009-10-17 16:59:10 UTC (rev
5902)
+++ trunk/Italian.lproj/DownloadsWindow.xib 2009-10-17 17:12:45 UTC (rev
5903)
@@ -187,28 +187,6 @@
<reference key="NSControlView" ref="335911258"/>
<int key="NSButtonFlags">141836543</int>
<int key="NSButtonFlags2">6</int>
-
<object class="NSImage" key="NSNormalImage">
-
<int key="NSImageFlags">549650432</int>
-
<string key="NSSize">{1, 1}</string>
-
<object class="NSMutableArray"
key="NSReps">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<object class="NSArray">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<integer value="0"/>
-
<object
class="NSBitmapImageRep">
-
<object
class="NSData" key="NSTIFFRepresentation">
-
<bytes
key="NS.bytes">TU0AKgAAAAoAAAANAQAAAwAAAAEAAQAAAQEAAwAAAAEAAQAAAQIAAwAAAAIACAAIAQMAAwAAAAEAAQAA
-AQYAAwAAAAEAAQAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAAQAA
-ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
-
</object>
-
</object>
-
</object>
-
</object>
-
<object class="NSColor" key="NSColor"
id="749359107">
-
<int key="NSColorSpace">3</int>
-
<bytes
key="NSWhite">MCAwAA</bytes>
-
</object>
-
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
@@ -240,25 +218,6 @@
<reference key="NSControlView" ref="335911258"/>
<int key="NSButtonFlags">141836543</int>
<int key="NSButtonFlags2">6</int>
-
<object class="NSImage" key="NSNormalImage">
-
<int key="NSImageFlags">549650432</int>
-
<string key="NSSize">{1, 1}</string>
-
<object class="NSMutableArray"
key="NSReps">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<object class="NSArray">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<integer value="0"/>
-
<object
class="NSBitmapImageRep">
-
<object
class="NSData" key="NSTIFFRepresentation">
-
<bytes
key="NS.bytes">TU0AKgAAAAoAAAANAQAAAwAAAAEAAQAAAQEAAwAAAAEAAQAAAQIAAwAAAAIACAAIAQMAAwAAAAEAAQAA
-AQYAAwAAAAEAAQAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAAQAA
-ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
-
</object>
-
</object>
-
</object>
-
</object>
-
<reference key="NSColor"
ref="749359107"/>
-
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
Modified: trunk/NSImage_SKExtensions.h
===================================================================
--- trunk/NSImage_SKExtensions.h 2009-10-17 16:59:10 UTC (rev 5902)
+++ trunk/NSImage_SKExtensions.h 2009-10-17 17:12:45 UTC (rev 5903)
@@ -120,10 +120,6 @@
extern NSString *SKImageNameZoomOutCursor;
extern NSString *SKImageNameCameraCursor;
-extern NSString *SKImageNameCancel;
-extern NSString *SKImageNameDelete;
-extern NSString *SKImageNameResume;
-
@interface NSImage (SKExtensions)
+ (void)makeImages;
Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m 2009-10-17 16:59:10 UTC (rev 5902)
+++ trunk/NSImage_SKExtensions.m 2009-10-17 17:12:45 UTC (rev 5903)
@@ -123,10 +123,6 @@
NSString *SKImageNameZoomOutCursor = @"ZoomOutCursor";
NSString *SKImageNameCameraCursor = @"CameraCursor";
-NSString *SKImageNameCancel = @"Cancel";
-NSString *SKImageNameDelete = @"Delete";
-NSString *SKImageNameResume = @"Resume";
-
- (NSImage *)copyWithMenuBadge {
NSBezierPath *arrowPath = [NSBezierPath bezierPath];
[arrowPath moveToPoint:NSMakePoint(23.5, 7.0)];
@@ -1896,59 +1892,10 @@
[cameraCursorImage setName:SKImageNameCameraCursor];
}
-+ (void)makeDownloadImages {
- static NSImage *cancelImage = nil;
- static NSImage *deleteImage = nil;
- static NSImage *resumeImage = nil;
-
- if (cancelImage)
- return;
-
- NSRect rect = NSMakeRect(0.0, 0.0, 16.0, 16.0);
- NSSize size = rect.size;
-
- cancelImage = [[NSImage alloc] initWithSize:size];
- [cancelImage lockFocus];
- [[[NSWorkspace sharedWorkspace]
iconForFileType:NSFileTypeForHFSTypeCode(kToolbarDeleteIcon)]
drawInRect:NSMakeRect(-2.0, -1.0, 20.0, 20.0) fromRect:NSZeroRect
operation:NSCompositeSourceOver fraction:1.0];
- [cancelImage unlockFocus];
- [cancelImage setName:SKImageNameCancel];
-
- NSImage *tmpImage = [[NSImage alloc] initWithSize:size];
- [tmpImage lockFocus];
- [[NSImage imageNamed:NSImageNameStopProgressFreestandingTemplate]
drawInRect:NSMakeRect(1.0, 1.0, 14.0, 14.0) fromRect:NSZeroRect
operation:NSCompositeSourceOver fraction:1.0];
- [[NSColor lightGrayColor] setFill];
- NSRectFillUsingOperation(rect, NSCompositeSourceAtop);
- [tmpImage unlockFocus];
- deleteImage = [[NSImage alloc] initWithSize:size];
- [deleteImage lockFocus];
- [[NSColor whiteColor] setFill];
- [[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(2.0, 2.0, 12.0, 12.0)]
fill];
- [tmpImage drawInRect:rect fromRect:NSZeroRect
operation:NSCompositeSourceOver fraction:1.0];
- [tmpImage release];
- [deleteImage unlockFocus];
- [deleteImage setName:SKImageNameDelete];
-
- tmpImage = [[NSImage alloc] initWithSize:size];
- [tmpImage lockFocus];
- [[NSImage imageNamed:NSImageNameRefreshFreestandingTemplate]
drawInRect:NSMakeRect(1.0, 1.0, 14.0, 14.0) fromRect:NSZeroRect
operation:NSCompositeSourceOver fraction:1.0];
- [[NSColor orangeColor] setFill];
- NSRectFillUsingOperation(rect, NSCompositeSourceAtop);
- [tmpImage unlockFocus];
- resumeImage = [[NSImage alloc] initWithSize:size];
- [resumeImage lockFocus];
- [[NSColor whiteColor] setFill];
- [[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(2.0, 2.0, 12.0, 12.0)]
fill];
- [tmpImage drawInRect:rect fromRect:NSZeroRect
operation:NSCompositeSourceOver fraction:1.0];
- [tmpImage release];
- [resumeImage unlockFocus];
- [resumeImage setName:SKImageNameResume];
-}
-
+ (void)makeImages {
[self makeAdornImages];
[self makeToolbarImages];
[self makeCursorImages];
- [self makeDownloadImages];
}
@end
Modified: trunk/SKDownloadController.h
===================================================================
--- trunk/SKDownloadController.h 2009-10-17 16:59:10 UTC (rev 5902)
+++ trunk/SKDownloadController.h 2009-10-17 17:12:45 UTC (rev 5903)
@@ -53,6 +53,10 @@
+ (id)sharedDownloadController;
++ (NSImage *)cancelImage;
++ (NSImage *)deleteImage;
++ (NSImage *)resumeImage;
+
- (SKDownload *)addDownloadForURL:(NSURL *)aURL;
- (IBAction)clearDownloads:(id)sender;
Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m 2009-10-17 16:59:10 UTC (rev 5902)
+++ trunk/SKDownloadController.m 2009-10-17 17:12:45 UTC (rev 5903)
@@ -107,6 +107,59 @@
return download;
}
+#pragma mark Images
+
++ (NSImage *)cancelImage {
+ static NSImage *cancelImage = nil;
+ if (cancelImage == nil) {
+ cancelImage = [[NSImage alloc] initWithSize:NSMakeSize(16.0, 16.0)];
+ [cancelImage lockFocus];
+ [[[NSWorkspace sharedWorkspace]
iconForFileType:NSFileTypeForHFSTypeCode(kToolbarDeleteIcon)]
drawInRect:NSMakeRect(-2.0, -1.0, 20.0, 20.0) fromRect:NSZeroRect
operation:NSCompositeSourceOver fraction:1.0];
+ [cancelImage unlockFocus];
+ }
+ return cancelImage;
+}
+
++ (NSImage *)deleteImage {
+ static NSImage *deleteImage = nil;
+ if (deleteImage == nil) {
+ NSImage *tmpImage = [[NSImage alloc] initWithSize:NSMakeSize(16.0,
16.0)];
+ [tmpImage lockFocus];
+ [[NSImage imageNamed:NSImageNameStopProgressFreestandingTemplate]
drawInRect:NSMakeRect(1.0, 1.0, 14.0, 14.0) fromRect:NSZeroRect
operation:NSCompositeSourceOver fraction:1.0];
+ [[NSColor lightGrayColor] setFill];
+ NSRectFillUsingOperation(NSMakeRect(0.0, 0.0, 16.0, 16.0),
NSCompositeSourceAtop);
+ [tmpImage unlockFocus];
+ deleteImage = [[NSImage alloc] initWithSize:NSMakeSize(16.0, 16.0)];
+ [deleteImage lockFocus];
+ [[NSColor whiteColor] setFill];
+ [[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(2.0, 2.0, 12.0,
12.0)] fill];
+ [tmpImage drawInRect:NSMakeRect(0.0, 0.0, 16.0, 16.0)
fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0];
+ [tmpImage release];
+ [deleteImage unlockFocus];
+ }
+ return deleteImage;
+}
+
++ (NSImage *)resumeImage {
+ static NSImage *resumeImage = nil;
+ if (resumeImage == nil) {
+ NSImage *tmpImage = [[NSImage alloc] initWithSize:NSMakeSize(16.0,
16.0)];
+ [tmpImage lockFocus];
+ [[NSImage imageNamed:NSImageNameRefreshFreestandingTemplate]
drawInRect:NSMakeRect(1.0, 1.0, 14.0, 14.0) fromRect:NSZeroRect
operation:NSCompositeSourceOver fraction:1.0];
+ [[NSColor orangeColor] setFill];
+ NSRectFillUsingOperation(NSMakeRect(0.0, 0.0, 16.0, 16.0),
NSCompositeSourceAtop);
+ [tmpImage unlockFocus];
+ resumeImage = [[NSImage alloc] initWithSize:NSMakeSize(16.0, 16.0)];
+ [resumeImage lockFocus];
+ [[NSColor whiteColor] setFill];
+ [[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(2.0, 2.0, 12.0,
12.0)] fill];
+ [tmpImage drawInRect:NSMakeRect(0.0, 0.0, 16.0, 16.0)
fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0];
+ [tmpImage release];
+ [resumeImage unlockFocus];
+ }
+ return resumeImage;
+}
+
#pragma mark Accessors
- (NSArray *)downloads {
@@ -294,11 +347,11 @@
if ([identifier isEqualToString:CANCEL_COLUMNID]) {
if ([download canCancel]) {
- [cell setImage:[NSImage imageNamed:@"Cancel"]];
+ [cell setImage:[[self class] cancelImage]];
[cell setAction:@selector(cancelDownload:)];
[cell setTarget:self];
} else if ([download canRemove]) {
- [cell setImage:[NSImage imageNamed:@"Delete"]];
+ [cell setImage:[[self class] deleteImage]];
[cell setAction:@selector(removeDownload:)];
[cell setTarget:self];
} else {
@@ -308,7 +361,7 @@
}
} else if ([identifier isEqualToString:RESUME_COLUMNID]) {
if ([download canResume]) {
- [cell setImage:[NSImage imageNamed:@"Resume"]];
+ [cell setImage:[[self class] resumeImage]];
[cell setAction:@selector(resumeDownload:)];
[cell setTarget:self];
} else {
Modified: trunk/Spanish.lproj/DownloadsWindow.xib
===================================================================
--- trunk/Spanish.lproj/DownloadsWindow.xib 2009-10-17 16:59:10 UTC (rev
5902)
+++ trunk/Spanish.lproj/DownloadsWindow.xib 2009-10-17 17:12:45 UTC (rev
5903)
@@ -187,28 +187,6 @@
<reference key="NSControlView" ref="420826291"/>
<int key="NSButtonFlags">141836543</int>
<int key="NSButtonFlags2">6</int>
-
<object class="NSImage" key="NSNormalImage">
-
<int key="NSImageFlags">549650432</int>
-
<string key="NSSize">{1, 1}</string>
-
<object class="NSMutableArray"
key="NSReps">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<object class="NSArray">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<integer value="0"/>
-
<object
class="NSBitmapImageRep">
-
<object
class="NSData" key="NSTIFFRepresentation">
-
<bytes
key="NS.bytes">TU0AKgAAAAoAAAANAQAAAwAAAAEAAQAAAQEAAwAAAAEAAQAAAQIAAwAAAAIACAAIAQMAAwAAAAEAAQAA
-AQYAAwAAAAEAAQAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAAQAA
-ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
-
</object>
-
</object>
-
</object>
-
</object>
-
<object class="NSColor" key="NSColor"
id="342096985">
-
<int key="NSColorSpace">3</int>
-
<bytes
key="NSWhite">MCAwAA</bytes>
-
</object>
-
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
@@ -240,25 +218,6 @@
<reference key="NSControlView" ref="420826291"/>
<int key="NSButtonFlags">141836543</int>
<int key="NSButtonFlags2">6</int>
-
<object class="NSImage" key="NSNormalImage">
-
<int key="NSImageFlags">549650432</int>
-
<string key="NSSize">{1, 1}</string>
-
<object class="NSMutableArray"
key="NSReps">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<object class="NSArray">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<integer value="0"/>
-
<object
class="NSBitmapImageRep">
-
<object
class="NSData" key="NSTIFFRepresentation">
-
<bytes
key="NS.bytes">TU0AKgAAAAoAAAANAQAAAwAAAAEAAQAAAQEAAwAAAAEAAQAAAQIAAwAAAAIACAAIAQMAAwAAAAEAAQAA
-AQYAAwAAAAEAAQAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAAQAA
-ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
-
</object>
-
</object>
-
</object>
-
</object>
-
<reference key="NSColor"
ref="342096985"/>
-
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
Modified: trunk/ru.lproj/DownloadsWindow.xib
===================================================================
--- trunk/ru.lproj/DownloadsWindow.xib 2009-10-17 16:59:10 UTC (rev 5902)
+++ trunk/ru.lproj/DownloadsWindow.xib 2009-10-17 17:12:45 UTC (rev 5903)
@@ -187,28 +187,6 @@
<reference key="NSControlView" ref="201762635"/>
<int key="NSButtonFlags">141836543</int>
<int key="NSButtonFlags2">6</int>
-
<object class="NSImage" key="NSNormalImage">
-
<int key="NSImageFlags">549650432</int>
-
<string key="NSSize">{1, 1}</string>
-
<object class="NSMutableArray"
key="NSReps">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<object class="NSArray">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<integer value="0"/>
-
<object
class="NSBitmapImageRep">
-
<object
class="NSData" key="NSTIFFRepresentation">
-
<bytes
key="NS.bytes">TU0AKgAAAAoAAAANAQAAAwAAAAEAAQAAAQEAAwAAAAEAAQAAAQIAAwAAAAIACAAIAQMAAwAAAAEAAQAA
-AQYAAwAAAAEAAQAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAAQAA
-ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
-
</object>
-
</object>
-
</object>
-
</object>
-
<object class="NSColor" key="NSColor"
id="756314607">
-
<int key="NSColorSpace">3</int>
-
<bytes
key="NSWhite">MCAwAA</bytes>
-
</object>
-
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
@@ -240,25 +218,6 @@
<reference key="NSControlView" ref="201762635"/>
<int key="NSButtonFlags">141836543</int>
<int key="NSButtonFlags2">6</int>
-
<object class="NSImage" key="NSNormalImage">
-
<int key="NSImageFlags">549650432</int>
-
<string key="NSSize">{1, 1}</string>
-
<object class="NSMutableArray"
key="NSReps">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<object class="NSArray">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<integer value="0"/>
-
<object
class="NSBitmapImageRep">
-
<object
class="NSData" key="NSTIFFRepresentation">
-
<bytes
key="NS.bytes">TU0AKgAAAAoAAAANAQAAAwAAAAEAAQAAAQEAAwAAAAEAAQAAAQIAAwAAAAIACAAIAQMAAwAAAAEAAQAA
-AQYAAwAAAAEAAQAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAAQAA
-ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
-
</object>
-
</object>
-
</object>
-
</object>
-
<reference key="NSColor"
ref="756314607"/>
-
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
Modified: trunk/zh_TW.lproj/DownloadsWindow.xib
===================================================================
--- trunk/zh_TW.lproj/DownloadsWindow.xib 2009-10-17 16:59:10 UTC (rev
5902)
+++ trunk/zh_TW.lproj/DownloadsWindow.xib 2009-10-17 17:12:45 UTC (rev
5903)
@@ -186,28 +186,6 @@
<reference key="NSControlView" ref="254998169"/>
<int key="NSButtonFlags">141836543</int>
<int key="NSButtonFlags2">6</int>
-
<object class="NSImage" key="NSNormalImage">
-
<int key="NSImageFlags">549650432</int>
-
<string key="NSSize">{1, 1}</string>
-
<object class="NSMutableArray"
key="NSReps">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<object class="NSArray">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<integer value="0"/>
-
<object
class="NSBitmapImageRep">
-
<object
class="NSData" key="NSTIFFRepresentation">
-
<bytes
key="NS.bytes">TU0AKgAAAAoAAAANAQAAAwAAAAEAAQAAAQEAAwAAAAEAAQAAAQIAAwAAAAIACAAIAQMAAwAAAAEAAQAA
-AQYAAwAAAAEAAQAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAAQAA
-ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
-
</object>
-
</object>
-
</object>
-
</object>
-
<object class="NSColor" key="NSColor"
id="165625503">
-
<int key="NSColorSpace">3</int>
-
<bytes
key="NSWhite">MCAwAA</bytes>
-
</object>
-
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
@@ -239,25 +217,6 @@
<reference key="NSControlView" ref="254998169"/>
<int key="NSButtonFlags">141836543</int>
<int key="NSButtonFlags2">6</int>
-
<object class="NSImage" key="NSNormalImage">
-
<int key="NSImageFlags">549650432</int>
-
<string key="NSSize">{1, 1}</string>
-
<object class="NSMutableArray"
key="NSReps">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<object class="NSArray">
-
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<integer value="0"/>
-
<object
class="NSBitmapImageRep">
-
<object
class="NSData" key="NSTIFFRepresentation">
-
<bytes
key="NS.bytes">TU0AKgAAAAoAAAANAQAAAwAAAAEAAQAAAQEAAwAAAAEAAQAAAQIAAwAAAAIACAAIAQMAAwAAAAEAAQAA
-AQYAAwAAAAEAAQAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAAQAA
-ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
-
</object>
-
</object>
-
</object>
-
</object>
-
<reference key="NSColor"
ref="165625503"/>
-
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
