Rework how we delete bookmark from the assistant popover to close match Mac OS X

1 files changed, 92 insertions, 79 deletions

diff --git a/BookmarkAssistant.xib b/BookmarkAssistant.xib
index 46a8164..686881b 100644
--- a/BookmarkAssistant.xib
+++ b/BookmarkAssistant.xib
@@ -2,10 +2,10 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1070</int>
-		<string key="IBDocument.SystemVersion">11C74</string>
+		<string key="IBDocument.SystemVersion">11D50b</string>
 		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1138.23</string>
-		<string key="IBDocument.HIToolboxVersion">567.00</string>
+		<string key="IBDocument.AppKitVersion">1138.32</string>
+		<string key="IBDocument.HIToolboxVersion">568.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			<string key="NS.object.0">1938</string>
@@ -15,10 +15,11 @@
 			<string>NSCustomObject</string>
 			<string>NSTextFieldCell</string>
 			<string>NSScrollView</string>
+			<string>NSButtonCell</string>
 			<string>NSCustomView</string>
 			<string>NSTableHeaderView</string>
 			<string>NSTableColumn</string>
-			<string>NSButtonCell</string>
+			<string>NSButton</string>
 			<string>NSScroller</string>
 			<string>NSTableView</string>
 		</object>
@@ -46,6 +47,37 @@
 				<int key="NSvFlags">268</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="NSButton" id="255917402">
+						<reference key="NSNextResponder" ref="159381209"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{5, 6}, {24, 24}}</string>
+						<reference key="NSSuperview" ref="159381209"/>
+						<reference key="NSWindow"/>
+						<string key="NSReuseIdentifierKey">_NS:687</string>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSButtonCell" key="NSCell" id="836173256">
+							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags2">134217728</int>
+							<string key="NSContents"/>
+							<object class="NSFont" key="NSSupport" id="622951820">
+								<string key="NSName">LucidaGrande</string>
+								<double key="NSSize">13</double>
+								<int key="NSfFlags">1044</int>
+							</object>
+							<string key="NSCellIdentifier">_NS:687</string>
+							<reference key="NSControlView" ref="255917402"/>
+							<int key="NSButtonFlags">-2033958657</int>
+							<int key="NSButtonFlags2">6</int>
+							<object class="NSCustomResource" key="NSNormalImage">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">NSRemoveTemplate</string>
+							</object>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"/>
+							<int key="NSPeriodicDelay">200</int>
+							<int key="NSPeriodicInterval">25</int>
+						</object>
+					</object>
 					<object class="NSScrollView" id="40615759">
 						<reference key="NSNextResponder" ref="159381209"/>
 						<int key="NSvFlags">274</int>
@@ -59,7 +91,7 @@
 									<object class="NSTableView" id="469965926">
 										<reference key="NSNextResponder" ref="171758467"/>
 										<int key="NSvFlags">256</int>
-										<string key="NSFrameSize">{795, 269}</string>
+										<string key="NSFrameSize">{795, 243}</string>
 										<reference key="NSSuperview" ref="171758467"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="1055755166"/>
@@ -114,11 +146,7 @@
 													<int key="NSCellFlags">337772096</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">Text Cell</string>
-													<object class="NSFont" key="NSSupport" id="622951820">
-														<string key="NSName">LucidaGrande</string>
-														<double key="NSSize">13</double>
-														<int key="NSfFlags">1044</int>
-													</object>
+													<reference key="NSSupport" ref="622951820"/>
 													<reference key="NSControlView" ref="469965926"/>
 													<object class="NSColor" key="NSBackgroundColor" id="118030083">
 														<int key="NSColorSpace">6</int>
@@ -170,7 +198,7 @@
 											</object>
 											<object class="NSTableColumn" id="831765575">
 												<string key="NSIdentifier">column3</string>
-												<double key="NSWidth">226</double>
+												<double key="NSWidth">256</double>
 												<double key="NSMinWidth">10</double>
 												<double key="NSMaxWidth">3.4028234663852886e+38</double>
 												<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -178,7 +206,7 @@
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">URL</string>
 													<reference key="NSSupport" ref="26"/>
-													<object class="NSColor" key="NSBackgroundColor" id="570992918">
+													<object class="NSColor" key="NSBackgroundColor">
 														<int key="NSColorSpace">6</int>
 														<string key="NSCatalogName">System</string>
 														<string key="NSColorName">headerColor</string>
@@ -203,40 +231,6 @@
 												<bool key="NSIsEditable">YES</bool>
 												<reference key="NSTableView" ref="469965926"/>
 											</object>
-											<object class="NSTableColumn" id="164095070">
-												<string key="NSIdentifier">column4</string>
-												<double key="NSWidth">27</double>
-												<double key="NSMinWidth">10</double>
-												<double key="NSMaxWidth">3.4028234663852886e+38</double>
-												<object class="NSTableHeaderCell" key="NSHeaderCell">
-													<int key="NSCellFlags">75628096</int>
-													<int key="NSCellFlags2">2048</int>
-													<string key="NSContents"/>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSBackgroundColor" ref="570992918"/>
-													<reference key="NSTextColor" ref="897392244"/>
-												</object>
-												<object class="NSButtonCell" key="NSDataCell" id="854228230">
-													<int key="NSCellFlags">67239424</int>
-													<int key="NSCellFlags2">134348800</int>
-													<string key="NSContents"/>
-													<reference key="NSSupport" ref="26"/>
-													<string key="NSCellIdentifier">_NS:687</string>
-													<reference key="NSControlView" ref="469965926"/>
-													<int key="NSButtonFlags">-2042085121</int>
-													<int key="NSButtonFlags2">1</int>
-													<object class="NSCustomResource" key="NSNormalImage" id="263178287">
-														<string key="NSClassName">NSImage</string>
-														<string key="NSResourceName">NSRemoveTemplate</string>
-													</object>
-													<reference key="NSAlternateImage" ref="263178287"/>
-													<string key="NSAlternateContents"/>
-													<string key="NSKeyEquivalent"/>
-													<int key="NSPeriodicDelay">200</int>
-													<int key="NSPeriodicInterval">25</int>
-												</object>
-												<reference key="NSTableView" ref="469965926"/>
-											</object>
 										</object>
 										<double key="NSIntercellSpacingWidth">3</double>
 										<double key="NSIntercellSpacingHeight">7</double>
@@ -251,7 +245,7 @@
 											</object>
 										</object>
 										<double key="NSRowHeight">17</double>
-										<int key="NSTvFlags">1444937728</int>
+										<int key="NSTvFlags">1455423488</int>
 										<reference key="NSDelegate"/>
 										<reference key="NSDataSource"/>
 										<int key="NSColumnAutoresizingStyle">5</int>
@@ -262,7 +256,7 @@
 										<int key="NSTableViewGroupRowStyle">1</int>
 									</object>
 								</object>
-								<string key="NSFrame">{{1, 17}, {795, 269}}</string>
+								<string key="NSFrame">{{1, 17}, {795, 243}}</string>
 								<reference key="NSSuperview" ref="40615759"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="469965926"/>
@@ -286,14 +280,14 @@
 							<object class="NSScroller" id="1017281827">
 								<reference key="NSNextResponder" ref="40615759"/>
 								<int key="NSvFlags">-2147483392</int>
-								<string key="NSFrame">{{1, 271}, {458, 15}}</string>
+								<string key="NSFrame">{{1, 271}, {795, 15}}</string>
 								<reference key="NSSuperview" ref="40615759"/>
 								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:1847</string>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="40615759"/>
 								<string key="NSAction">_doScroller:</string>
-								<double key="NSPercent">0.9978213507625272</double>
+								<double key="NSPercent">0.99874371859296485</double>
 							</object>
 							<object class="NSClipView" id="1055755166">
 								<reference key="NSNextResponder" ref="40615759"/>
@@ -311,7 +305,7 @@
 								<int key="NScvFlags">4</int>
 							</object>
 						</object>
-						<string key="NSFrame">{{5, 4}, {797, 287}}</string>
+						<string key="NSFrame">{{5, 38}, {797, 261}}</string>
 						<reference key="NSSuperview" ref="159381209"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="171758467"/>
@@ -324,7 +318,7 @@
 						<bytes key="NSScrollAmts">QSAAAEEgAABBwAAAQcAAAA</bytes>
 					</object>
 				</object>
-				<string key="NSFrameSize">{807, 296}</string>
+				<string key="NSFrameSize">{807, 304}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="40615759"/>
@@ -352,11 +346,19 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">bookmarkTableDeleteBtn</string>
+						<string key="label">deleteButton</string>
 						<reference key="source" ref="159381209"/>
-						<reference key="destination" ref="854228230"/>
+						<reference key="destination" ref="255917402"/>
 					</object>
-					<int key="connectionID">46</int>
+					<int key="connectionID">56</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">DeleteButtonClicked:</string>
+						<reference key="source" ref="159381209"/>
+						<reference key="destination" ref="255917402"/>
+					</object>
+					<int key="connectionID">57</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -394,6 +396,7 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="40615759"/>
+							<reference ref="255917402"/>
 						</object>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -416,7 +419,6 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="908185210"/>
 							<reference ref="894574855"/>
-							<reference ref="164095070"/>
 							<reference ref="831765575"/>
 						</object>
 						<reference key="parent" ref="40615759"/>
@@ -465,32 +467,32 @@
 						<reference key="parent" ref="40615759"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">32</int>
-						<reference key="object" ref="164095070"/>
+						<int key="objectID">47</int>
+						<reference key="object" ref="831765575"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="854228230"/>
+							<reference ref="657760171"/>
 						</object>
 						<reference key="parent" ref="469965926"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">44</int>
-						<reference key="object" ref="854228230"/>
-						<reference key="parent" ref="164095070"/>
+						<int key="objectID">48</int>
+						<reference key="object" ref="657760171"/>
+						<reference key="parent" ref="831765575"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">47</int>
-						<reference key="object" ref="831765575"/>
+						<int key="objectID">53</int>
+						<reference key="object" ref="255917402"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="657760171"/>
+							<reference ref="836173256"/>
 						</object>
-						<reference key="parent" ref="469965926"/>
+						<reference key="parent" ref="159381209"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">48</int>
-						<reference key="object" ref="657760171"/>
-						<reference key="parent" ref="831765575"/>
+						<int key="objectID">54</int>
+						<reference key="object" ref="836173256"/>
+						<reference key="parent" ref="255917402"/>
 					</object>
 				</object>
 			</object>
@@ -510,11 +512,11 @@
 					<string>29.IBPluginDependency</string>
 					<string>30.IBPluginDependency</string>
 					<string>31.IBPluginDependency</string>
-					<string>32.IBPluginDependency</string>
 					<string>4.IBPluginDependency</string>
-					<string>44.IBPluginDependency</string>
 					<string>47.IBPluginDependency</string>
 					<string>48.IBPluginDependency</string>
+					<string>53.IBPluginDependency</string>
+					<string>54.IBPluginDependency</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -549,7 +551,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">48</int>
+			<int key="maxID">57</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -557,36 +559,47 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">BookmarkAssistant</string>
 					<string key="superclassName">NSView</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">DeleteButtonClicked:</string>
+						<string key="NS.object.0">NSButton</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">DeleteButtonClicked:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">DeleteButtonClicked:</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+					</object>
 					<object class="NSMutableDictionary" key="outlets">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>bookmarkTableDeleteBtn</string>
 							<string>bookmarkTableView</string>
+							<string>deleteButton</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>NSButtonCell</string>
 							<string>NSTableView</string>
+							<string>NSButton</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>bookmarkTableDeleteBtn</string>
 							<string>bookmarkTableView</string>
+							<string>deleteButton</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<object class="IBToOneOutletInfo">
-								<string key="name">bookmarkTableDeleteBtn</string>
-								<string key="candidateClassName">NSButtonCell</string>
-							</object>
-							<object class="IBToOneOutletInfo">
 								<string key="name">bookmarkTableView</string>
 								<string key="candidateClassName">NSTableView</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">deleteButton</string>
+								<string key="candidateClassName">NSButton</string>
+							</object>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">