From 783e38d6235ebe7e913a934f4748762482c8447d Mon Sep 17 00:00:00 2001
From: Nathan Kinsinger <nkinsinger@brotherbard.com>
Date: Mon, 22 Mar 2010 12:26:40 -0600
Subject: [PATCH] Remove the lower toolbar from the history and stage views

    - in the history view move the detail/tree view and quick look buttons to the top toolbar
---
 PBGitCommitView.xib  | 112 +++++------
 PBGitHistoryView.xib | 441 ++++++++++++++++++-------------------------
 2 files changed, 229 insertions(+), 324 deletions(-)

diff --git a/PBGitCommitView.xib b/PBGitCommitView.xib
index 42d061a..96cec64 100644
--- a/PBGitCommitView.xib
+++ b/PBGitCommitView.xib
@@ -3,7 +3,7 @@
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
 		<string key="IBDocument.SystemVersion">10C540</string>
-		<string key="IBDocument.InterfaceBuilderVersion">759</string>
+		<string key="IBDocument.InterfaceBuilderVersion">762</string>
 		<string key="IBDocument.AppKitVersion">1038.25</string>
 		<string key="IBDocument.HIToolboxVersion">458.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
@@ -15,13 +15,13 @@
 			</object>
 			<object class="NSMutableArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>759</string>
-				<string>759</string>
+				<string>762</string>
+				<string>762</string>
 			</object>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="130"/>
+			<integer value="1"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -53,40 +53,6 @@
 				<int key="NSvFlags">274</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSBox" id="471472652">
-						<reference key="NSNextResponder" ref="750704519"/>
-						<int key="NSvFlags">34</int>
-						<string key="NSFrame">{{0, 32}, {852, 5}}</string>
-						<reference key="NSSuperview" ref="750704519"/>
-						<string key="NSOffsets">{0, 0}</string>
-						<object class="NSTextFieldCell" key="NSTitleCell">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">0</int>
-							<string key="NSContents">Box</string>
-							<object class="NSFont" key="NSSupport" id="554612341">
-								<string key="NSName">LucidaGrande</string>
-								<double key="NSSize">13</double>
-								<int key="NSfFlags">1044</int>
-							</object>
-							<object class="NSColor" key="NSBackgroundColor" id="282216416">
-								<int key="NSColorSpace">6</int>
-								<string key="NSCatalogName">System</string>
-								<string key="NSColorName">textBackgroundColor</string>
-								<object class="NSColor" key="NSColor" id="818038086">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MQA</bytes>
-								</object>
-							</object>
-							<object class="NSColor" key="NSTextColor">
-								<int key="NSColorSpace">3</int>
-								<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
-							</object>
-						</object>
-						<int key="NSBorderType">3</int>
-						<int key="NSBoxType">2</int>
-						<int key="NSTitlePosition">0</int>
-						<bool key="NSTransparent">NO</bool>
-					</object>
 					<object class="NSSplitView" id="812432808">
 						<reference key="NSNextResponder" ref="750704519"/>
 						<int key="NSvFlags">274</int>
@@ -116,7 +82,7 @@
 										<string>public.url-name</string>
 									</object>
 								</object>
-								<string key="NSFrameSize">{852, 173}</string>
+								<string key="NSFrameSize">{852, 181}</string>
 								<reference key="NSSuperview" ref="812432808"/>
 								<reference key="NSNextKeyView"/>
 								<string key="FrameName"/>
@@ -170,7 +136,7 @@
 																	<object class="NSTableView" id="588180404">
 																		<reference key="NSNextResponder" ref="614437325"/>
 																		<int key="NSvFlags">4352</int>
-																		<string key="NSFrameSize">{189, 194}</string>
+																		<string key="NSFrameSize">{189, 221}</string>
 																		<reference key="NSSuperview" ref="614437325"/>
 																		<bool key="NSEnabled">YES</bool>
 																		<object class="_NSCornerView" key="NSCornerView">
@@ -197,7 +163,10 @@
 																						<int key="NSColorSpace">6</int>
 																						<string key="NSCatalogName">System</string>
 																						<string key="NSColorName">headerColor</string>
-																						<reference key="NSColor" ref="818038086"/>
+																						<object class="NSColor" key="NSColor" id="818038086">
+																							<int key="NSColorSpace">3</int>
+																							<bytes key="NSWhite">MQA</bytes>
+																						</object>
 																					</object>
 																					<object class="NSColor" key="NSTextColor" id="94707925">
 																						<int key="NSColorSpace">6</int>
@@ -259,7 +228,7 @@
 																		<int key="NSTableViewDraggingDestinationStyle">0</int>
 																	</object>
 																</object>
-																<string key="NSFrame">{{1, 1}, {189, 194}}</string>
+																<string key="NSFrame">{{1, 1}, {189, 221}}</string>
 																<reference key="NSSuperview" ref="563607114"/>
 																<reference key="NSNextKeyView" ref="588180404"/>
 																<reference key="NSDocView" ref="588180404"/>
@@ -286,7 +255,7 @@
 																<double key="NSPercent">0.99470899999999995</double>
 															</object>
 														</object>
-														<string key="NSFrame">{{-1, -1}, {191, 196}}</string>
+														<string key="NSFrame">{{-1, -1}, {191, 223}}</string>
 														<reference key="NSSuperview" ref="663963274"/>
 														<reference key="NSNextKeyView" ref="614437325"/>
 														<int key="NSsFlags">562</int>
@@ -296,11 +265,11 @@
 														<bytes key="NSScrollAmts">QSAAAEEgAABBiAAAQYgAAA</bytes>
 													</object>
 												</object>
-												<string key="NSFrameSize">{190, 200}</string>
+												<string key="NSFrameSize">{190, 227}</string>
 												<reference key="NSSuperview" ref="208180574"/>
 											</object>
 										</object>
-										<string key="NSFrameSize">{190, 215}</string>
+										<string key="NSFrameSize">{190, 242}</string>
 										<reference key="NSSuperview" ref="217294340"/>
 										<string key="NSOffsets">{0, 0}</string>
 										<object class="NSTextFieldCell" key="NSTitleCell">
@@ -308,7 +277,12 @@
 											<int key="NSCellFlags2">0</int>
 											<string key="NSContents">Unstaged Changes</string>
 											<reference key="NSSupport" ref="26"/>
-											<reference key="NSBackgroundColor" ref="282216416"/>
+											<object class="NSColor" key="NSBackgroundColor" id="282216416">
+												<int key="NSColorSpace">6</int>
+												<string key="NSCatalogName">System</string>
+												<string key="NSColorName">textBackgroundColor</string>
+												<reference key="NSColor" ref="818038086"/>
+											</object>
 											<object class="NSColor" key="NSTextColor">
 												<int key="NSColorSpace">3</int>
 												<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
@@ -340,7 +314,11 @@
 															<int key="NSCellFlags">67239424</int>
 															<int key="NSCellFlags2">134217728</int>
 															<string key="NSContents">Commit</string>
-															<reference key="NSSupport" ref="554612341"/>
+															<object class="NSFont" key="NSSupport" id="554612341">
+																<string key="NSName">LucidaGrande</string>
+																<double key="NSSize">13</double>
+																<int key="NSfFlags">1044</int>
+															</object>
 															<reference key="NSControlView" ref="792511503"/>
 															<int key="NSButtonFlags">-2038284033</int>
 															<int key="NSButtonFlags2">301990017</int>
@@ -387,7 +365,7 @@
 																				<string>public.url</string>
 																			</object>
 																		</object>
-																		<string key="NSFrameSize">{427, 14}</string>
+																		<string key="NSFrameSize">{427, 41}</string>
 																		<reference key="NSSuperview" ref="245211955"/>
 																		<object class="NSTextContainer" key="NSTextContainer" id="311869542">
 																			<object class="NSLayoutManager" key="NSLayoutManager">
@@ -461,7 +439,7 @@
 																		<nil key="NSDelegate"/>
 																	</object>
 																</object>
-																<string key="NSFrame">{{1, 1}, {427, 157}}</string>
+																<string key="NSFrame">{{1, 1}, {427, 184}}</string>
 																<reference key="NSSuperview" ref="227052526"/>
 																<reference key="NSNextKeyView" ref="1023793991"/>
 																<reference key="NSDocView" ref="1023793991"/>
@@ -493,7 +471,7 @@
 																<double key="NSPercent">0.94565220000000005</double>
 															</object>
 														</object>
-														<string key="NSFrame">{{0, 36}, {429, 159}}</string>
+														<string key="NSFrame">{{0, 36}, {429, 186}}</string>
 														<reference key="NSSuperview" ref="154221104"/>
 														<reference key="NSNextKeyView" ref="245211955"/>
 														<int key="NSsFlags">530</int>
@@ -549,11 +527,11 @@
 														</object>
 													</object>
 												</object>
-												<string key="NSFrameSize">{429, 200}</string>
+												<string key="NSFrameSize">{429, 227}</string>
 												<reference key="NSSuperview" ref="635871052"/>
 											</object>
 										</object>
-										<string key="NSFrame">{{199, 0}, {429, 215}}</string>
+										<string key="NSFrame">{{199, 0}, {429, 242}}</string>
 										<reference key="NSSuperview" ref="217294340"/>
 										<string key="NSOffsets">{0, 0}</string>
 										<object class="NSTextFieldCell" key="NSTitleCell">
@@ -596,7 +574,7 @@
 																	<object class="NSTableView" id="638535043">
 																		<reference key="NSNextResponder" ref="551030904"/>
 																		<int key="NSvFlags">4352</int>
-																		<string key="NSFrameSize">{214, 194}</string>
+																		<string key="NSFrameSize">{214, 221}</string>
 																		<reference key="NSSuperview" ref="551030904"/>
 																		<int key="NSTag">1</int>
 																		<bool key="NSEnabled">YES</bool>
@@ -649,7 +627,7 @@
 																		<int key="NSTableViewDraggingDestinationStyle">0</int>
 																	</object>
 																</object>
-																<string key="NSFrame">{{1, 1}, {214, 194}}</string>
+																<string key="NSFrame">{{1, 1}, {214, 221}}</string>
 																<reference key="NSSuperview" ref="617511385"/>
 																<reference key="NSNextKeyView" ref="638535043"/>
 																<reference key="NSDocView" ref="638535043"/>
@@ -676,7 +654,7 @@
 																<double key="NSPercent">0.90033220000000003</double>
 															</object>
 														</object>
-														<string key="NSFrame">{{0, -1}, {216, 196}}</string>
+														<string key="NSFrame">{{0, -1}, {216, 223}}</string>
 														<reference key="NSSuperview" ref="559277910"/>
 														<reference key="NSNextKeyView" ref="551030904"/>
 														<int key="NSsFlags">562</int>
@@ -686,11 +664,11 @@
 														<bytes key="NSScrollAmts">QSAAAEEgAABBiAAAQYgAAA</bytes>
 													</object>
 												</object>
-												<string key="NSFrameSize">{215, 200}</string>
+												<string key="NSFrameSize">{215, 227}</string>
 												<reference key="NSSuperview" ref="955377287"/>
 											</object>
 										</object>
-										<string key="NSFrame">{{637, 0}, {215, 215}}</string>
+										<string key="NSFrame">{{637, 0}, {215, 242}}</string>
 										<reference key="NSSuperview" ref="217294340"/>
 										<string key="NSOffsets">{0, 0}</string>
 										<object class="NSTextFieldCell" key="NSTitleCell">
@@ -711,12 +689,12 @@
 										<bool key="NSTransparent">NO</bool>
 									</object>
 								</object>
-								<string key="NSFrame">{{0, 182}, {852, 215}}</string>
+								<string key="NSFrame">{{0, 190}, {852, 242}}</string>
 								<reference key="NSSuperview" ref="812432808"/>
 								<bool key="NSIsVertical">YES</bool>
 							</object>
 						</object>
-						<string key="NSFrame">{{0, 35}, {852, 397}}</string>
+						<string key="NSFrameSize">{852, 432}</string>
 						<reference key="NSSuperview" ref="750704519"/>
 						<string key="NSAutosaveName">CommitViewSplitView</string>
 					</object>
@@ -1087,7 +1065,6 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="812432808"/>
-							<reference ref="471472652"/>
 						</object>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -1331,11 +1308,6 @@
 						<reference key="object" ref="964972443"/>
 						<reference key="parent" ref="1042222292"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">308</int>
-						<reference key="object" ref="471472652"/>
-						<reference key="parent" ref="750704519"/>
-					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1371,7 +1343,6 @@
 					<string>248.IBPluginDependency</string>
 					<string>278.IBPluginDependency</string>
 					<string>279.IBPluginDependency</string>
-					<string>308.IBPluginDependency</string>
 					<string>45.IBPluginDependency</string>
 					<string>46.IBPluginDependency</string>
 					<string>47.IBPluginDependency</string>
@@ -1420,7 +1391,6 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>PBFileChangesTableView</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1573,6 +1543,10 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">PBViewController</string>
 					<string key="superclassName">NSViewController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">refresh:</string>
+						<string key="NS.object.0">id</string>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">PBViewController.h</string>
@@ -2274,5 +2248,9 @@
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<string key="IBDocument.LastKnownRelativeProjectPath">GitX.xcodeproj</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NS.key.0">NSSwitch</string>
+			<string key="NS.object.0">{15, 15}</string>
+		</object>
 	</data>
 </archive>
diff --git a/PBGitHistoryView.xib b/PBGitHistoryView.xib
index 4085e58..caa5c24 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="312"/>
+			<integer value="316"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -103,25 +103,49 @@
 				<int key="NSvFlags">4370</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSCustomView" id="136155223">
+					<object class="NSCustomView" id="172148644">
 						<reference key="NSNextResponder" ref="319362431"/>
-						<int key="NSvFlags">290</int>
+						<int key="NSvFlags">266</int>
 						<object class="NSMutableArray" key="NSSubviews">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="NSSegmentedControl" id="802449565">
-								<reference key="NSNextResponder" ref="136155223"/>
-								<int key="NSvFlags">293</int>
-								<string key="NSFrame">{{376, 1}, {71, 25}}</string>
-								<reference key="NSSuperview" ref="136155223"/>
+							<object class="NSButton" id="16222431">
+								<reference key="NSNextResponder" ref="172148644"/>
+								<int key="NSvFlags">289</int>
+								<string key="NSFrame">{{805, 3}, {37, 25}}</string>
+								<reference key="NSSuperview" ref="172148644"/>
 								<bool key="NSEnabled">YES</bool>
-								<object class="NSSegmentedCell" key="NSCell" id="534046869">
+								<object class="NSButtonCell" key="NSCell" id="102056827">
 									<int key="NSCellFlags">-2080244224</int>
-									<int key="NSCellFlags2">0</int>
+									<int key="NSCellFlags2">134217728</int>
+									<string key="NSContents">QuickLook</string>
 									<object class="NSFont" key="NSSupport" id="924107556">
 										<string key="NSName">LucidaGrande</string>
 										<double key="NSSize">13</double>
 										<int key="NSfFlags">1044</int>
 									</object>
+									<reference key="NSControlView" ref="16222431"/>
+									<int key="NSButtonFlags">-2033958657</int>
+									<int key="NSButtonFlags2">163</int>
+									<object class="NSCustomResource" key="NSNormalImage">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">NSQuickLookTemplate</string>
+									</object>
+									<string key="NSAlternateContents"/>
+									<string key="NSKeyEquivalent"/>
+									<int key="NSPeriodicDelay">400</int>
+									<int key="NSPeriodicInterval">75</int>
+								</object>
+							</object>
+							<object class="NSSegmentedControl" id="802449565">
+								<reference key="NSNextResponder" ref="172148644"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrame">{{267, 3}, {71, 25}}</string>
+								<reference key="NSSuperview" ref="172148644"/>
+								<bool key="NSEnabled">YES</bool>
+								<object class="NSSegmentedCell" key="NSCell" id="534046869">
+									<int key="NSCellFlags">-2080244224</int>
+									<int key="NSCellFlags2">0</int>
+									<reference key="NSSupport" ref="924107556"/>
 									<reference key="NSControlView" ref="802449565"/>
 									<object class="NSMutableArray" key="NSSegmentImages">
 										<bool key="EncodedWithXMLCoder">YES</bool>
@@ -150,23 +174,23 @@
 									<int key="NSSegmentStyle">2</int>
 								</object>
 							</object>
-							<object class="NSButton" id="16222431">
-								<reference key="NSNextResponder" ref="136155223"/>
-								<int key="NSvFlags">289</int>
-								<string key="NSFrame">{{795, 1}, {37, 25}}</string>
-								<reference key="NSSuperview" ref="136155223"/>
+							<object class="NSButton" id="258088911">
+								<reference key="NSNextResponder" ref="172148644"/>
+								<int key="NSvFlags">268</int>
+								<string key="NSFrame">{{206, 3}, {37, 25}}</string>
+								<reference key="NSSuperview" ref="172148644"/>
 								<bool key="NSEnabled">YES</bool>
-								<object class="NSButtonCell" key="NSCell" id="102056827">
+								<object class="NSButtonCell" key="NSCell" id="760195759">
 									<int key="NSCellFlags">-2080244224</int>
 									<int key="NSCellFlags2">134217728</int>
-									<string key="NSContents">QuickLook</string>
+									<string key="NSContents">Rebase</string>
 									<reference key="NSSupport" ref="924107556"/>
-									<reference key="NSControlView" ref="16222431"/>
+									<reference key="NSControlView" ref="258088911"/>
 									<int key="NSButtonFlags">-2033958657</int>
 									<int key="NSButtonFlags2">163</int>
 									<object class="NSCustomResource" key="NSNormalImage">
 										<string key="NSClassName">NSImage</string>
-										<string key="NSResourceName">NSQuickLookTemplate</string>
+										<string key="NSResourceName">RebaseTemplate</string>
 									</object>
 									<string key="NSAlternateContents"/>
 									<string key="NSKeyEquivalent"/>
@@ -174,127 +198,53 @@
 									<int key="NSPeriodicInterval">75</int>
 								</object>
 							</object>
-							<object class="NSBox" id="832206172">
-								<reference key="NSNextResponder" ref="136155223"/>
-								<int key="NSvFlags">10</int>
-								<string key="NSFrame">{{0, 27}, {852, 5}}</string>
-								<reference key="NSSuperview" ref="136155223"/>
-								<string key="NSOffsets">{0, 0}</string>
-								<object class="NSTextFieldCell" key="NSTitleCell">
-									<int key="NSCellFlags">67239424</int>
-									<int key="NSCellFlags2">0</int>
-									<string key="NSContents">Box</string>
-									<reference key="NSSupport" ref="924107556"/>
-									<object class="NSColor" key="NSBackgroundColor" id="870781813">
-										<int key="NSColorSpace">6</int>
-										<string key="NSCatalogName">System</string>
-										<string key="NSColorName">textBackgroundColor</string>
-										<object class="NSColor" key="NSColor" id="965176493">
-											<int key="NSColorSpace">3</int>
-											<bytes key="NSWhite">MQA</bytes>
-										</object>
-									</object>
-									<object class="NSColor" key="NSTextColor">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
-									</object>
-								</object>
-								<int key="NSBorderType">3</int>
-								<int key="NSBoxType">2</int>
-								<int key="NSTitlePosition">0</int>
-								<bool key="NSTransparent">NO</bool>
-							</object>
-						</object>
-						<string key="NSFrameSize">{852, 30}</string>
-						<reference key="NSSuperview" ref="319362431"/>
-						<string key="NSClassName">NSView</string>
-					</object>
-					<object class="NSCustomView" id="172148644">
-						<reference key="NSNextResponder" ref="319362431"/>
-						<int key="NSvFlags">266</int>
-						<object class="NSMutableArray" key="NSSubviews">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="NSCustomView" id="564066926">
+							<object class="NSButton" id="1006113529">
 								<reference key="NSNextResponder" ref="172148644"/>
-								<int key="NSvFlags">269</int>
-								<object class="NSMutableArray" key="NSSubviews">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<object class="NSButton" id="258088911">
-										<reference key="NSNextResponder" ref="564066926"/>
-										<int key="NSvFlags">268</int>
-										<string key="NSFrame">{{110, 3}, {37, 25}}</string>
-										<reference key="NSSuperview" ref="564066926"/>
-										<bool key="NSEnabled">YES</bool>
-										<object class="NSButtonCell" key="NSCell" id="760195759">
-											<int key="NSCellFlags">-2080244224</int>
-											<int key="NSCellFlags2">134217728</int>
-											<string key="NSContents">Rebase</string>
-											<reference key="NSSupport" ref="924107556"/>
-											<reference key="NSControlView" ref="258088911"/>
-											<int key="NSButtonFlags">-2033958657</int>
-											<int key="NSButtonFlags2">163</int>
-											<object class="NSCustomResource" key="NSNormalImage">
-												<string key="NSClassName">NSImage</string>
-												<string key="NSResourceName">RebaseTemplate</string>
-											</object>
-											<string key="NSAlternateContents"/>
-											<string key="NSKeyEquivalent"/>
-											<int key="NSPeriodicDelay">400</int>
-											<int key="NSPeriodicInterval">75</int>
-										</object>
-									</object>
-									<object class="NSButton" id="1006113529">
-										<reference key="NSNextResponder" ref="564066926"/>
-										<int key="NSvFlags">268</int>
-										<string key="NSFrame">{{65, 3}, {37, 25}}</string>
-										<reference key="NSSuperview" ref="564066926"/>
-										<bool key="NSEnabled">YES</bool>
-										<object class="NSButtonCell" key="NSCell" id="772225018">
-											<int key="NSCellFlags">-2080244224</int>
-											<int key="NSCellFlags2">134217728</int>
-											<string key="NSContents">Cherry Pick</string>
-											<reference key="NSSupport" ref="924107556"/>
-											<reference key="NSControlView" ref="1006113529"/>
-											<int key="NSButtonFlags">-2033958657</int>
-											<int key="NSButtonFlags2">163</int>
-											<object class="NSCustomResource" key="NSNormalImage">
-												<string key="NSClassName">NSImage</string>
-												<string key="NSResourceName">CherryPickTemplate</string>
-											</object>
-											<string key="NSAlternateContents"/>
-											<string key="NSKeyEquivalent"/>
-											<int key="NSPeriodicDelay">400</int>
-											<int key="NSPeriodicInterval">75</int>
-										</object>
-									</object>
-									<object class="NSButton" id="502319102">
-										<reference key="NSNextResponder" ref="564066926"/>
-										<int key="NSvFlags">268</int>
-										<string key="NSFrame">{{20, 3}, {37, 25}}</string>
-										<reference key="NSSuperview" ref="564066926"/>
-										<bool key="NSEnabled">YES</bool>
-										<object class="NSButtonCell" key="NSCell" id="934102630">
-											<int key="NSCellFlags">-2080244224</int>
-											<int key="NSCellFlags2">134217728</int>
-											<string key="NSContents">Merge</string>
-											<reference key="NSSupport" ref="924107556"/>
-											<reference key="NSControlView" ref="502319102"/>
-											<int key="NSButtonFlags">-2033958657</int>
-											<int key="NSButtonFlags2">163</int>
-											<object class="NSCustomResource" key="NSNormalImage">
-												<string key="NSClassName">NSImage</string>
-												<string key="NSResourceName">MergeTemplate</string>
-											</object>
-											<string key="NSAlternateContents"/>
-											<string key="NSKeyEquivalent"/>
-											<int key="NSPeriodicDelay">400</int>
-											<int key="NSPeriodicInterval">75</int>
-										</object>
-									</object>
-								</object>
-								<string key="NSFrame">{{342, 0}, {167, 30}}</string>
+								<int key="NSvFlags">268</int>
+								<string key="NSFrame">{{161, 3}, {37, 25}}</string>
 								<reference key="NSSuperview" ref="172148644"/>
-								<string key="NSClassName">NSView</string>
+								<bool key="NSEnabled">YES</bool>
+								<object class="NSButtonCell" key="NSCell" id="772225018">
+									<int key="NSCellFlags">-2080244224</int>
+									<int key="NSCellFlags2">134217728</int>
+									<string key="NSContents">Cherry Pick</string>
+									<reference key="NSSupport" ref="924107556"/>
+									<reference key="NSControlView" ref="1006113529"/>
+									<int key="NSButtonFlags">-2033958657</int>
+									<int key="NSButtonFlags2">163</int>
+									<object class="NSCustomResource" key="NSNormalImage">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">CherryPickTemplate</string>
+									</object>
+									<string key="NSAlternateContents"/>
+									<string key="NSKeyEquivalent"/>
+									<int key="NSPeriodicDelay">400</int>
+									<int key="NSPeriodicInterval">75</int>
+								</object>
+							</object>
+							<object class="NSButton" id="502319102">
+								<reference key="NSNextResponder" ref="172148644"/>
+								<int key="NSvFlags">268</int>
+								<string key="NSFrame">{{116, 3}, {37, 25}}</string>
+								<reference key="NSSuperview" ref="172148644"/>
+								<bool key="NSEnabled">YES</bool>
+								<object class="NSButtonCell" key="NSCell" id="934102630">
+									<int key="NSCellFlags">-2080244224</int>
+									<int key="NSCellFlags2">134217728</int>
+									<string key="NSContents">Merge</string>
+									<reference key="NSSupport" ref="924107556"/>
+									<reference key="NSControlView" ref="502319102"/>
+									<int key="NSButtonFlags">-2033958657</int>
+									<int key="NSButtonFlags2">163</int>
+									<object class="NSCustomResource" key="NSNormalImage">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">MergeTemplate</string>
+									</object>
+									<string key="NSAlternateContents"/>
+									<string key="NSKeyEquivalent"/>
+									<int key="NSPeriodicDelay">400</int>
+									<int key="NSPeriodicInterval">75</int>
+								</object>
 							</object>
 							<object class="NSButton" id="107487665">
 								<reference key="NSNextResponder" ref="172148644"/>
@@ -355,7 +305,15 @@
 									<int key="NSCellFlags2">0</int>
 									<string key="NSContents">Box</string>
 									<reference key="NSSupport" ref="924107556"/>
-									<reference key="NSBackgroundColor" ref="870781813"/>
+									<object class="NSColor" key="NSBackgroundColor" id="870781813">
+										<int key="NSColorSpace">6</int>
+										<string key="NSCatalogName">System</string>
+										<string key="NSColorName">textBackgroundColor</string>
+										<object class="NSColor" key="NSColor" id="965176493">
+											<int key="NSColorSpace">3</int>
+											<bytes key="NSWhite">MQA</bytes>
+										</object>
+									</object>
 									<object class="NSColor" key="NSTextColor">
 										<int key="NSColorSpace">3</int>
 										<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
@@ -384,7 +342,7 @@
 									<object class="NSBox" id="147470634">
 										<reference key="NSNextResponder" ref="24227530"/>
 										<int key="NSvFlags">10</int>
-										<string key="NSFrame">{{0, 135}, {852, 5}}</string>
+										<string key="NSFrame">{{0, 143}, {852, 5}}</string>
 										<reference key="NSSuperview" ref="24227530"/>
 										<string key="NSOffsets">{0, 0}</string>
 										<object class="NSTextFieldCell" key="NSTitleCell">
@@ -416,7 +374,7 @@
 													<object class="NSTableView" id="254268962">
 														<reference key="NSNextResponder" ref="546023969"/>
 														<int key="NSvFlags">4352</int>
-														<string key="NSFrameSize">{852, 121}</string>
+														<string key="NSFrameSize">{852, 129}</string>
 														<reference key="NSSuperview" ref="546023969"/>
 														<bool key="NSEnabled">YES</bool>
 														<object class="NSTableHeaderView" key="NSHeaderView" id="942510576">
@@ -601,7 +559,7 @@
 														<int key="NSTableViewDraggingDestinationStyle">0</int>
 													</object>
 												</object>
-												<string key="NSFrame">{{0, 17}, {852, 121}}</string>
+												<string key="NSFrame">{{0, 17}, {852, 129}}</string>
 												<reference key="NSSuperview" ref="663765878"/>
 												<reference key="NSNextKeyView" ref="254268962"/>
 												<reference key="NSDocView" ref="254268962"/>
@@ -643,7 +601,7 @@
 											</object>
 											<reference ref="806470424"/>
 										</object>
-										<string key="NSFrameSize">{852, 138}</string>
+										<string key="NSFrameSize">{852, 146}</string>
 										<reference key="NSSuperview" ref="24227530"/>
 										<reference key="NSNextKeyView" ref="546023969"/>
 										<int key="NSsFlags">560</int>
@@ -787,12 +745,12 @@
 												</object>
 											</object>
 										</object>
-										<string key="NSFrame">{{0, 138}, {852, 24}}</string>
+										<string key="NSFrame">{{0, 146}, {852, 24}}</string>
 										<reference key="NSSuperview" ref="24227530"/>
 										<string key="NSClassName">PBGitGradientBarView</string>
 									</object>
 								</object>
-								<string key="NSFrameSize">{852, 162}</string>
+								<string key="NSFrameSize">{852, 170}</string>
 								<reference key="NSSuperview" ref="202620420"/>
 								<string key="NSClassName">NSView</string>
 							</object>
@@ -804,7 +762,7 @@
 									<object class="NSTabView" id="135073984">
 										<reference key="NSNextResponder" ref="560436169"/>
 										<int key="NSvFlags">18</int>
-										<string key="NSFrameSize">{852, 210}</string>
+										<string key="NSFrameSize">{852, 232}</string>
 										<reference key="NSSuperview" ref="560436169"/>
 										<object class="NSMutableArray" key="NSTabViewItems">
 											<bool key="EncodedWithXMLCoder">YES</bool>
@@ -839,7 +797,7 @@
 																	<string>public.url-name</string>
 																</object>
 															</object>
-															<string key="NSFrame">{{1, 0}, {851, 211}}</string>
+															<string key="NSFrame">{{1, 0}, {851, 233}}</string>
 															<reference key="NSSuperview" ref="859052736"/>
 															<reference key="NSNextKeyView"/>
 															<string key="FrameName"/>
@@ -866,7 +824,7 @@
 															<bool key="AllowsUndo">YES</bool>
 														</object>
 													</object>
-													<string key="NSFrameSize">{852, 210}</string>
+													<string key="NSFrameSize">{852, 232}</string>
 													<reference key="NSSuperview" ref="135073984"/>
 												</object>
 												<string key="NSLabel">Details</string>
@@ -1264,12 +1222,12 @@
 										</object>
 									</object>
 								</object>
-								<string key="NSFrame">{{0, 163}, {852, 210}}</string>
+								<string key="NSFrame">{{0, 171}, {852, 232}}</string>
 								<reference key="NSSuperview" ref="202620420"/>
 								<string key="NSClassName">NSView</string>
 							</object>
 						</object>
-						<string key="NSFrame">{{0, 30}, {852, 373}}</string>
+						<string key="NSFrameSize">{852, 403}</string>
 						<reference key="NSSuperview" ref="319362431"/>
 						<int key="NSDividerStyle">2</int>
 						<string key="NSAutosaveName">HistoryViewSplitView</string>
@@ -1998,7 +1956,6 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="202620420"/>
-							<reference ref="136155223"/>
 							<reference ref="172148644"/>
 						</object>
 						<reference key="parent" ref="0"/>
@@ -2302,51 +2259,6 @@
 						<reference key="object" ref="1022125543"/>
 						<reference key="parent" ref="354285291"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">312</int>
-						<reference key="object" ref="136155223"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="832206172"/>
-							<reference ref="16222431"/>
-							<reference ref="802449565"/>
-						</object>
-						<reference key="parent" ref="319362431"/>
-						<string key="objectName">History Bottom Toolbar</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">314</int>
-						<reference key="object" ref="832206172"/>
-						<reference key="parent" ref="136155223"/>
-					</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="136155223"/>
-					</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="136155223"/>
-					</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">50</int>
-						<reference key="object" ref="102056827"/>
-						<reference key="parent" ref="16222431"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">316</int>
 						<reference key="object" ref="172148644"/>
@@ -2355,7 +2267,11 @@
 							<reference ref="923983319"/>
 							<reference ref="1051155594"/>
 							<reference ref="107487665"/>
-							<reference ref="564066926"/>
+							<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>
@@ -2398,59 +2314,6 @@
 						<reference key="object" ref="794901717"/>
 						<reference key="parent" ref="107487665"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">336</int>
-						<reference key="object" ref="564066926"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="502319102"/>
-							<reference ref="1006113529"/>
-							<reference ref="258088911"/>
-						</object>
-						<reference key="parent" ref="172148644"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">337</int>
-						<reference key="object" ref="502319102"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="934102630"/>
-						</object>
-						<reference key="parent" ref="564066926"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">338</int>
-						<reference key="object" ref="934102630"/>
-						<reference key="parent" ref="502319102"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">340</int>
-						<reference key="object" ref="1006113529"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="772225018"/>
-						</object>
-						<reference key="parent" ref="564066926"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">341</int>
-						<reference key="object" ref="772225018"/>
-						<reference key="parent" ref="1006113529"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">343</int>
-						<reference key="object" ref="258088911"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="760195759"/>
-						</object>
-						<reference key="parent" ref="564066926"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">344</int>
-						<reference key="object" ref="760195759"/>
-						<reference key="parent" ref="258088911"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">355</int>
 						<reference key="object" ref="884073279"/>
@@ -2493,6 +2356,76 @@
 						<reference key="object" ref="819755658"/>
 						<reference key="parent" ref="832955200"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">337</int>
+						<reference key="object" ref="502319102"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="934102630"/>
+						</object>
+						<reference key="parent" ref="172148644"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">338</int>
+						<reference key="object" ref="934102630"/>
+						<reference key="parent" ref="502319102"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">340</int>
+						<reference key="object" ref="1006113529"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="772225018"/>
+						</object>
+						<reference key="parent" ref="172148644"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">341</int>
+						<reference key="object" ref="772225018"/>
+						<reference key="parent" ref="1006113529"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">343</int>
+						<reference key="object" ref="258088911"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="760195759"/>
+						</object>
+						<reference key="parent" ref="172148644"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">344</int>
+						<reference key="object" ref="760195759"/>
+						<reference key="parent" ref="258088911"/>
+					</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>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -2544,8 +2477,6 @@
 					<string>31.ImportedFromIB2</string>
 					<string>310.IBPluginDependency</string>
 					<string>311.IBPluginDependency</string>
-					<string>312.IBPluginDependency</string>
-					<string>314.IBPluginDependency</string>
 					<string>316.IBPluginDependency</string>
 					<string>317.IBPluginDependency</string>
 					<string>32.IBPluginDependency</string>
@@ -2558,7 +2489,6 @@
 					<string>332.IBAttributePlaceholdersKey</string>
 					<string>332.IBPluginDependency</string>
 					<string>333.IBPluginDependency</string>
-					<string>336.IBPluginDependency</string>
 					<string>337.IBAttributePlaceholdersKey</string>
 					<string>337.IBPluginDependency</string>
 					<string>338.IBPluginDependency</string>
@@ -2656,8 +2586,6 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2681,7 +2609,6 @@
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">
 						<string key="NS.key.0">ToolTip</string>
 						<object class="IBToolTipAttribute" key="NS.object.0">
@@ -2759,7 +2686,7 @@
 						</object>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{627, 791}, {852, 432}}</string>
+					<string>{{463, 486}, {852, 432}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">