Bug 178607 - Put close button in the tab chain and fix button spacing and alignment in the Find bar. r=murph, sr=smorgan

camino/resources/localized/English.lproj/FindBar.nib/classes.nib

@@ -1,23 +1,44 @@
 {
-    IBClasses = (
-        {
-            ACTIONS = {findAll = id; findNext = id; findPrevious = id; hideFindBar = id; }; 
-            CLASS = FindBarController; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                mCloseBox = RolloverImageButton; 
-                mFindBar = NSView; 
-                mFinder = id; 
-                mMatchCase = NSButton; 
-                mSearchField = NSSearchField; 
-                mStatusText = NSTextField; 
-            }; 
-            SUPERCLASS = NSObject; 
-        }, 
-        {CLASS = FindBarView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, 
-        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {CLASS = RolloverImageButton; LANGUAGE = ObjC; SUPERCLASS = NSButton; }, 
-        {CLASS = StatusBarView; LANGUAGE = ObjC; SUPERCLASS = NSView; }
-    ); 
-    IBVersion = 1; 
+    IBClasses =     (
+                {
+            ACTIONS =             {
+                findAll = id;
+                findNext = id;
+                findPrevious = id;
+                hideFindBar = id;
+            };
+            CLASS = FindBarController;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                mCloseBox = RolloverImageButton;
+                mFindBar = NSView;
+                mFinder = id;
+                mMatchCase = NSButton;
+                mSearchField = NSSearchField;
+                mStatusText = NSTextField;
+            };
+            SUPERCLASS = NSObject;
+        },
+                {
+            CLASS = FindBarView;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSView;
+        },
+                {
+            CLASS = FirstResponder;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSObject;
+        },
+                {
+            CLASS = RolloverImageButton;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSButton;
+        },
+                {
+            CLASS = StatusBarView;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSView;
+        }
+    );
+    IBVersion = 1;
 }

camino/resources/localized/English.lproj/FindBar.nib/info.nib

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
@@ -7,11 +7,15 @@
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>5</key>
-		<string>310 570 820 66 0 0 1440 878 </string>
+		<string>310 610 820 66 0 0 1440 878 </string>
 	</dict>
 	<key>IBFramework Version</key>
-	<string>446.1</string>
+	<string>489.0</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>5</integer>
+	</array>
 	<key>IBSystem Version</key>
-	<string>8R2232</string>
+	<string>9B18</string>
 </dict>
 </plist>