Another UI iteration for bookmark management

1 files changed, 147 insertions, 19 deletions

diff --git a/MyDocument.xib b/MyDocument.xib
index 0a65464..24f7d44 100644
--- a/MyDocument.xib
+++ b/MyDocument.xib
@@ -99,6 +99,7 @@
 							<string>A6030668-108A-4E3B-B755-3C4C9FA83CC0</string>
 							<string>C388BBC0-26DE-4351-BE34-9615B3597AD1</string>
 							<string>C8A8A7C0-891C-4570-84D5-3EC8DE7A414E</string>
+							<string>DFDCB716-DF2B-4F31-8A3D-6205EC62F278</string>
 							<string>NSToolbarFlexibleSpaceItem</string>
 							<string>NSToolbarSpaceItem</string>
 						</object>
@@ -254,6 +255,7 @@
 											</object>
 											<reference key="NSMenuFont" ref="230042935"/>
 										</object>
+										<int key="NSSelectedIndex">-1</int>
 										<bool key="NSPullDown">YES</bool>
 										<int key="NSPreferredEdge">1</int>
 										<bool key="NSUsesItemFromMenu">YES</bool>
@@ -282,7 +284,7 @@
 								<object class="NSButton" key="NSToolbarItemView" id="765530566">
 									<reference key="NSNextResponder"/>
 									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{0, 14}, {12, 13}}</string>
+									<string key="NSFrame">{{0, 14}, {24, 24}}</string>
 									<reference key="NSSuperview"/>
 									<reference key="NSWindow"/>
 									<string key="NSReuseIdentifierKey">_NS:2510</string>
@@ -294,8 +296,8 @@
 										<reference key="NSSupport" ref="230042935"/>
 										<string key="NSCellIdentifier">_NS:2510</string>
 										<reference key="NSControlView" ref="765530566"/>
-										<int key="NSButtonFlags">-2042347265</int>
-										<int key="NSButtonFlags2">70</int>
+										<int key="NSButtonFlags">-2033958657</int>
+										<int key="NSButtonFlags2">6</int>
 										<object class="NSCustomResource" key="NSNormalImage" id="355661270">
 											<string key="NSClassName">NSImage</string>
 											<string key="NSResourceName">NSAddTemplate</string>
@@ -310,7 +312,7 @@
 								<nil key="NSToolbarItemTarget"/>
 								<nil key="NSToolbarItemAction"/>
 								<string key="NSToolbarItemMinSize">{12, 11}</string>
-								<string key="NSToolbarItemMaxSize">{12, 13}</string>
+								<string key="NSToolbarItemMaxSize">{25, 32}</string>
 								<bool key="NSToolbarItemEnabled">YES</bool>
 								<bool key="NSToolbarItemAutovalidates">YES</bool>
 								<int key="NSToolbarItemTag">0</int>
@@ -321,7 +323,7 @@
 								<object class="NSMutableString" key="NSToolbarItemIdentifier">
 									<characters key="NS.bytes">A6030668-108A-4E3B-B755-3C4C9FA83CC0</characters>
 								</object>
-								<string key="NSToolbarItemLabel"/>
+								<string key="NSToolbarItemLabel">Bookmarks</string>
 								<string key="NSToolbarItemPaletteLabel">Bookmarks</string>
 								<nil key="NSToolbarItemToolTip"/>
 								<object class="NSPopUpButton" key="NSToolbarItemView" id="956535447">
@@ -439,7 +441,7 @@
 								<object class="NSButton" key="NSToolbarItemView" id="849608253">
 									<reference key="NSNextResponder"/>
 									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{0, 14}, {12, 13}}</string>
+									<string key="NSFrame">{{0, 14}, {24, 24}}</string>
 									<reference key="NSSuperview"/>
 									<reference key="NSWindow"/>
 									<string key="NSReuseIdentifierKey">_NS:687</string>
@@ -452,10 +454,10 @@
 										<string key="NSCellIdentifier">_NS:687</string>
 										<reference key="NSControlView" ref="849608253"/>
 										<int key="NSButtonFlags">-2041822977</int>
-										<int key="NSButtonFlags2">70</int>
-										<object class="NSCustomResource" key="NSNormalImage" id="1032574847">
+										<int key="NSButtonFlags2">6</int>
+										<object class="NSCustomResource" key="NSNormalImage" id="156137783">
 											<string key="NSClassName">NSImage</string>
-											<string key="NSResourceName">NSQuickLookTemplate</string>
+											<string key="NSResourceName">NSActionTemplate</string>
 										</object>
 										<string key="NSAlternateContents"/>
 										<string key="NSKeyEquivalent"/>
@@ -463,11 +465,73 @@
 										<int key="NSPeriodicInterval">25</int>
 									</object>
 								</object>
-								<reference key="NSToolbarItemImage" ref="1032574847"/>
+								<reference key="NSToolbarItemImage" ref="156137783"/>
 								<nil key="NSToolbarItemTarget"/>
 								<nil key="NSToolbarItemAction"/>
 								<string key="NSToolbarItemMinSize">{12, 13}</string>
-								<string key="NSToolbarItemMaxSize">{15, 25}</string>
+								<string key="NSToolbarItemMaxSize">{24, 25}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">0</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+							</object>
+							<object class="NSToolbarItem" id="233786821">
+								<object class="NSMutableString" key="NSToolbarItemIdentifier">
+									<characters key="NS.bytes">DFDCB716-DF2B-4F31-8A3D-6205EC62F278</characters>
+								</object>
+								<string key="NSToolbarItemLabel"/>
+								<string key="NSToolbarItemPaletteLabel">Custom View</string>
+								<nil key="NSToolbarItemToolTip"/>
+								<object class="NSSegmentedControl" key="NSToolbarItemView" id="595054495">
+									<reference key="NSNextResponder"/>
+									<int key="NSvFlags">268</int>
+									<string key="NSFrame">{{0, 14}, {103, 25}}</string>
+									<reference key="NSSuperview"/>
+									<reference key="NSWindow"/>
+									<string key="NSReuseIdentifierKey">_NS:2177</string>
+									<bool key="NSEnabled">YES</bool>
+									<object class="NSSegmentedCell" key="NSCell" id="297413210">
+										<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>
+										<string key="NSCellIdentifier">_NS:2177</string>
+										<reference key="NSControlView" ref="595054495"/>
+										<object class="NSMutableArray" key="NSSegmentImages">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<object class="NSSegmentItem">
+												<double key="NSSegmentItemWidth">32</double>
+												<reference key="NSSegmentItemImage" ref="355661270"/>
+												<int key="NSSegmentItemImageScaling">0</int>
+											</object>
+											<object class="NSSegmentItem">
+												<double key="NSSegmentItemWidth">32</double>
+												<object class="NSCustomResource" key="NSSegmentItemImage">
+													<string key="NSClassName">NSImage</string>
+													<string key="NSResourceName">NSRemoveTemplate</string>
+												</object>
+												<int key="NSSegmentItemTag">1</int>
+												<int key="NSSegmentItemImageScaling">0</int>
+											</object>
+											<object class="NSSegmentItem">
+												<reference key="NSSegmentItemImage" ref="156137783"/>
+												<int key="NSSegmentItemImageScaling">0</int>
+											</object>
+										</object>
+										<int key="NSSelectedSegment">1</int>
+										<int key="NSTrackingMode">2</int>
+										<int key="NSSegmentStyle">2</int>
+									</object>
+								</object>
+								<nil key="NSToolbarItemImage"/>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{71, 25}</string>
+								<string key="NSToolbarItemMaxSize">{104, 25}</string>
 								<bool key="NSToolbarItemEnabled">YES</bool>
 								<bool key="NSToolbarItemAutovalidates">YES</bool>
 								<int key="NSToolbarItemTag">0</int>
@@ -530,7 +594,7 @@
 							</object>
 						</object>
 					</object>
-					<object class="NSArray" key="NSToolbarIBAllowedItems">
+					<object class="NSMutableArray" key="NSToolbarIBAllowedItems">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<reference ref="495616625"/>
 						<reference ref="1036587131"/>
@@ -540,14 +604,15 @@
 						<reference ref="886590447"/>
 						<reference ref="996004678"/>
 						<reference ref="757526876"/>
+						<reference ref="233786821"/>
 					</object>
-					<object class="NSArray" key="NSToolbarIBDefaultItems">
+					<object class="NSMutableArray" key="NSToolbarIBDefaultItems">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<reference ref="1036587131"/>
 						<reference ref="197468186"/>
+						<reference ref="197468186"/>
 						<reference ref="155957436"/>
-						<reference ref="996004678"/>
-						<reference ref="757526876"/>
+						<reference ref="233786821"/>
 						<reference ref="495616625"/>
 						<reference ref="886590447"/>
 					</object>
@@ -713,7 +778,6 @@
 																		<int key="NSvFlags">-2147483392</int>
 																		<string key="NSFrame">{{1, 508}, {194, 15}}</string>
 																		<reference key="NSSuperview" ref="998159096"/>
-																		<reference key="NSNextKeyView" ref="136609568"/>
 																		<int key="NSViewLayerContentsRedrawPolicy">2</int>
 																		<int key="NSsFlags">1</int>
 																		<reference key="NSTarget" ref="998159096"/>
@@ -1554,6 +1618,22 @@
 					<int key="connectionID">243</int>
 				</object>
 				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">BookmarkToolbarClicked:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="297413210"/>
+					</object>
+					<int key="connectionID">247</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">bookmarkToolbar</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="297413210"/>
+					</object>
+					<int key="connectionID">249</int>
+				</object>
+				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
 						<reference key="source" ref="252265233"/>
@@ -1622,6 +1702,7 @@
 							<reference ref="1036587131"/>
 							<reference ref="996004678"/>
 							<reference ref="757526876"/>
+							<reference ref="233786821"/>
 						</object>
 						<reference key="parent" ref="252265233"/>
 					</object>
@@ -2138,6 +2219,29 @@
 						<reference key="object" ref="896979168"/>
 						<reference key="parent" ref="912000356"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">246</int>
+						<reference key="object" ref="233786821"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="595054495"/>
+						</object>
+						<reference key="parent" ref="668416762"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">244</int>
+						<reference key="object" ref="595054495"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="297413210"/>
+						</object>
+						<reference key="parent" ref="233786821"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">245</int>
+						<reference key="object" ref="297413210"/>
+						<reference key="parent" ref="595054495"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -2193,6 +2297,10 @@
 					<string>230.IBPluginDependency</string>
 					<string>231.IBPluginDependency</string>
 					<string>234.IBPluginDependency</string>
+					<string>244.IBPluginDependency</string>
+					<string>245.IBNSSegmentedControlInspectorSelectedSegmentMetadataKey</string>
+					<string>245.IBPluginDependency</string>
+					<string>246.IBPluginDependency</string>
 					<string>42.IBPluginDependency</string>
 					<string>48.IBPluginDependency</string>
 					<string>53.IBPluginDependency</string>
@@ -2280,6 +2388,10 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<integer value="0"/>
+					<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>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2320,7 +2432,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">243</int>
+			<int key="maxID">257</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2332,6 +2444,7 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>BookmarkToolbarClicked:</string>
 							<string>IndexItemClicked:</string>
 							<string>MultipleMatchItemClicked:</string>
 							<string>SearchItemClicked:</string>
@@ -2340,6 +2453,7 @@
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
 							<string>NSTableView</string>
 							<string>NSTableView</string>
 							<string>NSTableView</string>
@@ -2351,6 +2465,7 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>BookmarkToolbarClicked:</string>
 							<string>IndexItemClicked:</string>
 							<string>MultipleMatchItemClicked:</string>
 							<string>SearchItemClicked:</string>
@@ -2360,6 +2475,10 @@
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<object class="IBActionInfo">
+								<string key="name">BookmarkToolbarClicked:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
 								<string key="name">IndexItemClicked:</string>
 								<string key="candidateClassName">NSTableView</string>
 							</object>
@@ -2387,6 +2506,7 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>addBookmarkBtn</string>
 							<string>bookmarkSelector</string>
+							<string>bookmarkToolbar</string>
 							<string>indexResults</string>
 							<string>indexSearchEntry</string>
 							<string>multipleMatchResults</string>
@@ -2404,6 +2524,7 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NSButton</string>
 							<string>NSPopUpButton</string>
+							<string>NSSegmentedCell</string>
 							<string>NSTableView</string>
 							<string>NSSearchField</string>
 							<string>NSTableView</string>
@@ -2424,6 +2545,7 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>addBookmarkBtn</string>
 							<string>bookmarkSelector</string>
+							<string>bookmarkToolbar</string>
 							<string>indexResults</string>
 							<string>indexSearchEntry</string>
 							<string>multipleMatchResults</string>
@@ -2448,6 +2570,10 @@
 								<string key="candidateClassName">NSPopUpButton</string>
 							</object>
 							<object class="IBToOneOutletInfo">
+								<string key="name">bookmarkToolbar</string>
+								<string key="candidateClassName">NSSegmentedCell</string>
+							</object>
+							<object class="IBToOneOutletInfo">
 								<string key="name">indexResults</string>
 								<string key="candidateClassName">NSTableView</string>
 							</object>
@@ -2516,17 +2642,19 @@
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<object class="NSArray" key="dict.sortedKeys">
 				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>NSActionTemplate</string>
 				<string>NSAddTemplate</string>
 				<string>NSMenuCheckmark</string>
 				<string>NSMenuMixedState</string>
-				<string>NSQuickLookTemplate</string>
+				<string>NSRemoveTemplate</string>
 			</object>
 			<object class="NSMutableArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>{15, 15}</string>
 				<string>{8, 8}</string>
 				<string>{11, 11}</string>
 				<string>{10, 3}</string>
-				<string>{21, 16}</string>
+				<string>{8, 8}</string>
 			</object>
 		</object>
 	</data>