From 618eb9d30ab41d9a216f5fae7ec6d1f9bcbbf737 Mon Sep 17 00:00:00 2001
From: Sven Weidauer <sven.weidauer@gmail.com>
Date: Wed, 2 Feb 2011 12:25:31 +0000
Subject: Basic bookmark editing.

svn path=/trunk/netsurf/; revision=11601
---
 cocoa/BookmarksController.h   |   4 +
 cocoa/BookmarksController.m   |  21 ++-
 cocoa/Tree.m                  |   4 +-
 cocoa/res/BookmarksWindow.xib | 299 ++++++++++++++++++++++++++++++++++++------
 4 files changed, 283 insertions(+), 45 deletions(-)

diff --git a/cocoa/BookmarksController.h b/cocoa/BookmarksController.h
index 39449b647..494ee0533 100644
--- a/cocoa/BookmarksController.h
+++ b/cocoa/BookmarksController.h
@@ -34,4 +34,8 @@
 - (IBAction) openBookmarkURL: (id) sender;
 - (IBAction) addBookmark: (id) sender;
 
+- (IBAction) editSelected: (id) sender;
+- (IBAction) deleteSelected: (id) sender;
+- (IBAction) addFolder: (id) sender;
+
 @end
diff --git a/cocoa/BookmarksController.m b/cocoa/BookmarksController.m
index 3abb73fa9..76ea5c299 100644
--- a/cocoa/BookmarksController.m
+++ b/cocoa/BookmarksController.m
@@ -118,7 +118,11 @@ static const char *cocoa_hotlist_path( void )
 
 - (IBAction) addBookmark: (id) sender;
 {
-	NSLog( @"TODO: add bookmark" );
+	struct browser_window *bw = [[(NetSurfApp *)NSApp frontTab] browser];
+	if (bw && bw->current_content) {
+		const char *url = content_get_url( bw->current_content );
+		hotlist_add_page( url );
+	}
 }
 
 - (BOOL) validateUserInterfaceItem: (id) item;
@@ -148,4 +152,19 @@ static const char *cocoa_hotlist_path( void )
 															  nil]];
 }
 
+- (IBAction) editSelected: (id) sender;
+{
+	hotlist_edit_selected();
+}
+
+- (IBAction) deleteSelected: (id) sender;
+{
+	hotlist_delete_selected();
+}
+
+- (IBAction) addFolder: (id) sender;
+{
+	hotlist_add_folder();
+}
+
 @end
diff --git a/cocoa/Tree.m b/cocoa/Tree.m
index ce7f89100..b0f5c7c0a 100644
--- a/cocoa/Tree.m
+++ b/cocoa/Tree.m
@@ -106,8 +106,8 @@ static void tree_get_window_dimensions( int *width, int *height, void *data )
 	
 	NSSize size = [delegate treeWindowSize: (Tree *)data];
 
-	*width = cocoa_pt_to_px( size.width );
-	*height = cocoa_pt_to_px( size.height );
+	if (width != NULL) *width = cocoa_pt_to_px( size.width );
+	if (height != NULL) *height = cocoa_pt_to_px( size.height );
 }
 
 @end
diff --git a/cocoa/res/BookmarksWindow.xib b/cocoa/res/BookmarksWindow.xib
index 9800b3e1d..b038e6ca1 100644
--- a/cocoa/res/BookmarksWindow.xib
+++ b/cocoa/res/BookmarksWindow.xib
@@ -12,7 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="2"/>
+			<integer value="1"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -41,39 +41,40 @@
 			<object class="NSWindowTemplate" id="1005">
 				<int key="NSWindowStyleMask">15</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{196, 142}, {367, 368}}</string>
+				<string key="NSWindowRect">{{196, 80}, {350, 400}}</string>
 				<int key="NSWTFlags">1618477056</int>
 				<string key="NSWindowTitle">Bookmarks</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSWindowContentMinSize">{200, 100}</string>
 				<object class="NSView" key="NSWindowView" id="1006">
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSScrollView" id="53827100">
+						<object class="NSScrollView" id="79136560">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">274</int>
 							<object class="NSMutableArray" key="NSSubviews">
 								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSClipView" id="501480005">
-									<reference key="NSNextResponder" ref="53827100"/>
+								<object class="NSClipView" id="286793088">
+									<reference key="NSNextResponder" ref="79136560"/>
 									<int key="NSvFlags">2304</int>
 									<object class="NSMutableArray" key="NSSubviews">
 										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSCustomView" id="895061337">
-											<reference key="NSNextResponder" ref="501480005"/>
+										<object class="NSCustomView" id="347174519">
+											<reference key="NSNextResponder" ref="286793088"/>
 											<int key="NSvFlags">274</int>
-											<string key="NSFrameSize">{367, 328}</string>
-											<reference key="NSSuperview" ref="501480005"/>
+											<string key="NSFrameSize">{350, 360}</string>
+											<reference key="NSSuperview" ref="286793088"/>
 											<string key="NSClassName">TreeView</string>
 										</object>
 									</object>
-									<string key="NSFrame">{{1, 1}, {367, 328}}</string>
-									<reference key="NSSuperview" ref="53827100"/>
-									<reference key="NSNextKeyView" ref="895061337"/>
-									<reference key="NSDocView" ref="895061337"/>
+									<string key="NSFrame">{{1, 1}, {350, 360}}</string>
+									<reference key="NSSuperview" ref="79136560"/>
+									<reference key="NSNextKeyView" ref="347174519"/>
+									<reference key="NSDocView" ref="347174519"/>
 									<object class="NSColor" key="NSBGColor">
 										<int key="NSColorSpace">6</int>
 										<string key="NSCatalogName">System</string>
@@ -85,41 +86,116 @@
 									</object>
 									<int key="NScvFlags">4</int>
 								</object>
-								<object class="NSScroller" id="766812660">
-									<reference key="NSNextResponder" ref="53827100"/>
+								<object class="NSScroller" id="343618412">
+									<reference key="NSNextResponder" ref="79136560"/>
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{353, 1}, {15, 313}}</string>
-									<reference key="NSSuperview" ref="53827100"/>
-									<reference key="NSTarget" ref="53827100"/>
+									<reference key="NSSuperview" ref="79136560"/>
+									<reference key="NSTarget" ref="79136560"/>
 									<string key="NSAction">_doScroller:</string>
 									<double key="NSCurValue">1</double>
 									<double key="NSPercent">0.96363627910614014</double>
 								</object>
-								<object class="NSScroller" id="86289003">
-									<reference key="NSNextResponder" ref="53827100"/>
+								<object class="NSScroller" id="885399726">
+									<reference key="NSNextResponder" ref="79136560"/>
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{1, 314}, {352, 15}}</string>
-									<reference key="NSSuperview" ref="53827100"/>
+									<reference key="NSSuperview" ref="79136560"/>
 									<int key="NSsFlags">1</int>
-									<reference key="NSTarget" ref="53827100"/>
+									<reference key="NSTarget" ref="79136560"/>
 									<string key="NSAction">_doScroller:</string>
 									<double key="NSPercent">0.50602412223815918</double>
 								</object>
 							</object>
-							<string key="NSFrame">{{-1, 39}, {369, 330}}</string>
+							<string key="NSFrame">{{-1, 39}, {352, 362}}</string>
 							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSNextKeyView" ref="501480005"/>
+							<reference key="NSNextKeyView" ref="286793088"/>
 							<int key="NSsFlags">562</int>
-							<reference key="NSVScroller" ref="766812660"/>
-							<reference key="NSHScroller" ref="86289003"/>
-							<reference key="NSContentView" ref="501480005"/>
+							<reference key="NSVScroller" ref="343618412"/>
+							<reference key="NSHScroller" ref="885399726"/>
+							<reference key="NSContentView" ref="286793088"/>
+						</object>
+						<object class="NSButton" id="1013386414">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">292</int>
+							<string key="NSFrame">{{7, 7}, {29, 25}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="1030859690">
+								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents"/>
+								<object class="NSFont" key="NSSupport" id="1037042855">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">1044</int>
+								</object>
+								<reference key="NSControlView" ref="1013386414"/>
+								<int key="NSButtonFlags">-2033958657</int>
+								<int key="NSButtonFlags2">163</int>
+								<object class="NSCustomResource" key="NSNormalImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">NSAddTemplate</string>
+								</object>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">400</int>
+								<int key="NSPeriodicInterval">75</int>
+							</object>
+						</object>
+						<object class="NSButton" id="812276353">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">292</int>
+							<string key="NSFrame">{{43, 7}, {29, 25}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="142633288">
+								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents"/>
+								<reference key="NSSupport" ref="1037042855"/>
+								<reference key="NSControlView" ref="812276353"/>
+								<int key="NSButtonFlags">-2033958657</int>
+								<int key="NSButtonFlags2">163</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">400</int>
+								<int key="NSPeriodicInterval">75</int>
+							</object>
+						</object>
+						<object class="NSButton" id="482147213">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">292</int>
+							<string key="NSFrame">{{80, 7}, {38, 25}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="586666285">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Edit</string>
+								<reference key="NSSupport" ref="1037042855"/>
+								<reference key="NSControlView" ref="482147213"/>
+								<int key="NSButtonFlags">-2038152961</int>
+								<int key="NSButtonFlags2">163</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">400</int>
+								<int key="NSPeriodicInterval">75</int>
+							</object>
 						</object>
 					</object>
-					<string key="NSFrameSize">{367, 368}</string>
+					<string key="NSFrameSize">{350, 400}</string>
 					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
+				<string key="NSMinSize">{200, 122}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<bool key="NSAutorecalculatesContentBorderThicknessMinY">NO</bool>
+				<double key="NSContentBorderThicknessMinY">39</double>
 			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -137,10 +213,42 @@
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">view</string>
 						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="895061337"/>
+						<reference key="destination" ref="347174519"/>
 					</object>
 					<int key="connectionID">8</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">addFolder:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1013386414"/>
+					</object>
+					<int key="connectionID">17</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">deleteSelected:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="812276353"/>
+					</object>
+					<int key="connectionID">18</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">editSelected:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="482147213"/>
+					</object>
+					<int key="connectionID">19</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">initialFirstResponder</string>
+						<reference key="source" ref="1005"/>
+						<reference key="destination" ref="347174519"/>
+					</object>
+					<int key="connectionID">20</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -183,35 +291,80 @@
 						<reference key="object" ref="1006"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="53827100"/>
+							<reference ref="79136560"/>
+							<reference ref="1013386414"/>
+							<reference ref="812276353"/>
+							<reference ref="482147213"/>
 						</object>
 						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">4</int>
-						<reference key="object" ref="53827100"/>
+						<reference key="object" ref="79136560"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="766812660"/>
-							<reference ref="86289003"/>
-							<reference ref="895061337"/>
+							<reference ref="343618412"/>
+							<reference ref="885399726"/>
+							<reference ref="347174519"/>
 						</object>
 						<reference key="parent" ref="1006"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">5</int>
-						<reference key="object" ref="766812660"/>
-						<reference key="parent" ref="53827100"/>
+						<reference key="object" ref="343618412"/>
+						<reference key="parent" ref="79136560"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">6</int>
-						<reference key="object" ref="86289003"/>
-						<reference key="parent" ref="53827100"/>
+						<reference key="object" ref="885399726"/>
+						<reference key="parent" ref="79136560"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">7</int>
-						<reference key="object" ref="895061337"/>
-						<reference key="parent" ref="53827100"/>
+						<reference key="object" ref="347174519"/>
+						<reference key="parent" ref="79136560"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">11</int>
+						<reference key="object" ref="1013386414"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1030859690"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">12</int>
+						<reference key="object" ref="1030859690"/>
+						<reference key="parent" ref="1013386414"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">13</int>
+						<reference key="object" ref="812276353"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="142633288"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">14</int>
+						<reference key="object" ref="142633288"/>
+						<reference key="parent" ref="812276353"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="482147213"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="586666285"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">16</int>
+						<reference key="object" ref="586666285"/>
+						<reference key="parent" ref="482147213"/>
 					</object>
 				</object>
 			</object>
@@ -225,6 +378,17 @@
 					<string>1.NSWindowTemplate.visibleAtLaunch</string>
 					<string>1.WindowOrigin</string>
 					<string>1.editorWindowContentRectSynchronizationRect</string>
+					<string>1.windowTemplate.hasMinSize</string>
+					<string>1.windowTemplate.minSize</string>
+					<string>11.IBPluginDependency</string>
+					<string>11.IBViewBoundsToFrameTransform</string>
+					<string>12.IBPluginDependency</string>
+					<string>13.IBPluginDependency</string>
+					<string>13.IBViewBoundsToFrameTransform</string>
+					<string>14.IBPluginDependency</string>
+					<string>15.IBPluginDependency</string>
+					<string>15.IBViewBoundsToFrameTransform</string>
+					<string>16.IBPluginDependency</string>
 					<string>2.IBPluginDependency</string>
 					<string>4.IBPluginDependency</string>
 					<string>4.IBViewBoundsToFrameTransform</string>
@@ -234,12 +398,29 @@
 				</object>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>{{344, 236}, {367, 368}}</string>
+					<string>{{226, 417}, {350, 400}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{344, 236}, {367, 368}}</string>
+					<string>{{226, 417}, {350, 400}}</string>
 					<integer value="1"/>
 					<string>{196, 240}</string>
 					<string>{{202, 428}, {480, 270}}</string>
+					<boolean value="YES"/>
+					<string>{200, 100}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABAwAAAwfAAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABCJAAAwfAAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABCmAAAwfAAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
@@ -266,7 +447,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">8</int>
+			<int key="maxID">20</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -279,12 +460,18 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>addBookmark:</string>
+							<string>addFolder:</string>
+							<string>deleteSelected:</string>
+							<string>editSelected:</string>
 							<string>openBookmarkURL:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
@@ -292,6 +479,9 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>addBookmark:</string>
+							<string>addFolder:</string>
+							<string>deleteSelected:</string>
+							<string>editSelected:</string>
 							<string>openBookmarkURL:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
@@ -300,6 +490,18 @@
 								<string key="name">addBookmark:</string>
 								<string key="candidateClassName">id</string>
 							</object>
+							<object class="IBActionInfo">
+								<string key="name">addFolder:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">deleteSelected:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">editSelected:</string>
+								<string key="candidateClassName">id</string>
+							</object>
 							<object class="IBActionInfo">
 								<string key="name">openBookmarkURL:</string>
 								<string key="candidateClassName">id</string>
@@ -391,5 +593,18 @@
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<string key="IBDocument.LastKnownRelativeProjectPath">../NetSurf.xcodeproj</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSArray" key="dict.sortedKeys">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>NSAddTemplate</string>
+				<string>NSRemoveTemplate</string>
+			</object>
+			<object class="NSMutableArray" key="dict.values">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>{8, 8}</string>
+				<string>{8, 8}</string>
+			</object>
+		</object>
 	</data>
 </archive>
-- 
cgit v1.2.3