Revision: 6804
http://skim-app.svn.sourceforge.net/skim-app/?rev=6804&view=rev
Author: hofman
Date: 2010-09-14 13:50:56 +0000 (Tue, 14 Sep 2010)
Log Message:
-----------
make text font size of generic note text editor sticky and change globally
Modified Paths:
--------------
trunk/NoteWindow.xib
trunk/SKNoteWindowController.h
trunk/SKNoteWindowController.m
trunk/Skim.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/SKNoteTextView.h
trunk/SKNoteTextView.m
Modified: trunk/NoteWindow.xib
===================================================================
--- trunk/NoteWindow.xib 2010-09-14 12:03:18 UTC (rev 6803)
+++ trunk/NoteWindow.xib 2010-09-14 13:50:56 UTC (rev 6804)
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1040</int>
- <string key="IBDocument.SystemVersion">10D573</string>
- <string key="IBDocument.InterfaceBuilderVersion">740</string>
+ <string key="IBDocument.SystemVersion">10F569</string>
+ <string key="IBDocument.InterfaceBuilderVersion">788</string>
<string key="IBDocument.AppKitVersion">1038.29</string>
- <string key="IBDocument.HIToolboxVersion">460.00</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">788</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -50,7 +50,7 @@
<string
key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{160,
160}</string>
<object class="NSView" key="NSWindowView"
id="123586400">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray"
key="NSSubviews">
<bool
key="EncodedWithXMLCoder">YES</bool>
@@ -92,7 +92,6 @@
</object>
<string key="NSFrameSize">{331, 14}</string>
<reference key="NSSuperview" ref="470158365"/>
-
<reference key="NSWindow"/>
<object class="NSTextContainer" key="NSTextContainer" id="335718065">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@@ -176,7 +175,6 @@
</object>
<string
key="NSFrameSize">{331, 173}</string>
<reference key="NSSuperview" ref="740348933"/>
-
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="315707833"/>
<reference key="NSDocView" ref="315707833"/>
<reference key="NSBGColor" ref="814770805"/>
@@ -191,7 +189,6 @@
<int
key="NSvFlags">256</int>
<string
key="NSFrame">{{331, 0}, {11, 173}}</string>
<reference key="NSSuperview" ref="740348933"/>
-
<reference key="NSWindow"/>
<int
key="NSsFlags">256</int>
<reference key="NSTarget" ref="740348933"/>
<string
key="NSAction">_doScroller:</string>
@@ -202,7 +199,6 @@
<int
key="NSvFlags">-2147483392</int>
<string
key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="740348933"/>
-
<reference key="NSWindow"/>
<int
key="NSsFlags">257</int>
<reference key="NSTarget" ref="740348933"/>
<string
key="NSAction">_doScroller:</string>
@@ -212,7 +208,6 @@
</object>
<string
key="NSFrame">{{0, 22}, {342, 173}}</string>
<reference
key="NSSuperview" ref="123586400"/>
- <reference
key="NSWindow"/>
<reference
key="NSNextKeyView" ref="470158365"/>
<int
key="NSsFlags">16</int>
<reference
key="NSVScroller" ref="17499870"/>
@@ -229,7 +224,6 @@
<int
key="NSvFlags">289</int>
<string
key="NSFrame">{{241, 1}, {87, 20}}</string>
<reference key="NSSuperview" ref="436876392"/>
-
<reference key="NSWindow"/>
<bool
key="NSEnabled">YES</bool>
<object
class="NSButtonCell" key="NSCell" id="931625359">
<int key="NSCellFlags">67239424</int>
@@ -259,7 +253,6 @@
</object>
<string
key="NSFrameSize">{341, 22}</string>
<reference
key="NSSuperview" ref="123586400"/>
- <reference
key="NSWindow"/>
<string
key="NSClassName">SKStatusBar</string>
<string
key="NSExtension">NSControl</string>
</object>
@@ -285,7 +278,6 @@
</object>
<string
key="NSFrame">{{272, 6}, {62, 62}}</string>
<reference key="NSSuperview" ref="823702365"/>
-
<reference key="NSWindow"/>
<bool
key="NSEnabled">YES</bool>
<object
class="NSImageCell" key="NSCell" id="560294733">
<int key="NSCellFlags">270663168</int>
@@ -302,7 +294,6 @@
<int
key="NSvFlags">266</int>
<string
key="NSFrame">{{10, 43}, {257, 22}}</string>
<reference key="NSSuperview" ref="823702365"/>
-
<reference key="NSWindow"/>
<bool
key="NSEnabled">YES</bool>
<object
class="NSTextFieldCell" key="NSCell" id="582578156">
<int key="NSCellFlags">-1804468671</int>
@@ -334,7 +325,6 @@
<int
key="NSvFlags">266</int>
<string
key="NSFrame">{{44, 11}, {226, 26}}</string>
<reference key="NSSuperview" ref="823702365"/>
-
<reference key="NSWindow"/>
<bool
key="NSEnabled">YES</bool>
<object
class="NSPopUpButtonCell" key="NSCell" id="712351303">
<int key="NSCellFlags">-2076049856</int>
@@ -459,7 +449,6 @@
<int
key="NSvFlags">268</int>
<string
key="NSFrame">{{7, 17}, {35, 17}}</string>
<reference key="NSSuperview" ref="823702365"/>
-
<reference key="NSWindow"/>
<bool
key="NSEnabled">YES</bool>
<object
class="NSTextFieldCell" key="NSCell" id="672652341">
<int key="NSCellFlags">67239424</int>
@@ -484,14 +473,11 @@
</object>
<string
key="NSFrame">{{0, 195}, {341, 75}}</string>
<reference
key="NSSuperview" ref="123586400"/>
- <reference
key="NSWindow"/>
<string
key="NSClassName">SKGradientView</string>
<string
key="NSExtension">NSView</string>
</object>
</object>
<string key="NSFrameSize">{341,
270}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440,
938}}</string>
<string key="NSMinSize">{160, 182}</string>
@@ -1074,6 +1060,7 @@
<string>244.IBShouldRemoveOnLegacySave</string>
<string>39.IBPluginDependency</string>
<string>39.ImportedFromIB2</string>
+ <string>40.CustomClassName</string>
<string>40.IBPluginDependency</string>
<string>40.ImportedFromIB2</string>
<string>42.CustomClassName</string>
@@ -1134,6 +1121,7 @@
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
+ <string>SKNoteTextView</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>SKDragImageView</string>
@@ -1175,18 +1163,6 @@
<object class="NSMutableArray"
key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
- <string
key="className">BDSKContainerView</string>
- <string
key="superclassName">NSView</string>
- <object class="NSMutableDictionary"
key="outlets">
- <string
key="NS.key.0">contentView</string>
- <string
key="NS.object.0">id</string>
- </object>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">BDSKContainerView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string
key="className">FirstResponder</string>
<string
key="superclassName">NSObject</string>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -1203,6 +1179,13 @@
</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>
@@ -1279,6 +1262,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>
@@ -1313,6 +1303,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>
@@ -1374,6 +1383,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"/>
@@ -1453,6 +1496,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>
@@ -1473,10 +1523,24 @@
<string
key="NS.key.0">show:</string>
<string
key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary"
key="actionInfosByName">
+ <string
key="NS.key.0">show:</string>
+ <object class="IBActionInfo"
key="NS.object.0">
+ <string
key="name">show:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
<object class="NSMutableDictionary"
key="outlets">
<string
key="NS.key.0">delegate</string>
<string
key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary"
key="toOneOutletInfosByName">
+ <string
key="NS.key.0">delegate</string>
+ <object
class="IBToOneOutletInfo" key="NS.object.0">
+ <string
key="name">delegate</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
<string
key="minorKey">SKDragImageView.h</string>
@@ -1484,19 +1548,45 @@
</object>
<object class="IBPartialClassDescription">
<string
key="className">SKGradientView</string>
- <string
key="superclassName">BDSKContainerView</string>
+ <string
key="superclassName">NSView</string>
+ <object class="NSMutableDictionary"
key="outlets">
+ <string
key="NS.key.0">contentView</string>
+ <string
key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary"
key="toOneOutletInfosByName">
+ <string
key="NS.key.0">contentView</string>
+ <object
class="IBToOneOutletInfo" key="NS.object.0">
+ <string
key="name">contentView</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
<string
key="minorKey">SKGradientView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
+ <string
key="className">SKNoteTextView</string>
+ <string
key="superclassName">NSTextView</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBProjectSource</string>
+ <string
key="minorKey">SKNoteTextView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string
key="className">SKNoteWindowController</string>
<string
key="superclassName">SKWindowController</string>
<object class="NSMutableDictionary"
key="actions">
<string
key="NS.key.0">statusBarClicked:</string>
<string
key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary"
key="actionInfosByName">
+ <string
key="NS.key.0">statusBarClicked:</string>
+ <object class="IBActionInfo"
key="NS.object.0">
+ <string
key="name">statusBarClicked:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
<object class="NSMutableDictionary"
key="outlets">
<bool
key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray"
key="dict.sortedKeys">
@@ -1519,9 +1609,58 @@
<string>SKDragImageView</string>
<string>NSObjectController</string>
<string>SKStatusBar</string>
-
<string>NSTextView</string>
+
<string>SKNoteTextView</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>checkButton</string>
+
<string>gradientView</string>
+
<string>iconLabelField</string>
+
<string>iconTypePopUpButton</string>
+
<string>imageView</string>
+
<string>noteController</string>
+
<string>statusBar</string>
+
<string>textView</string>
+ </object>
+ <object class="NSMutableArray"
key="dict.values">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">checkButton</string>
+ <string
key="candidateClassName">NSButton</string>
+ </object>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">gradientView</string>
+ <string
key="candidateClassName">SKGradientView</string>
+ </object>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">iconLabelField</string>
+ <string
key="candidateClassName">NSTextField</string>
+ </object>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">iconTypePopUpButton</string>
+ <string
key="candidateClassName">NSPopUpButton</string>
+ </object>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">imageView</string>
+ <string
key="candidateClassName">SKDragImageView</string>
+ </object>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">noteController</string>
+ <string
key="candidateClassName">NSObjectController</string>
+ </object>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">statusBar</string>
+ <string
key="candidateClassName">SKStatusBar</string>
+ </object>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">textView</string>
+ <string
key="candidateClassName">SKNoteTextView</string>
+ </object>
+ </object>
+ </object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
<string
key="minorKey">SKNoteWindowController.h</string>
@@ -1551,6 +1690,25 @@
<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>startAnimation:</string>
+
<string>stopAnimation:</string>
+ </object>
+ <object class="NSMutableArray"
key="dict.values">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object
class="IBActionInfo">
+ <string
key="name">startAnimation:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">stopAnimation:</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">
@@ -1566,6 +1724,30 @@
<string>id</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>iconCell</string>
+
<string>leftCell</string>
+
<string>rightCell</string>
+ </object>
+ <object class="NSMutableArray"
key="dict.values">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">iconCell</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">leftCell</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">rightCell</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
<string
key="minorKey">SKStatusBar.h</string>
@@ -2189,6 +2371,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>
@@ -2226,11 +2415,71 @@
<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="64250864"/>
</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="1040" key="NS.object.0"/>
@@ -2246,5 +2495,20 @@
<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">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSMenuCheckmark</string>
+ <string>NSMenuMixedState</string>
+ <string>NSSwitch</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{9, 8}</string>
+ <string>{7, 2}</string>
+ <string>{15, 15}</string>
+ </object>
+ </object>
</data>
</archive>
Added: trunk/SKNoteTextView.h
===================================================================
--- trunk/SKNoteTextView.h (rev 0)
+++ trunk/SKNoteTextView.h 2010-09-14 13:50:56 UTC (rev 6804)
@@ -0,0 +1,48 @@
+//
+// SKNoteTextView.h
+// Skim
+//
+// Created by Christiaan on 9/14/10.
+/*
+ This software is Copyright (c) 2010
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Cocoa/Cocoa.h>
+
+
+...@interface SKNoteTextView : NSTextView {
+ BOOL usesDefaultFontSize;
+}
+
+...@property (nonatomic) BOOL usesDefaultFontSize;
+
+...@end
Added: trunk/SKNoteTextView.m
===================================================================
--- trunk/SKNoteTextView.m (rev 0)
+++ trunk/SKNoteTextView.m 2010-09-14 13:50:56 UTC (rev 6804)
@@ -0,0 +1,92 @@
+//
+// SKNoteTextView.m
+// Skim
+//
+// Created by Christiaan on 9/14/10.
+/*
+ This software is Copyright (c) 2010
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "SKNoteTextView.h"
+
+static char SKNoteTextViewDefaultsObservationContext;
+
+#define SKNoteTextFontSizeKey @"SKNoteTextFontSize"
+
+...@implementation SKNoteTextView
+
+...@synthesize usesDefaultFontSize;
+
+- (void)dealloc {
+ if (usesDefaultFontSize)
+ [[NSUserDefaultsController sharedUserDefaultsController]
removeObserver:self forKeyPath:[@"values."
stringByAppendingString:SKNoteTextFontSizeKey]];
+ [super dealloc];
+}
+
+- (void)setUsesDefaultFontSize:(BOOL)flag {
+ if (usesDefaultFontSize != flag) {
+ usesDefaultFontSize = flag;
+ if (usesDefaultFontSize) {
+ CGFloat fontSize = [[NSUserDefaults standardUserDefaults]
floatForKey:SKNoteTextFontSizeKey];
+ [self setFont:[NSFont userFontOfSize:fontSize]];
+ [[NSUserDefaultsController sharedUserDefaultsController]
addObserver:self
+ forKeyPath:[@"values."
stringByAppendingString:SKNoteTextFontSizeKey]
+ options:0
+ context:&SKNoteTextViewDefaultsObservationContext];
+ } else {
+ [[NSUserDefaultsController sharedUserDefaultsController]
removeObserver:self forKeyPath:[@"values."
stringByAppendingString:SKNoteTextFontSizeKey]];
+ }
+ }
+}
+
+- (void)changeFont:(id)sender {
+ if (usesDefaultFontSize) {
+ NSFont *font = [sender convertFont:[self font]];
+ [[NSUserDefaults standardUserDefaults] setFloat:[font pointSize]
forKey:SKNoteTextFontSizeKey];
+ } else {
+ [super changeFont:sender];
+ }
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object
change:(NSDictionary *)change context:(void *)context {
+ if (context == &SKNoteTextViewDefaultsObservationContext) {
+ NSString *key = [keyPath substringFromIndex:7];
+ if ([key isEqualToString:SKNoteTextFontSizeKey] &&
usesDefaultFontSize) {
+ CGFloat fontSize = [[NSUserDefaults standardUserDefaults]
floatForKey:SKNoteTextFontSizeKey];
+ [self setFont:[NSFont userFontOfSize:fontSize]];
+ }
+ } else {
+ [super observeValueForKeyPath:keyPath ofObject:object change:change
context:context];
+ }
+}
+
+...@end
Modified: trunk/SKNoteWindowController.h
===================================================================
--- trunk/SKNoteWindowController.h 2010-09-14 12:03:18 UTC (rev 6803)
+++ trunk/SKNoteWindowController.h 2010-09-14 13:50:56 UTC (rev 6804)
@@ -41,10 +41,10 @@
#import "SKDragImageView.h"
-...@class PDFAnnotation, SKStatusBar, SKGradientView;
+...@class PDFAnnotation, SKStatusBar, SKGradientView, SKNoteTextView;
@interface SKNoteWindowController : SKWindowController <NSWindowDelegate,
SKDragImageViewDelegate> {
- NSTextView *textView;
+ SKNoteTextView *textView;
SKGradientView *gradientView;
SKDragImageView *imageView;
SKStatusBar *statusBar;
@@ -62,7 +62,7 @@
NSUndoManager *textViewUndoManager;
}
-...@property (nonatomic, retain) IBOutlet NSTextView *textView;
+...@property (nonatomic, retain) IBOutlet SKNoteTextView *textView;
@property (nonatomic, retain) IBOutlet SKGradientView *gradientView;
@property (nonatomic, retain) IBOutlet SKDragImageView *imageView;
@property (nonatomic, retain) IBOutlet SKStatusBar *statusBar;
Modified: trunk/SKNoteWindowController.m
===================================================================
--- trunk/SKNoteWindowController.m 2010-09-14 12:03:18 UTC (rev 6803)
+++ trunk/SKNoteWindowController.m 2010-09-14 13:50:56 UTC (rev 6804)
@@ -52,6 +52,7 @@
#import "NSString_SKExtensions.h"
#import "SKGradientView.h"
#import "NSGeometry_SKExtensions.h"
+#import "SKNoteTextView.h"
#define EM_DASH_CHARACTER 0x2014
@@ -178,7 +179,7 @@
[[textView enclosingScrollView] setFrame:frame];
[textView unbind:@"attributedString"];
[textView setRichText:NO];
- [textView setUsesFontPanel:NO];
+ [textView setUsesDefaultFontSize:YES];
[textView bind:@"value" toObject:noteController
withKeyPath:@"selection.string" options:nil];
NSSize minimumSize = [[self window] minSize];
@@ -356,4 +357,5 @@
[super observeValueForKeyPath:keyPath ofObject:object change:change
context:context];
}
}
+
@end
Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj 2010-09-14 12:03:18 UTC (rev
6803)
+++ trunk/Skim.xcodeproj/project.pbxproj 2010-09-14 13:50:56 UTC (rev
6804)
@@ -82,6 +82,7 @@
CE19446910627483007E8770 /* SnapshotWindow.xib in Resources */
= {isa = PBXBuildFile; fileRef = CE19446210627483007E8770 /* SnapshotWindow.xib
*/; };
CE199DFD0D957A16009B2055 /* SKAnnotationTypeImageCell.m in
Sources */ = {isa = PBXBuildFile; fileRef = CE199DFC0D957A16009B2055 /*
SKAnnotationTypeImageCell.m */; };
CE1ADEBF0C4C341100071840 /* SKTransitionController.m in Sources
*/ = {isa = PBXBuildFile; fileRef = CE1ADEBE0C4C341100071840 /*
SKTransitionController.m */; };
+ CE1C77B6123FB41E00C73F1A /* SKNoteTextView.m in Sources */ =
{isa = PBXBuildFile; fileRef = CE1C77B5123FB41E00C73F1A /* SKNoteTextView.m */;
};
CE1CC5BE1143C57300F6B208 /* NoteWindow.xib in Resources */ =
{isa = PBXBuildFile; fileRef = CE1CC5BD1143C57300F6B208 /* NoteWindow.xib */; };
CE1CC6121143DDFD00F6B208 /* LineInspector.xib in Resources */ =
{isa = PBXBuildFile; fileRef = CE1CC6111143DDFD00F6B208 /* LineInspector.xib
*/; };
CE1CC6B91143F05D00F6B208 /* TransitionSheet.xib in Resources */
= {isa = PBXBuildFile; fileRef = CE1CC6B81143F05D00F6B208 /*
TransitionSheet.xib */; };
@@ -607,6 +608,8 @@
CE199DFC0D957A16009B2055 /* SKAnnotationTypeImageCell.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = SKAnnotationTypeImageCell.m; sourceTree = "<group>";
};
CE1ADB170C4BC6DE00071840 /* OpenGL.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework;
sourceTree = "<absolute>"; };
CE1ADEBE0C4C341100071840 /* SKTransitionController.m */ = {isa
= PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc;
path = SKTransitionController.m; sourceTree = "<group>"; };
+ CE1C77B4123FB41E00C73F1A /* SKNoteTextView.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
SKNoteTextView.h; sourceTree = "<group>"; };
+ CE1C77B5123FB41E00C73F1A /* SKNoteTextView.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= SKNoteTextView.m; sourceTree = "<group>"; };
CE1CC5BD1143C57300F6B208 /* NoteWindow.xib */ = {isa =
PBXFileReference; lastKnownFileType = file.xib; path = NoteWindow.xib;
sourceTree = "<group>"; };
CE1CC6111143DDFD00F6B208 /* LineInspector.xib */ = {isa =
PBXFileReference; lastKnownFileType = file.xib; path = LineInspector.xib;
sourceTree = "<group>"; };
CE1CC6B81143F05D00F6B208 /* TransitionSheet.xib */ = {isa =
PBXFileReference; lastKnownFileType = file.xib; path = TransitionSheet.xib;
sourceTree = "<group>"; };
@@ -1680,6 +1683,8 @@
CE4BC12E0C357A0300C2AF03 /* SKLineWell.m */,
CEA575CC0B9206E60003D2E7 /* SKNoteOutlineView.h
*/,
CEA575CD0B9206E60003D2E7 /* SKNoteOutlineView.m
*/,
+ CE1C77B4123FB41E00C73F1A /* SKNoteTextView.h */,
+ CE1C77B5123FB41E00C73F1A /* SKNoteTextView.m */,
CE5BF8400C7CC24A00EBDCF7 /* SKOutlineView.h */,
CE5BF8410C7CC24A00EBDCF7 /* SKOutlineView.m */,
4530DCF50B27CACE007C59F4 /* SKPDFView.h */,
@@ -2597,6 +2602,7 @@
CE9768831161195C008DCB8F /*
SKDownloadPreferenceController.m in Sources */,
CE121AC81180644A00951425 /* SKScriptMenu.m in
Sources */,
CEFDEA9111F6FF8300D6FEBA /*
NSScreen_SKExtensions.m in Sources */,
+ CE1C77B6123FB41E00C73F1A /* SKNoteTextView.m in
Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit