From d1474bd22ac302b3ba301c6b01d9ec882cdb3d13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Berg?= <andre.bergmedia@googlemail.com>
Date: Mon, 5 Apr 2010 23:52:04 +0200
Subject: [PATCH] Improving configuration of NSArrayController in
 PBGitHistoryView.

---
 PBGitHistoryView.xib | 274 +++++++++++++++++++++++++++++--------------
 1 file changed, 184 insertions(+), 90 deletions(-)

diff --git a/PBGitHistoryView.xib b/PBGitHistoryView.xib
index 0f486eb..b8b1229 100644
--- a/PBGitHistoryView.xib
+++ b/PBGitHistoryView.xib
@@ -21,7 +21,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="46"/>
+			<integer value="309"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -90,10 +90,11 @@
 					<string>realSha</string>
 				</object>
 				<string key="NSObjectClassName">PBGitCommit</string>
+				<bool key="NSAutomaticallyPreparesContent">YES</bool>
 				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
-				<bool key="NSPreservesSelection">YES</bool>
+				<bool key="NSAvoidsEmptySelection">YES</bool>
 				<bool key="NSFilterRestrictsInsertion">YES</bool>
-				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
+				<bool key="NSAutomaticallyRearrangesObjects">YES</bool>
 			</object>
 			<object class="NSCustomObject" id="568231003">
 				<string key="NSClassName">PBWebHistoryController</string>
@@ -108,6 +109,70 @@
 						<int key="NSvFlags">266</int>
 						<object class="NSMutableArray" key="NSSubviews">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="NSSegmentedControl" id="278401465">
+								<reference key="NSNextResponder" ref="172148644"/>
+								<int key="NSvFlags">268</int>
+								<string key="NSFrame">{{362, 3}, {141, 25}}</string>
+								<reference key="NSSuperview" ref="172148644"/>
+								<bool key="NSEnabled">YES</bool>
+								<object class="NSSegmentedCell" key="NSCell" id="114058149">
+									<int key="NSCellFlags">67239424</int>
+									<int key="NSCellFlags2">0</int>
+									<object class="NSFont" key="NSSupport">
+										<string key="NSName">LucidaGrande</string>
+										<double key="NSSize">13</double>
+										<int key="NSfFlags">16</int>
+									</object>
+									<reference key="NSControlView" ref="278401465"/>
+									<object class="NSMutableArray" key="NSSegmentImages">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSSegmentItem">
+											<double key="NSSegmentItemWidth">33</double>
+											<object class="NSCustomResource" key="NSSegmentItemImage">
+												<string key="NSClassName">NSImage</string>
+												<string key="NSResourceName">AddRemote</string>
+											</object>
+											<string key="NSSegmentItemLabel"/>
+											<string key="NSSegmentItemTooltip">Add remote</string>
+											<int key="NSSegmentItemImageScaling">0</int>
+										</object>
+										<object class="NSSegmentItem">
+											<double key="NSSegmentItemWidth">33</double>
+											<object class="NSCustomResource" key="NSSegmentItemImage">
+												<string key="NSClassName">NSImage</string>
+												<string key="NSResourceName">FetchTemplate</string>
+											</object>
+											<string key="NSSegmentItemLabel"/>
+											<string key="NSSegmentItemTooltip">Fetch from default remote</string>
+											<int key="NSSegmentItemTag">1</int>
+											<int key="NSSegmentItemImageScaling">0</int>
+										</object>
+										<object class="NSSegmentItem">
+											<double key="NSSegmentItemWidth">33</double>
+											<object class="NSCustomResource" key="NSSegmentItemImage">
+												<string key="NSClassName">NSImage</string>
+												<string key="NSResourceName">PullTemplate</string>
+											</object>
+											<string key="NSSegmentItemTooltip">Pull from default remote</string>
+											<int key="NSSegmentItemTag">2</int>
+											<int key="NSSegmentItemImageScaling">0</int>
+										</object>
+										<object class="NSSegmentItem">
+											<double key="NSSegmentItemWidth">33</double>
+											<object class="NSCustomResource" key="NSSegmentItemImage">
+												<string key="NSClassName">NSImage</string>
+												<string key="NSResourceName">PushTemplate</string>
+											</object>
+											<string key="NSSegmentItemTooltip">Push to default remote</string>
+											<int key="NSSegmentItemTag">3</int>
+											<int key="NSSegmentItemImageScaling">0</int>
+										</object>
+									</object>
+									<int key="NSSelectedSegment">2</int>
+									<int key="NSTrackingMode">2</int>
+									<int key="NSSegmentStyle">2</int>
+								</object>
+							</object>
 							<object class="NSButton" id="16222431">
 								<reference key="NSNextResponder" ref="172148644"/>
 								<int key="NSvFlags">289</int>
@@ -701,6 +766,7 @@
 														<int key="NSPeriodicInterval">75</int>
 													</object>
 													<int key="NSMaximumRecents">255</int>
+													<bytes key="NSSearchFieldFlags">CAAAAA</bytes>
 												</object>
 											</object>
 											<object class="NSButton" id="1055854415">
@@ -964,7 +1030,7 @@
 																				<object class="NSTextView" id="75600241">
 																					<reference key="NSNextResponder" ref="321980917"/>
 																					<int key="NSvFlags">2322</int>
-																					<string key="NSFrameSize">{545, 98}</string>
+																					<string key="NSFrameSize">{545, 0}</string>
 																					<reference key="NSSuperview" ref="321980917"/>
 																					<object class="NSTextContainer" key="NSTextContainer" id="480935218">
 																						<object class="NSLayoutManager" key="NSLayoutManager">
@@ -1906,6 +1972,22 @@
 					</object>
 					<int key="connectionID">398</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">remoteControls</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="278401465"/>
+					</object>
+					<int key="connectionID">407</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">fetchPullPushAction:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="278401465"/>
+					</object>
+					<int key="connectionID">408</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -2259,61 +2341,11 @@
 						<reference key="object" ref="1022125543"/>
 						<reference key="parent" ref="354285291"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">316</int>
-						<reference key="object" ref="172148644"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="923983319"/>
-							<reference ref="1051155594"/>
-							<reference ref="107487665"/>
-							<reference ref="258088911"/>
-							<reference ref="1006113529"/>
-							<reference ref="502319102"/>
-							<reference ref="16222431"/>
-							<reference ref="802449565"/>
-						</object>
-						<reference key="parent" ref="319362431"/>
-						<string key="objectName">History Upper Toolbar</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">317</int>
-						<reference key="object" ref="923983319"/>
-						<reference key="parent" ref="172148644"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">327</int>
 						<reference key="object" ref="147470634"/>
 						<reference key="parent" ref="24227530"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">330</int>
-						<reference key="object" ref="1051155594"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="870128015"/>
-						</object>
-						<reference key="parent" ref="172148644"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">331</int>
-						<reference key="object" ref="870128015"/>
-						<reference key="parent" ref="1051155594"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">332</int>
-						<reference key="object" ref="107487665"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="794901717"/>
-						</object>
-						<reference key="parent" ref="172148644"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">333</int>
-						<reference key="object" ref="794901717"/>
-						<reference key="parent" ref="107487665"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">355</int>
 						<reference key="object" ref="884073279"/>
@@ -2356,6 +2388,66 @@
 						<reference key="object" ref="819755658"/>
 						<reference key="parent" ref="832955200"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">316</int>
+						<reference key="object" ref="172148644"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="802449565"/>
+							<reference ref="16222431"/>
+							<reference ref="502319102"/>
+							<reference ref="1006113529"/>
+							<reference ref="258088911"/>
+							<reference ref="107487665"/>
+							<reference ref="1051155594"/>
+							<reference ref="923983319"/>
+							<reference ref="278401465"/>
+						</object>
+						<reference key="parent" ref="319362431"/>
+						<string key="objectName">History Upper Toolbar</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">399</int>
+						<reference key="object" ref="278401465"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="114058149"/>
+						</object>
+						<reference key="parent" ref="172148644"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">400</int>
+						<reference key="object" ref="114058149"/>
+						<reference key="parent" ref="278401465"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">48</int>
+						<reference key="object" ref="802449565"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="534046869"/>
+						</object>
+						<reference key="parent" ref="172148644"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">51</int>
+						<reference key="object" ref="534046869"/>
+						<reference key="parent" ref="802449565"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">49</int>
+						<reference key="object" ref="16222431"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="102056827"/>
+						</object>
+						<reference key="parent" ref="172148644"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">50</int>
+						<reference key="object" ref="102056827"/>
+						<reference key="parent" ref="16222431"/>
+					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">337</int>
 						<reference key="object" ref="502319102"/>
@@ -2399,32 +2491,37 @@
 						<reference key="parent" ref="258088911"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">48</int>
-						<reference key="object" ref="802449565"/>
+						<int key="objectID">332</int>
+						<reference key="object" ref="107487665"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="534046869"/>
+							<reference ref="794901717"/>
 						</object>
 						<reference key="parent" ref="172148644"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">51</int>
-						<reference key="object" ref="534046869"/>
-						<reference key="parent" ref="802449565"/>
+						<int key="objectID">333</int>
+						<reference key="object" ref="794901717"/>
+						<reference key="parent" ref="107487665"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">49</int>
-						<reference key="object" ref="16222431"/>
+						<int key="objectID">330</int>
+						<reference key="object" ref="1051155594"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="102056827"/>
+							<reference ref="870128015"/>
 						</object>
 						<reference key="parent" ref="172148644"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">50</int>
-						<reference key="object" ref="102056827"/>
-						<reference key="parent" ref="16222431"/>
+						<int key="objectID">331</int>
+						<reference key="object" ref="870128015"/>
+						<reference key="parent" ref="1051155594"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">317</int>
+						<reference key="object" ref="923983319"/>
+						<reference key="parent" ref="172148644"/>
 					</object>
 				</object>
 			</object>
@@ -2516,8 +2613,11 @@
 					<string>388.IBPluginDependency</string>
 					<string>39.IBPluginDependency</string>
 					<string>39.ImportedFromIB2</string>
+					<string>399.IBPluginDependency</string>
 					<string>4.IBAttributePlaceholdersKey</string>
 					<string>4.IBPluginDependency</string>
+					<string>400.IBPluginDependency</string>
+					<string>400.IBSegmentedControlInspectorSelectedSegmentMetadataKey</string>
 					<string>46.IBEditorWindowLastContentRect</string>
 					<string>46.IBPluginDependency</string>
 					<string>48.IBPluginDependency</string>
@@ -2678,6 +2778,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<reference key="dict.sortedKeys" ref="0"/>
@@ -2686,7 +2787,9 @@
 						</object>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{463, 486}, {852, 432}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<integer value="2"/>
+					<string>{{501, 356}, {852, 432}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">
@@ -2722,11 +2825,18 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">398</int>
+			<int key="maxID">408</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">BMScript.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSOutlineView</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -2791,6 +2901,7 @@
 							<string>cherryPick:</string>
 							<string>createBranch:</string>
 							<string>createTag:</string>
+							<string>fetchPullPushAction:</string>
 							<string>merge:</string>
 							<string>openFilesAction:</string>
 							<string>openSelectedFile:</string>
@@ -2821,6 +2932,7 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -2837,6 +2949,7 @@
 							<string>mergeButton</string>
 							<string>rebaseButton</string>
 							<string>refController</string>
+							<string>remoteControls</string>
 							<string>scopeBarView</string>
 							<string>searchField</string>
 							<string>selectedBranchFilterItem</string>
@@ -2849,13 +2962,14 @@
 							<string>NSButton</string>
 							<string>NSButton</string>
 							<string>NSArrayController</string>
-							<string>NSTableView</string>
+							<string>PBCommitList</string>
 							<string>NSOutlineView</string>
 							<string>PBCollapsibleSplitView</string>
 							<string>NSButton</string>
 							<string>NSButton</string>
 							<string>NSButton</string>
 							<string>PBRefController</string>
+							<string>NSSegmentedControl</string>
 							<string>PBGitGradientBarView</string>
 							<string>NSSearchField</string>
 							<string>NSButton</string>
@@ -2980,9 +3094,6 @@
 							<string>commitController</string>
 							<string>commitList</string>
 							<string>historyController</string>
-							<string>pullItem</string>
-							<string>pushItem</string>
-							<string>rebaseItem</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2990,9 +3101,6 @@
 							<string>NSArrayController</string>
 							<string>PBCommitList</string>
 							<string>PBGitHistoryController</string>
-							<string>KBPopUpToolbarItem</string>
-							<string>KBPopUpToolbarItem</string>
-							<string>KBPopUpToolbarItem</string>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -3483,13 +3591,6 @@
 						<string key="minorKey">ImageKit.framework/Headers/IKImageBrowserView.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">ImageKit.framework/Headers/IKSaveOptions.h</string>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -3532,13 +3633,6 @@
 						<string key="minorKey">QuartzFilters.framework/Headers/QuartzFilterManager.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">QuickLookUI.framework/Headers/QLPreviewPanel.h</string>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -3875,7 +3969,7 @@
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1060" key="NS.object.0"/>
+			<integer value="1050" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>