Changeset 69595 in webkit
- Timestamp:
- Oct 12, 2010 1:28:06 PM (14 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 4 edited
-
ChangeLog (modified) (1 diff)
-
MiniBrowser/mac/BrowserWindow.xib (modified) (17 diffs)
-
MiniBrowser/mac/BrowserWindowController.h (modified) (2 diffs)
-
MiniBrowser/mac/BrowserWindowController.m (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r69591 r69595 1 2010-10-12 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Sam Weinig. 4 5 Add a simple Find UI to MiniBrowser 6 https://bugs.webkit.org/show_bug.cgi?id=47553 7 8 * MiniBrowser/mac/BrowserWindow.xib: 9 Add Find panel. 10 11 * MiniBrowser/mac/BrowserWindowController.h: 12 * MiniBrowser/mac/BrowserWindowController.m: 13 (-[BrowserWindowController performFindPanelAction:]): 14 Show the find panel. 15 16 (-[BrowserWindowController find:]): 17 Tell the WKPageRef to find the given string. 18 1 19 2010-10-12 Tony Chang <tony@chromium.org> 2 20 -
trunk/WebKitTools/MiniBrowser/mac/BrowserWindow.xib
r63564 r69595 3 3 <data> 4 4 <int key="IBDocument.SystemTarget">1060</int> 5 <string key="IBDocument.SystemVersion">10 F569</string>6 <string key="IBDocument.InterfaceBuilderVersion"> 762</string>7 <string key="IBDocument.AppKitVersion">1038. 29</string>5 <string key="IBDocument.SystemVersion">10H545</string> 6 <string key="IBDocument.InterfaceBuilderVersion">820</string> 7 <string key="IBDocument.AppKitVersion">1038.35</string> 8 8 <string key="IBDocument.HIToolboxVersion">461.00</string> 9 9 <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> 10 10 <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> 11 <string key="NS.object.0"> 762</string>11 <string key="NS.object.0">820</string> 12 12 </object> 13 13 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> 14 14 <bool key="EncodedWithXMLCoder">YES</bool> 15 <integer value="2"/> 15 <integer value="9"/> 16 <integer value="71"/> 16 17 </object> 17 18 <object class="NSArray" key="IBDocument.PluginDependencies"> … … 93 94 <reference key="NSControlView" ref="690456651"/> 94 95 <bool key="NSDrawsBackground">YES</bool> 95 <object class="NSColor" key="NSBackgroundColor" >96 <object class="NSColor" key="NSBackgroundColor" id="1032961300"> 96 97 <int key="NSColorSpace">6</int> 97 98 <string key="NSCatalogName">System</string> … … 318 319 <string key="NSFrameAutosaveName">Main Window</string> 319 320 </object> 321 <object class="NSWindowTemplate" id="833876351"> 322 <int key="NSWindowStyleMask">147</int> 323 <int key="NSWindowBacking">2</int> 324 <string key="NSWindowRect">{{230, 479}, {452, 62}}</string> 325 <int key="NSWTFlags">-461897728</int> 326 <string key="NSWindowTitle">Find</string> 327 <string key="NSWindowClass">NSPanel</string> 328 <nil key="NSViewClass"/> 329 <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> 330 <object class="NSView" key="NSWindowView" id="585866018"> 331 <reference key="NSNextResponder"/> 332 <int key="NSvFlags">256</int> 333 <object class="NSMutableArray" key="NSSubviews"> 334 <bool key="EncodedWithXMLCoder">YES</bool> 335 <object class="NSSearchField" id="841639270"> 336 <reference key="NSNextResponder" ref="585866018"/> 337 <int key="NSvFlags">268</int> 338 <string key="NSFrame">{{20, 20}, {412, 22}}</string> 339 <reference key="NSSuperview" ref="585866018"/> 340 <bool key="NSEnabled">YES</bool> 341 <object class="NSSearchFieldCell" key="NSCell" id="41426839"> 342 <int key="NSCellFlags">343014976</int> 343 <int key="NSCellFlags2">268436544</int> 344 <string key="NSContents"/> 345 <reference key="NSSupport" ref="1064395332"/> 346 <reference key="NSControlView" ref="841639270"/> 347 <bool key="NSDrawsBackground">YES</bool> 348 <int key="NSTextBezelStyle">1</int> 349 <reference key="NSBackgroundColor" ref="1032961300"/> 350 <object class="NSColor" key="NSTextColor"> 351 <int key="NSColorSpace">6</int> 352 <string key="NSCatalogName">System</string> 353 <string key="NSColorName">controlTextColor</string> 354 <reference key="NSColor" ref="365730878"/> 355 </object> 356 <object class="NSButtonCell" key="NSSearchButtonCell"> 357 <int key="NSCellFlags">130560</int> 358 <int key="NSCellFlags2">0</int> 359 <string key="NSContents">search</string> 360 <reference key="NSControlView" ref="841639270"/> 361 <string key="NSAction">_searchFieldSearch:</string> 362 <reference key="NSTarget" ref="41426839"/> 363 <int key="NSButtonFlags">138690815</int> 364 <int key="NSButtonFlags2">0</int> 365 <string key="NSKeyEquivalent"/> 366 <int key="NSPeriodicDelay">400</int> 367 <int key="NSPeriodicInterval">75</int> 368 </object> 369 <object class="NSButtonCell" key="NSCancelButtonCell"> 370 <int key="NSCellFlags">130560</int> 371 <int key="NSCellFlags2">0</int> 372 <string key="NSContents">clear</string> 373 <object class="NSMutableArray" key="NSAccessibilityOverriddenAttributes"> 374 <bool key="EncodedWithXMLCoder">YES</bool> 375 <object class="NSMutableDictionary"> 376 <bool key="EncodedWithXMLCoder">YES</bool> 377 <object class="NSArray" key="dict.sortedKeys"> 378 <bool key="EncodedWithXMLCoder">YES</bool> 379 <string>AXDescription</string> 380 <string>NSAccessibilityEncodedAttributesValueType</string> 381 </object> 382 <object class="NSMutableArray" key="dict.values"> 383 <bool key="EncodedWithXMLCoder">YES</bool> 384 <string>cancel</string> 385 <integer value="1"/> 386 </object> 387 </object> 388 </object> 389 <reference key="NSControlView" ref="841639270"/> 390 <string key="NSAction">_searchFieldCancel:</string> 391 <reference key="NSTarget" ref="41426839"/> 392 <int key="NSButtonFlags">138690815</int> 393 <int key="NSButtonFlags2">0</int> 394 <string key="NSKeyEquivalent"/> 395 <int key="NSPeriodicDelay">400</int> 396 <int key="NSPeriodicInterval">75</int> 397 </object> 398 <int key="NSMaximumRecents">255</int> 399 </object> 400 </object> 401 </object> 402 <string key="NSFrameSize">{452, 62}</string> 403 <reference key="NSSuperview"/> 404 </object> 405 <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string> 406 <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> 407 </object> 320 408 </object> 321 409 <object class="IBObjectContainer" key="IBDocument.Objects"> … … 426 514 <int key="connectionID">67</int> 427 515 </object> 516 <object class="IBConnectionRecord"> 517 <object class="IBActionConnection" key="connection"> 518 <string key="label">find:</string> 519 <reference key="source" ref="1001"/> 520 <reference key="destination" ref="841639270"/> 521 </object> 522 <int key="connectionID">76</int> 523 </object> 524 <object class="IBConnectionRecord"> 525 <object class="IBOutletConnection" key="connection"> 526 <string key="label">findPanelWindow</string> 527 <reference key="source" ref="1001"/> 528 <reference key="destination" ref="833876351"/> 529 </object> 530 <int key="connectionID">77</int> 531 </object> 428 532 </object> 429 533 <object class="IBMutableOrderedSet" key="objectRecords"> … … 596 700 <reference key="object" ref="128750774"/> 597 701 <reference key="parent" ref="457655522"/> 702 </object> 703 <object class="IBObjectRecord"> 704 <int key="objectID">70</int> 705 <reference key="object" ref="833876351"/> 706 <object class="NSMutableArray" key="children"> 707 <bool key="EncodedWithXMLCoder">YES</bool> 708 <reference ref="585866018"/> 709 </object> 710 <reference key="parent" ref="0"/> 711 </object> 712 <object class="IBObjectRecord"> 713 <int key="objectID">71</int> 714 <reference key="object" ref="585866018"/> 715 <object class="NSMutableArray" key="children"> 716 <bool key="EncodedWithXMLCoder">YES</bool> 717 <reference ref="841639270"/> 718 </object> 719 <reference key="parent" ref="833876351"/> 720 </object> 721 <object class="IBObjectRecord"> 722 <int key="objectID">74</int> 723 <reference key="object" ref="841639270"/> 724 <object class="NSMutableArray" key="children"> 725 <bool key="EncodedWithXMLCoder">YES</bool> 726 <reference ref="41426839"/> 727 </object> 728 <reference key="parent" ref="585866018"/> 729 </object> 730 <object class="IBObjectRecord"> 731 <int key="objectID">75</int> 732 <reference key="object" ref="41426839"/> 733 <reference key="parent" ref="841639270"/> 598 734 </object> 599 735 </object> … … 628 764 <string>57.CustomClassName</string> 629 765 <string>58.CustomClassName</string> 766 <string>70.IBEditorWindowLastContentRect</string> 767 <string>70.IBPluginDependency</string> 768 <string>70.IBWindowTemplateEditedContentRect</string> 769 <string>70.NSWindowTemplate.visibleAtLaunch</string> 770 <string>71.IBPluginDependency</string> 771 <string>74.IBPluginDependency</string> 772 <string>75.IBPluginDependency</string> 630 773 <string>9.IBPluginDependency</string> 774 <string>9.IBViewBoundsToFrameTransform</string> 631 775 </object> 632 776 <object class="NSMutableArray" key="dict.values"> 633 777 <bool key="EncodedWithXMLCoder">YES</bool> 634 <string>{{ 276, 45}, {776, 608}}</string>635 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 636 <string>{{ 276, 45}, {776, 608}}</string>778 <string>{{404, 157}, {776, 608}}</string> 779 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 780 <string>{{404, 157}, {776, 608}}</string> 637 781 <integer value="1"/> 638 782 <string>{196, 240}</string> … … 657 801 <string>MBToolbarItem</string> 658 802 <string>MBToolbarItem</string> 659 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 803 <string>{{558, 468}, {452, 62}}</string> 804 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 805 <string>{{558, 468}, {452, 62}}</string> 806 <boolean value="NO"/> 807 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 808 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 809 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 810 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 811 <object class="NSAffineTransform"/> 660 812 </object> 661 813 </object> … … 676 828 </object> 677 829 <nil key="sourceID"/> 678 <int key="maxID"> 67</int>830 <int key="maxID">77</int> 679 831 </object> 680 832 <object class="IBClassDescriber" key="IBDocument.Classes"> … … 688 840 <object class="NSArray" key="dict.sortedKeys"> 689 841 <bool key="EncodedWithXMLCoder">YES</bool> 842 <string>dumpSourceToConsole:</string> 690 843 <string>fetch:</string> 844 <string>find:</string> 691 845 <string>forceRepaint:</string> 692 846 <string>goBack:</string> … … 694 848 <string>reload:</string> 695 849 <string>removeReinsertWebView:</string> 850 <string>resetZoom:</string> 696 851 <string>showHideWebView:</string> 852 <string>toggleZoomMode:</string> 853 <string>zoomIn:</string> 854 <string>zoomOut:</string> 697 855 </object> 698 856 <object class="NSMutableArray" key="dict.values"> … … 705 863 <string>id</string> 706 864 <string>id</string> 865 <string>id</string> 866 <string>id</string> 867 <string>id</string> 868 <string>id</string> 869 <string>id</string> 870 <string>id</string> 871 </object> 872 </object> 873 <object class="NSMutableDictionary" key="actionInfosByName"> 874 <bool key="EncodedWithXMLCoder">YES</bool> 875 <object class="NSArray" key="dict.sortedKeys"> 876 <bool key="EncodedWithXMLCoder">YES</bool> 877 <string>dumpSourceToConsole:</string> 878 <string>fetch:</string> 879 <string>find:</string> 880 <string>forceRepaint:</string> 881 <string>goBack:</string> 882 <string>goForward:</string> 883 <string>reload:</string> 884 <string>removeReinsertWebView:</string> 885 <string>resetZoom:</string> 886 <string>showHideWebView:</string> 887 <string>toggleZoomMode:</string> 888 <string>zoomIn:</string> 889 <string>zoomOut:</string> 890 </object> 891 <object class="NSMutableArray" key="dict.values"> 892 <bool key="EncodedWithXMLCoder">YES</bool> 893 <object class="IBActionInfo"> 894 <string key="name">dumpSourceToConsole:</string> 895 <string key="candidateClassName">id</string> 896 </object> 897 <object class="IBActionInfo"> 898 <string key="name">fetch:</string> 899 <string key="candidateClassName">id</string> 900 </object> 901 <object class="IBActionInfo"> 902 <string key="name">find:</string> 903 <string key="candidateClassName">id</string> 904 </object> 905 <object class="IBActionInfo"> 906 <string key="name">forceRepaint:</string> 907 <string key="candidateClassName">id</string> 908 </object> 909 <object class="IBActionInfo"> 910 <string key="name">goBack:</string> 911 <string key="candidateClassName">id</string> 912 </object> 913 <object class="IBActionInfo"> 914 <string key="name">goForward:</string> 915 <string key="candidateClassName">id</string> 916 </object> 917 <object class="IBActionInfo"> 918 <string key="name">reload:</string> 919 <string key="candidateClassName">id</string> 920 </object> 921 <object class="IBActionInfo"> 922 <string key="name">removeReinsertWebView:</string> 923 <string key="candidateClassName">id</string> 924 </object> 925 <object class="IBActionInfo"> 926 <string key="name">resetZoom:</string> 927 <string key="candidateClassName">id</string> 928 </object> 929 <object class="IBActionInfo"> 930 <string key="name">showHideWebView:</string> 931 <string key="candidateClassName">id</string> 932 </object> 933 <object class="IBActionInfo"> 934 <string key="name">toggleZoomMode:</string> 935 <string key="candidateClassName">id</string> 936 </object> 937 <object class="IBActionInfo"> 938 <string key="name">zoomIn:</string> 939 <string key="candidateClassName">id</string> 940 </object> 941 <object class="IBActionInfo"> 942 <string key="name">zoomOut:</string> 943 <string key="candidateClassName">id</string> 944 </object> 707 945 </object> 708 946 </object> … … 713 951 <string>backButton</string> 714 952 <string>containerView</string> 953 <string>findPanelWindow</string> 715 954 <string>forwardButton</string> 716 955 <string>progressIndicator</string> … … 723 962 <string>NSButton</string> 724 963 <string>NSView</string> 964 <string>NSWindow</string> 725 965 <string>NSButton</string> 726 966 <string>NSProgressIndicator</string> … … 730 970 </object> 731 971 </object> 972 <object class="NSMutableDictionary" key="toOneOutletInfosByName"> 973 <bool key="EncodedWithXMLCoder">YES</bool> 974 <object class="NSArray" key="dict.sortedKeys"> 975 <bool key="EncodedWithXMLCoder">YES</bool> 976 <string>backButton</string> 977 <string>containerView</string> 978 <string>findPanelWindow</string> 979 <string>forwardButton</string> 980 <string>progressIndicator</string> 981 <string>reloadButton</string> 982 <string>toolbar</string> 983 <string>urlText</string> 984 </object> 985 <object class="NSMutableArray" key="dict.values"> 986 <bool key="EncodedWithXMLCoder">YES</bool> 987 <object class="IBToOneOutletInfo"> 988 <string key="name">backButton</string> 989 <string key="candidateClassName">NSButton</string> 990 </object> 991 <object class="IBToOneOutletInfo"> 992 <string key="name">containerView</string> 993 <string key="candidateClassName">NSView</string> 994 </object> 995 <object class="IBToOneOutletInfo"> 996 <string key="name">findPanelWindow</string> 997 <string key="candidateClassName">NSWindow</string> 998 </object> 999 <object class="IBToOneOutletInfo"> 1000 <string key="name">forwardButton</string> 1001 <string key="candidateClassName">NSButton</string> 1002 </object> 1003 <object class="IBToOneOutletInfo"> 1004 <string key="name">progressIndicator</string> 1005 <string key="candidateClassName">NSProgressIndicator</string> 1006 </object> 1007 <object class="IBToOneOutletInfo"> 1008 <string key="name">reloadButton</string> 1009 <string key="candidateClassName">NSButton</string> 1010 </object> 1011 <object class="IBToOneOutletInfo"> 1012 <string key="name">toolbar</string> 1013 <string key="candidateClassName">NSToolbar</string> 1014 </object> 1015 <object class="IBToOneOutletInfo"> 1016 <string key="name">urlText</string> 1017 <string key="candidateClassName">NSTextField</string> 1018 </object> 1019 </object> 1020 </object> 732 1021 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 733 1022 <string key="majorKey">IBProjectSource</string> … … 1098 1387 </object> 1099 1388 <object class="IBPartialClassDescription"> 1389 <string key="className">NSPanel</string> 1390 <string key="superclassName">NSWindow</string> 1391 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1392 <string key="majorKey">IBFrameworkSource</string> 1393 <string key="minorKey">AppKit.framework/Headers/NSPanel.h</string> 1394 </object> 1395 </object> 1396 <object class="IBPartialClassDescription"> 1100 1397 <string key="className">NSProgressIndicator</string> 1101 1398 <string key="superclassName">NSView</string> … … 1118 1415 <string key="majorKey">IBFrameworkSource</string> 1119 1416 <string key="minorKey">AppKit.framework/Headers/NSResponder.h</string> 1417 </object> 1418 </object> 1419 <object class="IBPartialClassDescription"> 1420 <string key="className">NSSearchField</string> 1421 <string key="superclassName">NSTextField</string> 1422 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1423 <string key="majorKey">IBFrameworkSource</string> 1424 <string key="minorKey">AppKit.framework/Headers/NSSearchField.h</string> 1425 </object> 1426 </object> 1427 <object class="IBPartialClassDescription"> 1428 <string key="className">NSSearchFieldCell</string> 1429 <string key="superclassName">NSTextFieldCell</string> 1430 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1431 <string key="majorKey">IBFrameworkSource</string> 1432 <string key="minorKey">AppKit.framework/Headers/NSSearchFieldCell.h</string> 1120 1433 </object> 1121 1434 </object> … … 1203 1516 <string key="NS.key.0">showWindow:</string> 1204 1517 <string key="NS.object.0">id</string> 1518 </object> 1519 <object class="NSMutableDictionary" key="actionInfosByName"> 1520 <string key="NS.key.0">showWindow:</string> 1521 <object class="IBActionInfo" key="NS.object.0"> 1522 <string key="name">showWindow:</string> 1523 <string key="candidateClassName">id</string> 1524 </object> 1205 1525 </object> 1206 1526 <object class="IBClassDescriptionSource" key="sourceIdentifier"> -
trunk/WebKitTools/MiniBrowser/mac/BrowserWindowController.h
r67311 r69595 32 32 IBOutlet NSTextField *urlText; 33 33 IBOutlet NSView *containerView; 34 34 35 IBOutlet NSWindow *findPanelWindow; 36 35 37 WKPageNamespaceRef _pageNamespace; 36 38 WKView *_webView; … … 61 63 - (IBAction)dumpSourceToConsole:(id)sender; 62 64 65 - (IBAction)find:(id)sender; 66 63 67 @end -
trunk/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
r69575 r69595 660 660 } 661 661 662 - (IBAction)performFindPanelAction:(id)sender 663 { 664 [findPanelWindow makeKeyAndOrderFront:sender]; 665 } 666 667 - (IBAction)find:(id)sender 668 { 669 WKStringRef string = WKStringCreateWithCFString((CFStringRef)[sender stringValue]); 670 671 WKPageFindString(_webView.pageRef, string, kWKFindDirectionForward, 672 kWKFindOptionsCaseInsensitive | kWKFindOptionsWrapAround | kWKFindOptionsShowFindIndicator, 100); 673 } 674 662 675 @end
Note: See TracChangeset
for help on using the changeset viewer.
