pref reorganization part 1, no bug

camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/classes.nib

@@ -13,25 +13,13 @@
             SUPERCLASS = NSObject; 
         }, 
         {
-            ACTIONS = {
-                checkboxClicked = id; 
-                checkboxStartPageClicked = id; 
-                checkboxUseSystemHomePageClicked = id; 
-                chooseDownloadFolder = id; 
-                clearDiskCache = id; 
-                clearGlobalHistory = id; 
-                historyDaysModified = id; 
-            }; 
-            CLASS = OrgMozillaChimeraPreferenceNavigation; 
+            ACTIONS = {checkboxClicked = id; }; 
+            CLASS = OrgMozillaChimeraPreferenceTabbedBrowsing; 
             LANGUAGE = ObjC; 
             OUTLETS = {
-                checkboxNewTabBlank = NSButton; 
-                checkboxNewWindowBlank = NSButton; 
-                checkboxUseSystemHomePage = NSButton; 
-                mDownloadFolder = NSPopUpButton; 
-                mEnableHelperApps = NSButton; 
-                textFieldHistoryDays = NSTextField; 
-                textFieldHomePage = NSTextField; 
+                checkboxLoadTabsInBackground = NSButton; 
+                radioOpenForAE = id; 
+                radioOpenTabsForCommand = id; 
             }; 
             SUPERCLASS = PreferencePaneBase; 
         }, 

camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/info.nib

@@ -6,17 +6,6 @@
 	<string>140 56 522 320 0 0 1280 1002 </string>
 	<key>IBFramework Version</key>
 	<string>364.0</string>
-	<key>IBGroupedObjects</key>
-	<dict>
-		<key>5</key>
-		<array>
-			<string>12</string>
-			<string>24</string>
-			<string>56</string>
-		</array>
-	</dict>
-	<key>IBLastGroupID</key>
-	<string>8</string>
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>5</integer>

camino/PreferencePanes/Tabs/Tabs.h

@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+*
+* The contents of this file are subject to the Mozilla Public
+* License Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License. You may obtain a copy of
+* the License at http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS
+* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+* implied. See the License for the specific language governing
+* rights and limitations under the License.
+*
+* The Original Code is the Mozilla browser.
+*
+* The Initial Developer of the Original Code is Netscape
+* Communications Corporation. Portions created by Netscape are
+* Copyright (C) 2002 Netscape Communications Corporation. All
+* Rights Reserved.
+*
+* Contributor(s):
+*   william@dell.wisner.name (William Dell Wisner)
+*   joshmoz@gmail.com (Josh Aas)
+*/
+
+#import <Cocoa/Cocoa.h>
+#import <PreferencePaneBase.h>
+
+@interface OrgMozillaChimeraPreferenceTabs : PreferencePaneBase
+{
+  IBOutlet id radioOpenTabsForCommand;
+  IBOutlet id radioOpenForAE;
+  IBOutlet NSButton *checkboxLoadTabsInBackground;
+}
+
+- (IBAction)checkboxClicked:(id)sender;
+
+@end

camino/PreferencePanes/Tabs/Tabs.mm

@@ -0,0 +1,69 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+*
+* The contents of this file are subject to the Mozilla Public
+* License Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License. You may obtain a copy of
+* the License at http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS
+* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+* implied. See the License for the specific language governing
+* rights and limitations under the License.
+*
+* The Original Code is the Mozilla browser.
+*
+* The Initial Developer of the Original Code is Netscape
+* Communications Corporation. Portions created by Netscape are
+* Copyright (C) 2002 Netscape Communications Corporation. All
+* Rights Reserved.
+*
+* Contributor(s):
+*   william@dell.wisner.name (William Dell Wisner)
+*   joshmoz@gmail.com (Josh Aas)
+*/
+
+#import "Tabs.h"
+
+@implementation OrgMozillaChimeraPreferenceTabs
+
+- (id)initWithBundle:(NSBundle *)bundle
+{
+  self = [super initWithBundle:bundle];
+  return self;
+}
+
+- (void)dealloc
+{
+  [super dealloc];
+}
+
+- (void)mainViewDidLoad
+{
+  if (!mPrefService)
+    return;
+
+  BOOL gotPref;
+  
+  [radioOpenTabsForCommand selectCellWithTag:[self getBooleanPref:"browser.tabs.opentabfor.middleclick" withSuccess:&gotPref]];
+  [radioOpenForAE selectCellWithTag:[self getIntPref:"browser.reuse_window" withSuccess:&gotPref]];
+  [checkboxLoadTabsInBackground setState:[self getBooleanPref:"browser.tabs.loadInBackground" withSuccess:&gotPref]];
+}
+
+- (IBAction)checkboxClicked:(id)sender
+{
+  NSLog(@"called mofo");
+  if (!mPrefService)
+    return;
+
+  if (sender == radioOpenTabsForCommand) {
+    [self setPref:"browser.tabs.opentabfor.middleclick" toBoolean:[[sender selectedCell] tag]];
+  }
+  else if (sender == radioOpenForAE) {
+    [self setPref:"browser.reuse_window" toInt:[[sender selectedCell] tag]];
+  }
+  else if (sender == checkboxLoadTabsInBackground) {
+    [self setPref:"browser.tabs.loadInBackground" toBoolean:[sender state]];
+  }
+}
+
+@end

camino/resources/application/all-camino.js

@@ -74,6 +74,7 @@ pref("browser.urlbar.autocomplete.enabled", true);
 // Default to auto download enabled but auto helper dispatch disabled
 pref("browser.download.autoDownload", true);
 pref("browser.download.autoDispatch", false);
+pref("browser.download.progressDnldDialog.keepAlive", true);
 
 pref("chimera.enable_rendezvous", true);
 

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

@@ -7,17 +7,17 @@
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>29</key>
-		<string>431 657 433 44 0 0 1280 938 </string>
+		<string>757 833 433 44 0 0 1920 1178 </string>
 		<key>494</key>
 		<string>507 508 116 61 0 0 1152 848 </string>
 	</dict>
 	<key>IBFramework Version</key>
-	<string>362.0</string>
+	<string>364.0</string>
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>29</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>7M34</string>
+	<string>7S215</string>
 </dict>
 </plist>

camino/src/download/ProgressDlgController.mm

@@ -424,7 +424,7 @@ static id gSharedProgressController = nil;
 -(void)didEndDownload:(id <CHDownloadProgressDisplay>)progressDisplay
 {
   [self rebuildViews]; // to swap in the completed view
-  [[[self window] toolbar] validateVisibleItems];    // force update which doesn't always happen
+  [[[self window] toolbar] validateVisibleItems]; // force update which doesn't always happen
 }
 
 -(void)removeDownload:(id <CHDownloadProgressDisplay>)progressDisplay

camino/src/download/ProgressViewController.mm

@@ -419,6 +419,16 @@ enum {
 {
   mDownloadingError = !completedOK;
   
+  // close the window if user has set pref to close when all downloads complete
+  if (completedOK) {
+    BOOL gotPref;
+    // from the UI, this download is still going so close if we're the only one left
+    if (![[PreferenceManager sharedInstance] getBooleanPref:"browser.download.progressDnldDialog.keepAlive" withSuccess:&gotPref] &&
+        ([mProgressWindowController numDownloadsInProgress] == 1)) {
+      [mProgressWindowController close];
+    }
+  }
+  
   [self downloadDidEnd];
   [mProgressWindowController didEndDownload:self];
 }

camino/src/preferences/MVPreferencePaneDefaults.plist

@@ -2,5 +2,7 @@
   org.mozilla.chimera.preference.appearance,
   org.mozilla.chimera.preference.privacy,
   org.mozilla.chimera.preference.security,
-  org.mozilla.chimera.preference.webfeatures
+  org.mozilla.chimera.preference.webfeatures,
+  org.mozilla.camino.preference.tabs,
+  org.mozilla.camino.preference.downloads,
 )

camino/src/preferences/MVPreferencePaneGroups.plist

@@ -4,8 +4,10 @@
 		panes = (
             org.mozilla.chimera.preference.navigation,
             org.mozilla.chimera.preference.appearance,
-            org.mozilla.chimera.preference.webfeatures
-		); 
+            org.mozilla.chimera.preference.webfeatures,
+            org.mozilla.camino.preference.tabs,
+            org.mozilla.camino.preference.downloads,
+		);
 	},
   {
     identifier = security;