From c7c52ea1ccf5271dce84cf58e37d0a069669ba8e Mon Sep 17 00:00:00 2001
From: "pinkerton%netscape.com"
 <pinkerton%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 13 Nov 2003 18:21:02 +0000
Subject: [PATCH] make find panel more consistent with other cocoa apps (bug
 160771)

git-svn-id: svn://10.0.0.236/trunk@149256 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/camino/src/find/FindDlgController.h   |  11 +-
 mozilla/camino/src/find/FindDlgController.mm  | 112 ++++++++++++------
 .../English.lproj/FindDialog.nib/classes.nib  |   6 +-
 .../English.lproj/FindDialog.nib/info.nib     |  14 ++-
 .../English.lproj/FindDialog.nib/objects.nib  | Bin 2055 -> 2158 bytes
 5 files changed, 98 insertions(+), 45 deletions(-)

diff --git a/mozilla/camino/src/find/FindDlgController.h b/mozilla/camino/src/find/FindDlgController.h
index f8153a5ca53..441d893e732 100644
--- a/mozilla/camino/src/find/FindDlgController.h
+++ b/mozilla/camino/src/find/FindDlgController.h
@@ -41,13 +41,16 @@
     IBOutlet NSTextField* mSearchField;
     IBOutlet NSButton* mIgnoreCaseBox;
     IBOutlet NSButton* mWrapAroundBox;
-    IBOutlet NSButton* mSearchBackwardsBox;
-    IBOutlet NSButton* mFindButton;
+    IBOutlet NSButton* mFindNextButton;
+    IBOutlet NSButton* mFindPrevButton;
 }
 
-- (IBAction) find: (id)aSender;
+- (IBAction) findNextButton: (id)aSender;
+- (IBAction) findPreviousButton: (id)aSender;
+- (IBAction) findNextAndOrderOut: (id)aSender;
 
   // delegates for NSTextView
 - (void)controlTextDidChange:(NSNotification *)aNotification;
-
+- (void)loadFindStringFromPasteboard;
+- (void)putFindStringOnPasteboard;
 @end
diff --git a/mozilla/camino/src/find/FindDlgController.mm b/mozilla/camino/src/find/FindDlgController.mm
index bdaa3bb12be..30910fcd29a 100644
--- a/mozilla/camino/src/find/FindDlgController.mm
+++ b/mozilla/camino/src/find/FindDlgController.mm
@@ -39,75 +39,121 @@
 #import "Find.h"
 
 @interface FindDlgController(Private)
-  - (NSString*)getSearchText;
+- (NSString*)getSearchText;
+- (BOOL)find:(BOOL)searchBack;
 @end
 
 @implementation FindDlgController
 
+- (void)loadFindStringFromPasteboard
+{
+  NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:NSFindPboard];
+  if ([[pasteboard types] containsObject:NSStringPboardType]) {
+    NSString *string = [pasteboard stringForType:NSStringPboardType];
+    if (string && [string length]) {
+      [mSearchField setStringValue: string];
+      [mFindNextButton setEnabled:YES];
+      [mFindPrevButton setEnabled:YES];
+    }
+  }
+}
+
+- (void)putFindStringOnPasteboard
+{
+  NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:NSFindPboard];
+  [pasteboard declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:nil];
+  [pasteboard setString:[mSearchField stringValue] forType:NSStringPboardType];
+}
+
 //
 // -find
 //
-// User clicked the find button, send the action to the window controller of the
-// frontmost browser window. If we found something, hide the window. If not, beep.
+// Performs the actual search.  returns YES on success.
 //
--(IBAction) find: (id)aSender
+
+-(BOOL) find:(BOOL)searchBack
 {
   NSWindowController* controller = [[NSApp mainWindow] windowController];
   if ( [controller conformsToProtocol:@protocol(Find)] ) {
     id<Find> browserController = controller;
     BOOL ignoreCase = [mIgnoreCaseBox state];
     BOOL wrapSearch = [mWrapAroundBox state];
-    BOOL searchBack = [mSearchBackwardsBox state];
-
-    BOOL found = [browserController findInPageWithPattern:[mSearchField stringValue]
-                  caseSensitive:!ignoreCase wrap:wrapSearch
-                  backwards:searchBack];
-
-    if (! found ) 
-      NSBeep();
-    // we stay open
-  }
+    return [browserController findInPageWithPattern:[mSearchField stringValue] caseSensitive:!ignoreCase wrap:wrapSearch backwards:searchBack];
+  } 
   else
+    return NO;
+}
+
+- (IBAction) findNextButton: (id)aSender
+{
+  [self putFindStringOnPasteboard];
+  if (![self find:NO])
+    NSBeep();  
+}
+
+- (IBAction) findPreviousButton: (id)aSender
+{
+  [self putFindStringOnPasteboard];
+  if (![self find:YES])
     NSBeep();
 }
 
+- (IBAction) findNextAndOrderOut: (id)aSender
+{
+  [self putFindStringOnPasteboard];
+  if (![self find:NO])
+    NSBeep();
+  else
+    [self close];
+}
+
 
 //
-// controlTextDidChange
+// -controlTextDidChange:
 //
 // Check if there is anything in the text field, and if not, disable the find button
 //
 - (void)controlTextDidChange:(NSNotification *)aNotification
 {
-  if ( [[mSearchField stringValue] length] )
-    [mFindButton setEnabled:YES];
-  else
-    [mFindButton setEnabled:NO];
+  if ( [[mSearchField stringValue] length] ) {
+    [mFindNextButton setEnabled:YES];
+    [mFindPrevButton setEnabled:YES];
+  } 
+  else {
+    [mFindNextButton setEnabled:NO];
+    [mFindPrevButton setEnabled:NO];
+  }
 }
 
+//
+// -getSearchText
+//
 // Retrieve the most recent search string
+//
 - (NSString*)getSearchText
 {
-  NSWindowController* controller = [[NSApp mainWindow] windowController];
-  if (![controller conformsToProtocol:@protocol(Find)])
-    return nil;
+  NSPasteboard *findPboard = [NSPasteboard pasteboardWithName:NSFindPboard];
+  if ([[findPboard types] indexOfObject:NSStringPboardType] != NSNotFound) 
+    return [findPboard stringForType:NSStringPboardType];
 
-  id<Find> browserController = controller;
-  return [browserController lastFindText];
+  return [NSString string];
 }
 
+//
+// -showWindow:
+//
+// override to set the current search text in the text area before showing 
+// the window
+//
 - (IBAction)showWindow:(id)sender
 {
-  // Sync our text field with the most recent browser search string.
-  // We assume here that the frontmost window is a browser window.
-
-  NSWindowController* controller = [[NSApp mainWindow] windowController];
-  if ( [controller conformsToProtocol:@protocol(Find)] ) {
-    id<Find> browserController = controller;
-    [mSearchField setStringValue:[browserController lastFindText]];
-  }
-
+  [mSearchField setStringValue:[self getSearchText]];
   [super showWindow:sender];
 }
 
+-(void)windowDidLoad
+{
+  [mSearchField setStringValue:[self getSearchText]];  
+}
+
 @end
diff --git a/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/classes.nib b/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/classes.nib
index b0d20da5dca..008505933ef 100644
--- a/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/classes.nib
+++ b/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/classes.nib
@@ -1,13 +1,13 @@
 {
     IBClasses = (
         {
-            ACTIONS = {find = id; }; 
+            ACTIONS = {findNextAndOrderOut = id; findNextButton = id; findPreviousButton = id; }; 
             CLASS = FindDlgController; 
             LANGUAGE = ObjC; 
             OUTLETS = {
-                mFindButton = NSButton; 
+                mFindNextButton = NSButton; 
+                mFindPrevButton = NSButton; 
                 mIgnoreCaseBox = NSButton; 
-                mSearchBackwardsBox = NSButton; 
                 mSearchField = NSTextField; 
                 mWrapAroundBox = NSButton; 
             }; 
diff --git a/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/info.nib b/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/info.nib
index 681cc6970ac..162ee78befb 100644
--- a/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/info.nib
+++ b/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/info.nib
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>180 86 356 240 0 0 1152 746 </string>
+	<string>178 292 356 240 0 0 1152 848 </string>
 	<key>IBFramework Version</key>
-	<string>248.0</string>
+	<string>349.0</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>5</integer>
+	</array>
 	<key>IBSystem Version</key>
-	<string>5S66</string>
+	<string>7B85</string>
 </dict>
 </plist>
diff --git a/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/objects.nib b/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/objects.nib
index 27568a170bd6646209f30e9cffa7fa77bb12e25a..7f30c0bd254e0a3740c0db0904de91f89921c9f4 100644
GIT binary patch
literal 2158
zcmaJ?-*4Mg6uxfL(5~s)tSi!{Aq5zqZoDuiG*yVDKU7u$X~7diARavDCNp#F;yBCt
zFb!wd{sW@a)K5Wzzy`~pLs}nuH3=yXksvQT^Fs&_LK`5&0I_n8Z<?fH!c`sno^#Ln
z&Ue0h92vG(mT5X~TU5z8{XZ}%$r#(6k{4zcPrpG`drq+xhkV7@U`iG%#4QV#*+Skn
zb7FC_!upc972IUo(u}NBVbbCFyk?~5^z5u@*p{j5)bd=9N!p+fu45_r6qwE8Nt#>M
z6`MNJoeCS#v<zHY5-)YU&mlJ*>6RnSIppoq?em1NwY3<AO=w19Ny$<V7Vb;QONv2t
z55kV7<QEFIa$2WtAZu%pmo-{MTQnu(<0NClDfuOuUp9?2wMeDx286{hBj&~noPmXQ
zplQoeRtRH|Mm$!6D3Sm{PSW%Cyhio(KE{Spa=XyUcgoeE)JF)Zx^TU^?2s?-Cj{^1
zYT3m<7SU8SNhAo1kUMc^sjff6SPW9Bwq_dm9uJY@(=_m`X{E}Wcc%%9AYiDTv`d=@
zmM1E~K{oK(lTWFyM<M-w_`kbFo+kyO5{;yZLY^fS+zoi9K&F%#VUkMfQk~Qzp6f#R
zDd@0UuCabKnUnw>R6T3zCeT!mvVM^=DzD^innUi#ZJ=OAQO{;AvtXn{SC4&C?`M6P
zj3jyZ99>@r&mr{e+OHEZdccG<<$7iIK2jFhrYvsF#R-{<Z`1W2GIiy0DI(n^C6XlM
z3IrSub%4}O?eglbdo4u1@iFP7jHyC-Jy|auKlI^8y|BjGJ{U*%-9T8MBB)T%GX>i=
z4f4SbfUhiN_7IZUvjbq*H{p)mI{xA15(B^j>_XNsEt;5B^0W(flMUtbnozq#8v9CP
zg!Gk8JpJO<RVYx>JQpyGr(_XyAqRq&&4Q)U{z@4f@VFH<TRr2!!2-N|C&sB9V9f2r
zc(WJNDN9*SOoxr@VrtyD2NF2BpLJ76+kJ9KD@GH9(8LZRAW7J%!DFKMp|DdaV7Qy6
z8K#j+UMVSx9f4x61qVRBM~(^k?u9fU-xDBJot%Ta4I);Fa&-jcijpNgWp^;0j9mak
z7ycj7NQh|3qUSWTknf^u^`g4!egQSZv2Z0xj379~;V2S^xa@ka#3DE_zz})M>0hc#
z*F%pwwr3Y6nbQ>A%zE{{>z6KG+}d(T-COmWRlipC8&$tm^*5@1HSjm9!Jr?&rU5a^
z{HExy=)C9G;I(()czy#jY)j+l6Q19K1sFnN2fS~<I}8#Ob~vMsc>XFb&1*V+ET32`
z8ZeOk&E8!{L(#*g?HNjKm{0>CGkAcJzCgg?-5`!fV{b}MX{Q$pwoc*T7zTVUOv@pk
zhociLowayneHG!yaxzsc^-Kr`<@(L~DrVoE6K4aD#*BHsZNc((=TM<SpdCwqMGU5?
zPP6dU5Z(dCpU@1=2DaxlD{ptkyKt!8V^a;24;w(wb95#AMueC)8@I#XW=;IABCn%4
z>?P`@-4FpEn<Pvq?p{*^cl|ebt9b`@GBy#C2NdClvBMOw_w9NMp^j(T=}?{`?i5z?
z_j(h}qiF7?Y@5O&_ime}jr5`g-#6$`Xa}}YU(q6LHH+cw4fex#TdNK7UlaVFN#1&p
zZw&FD_VKMld{yGrDF1ms4+gk&n14OWZyn&jJ;Z;1n146Me|doaagcu>=gkq`80MS1
j_+O9mKOf;gP6Uq!1hqf5Ff(harZR6SIa)NWv!3@aUxj;m

literal 2055
zcmZ`)-*4Mg6uxfL&^GPb^vASL1A;UO4W1YinkvxJb}FlYbl_@xKoxSG+sw?di{p^?
z4To$00a0qjfGiY52hFAq`dA@Z%0qYyFMUT0p=m-02_e{kj&pp|Bo)O~?dy9_&iT%F
zzH=OjnHy^~oihz8Wv$-(Oh_`uPNc+z*~OK2scc@BOvxhOGuEFH`3|v5++;4FGxaRr
zJXdBtN&G38iKd}w8KKOC=i~E=mcFcJ=5)<8bXBE>V>?Vx`dw~1n>S5eBa98C#FouD
z#-b_lnnDY(ilxN2Xl_l{($pa368ofNdxQ-o;aY879LpPdQ(95!jA2L{;O>c($d_d=
zifF;l5?wdv6{@DEJ}&tl@ol)?u?Vxs!;^&Iz2ui{{9_SCmXkyPKWwDyhjUa_Utw$r
ze9NYyYxo`y(c)?b7*LdA`MragB1sa$B8ZYzD#QUlkkUMGFj@A_vc9)pd`Vu85<*VH
z|G{JOI>{56C?riJ@+vXluECmu4`Fqf2{Ne(HByT>whbYsfq%PHWxaATDS&54bxv1x
zpr;mPy*y-8+{l?U>p=8z6Y`#w<eM2o&ui(>)M2-4y{u<-RS+CpM|bXk<p5fC&hHX9
zbbt+E+IC9pvo>ili#UsMLKfqPgjJEN&$o&Z;eZq)kozrg7sJvgkoD<7=S$nZ9pc`-
zL)rm{WUh*?m>*txZoAeEYP4m8ez@J&2<j_@^idnqvTBk2F|6YL*bz`+wYbQzMwhm>
ziVQ$<fD0K-H)vu`%FzzMJvNZbDGJsuX_0TIilc<|6tBGe=Ho9QDM4{;;CwtKa;FPf
zDMLj)Z^*P4<XNep{0oXH-*7<aM=@UeAB^90W4dlgYl)e#R2@w9-D8kICj}V7>n6ey
z2FI2Xge)bF&;TLMVr}{_^3)?(n~wiR=wB#0#U#&i7_!{<&VW+SU*t-i;7Yv$s#MAQ
za5q7(GLg22L7Avdg870%Z9%XED90_RM)>4CRkEE{&n*M3$JPo!qJYBMjEYn;<QoYT
zZb35Axei$GI5Ji^89t7c(Uf={($fn|G`prsCbfh=%WPOtaA5Gl%HusCVoSKoAr`+|
zhhD2xhC<0ITH-2H6`Kco>#C$t6+0LvL2Jmg=3Au_!71hVw!k9j8#0c3VD&txfnTz3
z5eo$|7*0S%QuT}jByGBTzFYNOzv=G!Zo_x$zSr-1Xn3fp3+ElT2^)Ppw7Umu7>`_V
z7aX?=@7?pvaW`QHu&eahTw<}H!H{)#ajR=~fzJkPfjqe%$F0L_C*}*F)v#F(bEGDW
zzdleiEMSr^5HR@E8$qjyl$cUh7W1Y`p(iyBz7o1&k!JYafRpxKyu7oCXos@AoZ<Mz
zuDG|eiCLY<@)pDnoYmJ`CkX6B78`;0LFWW%8gKb(E2DFa3C6O>cPqy*QWM$fPg9j<
zKnoayvB@w4z=<EFHe5*I$DIb6_pO4H=@uTWMYIqqitjWrr%6RqOepKTV&u&BH;Nln
z{}b}wP8Ac5X)wlKqZ^@aLUeoeN8z*X@u%0|&qnnT__DoI@L5&<c{=chf?p<sW?%5f
z>ENf)pfMcWj|V?b1P{i7dMx<uRIn)o2Z>;JAo%;K;MbFZ9}Rw=3Vs*~{(3Ul8w?(v
d399|xGaf-njxNm3>9Q`(8&Z}QbmOMu{0nK*Pf`E?