Revision: 7693
http://skim-app.svn.sourceforge.net/skim-app/?rev=7693&view=rev
Author: hofman
Date: 2012-05-15 14:50:30 +0000 (Tue, 15 May 2012)
Log Message:
-----------
default free text note text alignment in preferences
Modified Paths:
--------------
trunk/Dutch.lproj/NotesPreferences.strings
trunk/English.lproj/NotesPreferences.strings
trunk/French.lproj/NotesPreferences.strings
trunk/German.lproj/NotesPreferences.strings
trunk/Italian.lproj/NotesPreferences.strings
trunk/Japanese.lproj/NotesPreferences.strings
trunk/NSImage_SKExtensions.h
trunk/NSImage_SKExtensions.m
trunk/NotesPreferences.xib
trunk/Spanish.lproj/NotesPreferences.strings
trunk/pl.lproj/NotesPreferences.strings
trunk/ru.lproj/NotesPreferences.strings
trunk/zh_TW.lproj/NotesPreferences.strings
Modified: trunk/Dutch.lproj/NotesPreferences.strings
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/NotesPreferences.strings
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/NotesPreferences.strings
===================================================================
(Binary files differ)
Modified: trunk/German.lproj/NotesPreferences.strings
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/NotesPreferences.strings
===================================================================
(Binary files differ)
Modified: trunk/Japanese.lproj/NotesPreferences.strings
===================================================================
(Binary files differ)
Modified: trunk/NSImage_SKExtensions.h
===================================================================
--- trunk/NSImage_SKExtensions.h 2012-05-08 09:16:05 UTC (rev 7692)
+++ trunk/NSImage_SKExtensions.h 2012-05-15 14:50:30 UTC (rev 7693)
@@ -113,6 +113,10 @@
extern NSString *SKImageNameFindViewAdorn;
extern NSString *SKImageNameGroupedFindViewAdorn;
+extern NSString *SKImageNameTextAlignLeft;
+extern NSString *SKImageNameTextAlignCenter;
+extern NSString *SKImageNameTextAlignRight;
+
extern NSString *SKImageNameResizeDiagonal45Cursor;
extern NSString *SKImageNameResizeDiagonal135Cursor;
extern NSString *SKImageNameZoomInCursor;
Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m 2012-05-08 09:16:05 UTC (rev 7692)
+++ trunk/NSImage_SKExtensions.m 2012-05-15 14:50:30 UTC (rev 7693)
@@ -116,6 +116,10 @@
NSString *SKImageNameFindViewAdorn = @"FindViewAdorn";
NSString *SKImageNameGroupedFindViewAdorn = @"GroupedFindViewAdorn";
+NSString *SKImageNameTextAlignLeft = @"TextAlignLeft";
+NSString *SKImageNameTextAlignCenter = @"TextAlignCenter";
+NSString *SKImageNameTextAlignRight = @"TextAlignRight";
+
NSString *SKImageNameResizeDiagonal45Cursor = @"ResizeDiagonal45Cursor";
NSString *SKImageNameResizeDiagonal135Cursor = @"ResizeDiagonal135Cursor";
NSString *SKImageNameZoomInCursor = @"ZoomInCursor";
@@ -1596,6 +1600,88 @@
[shadow1 release];
}
++ (void)makeTextAlignImages {
+ static NSImage *textAlignLeftImage = nil;
+ static NSImage *textAlignCenterImage = nil;
+ static NSImage *textAlignRightImage = nil;
+
+ if (textAlignLeftImage)
+ return;
+
+ NSRect rect = NSMakeRect(0.0, 0.0, 16.0, 11.0);
+ NSSize size = rect.size;
+ NSBezierPath *path;
+
+ textAlignLeftImage = [[NSImage alloc] initWithSize:size];
+ [textAlignLeftImage lockFocus];
+ [NSGraphicsContext saveGraphicsState];
+ [[NSColor clearColor] setFill];
+ NSRectFill(rect);
+ [[NSColor blackColor] setStroke];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(1.0, 1.5)];
+ [path lineToPoint:NSMakePoint(15.0, 1.5)];
+ [path moveToPoint:NSMakePoint(1.0, 3.5)];
+ [path lineToPoint:NSMakePoint(12.0, 3.5)];
+ [path moveToPoint:NSMakePoint(1.0, 5.5)];
+ [path lineToPoint:NSMakePoint(14.0, 5.5)];
+ [path moveToPoint:NSMakePoint(1.0, 7.5)];
+ [path lineToPoint:NSMakePoint(11.0, 7.5)];
+ [path moveToPoint:NSMakePoint(1.0, 9.5)];
+ [path lineToPoint:NSMakePoint(15.0, 9.5)];
+ [path setLineWidth:1.0];
+ [path stroke];
+ [NSGraphicsContext restoreGraphicsState];
+ [textAlignLeftImage unlockFocus];
+ [textAlignLeftImage setName:SKImageNameTextAlignLeft];
+
+ textAlignCenterImage = [[NSImage alloc] initWithSize:size];
+ [textAlignCenterImage lockFocus];
+ [NSGraphicsContext saveGraphicsState];
+ [[NSColor clearColor] setFill];
+ NSRectFill(rect);
+ [[NSColor blackColor] setStroke];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(1.0, 1.5)];
+ [path lineToPoint:NSMakePoint(15.0, 1.5)];
+ [path moveToPoint:NSMakePoint(4.0, 3.5)];
+ [path lineToPoint:NSMakePoint(12.0, 3.5)];
+ [path moveToPoint:NSMakePoint(2.0, 5.5)];
+ [path lineToPoint:NSMakePoint(14.0, 5.5)];
+ [path moveToPoint:NSMakePoint(5.0, 7.5)];
+ [path lineToPoint:NSMakePoint(11.0, 7.5)];
+ [path moveToPoint:NSMakePoint(1.0, 9.5)];
+ [path lineToPoint:NSMakePoint(15.0, 9.5)];
+ [path setLineWidth:1.0];
+ [path stroke];
+ [NSGraphicsContext restoreGraphicsState];
+ [textAlignCenterImage unlockFocus];
+ [textAlignCenterImage setName:SKImageNameTextAlignCenter];
+
+ textAlignRightImage = [[NSImage alloc] initWithSize:size];
+ [textAlignRightImage lockFocus];
+ [NSGraphicsContext saveGraphicsState];
+ [[NSColor clearColor] setFill];
+ NSRectFill(rect);
+ [[NSColor blackColor] setStroke];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(1.0, 1.5)];
+ [path lineToPoint:NSMakePoint(15.0, 1.5)];
+ [path moveToPoint:NSMakePoint(4.0, 3.5)];
+ [path lineToPoint:NSMakePoint(15.0, 3.5)];
+ [path moveToPoint:NSMakePoint(2.0, 5.5)];
+ [path lineToPoint:NSMakePoint(15.0, 5.5)];
+ [path moveToPoint:NSMakePoint(5.0, 7.5)];
+ [path lineToPoint:NSMakePoint(15.0, 7.5)];
+ [path moveToPoint:NSMakePoint(1.0, 9.5)];
+ [path lineToPoint:NSMakePoint(15.0, 9.5)];
+ [path setLineWidth:1.0];
+ [path stroke];
+ [NSGraphicsContext restoreGraphicsState];
+ [textAlignRightImage unlockFocus];
+ [textAlignRightImage setName:SKImageNameTextAlignRight];
+}
+
+ (void)makeCursorImages {
static NSImage *resizeDiagonal45CursorImage = nil;
static NSImage *resizeDiagonal135CursorImage = nil;
@@ -1888,6 +1974,7 @@
[self makeNoteImages];
[self makeAdornImages];
[self makeToolbarImages];
+ [self makeTextAlignImages];
[self makeCursorImages];
}
Modified: trunk/NotesPreferences.xib
===================================================================
--- trunk/NotesPreferences.xib 2012-05-08 09:16:05 UTC (rev 7692)
+++ trunk/NotesPreferences.xib 2012-05-15 14:50:30 UTC (rev 7693)
@@ -2,7 +2,7 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">10K540</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>
@@ -37,10 +37,63 @@
<int key="NSvFlags">292</int>
<object class="NSMutableArray" key="NSSubviews">
<bool
key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSSegmentedControl"
id="1013706888">
+ <reference
key="NSNextResponder" ref="1005"/>
+ <int key="NSvFlags">257</int>
+ <string key="NSFrame">{{423,
262}, {68, 20}}</string>
+ <reference key="NSSuperview"
ref="1005"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSSegmentedCell"
key="NSCell" id="223589735">
+ <int
key="NSCellFlags">67239424</int>
+ <int
key="NSCellFlags2">131072</int>
+ <object class="NSFont"
key="NSSupport">
+ <string
key="NSName">LucidaGrande</string>
+ <double
key="NSSize">11</double>
+ <int
key="NSfFlags">3100</int>
+ </object>
+ <reference
key="NSControlView" ref="1013706888"/>
+ <object
class="NSMutableArray" key="NSSegmentImages">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object
class="NSSegmentItem">
+ <double
key="NSSegmentItemWidth">20</double>
+ <object
class="NSCustomResource" key="NSSegmentItemImage">
+
<string key="NSClassName">NSImage</string>
+
<string key="NSResourceName">TextAlignLeft</string>
+
</object>
+ <string
key="NSSegmentItemLabel"/>
+ <string
key="NSSegmentItemTooltip">Align left</string>
+ <bool
key="NSSegmentItemSelected">YES</bool>
+ <int
key="NSSegmentItemImageScaling">0</int>
+ </object>
+ <object
class="NSSegmentItem">
+ <double
key="NSSegmentItemWidth">20</double>
+ <object
class="NSCustomResource" key="NSSegmentItemImage">
+
<string key="NSClassName">NSImage</string>
+
<string key="NSResourceName">TextAlignCenter</string>
+
</object>
+ <string
key="NSSegmentItemLabel"/>
+ <string
key="NSSegmentItemTooltip">Center</string>
+ <int
key="NSSegmentItemTag">2</int>
+ <int
key="NSSegmentItemImageScaling">0</int>
+ </object>
+ <object
class="NSSegmentItem">
+ <double
key="NSSegmentItemWidth">20</double>
+ <object
class="NSCustomResource" key="NSSegmentItemImage">
+
<string key="NSClassName">NSImage</string>
+
<string key="NSResourceName">TextAlignRight</string>
+
</object>
+ <string
key="NSSegmentItemTooltip">Align right</string>
+ <int
key="NSSegmentItemTag">1</int>
+ <int
key="NSSegmentItemImageScaling">0</int>
+ </object>
+ </object>
+ <int
key="NSSegmentStyle">1</int>
+ </object>
+ </object>
<object class="NSButton" id="17412635">
<reference
key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{122,
230}, {367, 22}}</string>
+ <string key="NSFrame">{{122,
230}, {295, 22}}</string>
<reference key="NSSuperview"
ref="1005"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="942827002">
@@ -67,7 +120,7 @@
<object class="NSButton" id="449588914">
<reference
key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{122,
262}, {367, 22}}</string>
+ <string key="NSFrame">{{122,
262}, {295, 22}}</string>
<reference key="NSSuperview"
ref="1005"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="58431203">
@@ -1803,6 +1856,30 @@
</object>
<int key="connectionID">272</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection"
key="connection">
+ <string
key="label">selectedTag: values.SKFreeTextNoteAlignment</string>
+ <reference key="source"
ref="1013706888"/>
+ <reference key="destination"
ref="251596978"/>
+ <object
class="NSNibBindingConnector" key="connector">
+ <reference
key="NSSource" ref="1013706888"/>
+ <reference
key="NSDestination" ref="251596978"/>
+ <string
key="NSLabel">selectedTag: values.SKFreeTextNoteAlignment</string>
+ <string
key="NSBinding">selectedTag</string>
+ <string
key="NSKeyPath">values.SKFreeTextNoteAlignment</string>
+ <int
key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">276</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object
class="IBAccessibilityConnection" key="connection">
+ <string
key="label">link</string>
+ <reference key="source"
ref="449588914"/>
+ <reference key="destination"
ref="1013706888"/>
+ </object>
+ <int key="connectionID">277</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -1881,6 +1958,7 @@
<reference
ref="1013728757"/>
<reference
ref="1061720991"/>
<reference
ref="357580651"/>
+ <reference
ref="1013706888"/>
</object>
<reference key="parent"
ref="0"/>
</object>
@@ -2380,6 +2458,20 @@
<reference key="object"
ref="352462776"/>
<reference key="parent"
ref="357580651"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">273</int>
+ <reference key="object"
ref="1013706888"/>
+ <object class="NSMutableArray"
key="children">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <reference
ref="223589735"/>
+ </object>
+ <reference key="parent"
ref="1005"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">274</int>
+ <reference key="object"
ref="223589735"/>
+ <reference key="parent"
ref="1013706888"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary"
key="flattenedProperties">
@@ -2444,6 +2536,10 @@
<string>27.IBAttributePlaceholdersKey</string>
<string>27.IBPluginDependency</string>
<string>27.ImportedFromIB2</string>
+ <string>273.IBPluginDependency</string>
+
<string>273.IBViewBoundsToFrameTransform</string>
+ <string>274.IBPluginDependency</string>
+
<string>274.IBSegmentedControlInspectorSelectedSegmentMetadataKey</string>
<string>28.IBPluginDependency</string>
<string>28.ImportedFromIB2</string>
<string>29.IBAttributePlaceholdersKey</string>
@@ -2482,6 +2578,7 @@
<string>41.CustomClassName</string>
<string>41.IBAttributePlaceholdersKey</string>
<string>41.IBPluginDependency</string>
+
<string>41.IBViewBoundsToFrameTransform</string>
<string>41.ImportedFromIB2</string>
<string>42.CustomClassName</string>
<string>42.IBAttributePlaceholdersKey</string>
@@ -2657,6 +2754,12 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes
key="NSTransformStruct">P4AAAL+AAABD2YAAw40AAA</bytes>
+ </object>
+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="2"/>
+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<object class="NSMutableDictionary">
<string
key="NS.key.0">ToolTip</string>
@@ -2736,6 +2839,9 @@
</object>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes
key="NSTransformStruct">P4AAAL+AAABC9AAAw40AAA</bytes>
+ </object>
<boolean value="YES"/>
<string>SKFontWell</string>
<object class="NSMutableDictionary">
@@ -2818,7 +2924,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">272</int>
+ <int key="maxID">277</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray"
key="referencedPartialClassDescriptions">
@@ -2827,7 +2933,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">
@@ -2965,6 +3071,13 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string
key="className">NSSegmentedControl</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBProjectSource</string>
+ <string
key="minorKey">NSSegmentedControl_SKExtensions.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string
key="className">NSUserDefaultsController</string>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
@@ -3825,6 +3938,22 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string
key="className">NSSegmentedCell</string>
+ <string
key="superclassName">NSActionCell</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBFrameworkSource</string>
+ <string
key="minorKey">AppKit.framework/Headers/NSSegmentedCell.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string
key="className">NSSegmentedControl</string>
+ <string
key="superclassName">NSControl</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBFrameworkSource</string>
+ <string
key="minorKey">AppKit.framework/Headers/NSSegmentedControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string
key="className">NSTextField</string>
<string
key="superclassName">NSControl</string>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -4001,5 +4130,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>TextAlignCenter</string>
+ <string>TextAlignLeft</string>
+ <string>TextAlignRight</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{128, 128}</string>
+ <string>{128, 128}</string>
+ <string>{128, 128}</string>
+ </object>
+ </object>
</data>
</archive>
Modified: trunk/Spanish.lproj/NotesPreferences.strings
===================================================================
(Binary files differ)
Modified: trunk/pl.lproj/NotesPreferences.strings
===================================================================
(Binary files differ)
Modified: trunk/ru.lproj/NotesPreferences.strings
===================================================================
(Binary files differ)
Modified: trunk/zh_TW.lproj/NotesPreferences.strings
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
