From 84b4a01f4f2032a17e5dc93e4b4f1f37a71ab04c Mon Sep 17 00:00:00 2001 From: Sven Weidauer Date: Tue, 1 Feb 2011 08:39:35 +0000 Subject: Implemented global history window using new Tree class. svn path=/trunk/netsurf/; revision=11578 --- cocoa/res/HistoryWindow.xib | 338 ++++++++++++++++++++++++++++++++++++++++++++ cocoa/res/MainMenu.xib | 206 ++++----------------------- 2 files changed, 363 insertions(+), 181 deletions(-) create mode 100644 cocoa/res/HistoryWindow.xib (limited to 'cocoa/res') diff --git a/cocoa/res/HistoryWindow.xib b/cocoa/res/HistoryWindow.xib new file mode 100644 index 000000000..a5ec90e1a --- /dev/null +++ b/cocoa/res/HistoryWindow.xib @@ -0,0 +1,338 @@ + + + + 1060 + 10J567 + 804 + 1038.35 + 462.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 804 + + + YES + + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + + + YES + + YES + + + YES + + + + YES + + HistoryWindowController + + + FirstResponder + + + NSApplication + + + 15 + 2 + {{196, 112}, {327, 398}} + 1618477056 + History + NSWindow + + {1.79769e+308, 1.79769e+308} + + + 256 + + YES + + + 274 + + YES + + + 2304 + + YES + + + 274 + {312, 383} + + TreeView + + + {{1, 1}, {312, 383}} + + + + + 6 + System + controlColor + + 3 + MC42NjY2NjY2NjY3AA + + + 4 + + + + 256 + {{313, 1}, {15, 383}} + + + _doScroller: + 1 + 0.96363627910614014 + + + + 256 + {{1, 384}, {312, 15}} + + 1 + + _doScroller: + 0.50602412223815918 + + + {{-1, -1}, {329, 400}} + + + 50 + + + + + + {327, 398} + + + {{0, 0}, {1680, 1028}} + {1.79769e+308, 1.79769e+308} + + + + + YES + + + window + + + + 3 + + + + view + + + + 8 + + + + + YES + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 1 + + + YES + + + + + + 2 + + + YES + + + + + + 4 + + + YES + + + + + + + + 5 + + + + + 6 + + + + + 7 + + + + + + + YES + + YES + 1.IBEditorWindowLastContentRect + 1.IBPluginDependency + 1.IBWindowTemplateEditedContentRect + 1.NSWindowTemplate.visibleAtLaunch + 1.WindowOrigin + 1.editorWindowContentRectSynchronizationRect + 2.IBPluginDependency + 4.IBPluginDependency + 5.IBPluginDependency + 6.IBPluginDependency + 7.IBPluginDependency + + + YES + {{361, 416}, {327, 398}} + com.apple.InterfaceBuilder.CocoaPlugin + {{361, 416}, {327, 398}} + + {196, 240} + {{202, 428}, {480, 270}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + YES + + + YES + + + + + YES + + + YES + + + + 8 + + + + YES + + HistoryWindowController + NSWindowController + + view + TreeView + + + view + + view + TreeView + + + + IBProjectSource + HistoryWindowController.h + + + + NSApplication + + IBProjectSource + PSMTabBarControl/PSMTabDragAssistant.h + + + + NSObject + + IBProjectSource + PSMTabBarControl/PSMTabBarCell.h + + + + NSObject + + IBProjectSource + PSMTabBarControl/PSMTabBarControl.h + + + + ScrollableView + NSView + + IBProjectSource + ScrollableView.h + + + + TreeView + ScrollableView + + IBProjectSource + TreeView.h + + + + + 0 + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + ../NetSurf.xcodeproj + 3 + + diff --git a/cocoa/res/MainMenu.xib b/cocoa/res/MainMenu.xib index 7ca05ec2b..028a970a5 100644 --- a/cocoa/res/MainMenu.xib +++ b/cocoa/res/MainMenu.xib @@ -12,7 +12,7 @@ YES - + YES @@ -643,87 +643,6 @@ _NSMainMenu - - 15 - 2 - {{196, 123}, {300, 387}} - 1685585920 - History - NSWindow - - {1.79769e+308, 1.79769e+308} - - - 256 - - YES - - - 274 - - YES - - - 2304 - - YES - - - 268 - {300, 387} - - TreeView - - - {{1, 1}, {300, 387}} - - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - 4 - - - - -2147483392 - {{319, 1}, {15, 371}} - - - _doScroller: - 0.99741602067183466 - - - - -2147483392 - {{1, 373}, {500, 15}} - - 1 - - _doScroller: - 1 - - - {{-1, -1}, {302, 389}} - - - 562 - - - - - - {300, 387} - - {{0, 0}, {1680, 1028}} - {1.79769e+308, 1.79769e+308} - NetSurfAppDelegate @@ -915,14 +834,6 @@ 759 - - - makeKeyAndOrderFront: - - - - 819 - delegate @@ -931,14 +842,6 @@ 821 - - - historyWindow - - - - 822 - newDocument: @@ -1043,6 +946,14 @@ 845 + + + showGlobalHistory: + + + + 846 + @@ -1490,50 +1401,6 @@ - - 811 - - - YES - - - - - - 812 - - - YES - - - - - - 813 - - - YES - - - - - - - - 814 - - - - - 815 - - - - - 816 - - - 817 @@ -1701,15 +1568,6 @@ 81.IBPluginDependency 81.ImportedFromIB2 81.editorWindowContentRectSynchronizationRect - 811.IBEditorWindowLastContentRect - 811.IBPluginDependency - 811.IBWindowTemplateEditedContentRect - 811.NSWindowTemplate.visibleAtLaunch - 812.IBPluginDependency - 813.IBPluginDependency - 814.IBPluginDependency - 815.IBPluginDependency - 816.IBPluginDependency 817.IBPluginDependency 818.IBPluginDependency 82.IBPluginDependency @@ -1769,7 +1627,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{810, 694}, {194, 103}} + {{876, 712}, {194, 103}} com.apple.InterfaceBuilder.CocoaPlugin {{525, 802}, {197, 73}} @@ -1836,15 +1694,6 @@ com.apple.InterfaceBuilder.CocoaPlugin {{323, 672}, {199, 203}} - {{331, 320}, {300, 387}} - com.apple.InterfaceBuilder.CocoaPlugin - {{331, 320}, {300, 387}} - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1880,7 +1729,7 @@ - 845 + 846 @@ -1903,6 +1752,7 @@ backForwardSelected: goBack: goForward: + goHome: navigate: reloadPage: stopLoading: @@ -1921,6 +1771,7 @@ id id id + id @@ -1930,6 +1781,7 @@ backForwardSelected: goBack: goForward: + goHome: navigate: reloadPage: stopLoading: @@ -1951,6 +1803,10 @@ goForward: id + + goHome: + id + navigate: id @@ -2116,6 +1972,7 @@ YES searchBackward: searchForward: + showGlobalHistory: showPreferences: showSearchWindow: @@ -2125,6 +1982,7 @@ id id id + id @@ -2133,6 +1991,7 @@ YES searchBackward: searchForward: + showGlobalHistory: showPreferences: showSearchWindow: @@ -2146,6 +2005,10 @@ searchForward: id + + showGlobalHistory: + id + showPreferences: id @@ -2156,17 +2019,6 @@ - - historyWindow - NSWindow - - - historyWindow - - historyWindow - NSWindow - - IBProjectSource NetSurfAppDelegate.h @@ -2293,14 +2145,6 @@ SearchWindowController.h - - TreeView - ScrollableView - - IBProjectSource - TreeView.h - - URLFieldCell NSTextFieldCell -- cgit v1.2.3