Revision: 7574
http://skim-app.svn.sourceforge.net/skim-app/?rev=7574&view=rev
Author: hofman
Date: 2011-12-15 23:23:17 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
draw expansion tool tip in download controller
Modified Paths:
--------------
trunk/DownloadsWindow.xib
trunk/SKProgressCell.m
Modified: trunk/DownloadsWindow.xib
===================================================================
--- trunk/DownloadsWindow.xib 2011-12-14 18:15:08 UTC (rev 7573)
+++ trunk/DownloadsWindow.xib 2011-12-15 23:23:17 UTC (rev 7574)
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10C540</string>
- <string key="IBDocument.InterfaceBuilderVersion">740</string>
- <string key="IBDocument.AppKitVersion">1038.25</string>
- <string key="IBDocument.HIToolboxVersion">458.00</string>
+ <string key="IBDocument.SystemVersion">10K549</string>
+ <string key="IBDocument.InterfaceBuilderVersion">851</string>
+ <string key="IBDocument.AppKitVersion">1038.36</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary"
key="IBDocument.PluginVersions">
<string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">740</string>
+ <string key="NS.object.0">851</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -18,13 +18,8 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <string
key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects"
id="222790738">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -50,7 +45,7 @@
<string
key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{213,
107}</string>
<object class="NSView" key="NSWindowView"
id="560536664">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray"
key="NSSubviews">
<bool
key="EncodedWithXMLCoder">YES</bool>
@@ -69,6 +64,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{360, 292}</string>
<reference key="NSSuperview" ref="725253566"/>
+
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
<nil key="NSNextResponder"/>
@@ -131,8 +127,8 @@
<reference key="NSTextColor" ref="691406105"/>
</object>
<object class="NSTextFieldCell" key="NSDataCell"
id="566708153">
-
<int key="NSCellFlags">337772032</int>
-
<int key="NSCellFlags2">0</int>
+
<int key="NSCellFlags">337772096</int>
+
<int key="NSCellFlags2">2048</int>
<object class="NSFont" key="NSSupport"
id="857731213">
<string
key="NSName">LucidaGrande</string>
<double key="NSSize">12</double>
@@ -252,6 +248,7 @@
</object>
<string
key="NSFrameSize">{360, 292}</string>
<reference key="NSSuperview" ref="929537651"/>
+
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="540499767"/>
<reference key="NSDocView" ref="540499767"/>
<object
class="NSColor" key="NSBGColor">
@@ -270,6 +267,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>
@@ -279,6 +277,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>
@@ -287,6 +286,7 @@
</object>
<string
key="NSFrame">{{0, 24}, {360, 292}}</string>
<reference
key="NSSuperview" ref="560536664"/>
+ <reference
key="NSWindow"/>
<reference
key="NSNextKeyView" ref="725253566"/>
<int
key="NSsFlags">528</int>
<reference
key="NSVScroller" ref="769180550"/>
@@ -299,6 +299,7 @@
<int
key="NSvFlags">289</int>
<string
key="NSFrame">{{324, 4}, {16, 16}}</string>
<reference
key="NSSuperview" ref="560536664"/>
+ <reference
key="NSWindow"/>
<bool
key="NSEnabled">YES</bool>
<object
class="NSButtonCell" key="NSCell" id="196332728">
<int
key="NSCellFlags">67239424</int>
@@ -329,6 +330,7 @@
<int
key="NSvFlags">292</int>
<string
key="NSFrame">{{8, 3}, {40, 18}}</string>
<reference
key="NSSuperview" ref="560536664"/>
+ <reference
key="NSWindow"/>
<bool
key="NSEnabled">YES</bool>
<object
class="NSButtonCell" key="NSCell" id="953259606">
<int
key="NSCellFlags">67239424</int>
@@ -353,6 +355,8 @@
</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>
@@ -593,7 +597,9 @@
<bool
key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord">
<int key="objectID">0</int>
- <reference key="object"
ref="0"/>
+ <object class="NSArray"
key="object" id="0">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ </object>
<reference key="children"
ref="222790738"/>
<nil key="parent"/>
</object>
@@ -916,6 +922,13 @@
<string
key="NS.key.0">:</string>
<string
key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary"
key="actionInfosByName">
+ <string
key="NS.key.0">:</string>
+ <object class="IBActionInfo"
key="NS.object.0">
+ <string
key="name">:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -925,11 +938,18 @@
<string
key="className">NSApplication</string>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">SKRichTextFormat.h</string>
+ <string
key="minorKey">NSAttributedString_SKExtensions.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string
key="className">NSApplication</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBProjectSource</string>
+ <string
key="minorKey">SKScriptMenu.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string
key="className">NSApplication</string>
<string
key="superclassName">NSResponder</string>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBUserSource</string>
@@ -978,13 +998,6 @@
<string
key="className">NSObject</string>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">SKFindController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string
key="className">NSObject</string>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBProjectSource</string>
<string
key="minorKey">SKLine.h</string>
</object>
</object>
@@ -994,6 +1007,13 @@
<string
key="NS.key.0">changeLineAttribute:</string>
<string
key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary"
key="actionInfosByName">
+ <string
key="NS.key.0">changeLineAttribute:</string>
+ <object class="IBActionInfo"
key="NS.object.0">
+ <string
key="name">changeLineAttribute:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
<string
key="minorKey">SKLineInspector.h</string>
@@ -1028,6 +1048,25 @@
<string>PDFView</string>
</object>
</object>
+ <object class="NSMutableDictionary"
key="actionInfosByName">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray"
key="dict.sortedKeys">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+
<string>PDFViewDidBeginEditing:</string>
+
<string>PDFViewDidEndEditing:</string>
+ </object>
+ <object class="NSMutableArray"
key="dict.values">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object
class="IBActionInfo">
+ <string
key="name">PDFViewDidBeginEditing:</string>
+ <string
key="candidateClassName">PDFView</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">PDFViewDidEndEditing:</string>
+ <string
key="candidateClassName">PDFView</string>
+ </object>
+ </object>
+ </object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
<string
key="minorKey">SKPDFView.h</string>
@@ -1044,20 +1083,6 @@
<string
key="className">NSObject</string>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">vendorsrc/martinkahr/RemoteControlWrapper/MultiClickRemoteBehavior.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string
key="className">NSObject</string>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">vendorsrc/martinkahr/RemoteControlWrapper/RemoteControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string
key="className">NSObject</string>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBProjectSource</string>
<string
key="minorKey">vendorsrc/ulikusterer/UKFileWatcher.h</string>
</object>
</object>
@@ -1089,6 +1114,40 @@
<string>id</string>
</object>
</object>
+ <object class="NSMutableDictionary"
key="actionInfosByName">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray"
key="dict.sortedKeys">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+
<string>changeDashPattern:</string>
+
<string>changeEndLineStyle:</string>
+
<string>changeLineStyle:</string>
+
<string>changeLineWidth:</string>
+
<string>changeStartLineStyle:</string>
+ </object>
+ <object class="NSMutableArray"
key="dict.values">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object
class="IBActionInfo">
+ <string
key="name">changeDashPattern:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">changeEndLineStyle:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">changeLineStyle:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">changeLineWidth:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">changeStartLineStyle:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -1149,8 +1208,26 @@
</object>
<object class="IBPartialClassDescription">
<string
key="className">NSWindow</string>
+ <object class="NSMutableDictionary"
key="actions">
+ <string
key="NS.key.0">toggleFullScreen:</string>
+ <string
key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary"
key="actionInfosByName">
+ <string
key="NS.key.0">toggleFullScreen:</string>
+ <object class="IBActionInfo"
key="NS.object.0">
+ <string
key="name">toggleFullScreen:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
+ <string
key="minorKey">SKCompatibility.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string
key="className">NSWindow</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBProjectSource</string>
<string
key="minorKey">SKMainDocument.h</string>
</object>
</object>
@@ -1168,6 +1245,13 @@
<string
key="NS.key.0">dismissSheet:</string>
<string
key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary"
key="actionInfosByName">
+ <string
key="NS.key.0">dismissSheet:</string>
+ <object class="IBActionInfo"
key="NS.object.0">
+ <string
key="name">dismissSheet:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
<string
key="minorKey">NSWindowController_SKExtensions.h</string>
@@ -1182,15 +1266,21 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">PDFView</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBProjectSource</string>
+ <string
key="minorKey">PDFView_SKExtensions.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string
key="className">SKDownloadController</string>
<string
key="superclassName">SKWindowController</string>
<object class="NSMutableDictionary"
key="actions">
<bool
key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray"
key="dict.sortedKeys">
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<string>cancelDownload:</string>
<string>clearDownloads:</string>
-
<string>removeDownload:</string>
+
<string>moveToTrash:</string>
<string>showDownloadPreferences:</string>
</object>
<object class="NSMutableArray"
key="dict.values">
@@ -1198,9 +1288,32 @@
<string>id</string>
<string>id</string>
<string>id</string>
- <string>id</string>
</object>
</object>
+ <object class="NSMutableDictionary"
key="actionInfosByName">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray"
key="dict.sortedKeys">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+
<string>clearDownloads:</string>
+
<string>moveToTrash:</string>
+
<string>showDownloadPreferences:</string>
+ </object>
+ <object class="NSMutableArray"
key="dict.values">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object
class="IBActionInfo">
+ <string
key="name">clearDownloads:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">moveToTrash:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">showDownloadPreferences:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
<object class="NSMutableDictionary"
key="outlets">
<bool
key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray"
key="dict.sortedKeys">
@@ -1218,6 +1331,35 @@
<string>SKTableView</string>
</object>
</object>
+ <object class="NSMutableDictionary"
key="toOneOutletInfosByName">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray"
key="dict.sortedKeys">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+
<string>arrayController</string>
+
<string>clearButton</string>
+
<string>prefButton</string>
+
<string>tableView</string>
+ </object>
+ <object class="NSMutableArray"
key="dict.values">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">arrayController</string>
+ <string
key="candidateClassName">NSArrayController</string>
+ </object>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">clearButton</string>
+ <string
key="candidateClassName">NSButton</string>
+ </object>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">prefButton</string>
+ <string
key="candidateClassName">NSButton</string>
+ </object>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">tableView</string>
+ <string
key="candidateClassName">SKTableView</string>
+ </object>
+ </object>
+ </object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
<string
key="minorKey">SKDownloadController.h</string>
@@ -1269,6 +1411,40 @@
<string>id</string>
</object>
</object>
+ <object class="NSMutableDictionary"
key="actionInfosByName">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray"
key="dict.sortedKeys">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <string>copy:</string>
+ <string>delete:</string>
+ <string>paste:</string>
+
<string>scrollToBeginningOfDocument:</string>
+
<string>scrollToEndOfDocument:</string>
+ </object>
+ <object class="NSMutableArray"
key="dict.values">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object
class="IBActionInfo">
+ <string
key="name">copy:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">delete:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">paste:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">scrollToBeginningOfDocument:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">scrollToEndOfDocument:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
<string
key="minorKey">SKTableView.h</string>
@@ -1852,6 +2028,13 @@
<string
key="NS.key.0">showWindow:</string>
<string
key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary"
key="actionInfosByName">
+ <string
key="NS.key.0">showWindow:</string>
+ <object class="IBActionInfo"
key="NS.object.0">
+ <string
key="name">showWindow:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBFrameworkSource</string>
<string
key="minorKey">AppKit.framework/Headers/NSWindowController.h</string>
@@ -1889,18 +2072,78 @@
<string>id</string>
</object>
</object>
+ <object class="NSMutableDictionary"
key="actionInfosByName">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray"
key="dict.sortedKeys">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <string>goBack:</string>
+
<string>goForward:</string>
+
<string>goToFirstPage:</string>
+
<string>goToLastPage:</string>
+
<string>goToNextPage:</string>
+
<string>goToPreviousPage:</string>
+
<string>selectAll:</string>
+
<string>takeBackgroundColorFrom:</string>
+ <string>zoomIn:</string>
+
<string>zoomOut:</string>
+ </object>
+ <object class="NSMutableArray"
key="dict.values">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object
class="IBActionInfo">
+ <string
key="name">goBack:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">goForward:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">goToFirstPage:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">goToLastPage:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">goToNextPage:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">goToPreviousPage:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">selectAll:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">takeBackgroundColorFrom:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">zoomIn:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">zoomOut:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
<reference key="sourceIdentifier"
ref="968691504"/>
</object>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
+ <string
key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary"
key="IBDocument.PluginDeclaredDependencies">
<string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1050" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary"
key="IBDocument.PluginDeclaredDependencyDefaults">
<string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
- <integer value="1050" key="NS.object.0"/>
+ <integer value="1060" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary"
key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
@@ -1909,5 +2152,9 @@
<bool
key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string
key="IBDocument.LastKnownRelativeProjectPath">Skim.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary"
key="IBDocument.LastKnownImageSizes">
+ <string key="NS.key.0">NSPreferencesGeneral</string>
+ <string key="NS.object.0">{32, 32}</string>
+ </object>
</data>
</archive>
Modified: trunk/SKProgressCell.m
===================================================================
--- trunk/SKProgressCell.m 2011-12-14 18:15:08 UTC (rev 7573)
+++ trunk/SKProgressCell.m 2011-12-15 23:23:17 UTC (rev 7574)
@@ -141,7 +141,7 @@
NSRectEdge topEdge = [controlView isFlipped] ? NSMinYEdge : NSMaxYEdge;
NSRect insetRect = SKShrinkRect(NSInsetRect(cellFrame, MARGIN_X, 0.0),
MARGIN_Y, bottomEdge);
- [super drawWithFrame:SKSliceRect(insetRect, [self cellSize].height,
topEdge) inView:controlView];
+ [super drawWithFrame:SKSliceRect(insetRect, [super cellSize].height,
topEdge) inView:controlView];
if (progressIndicator) {
[progressIndicator setFrame:SKSliceRect(insetRect,
NSHeight([progressIndicator frame]), bottomEdge)];
@@ -153,8 +153,26 @@
}
}
+- (void)drawWithExpansionFrame:(NSRect)cellFrame inView:(NSView *)controlView {
+ NSRectEdge bottomEdge = [controlView isFlipped] ? NSMaxYEdge : NSMinYEdge;
+ NSRectEdge topEdge = [controlView isFlipped] ? NSMinYEdge : NSMaxYEdge;
+ NSRect insetRect = SKShrinkRect(NSInsetRect(cellFrame, MARGIN_X, 0.0),
MARGIN_Y, bottomEdge);
+
+ [super drawWithFrame:SKSliceRect(insetRect, [super
cellSizeForBounds:cellFrame].height, topEdge) inView:controlView];
+
+ if (nil == objectValueForKey([self objectValue],
SKDownloadProgressIndicatorKey))
+ [statusCell drawWithFrame:SKSliceRect(insetRect, [statusCell
cellSize].height, bottomEdge) inView:controlView];
+}
+
- (NSRect)expansionFrameWithFrame:(NSRect)cellFrame inView:(NSView *)view {
- return NSZeroRect;
+ NSRect rect = [super expansionFrameWithFrame:cellFrame inView:view];
+ if (nil == objectValueForKey([self objectValue],
SKDownloadProgressIndicatorKey)) {
+ NSSize statusSize = [statusCell cellSize];
+ rect.size.width = fmax(NSWidth(rect), statusSize.width);
+ rect.size.height += statusSize.height + MARGIN_Y;
+ }
+ rect.size.width += MARGIN_X;
+ return rect;
}
#pragma mark Accessibility
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
10 Tips for Better Server Consolidation
Server virtualization is being driven by many needs.
But none more important than the need to reduce IT complexity
while improving strategic productivity. Learn More!
http://www.accelacomm.com/jaw/sdnl/114/51507609/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
