Revision: 7550
http://skim-app.svn.sourceforge.net/skim-app/?rev=7550&view=rev
Author: hofman
Date: 2011-12-04 00:44:19 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
set text+icon formatter in IB
Modified Paths:
--------------
trunk/BookmarksWindow.xib
trunk/SKTextWithIconCell.m
Modified: trunk/BookmarksWindow.xib
===================================================================
--- trunk/BookmarksWindow.xib 2011-12-04 00:42:07 UTC (rev 7549)
+++ trunk/BookmarksWindow.xib 2011-12-04 00:44:19 UTC (rev 7550)
@@ -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">10F569</string>
- <string key="IBDocument.InterfaceBuilderVersion">788</string>
- <string key="IBDocument.AppKitVersion">1038.29</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">788</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="891723927">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -240,7 +235,9 @@
<string
key="NSString">NaN</string>
<object class="NSDictionary"
key="NSAttributes">
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<reference
key="dict.sortedKeys" ref="0"/>
+
<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>
@@ -377,6 +374,9 @@
<string key="NSMinSize">{300, 122}</string>
<string key="NSMaxSize">{1.79769e+308,
1.79769e+308}</string>
</object>
+ <object class="NSCustomObject" id="1025403429">
+ <string
key="NSClassName">SKTextWithIconFormatter</string>
+ </object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
@@ -437,6 +437,14 @@
</object>
<int key="connectionID">90</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection"
key="connection">
+ <string
key="label">formatter</string>
+ <reference key="source"
ref="6516295"/>
+ <reference key="destination"
ref="1025403429"/>
+ </object>
+ <int key="connectionID">103</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -579,6 +587,11 @@
<reference key="object"
ref="579474317"/>
<reference key="parent"
ref="744363902"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">102</int>
+ <reference key="object"
ref="1025403429"/>
+ <reference key="parent"
ref="0"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary"
key="flattenedProperties">
@@ -592,6 +605,7 @@
<string>101.IBNumberFormatterBehaviorMetadataKey</string>
<string>101.IBNumberFormatterLocalizesFormatMetadataKey</string>
<string>101.IBPluginDependency</string>
+ <string>102.IBPluginDependency</string>
<string>37.IBPluginDependency</string>
<string>37.ImportedFromIB2</string>
<string>5.IBEditorWindowLastContentRect</string>
@@ -635,6 +649,7 @@
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>{{42, 549}, {400, 250}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -684,7 +699,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">101</int>
+ <int key="maxID">103</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray"
key="referencedPartialClassDescriptions">
@@ -712,7 +727,7 @@
<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">
@@ -756,13 +771,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>
@@ -848,20 +856,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>
@@ -987,8 +981,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>
@@ -1027,6 +1039,13 @@
</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">SKBookmarkController</string>
<string
key="superclassName">SKWindowController</string>
<object class="NSMutableDictionary"
key="actions">
@@ -1037,6 +1056,7 @@
<string>doubleClickBookmark:</string>
<string>insertBookmarkFolder:</string>
<string>insertBookmarkSeparator:</string>
+
<string>openBookmark:</string>
<string>toggleStatusBar:</string>
</object>
<object class="NSMutableArray"
key="dict.values">
@@ -1046,6 +1066,7 @@
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary"
key="actionInfosByName">
@@ -1056,6 +1077,7 @@
<string>doubleClickBookmark:</string>
<string>insertBookmarkFolder:</string>
<string>insertBookmarkSeparator:</string>
+
<string>openBookmark:</string>
<string>toggleStatusBar:</string>
</object>
<object class="NSMutableArray"
key="dict.values">
@@ -1077,6 +1099,10 @@
<string
key="candidateClassName">id</string>
</object>
<object
class="IBActionInfo">
+ <string
key="name">openBookmark:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
<string
key="name">toggleStatusBar:</string>
<string
key="candidateClassName">id</string>
</object>
@@ -1136,6 +1162,7 @@
<bool
key="EncodedWithXMLCoder">YES</bool>
<string>copy:</string>
<string>delete:</string>
+ <string>paste:</string>
<string>scrollToBeginningOfDocument:</string>
<string>scrollToEndOfDocument:</string>
</object>
@@ -1145,6 +1172,7 @@
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary"
key="actionInfosByName">
@@ -1153,6 +1181,7 @@
<bool
key="EncodedWithXMLCoder">YES</bool>
<string>copy:</string>
<string>delete:</string>
+ <string>paste:</string>
<string>scrollToBeginningOfDocument:</string>
<string>scrollToEndOfDocument:</string>
</object>
@@ -1167,6 +1196,10 @@
<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>
@@ -1279,7 +1312,7 @@
<object class="IBPartialClassDescription">
<string
key="className">SKTextWithIconCell</string>
<string
key="superclassName">NSTextFieldCell</string>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier" id="916925389">
<string
key="majorKey">IBProjectSource</string>
<string
key="minorKey">SKTextWithIconCell.h</string>
</object>
@@ -1293,6 +1326,11 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string
key="className">SKTextWithIconFormatter</string>
+ <string
key="superclassName">NSFormatter</string>
+ <reference key="sourceIdentifier"
ref="916925389"/>
+ </object>
+ <object class="IBPartialClassDescription">
<string
key="className">SKWindowController</string>
<string
key="superclassName">NSWindowController</string>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -1950,7 +1988,7 @@
</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>
Modified: trunk/SKTextWithIconCell.m
===================================================================
--- trunk/SKTextWithIconCell.m 2011-12-04 00:42:07 UTC (rev 7549)
+++ trunk/SKTextWithIconCell.m 2011-12-04 00:44:19 UTC (rev 7550)
@@ -50,30 +50,6 @@
@implementation SKTextWithIconCell
-static SKTextWithIconFormatter *textWithIconFormatter = nil;
-
-+ (void)initialize {
- SKINITIALIZE;
- textWithIconFormatter = [[SKTextWithIconFormatter alloc] init];
-}
-
-- (id)init {
- self = [super initTextCell:@""];
- if (self) {
- [self setFormatter:textWithIconFormatter];
- }
- return self;
-}
-
-- (id)initWithCoder:(NSCoder *)coder {
- self = [super initWithCoder:coder];
- if (self) {
- if ([self formatter] == nil)
- [self setFormatter:textWithIconFormatter];
- }
- return self;
-}
-
- (NSSize)cellSize {
NSSize cellSize = [super cellSize];
cellSize.width += cellSize.height - 1 + BORDER_BETWEEN_EDGE_AND_IMAGE +
BORDER_BETWEEN_IMAGE_AND_TEXT;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
