Revision: 7679
http://skim-app.svn.sourceforge.net/skim-app/?rev=7679&view=rev
Author: hofman
Date: 2012-03-11 12:10:52 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
use display pattern title binding for box title of transition info
Modified Paths:
--------------
trunk/SKPresentationOptionsSheetController.m
trunk/SKTransitionInfo.m
trunk/TransitionSheet.xib
Modified: trunk/SKPresentationOptionsSheetController.m
===================================================================
--- trunk/SKPresentationOptionsSheetController.m 2012-03-10 22:02:41 UTC
(rev 7678)
+++ trunk/SKPresentationOptionsSheetController.m 2012-03-11 12:10:52 UTC
(rev 7679)
@@ -184,14 +184,6 @@
[[self undoManager] enableUndoRegistration];
}
- NSBox *box = [boxes objectAtIndex:0];
- NSDictionary *bindingInfo = [box infoForBinding:NSTitleBinding];
- if (bindingInfo) {
- NSMutableDictionary *options = [NSMutableDictionary
dictionaryWithDictionary:[bindingInfo objectForKey:NSOptionsKey]];
- [options setObject:[transition title]
forKey:NSMultipleValuesPlaceholderBindingOption];
- [box bind:NSTitleBinding toObject:[bindingInfo
objectForKey:NSObservedObjectKey] withKeyPath:[bindingInfo
objectForKey:NSObservedKeyPathKey] options:options];
- }
-
// set the current notes document and observe changes for the popup
[self handleDocumentsDidChangeNotification:nil];
NSInteger docIndex = [notesDocumentPopUpButton
indexOfItemWithRepresentedObject:[controller presentationNotesDocument]];
Modified: trunk/SKTransitionInfo.m
===================================================================
--- trunk/SKTransitionInfo.m 2012-03-10 22:02:41 UTC (rev 7678)
+++ trunk/SKTransitionInfo.m 2012-03-11 12:10:52 UTC (rev 7679)
@@ -45,10 +45,6 @@
@synthesize transitionStyle, duration, shouldRestrict, thumbnail, label;
@dynamic properties, title;
-+ (NSSet *)keyPathsForValuesAffectingTitle {
- return [NSSet setWithObjects:@"label", nil];
-}
-
- (id)init {
self = [super init];
if (self) {
@@ -89,10 +85,7 @@
}
- (NSString *)title {
- NSString *title = NSLocalizedString(@"Page Transition", @"Box title");
- if (label)
- title = [NSString stringWithFormat:@"%@ %@", title, label];
- return title;
+ return NSLocalizedString(@"Page Transition", @"Box title");
}
@end
Modified: trunk/TransitionSheet.xib
===================================================================
--- trunk/TransitionSheet.xib 2012-03-10 22:02:41 UTC (rev 7678)
+++ trunk/TransitionSheet.xib 2012-03-11 12:10:52 UTC (rev 7679)
@@ -45,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="340829660">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray"
key="NSSubviews">
<bool
key="EncodedWithXMLCoder">YES</bool>
@@ -54,7 +54,6 @@
<int
key="NSvFlags">257</int>
<string
key="NSFrame">{{330, 12}, {82, 32}}</string>
<reference
key="NSSuperview" ref="340829660"/>
- <reference
key="NSWindow"/>
<int key="NSTag">1</int>
<bool
key="NSEnabled">YES</bool>
<object
class="NSButtonCell" key="NSCell" id="315005595">
@@ -82,7 +81,6 @@
<int
key="NSvFlags">257</int>
<string
key="NSFrame">{{248, 12}, {82, 32}}</string>
<reference
key="NSSuperview" ref="340829660"/>
- <reference
key="NSWindow"/>
<bool
key="NSEnabled">YES</bool>
<object
class="NSButtonCell" key="NSCell" id="466969999">
<int
key="NSCellFlags">67239424</int>
@@ -114,7 +112,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{216, 42}, {50, 22}}</string>
<reference key="NSSuperview" ref="210267139"/>
-
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="980241155">
<int key="NSCellFlags">-1804468671</int>
@@ -221,7 +218,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{82, 38}, {128, 26}}</string>
<reference key="NSSuperview" ref="210267139"/>
-
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSliderCell" key="NSCell" id="720130701">
<int key="NSCellFlags">67501824</int>
@@ -250,7 +246,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{81, 68}, {188, 26}}</string>
<reference key="NSSuperview" ref="210267139"/>
-
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="940202859">
<int key="NSCellFlags">71433792</int>
@@ -286,7 +281,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{35, 75}, {44, 17}}</string>
<reference key="NSSuperview" ref="210267139"/>
-
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="421398262">
<int key="NSCellFlags">68288064</int>
@@ -316,7 +310,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{15, 44}, {64, 17}}</string>
<reference key="NSSuperview" ref="210267139"/>
-
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="951139340">
<int key="NSCellFlags">68288064</int>
@@ -333,7 +326,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{82, 14}, {132, 18}}</string>
<reference key="NSSuperview" ref="210267139"/>
-
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<int key="NSNumRows">1</int>
<int key="NSNumCols">2</int>
@@ -554,7 +546,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{30, 15}, {49, 17}}</string>
<reference key="NSSuperview" ref="210267139"/>
-
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="510896588">
<int key="NSCellFlags">68288064</int>
@@ -569,12 +560,10 @@
</object>
<string
key="NSFrame">{{1, 1}, {284, 102}}</string>
<reference key="NSSuperview" ref="408977945"/>
-
<reference key="NSWindow"/>
</object>
</object>
<string
key="NSFrame">{{123, 120}, {286, 118}}</string>
<reference
key="NSSuperview" ref="340829660"/>
- <reference
key="NSWindow"/>
<string
key="NSOffsets">{0, 0}</string>
<object
class="NSTextFieldCell" key="NSTitleCell">
<int
key="NSCellFlags">67239424</int>
@@ -612,7 +601,6 @@
<int key="NSvFlags">258</int>
<string key="NSFrame">{{15, 10}, {254, 26}}</string>
<reference key="NSSuperview" ref="106960449"/>
-
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="275989702">
<int key="NSCellFlags">71433792</int>
@@ -663,12 +651,10 @@
</object>
<string
key="NSFrame">{{1, 1}, {284, 44}}</string>
<reference key="NSSuperview" ref="812147241"/>
-
<reference key="NSWindow"/>
</object>
</object>
<string
key="NSFrame">{{123, 56}, {286, 60}}</string>
<reference
key="NSSuperview" ref="340829660"/>
- <reference
key="NSWindow"/>
<string
key="NSOffsets">{0, 0}</string>
<object
class="NSTextFieldCell" key="NSTitleCell">
<int
key="NSCellFlags">67239424</int>
@@ -692,7 +678,6 @@
<int
key="NSvFlags">265</int>
<string
key="NSFrame">{{124, 244}, {177, 18}}</string>
<reference
key="NSSuperview" ref="340829660"/>
- <reference
key="NSWindow"/>
<bool
key="NSEnabled">YES</bool>
<object
class="NSButtonCell" key="NSCell" id="168094914">
<int
key="NSCellFlags">67239424</int>
@@ -730,7 +715,6 @@
<int key="NSvFlags">4388</int>
<string key="NSFrameSize">{85, 238}</string>
<reference key="NSSuperview" ref="975205502"/>
-
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
<nil key="NSNextResponder"/>
@@ -828,7 +812,6 @@
</object>
<string
key="NSFrame">{{1, 1}, {85, 238}}</string>
<reference key="NSSuperview" ref="486255841"/>
-
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="699445479"/>
<reference key="NSDocView" ref="699445479"/>
<reference key="NSBGColor" ref="244634545"/>
@@ -839,7 +822,6 @@
<int
key="NSvFlags">256</int>
<string
key="NSFrame">{{86, 1}, {11, 238}}</string>
<reference key="NSSuperview" ref="486255841"/>
-
<reference key="NSWindow"/>
<int
key="NSsFlags">256</int>
<reference key="NSTarget" ref="486255841"/>
<string
key="NSAction">_doScroller:</string>
@@ -850,7 +832,6 @@
<int
key="NSvFlags">-2147483392</int>
<string
key="NSFrame">{{-100, -100}, {128, 15}}</string>
<reference key="NSSuperview" ref="486255841"/>
-
<reference key="NSWindow"/>
<int
key="NSsFlags">1</int>
<reference key="NSTarget" ref="486255841"/>
<string
key="NSAction">_doScroller:</string>
@@ -859,7 +840,6 @@
</object>
<string
key="NSFrame">{{20, 20}, {98, 240}}</string>
<reference
key="NSSuperview" ref="340829660"/>
- <reference
key="NSWindow"/>
<reference
key="NSNextKeyView" ref="975205502"/>
<int
key="NSsFlags">18</int>
<reference
key="NSVScroller" ref="945944212"/>
@@ -869,8 +849,6 @@
</object>
</object>
<string key="NSFrameSize">{426,
280}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440,
878}}</string>
<string key="NSMinSize">{213, 129}</string>
@@ -886,6 +864,7 @@
<string>fromThumbnail.label</string>
<string>nextThumbnail.image</string>
<string>label</string>
+ <string>title</string>
</object>
<bool key="NSEditable">YES</bool>
<object class="_NSManagedProxy"
key="_NSManagedProxy"/>
@@ -1265,22 +1244,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection"
key="connection">
- <string key="label">title:
selection.title</string>
- <reference key="source"
ref="408977945"/>
- <reference key="destination"
ref="676443264"/>
- <object
class="NSNibBindingConnector" key="connector">
- <reference
key="NSSource" ref="408977945"/>
- <reference
key="NSDestination" ref="676443264"/>
- <string
key="NSLabel">title: selection.title</string>
- <string
key="NSBinding">title</string>
- <string
key="NSKeyPath">selection.title</string>
- <int
key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">496</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection"
key="connection">
<string key="label">value:
selection.duration</string>
<reference key="source"
ref="646873914"/>
<reference key="destination"
ref="676443264"/>
@@ -1366,6 +1329,47 @@
</object>
<int key="connectionID">506</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection"
key="connection">
+ <string
key="label">displayPatternTitle1: selection.title</string>
+ <reference key="source"
ref="408977945"/>
+ <reference key="destination"
ref="676443264"/>
+ <object
class="NSNibBindingConnector" key="connector" id="131929769">
+ <reference
key="NSSource" ref="408977945"/>
+ <reference
key="NSDestination" ref="676443264"/>
+ <string
key="NSLabel">displayPatternTitle1: selection.title</string>
+ <string
key="NSBinding">displayPatternTitle1</string>
+ <string
key="NSKeyPath">selection.title</string>
+ <object
class="NSDictionary" key="NSOptions">
+ <string
key="NS.key.0">NSDisplayPattern</string>
+ <string
key="NS.object.0">%{title1}@ %{title2}@</string>
+ </object>
+ <int
key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">512</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection"
key="connection">
+ <string
key="label">displayPatternTitle2: selection.label</string>
+ <reference key="source"
ref="408977945"/>
+ <reference key="destination"
ref="676443264"/>
+ <object
class="NSNibBindingConnector" key="connector">
+ <reference
key="NSSource" ref="408977945"/>
+ <reference
key="NSDestination" ref="676443264"/>
+ <string
key="NSLabel">displayPatternTitle2: selection.label</string>
+ <string
key="NSBinding">displayPatternTitle2</string>
+ <string
key="NSKeyPath">selection.label</string>
+ <object
class="NSDictionary" key="NSOptions">
+ <string
key="NS.key.0">NSDisplayPattern</string>
+ <string
key="NS.object.0">%{title1}@ %{title2}@</string>
+ </object>
+ <reference
key="NSPreviousConnector" ref="131929769"/>
+ <int
key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">513</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -1930,7 +1934,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">506</int>
+ <int key="maxID">513</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray"
key="referencedPartialClassDescriptions">
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
