From 99bb64c0e6ccfc3b751e2d6497fce92cf6f66f88 Mon Sep 17 00:00:00 2001 From: "joshmoz%gmail.com" Date: Tue, 18 Jan 2005 23:34:29 +0000 Subject: [PATCH] move history prefs into their own pane, part of major prefs reorg git-svn-id: svn://10.0.0.236/trunk@167956 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/camino/Camino.xcode/project.pbxproj | 285 ++++++++++++++++++ .../English.lproj/History.nib/classes.nib | 25 ++ .../English.lproj/History.nib/info.nib | 16 + .../History.nib/keyedobjects.nib | Bin 0 -> 6389 bytes .../History/English.lproj/Localizable.strings | Bin 0 -> 74 bytes .../camino/PreferencePanes/History/History.h | 37 +++ .../camino/PreferencePanes/History/History.mm | 97 ++++++ .../PreferencePanes/History/History.tiff | Bin 0 -> 18186 bytes .../English.lproj/Navigation.nib/classes.nib | 9 +- .../English.lproj/Navigation.nib/info.nib | 17 +- .../Navigation.nib/keyedobjects.nib | Bin 9062 -> 5281 bytes .../PreferencePanes/Navigation/Navigation.h | 5 - .../PreferencePanes/Navigation/Navigation.mm | 79 +---- .../Navigation/Navigation.tiff | Bin 4314 -> 17330 bytes .../MVPreferencePaneDefaults.plist | 3 +- 15 files changed, 483 insertions(+), 90 deletions(-) create mode 100644 mozilla/camino/PreferencePanes/History/English.lproj/History.nib/classes.nib create mode 100644 mozilla/camino/PreferencePanes/History/English.lproj/History.nib/info.nib create mode 100644 mozilla/camino/PreferencePanes/History/English.lproj/History.nib/keyedobjects.nib create mode 100644 mozilla/camino/PreferencePanes/History/English.lproj/Localizable.strings create mode 100644 mozilla/camino/PreferencePanes/History/History.h create mode 100644 mozilla/camino/PreferencePanes/History/History.mm create mode 100644 mozilla/camino/PreferencePanes/History/History.tiff diff --git a/mozilla/camino/Camino.xcode/project.pbxproj b/mozilla/camino/Camino.xcode/project.pbxproj index 40dff06dda7..7401fb79fb0 100644 --- a/mozilla/camino/Camino.xcode/project.pbxproj +++ b/mozilla/camino/Camino.xcode/project.pbxproj @@ -109,6 +109,284 @@ settings = { }; }; + 035A4971079DC83D0084B05F = { + buildActionMask = 2147483647; + files = ( + 035A498B079DCA100084B05F, + 035A498D079DCA100084B05F, + 035A4990079DCA100084B05F, + ); + isa = PBXResourcesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 035A4972079DC83D0084B05F = { + buildActionMask = 2147483647; + files = ( + 035A4999079DCACD0084B05F, + 035A498F079DCA100084B05F, + ); + isa = PBXSourcesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 035A4973079DC83D0084B05F = { + buildActionMask = 2147483647; + files = ( + 035A4AA0079DCB0B0084B05F, + 035A4AA1079DCB0B0084B05F, + 035A4AA2079DCB0B0084B05F, + 035A4AA3079DCB0B0084B05F, + ); + isa = PBXFrameworksBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 035A4974079DC83D0084B05F = { + buildPhases = ( + 035A4991079DCA720084B05F, + 035A4971079DC83D0084B05F, + 035A4972079DC83D0084B05F, + 035A4973079DC83D0084B05F, + ); + buildRules = ( + ); + buildSettings = { + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = src/includes/ChimeraPrefix.h; + HEADER_SEARCH_PATHS = "../dist/include/nkcache ../dist/include/webbrwsr ../dist/include/dom ../dist/include/nspr ../dist/include/string ../dist/include/rdf ../dist/include/necko ../dist/include/find ../dist/include/embed_base ../dist/include/windowwatcher ../dist/include/webshell ../dist/include/widget ../dist/include/uriloader ../dist/include/docshell ../dist/include/profile ../dist/include/layout ../dist/include/content ../dist/include/webbrowserpersist ../dist/include/pref ../dist/include/mimetype ../dist/include/shistory ../dist/include/history ../dist/include/view ../dist/include/gfx ../dist/include/xultmpl ../dist/include/xmlextras ../dist/include/htmlparser ../dist/include/locale ../dist/include/unicharutil ../dist/include/appcomps ../dist/include/xpcom ../dist/include/ $(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon"; + INFOPLIST_FILE = "Info-HistoryPrefPane.plist"; + INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; + LIBRARY_SEARCH_PATHS = "../dist/bin ../dist/lib ../intl/unicharutil/util"; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = "-bundle -lxpcom -lxpcom_core -lplds4 -lplc4 -lnspr4 -lpthread -lm"; + OTHER_REZFLAGS = ""; + PRODUCT_NAME = History; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; + WRAPPER_EXTENSION = prefPane; + }; + dependencies = ( + ); + isa = PBXNativeTarget; + name = HistoryPrefPane; + productName = HistoryPrefPane; + productReference = 035A4975079DC83D0084B05F; + productSettingsXML = " + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + HistoryPrefPane + CFBundleIdentifier + com.yourcompany.HistoryPrefPane + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + APPL + CFBundleSignature + ???? + CFBundleVersion + 1.0 + + +"; + productType = "com.apple.product-type.bundle"; + }; + 035A4975079DC83D0084B05F = { + explicitFileType = wrapper.cfbundle; + includeInIndex = 0; + isa = PBXFileReference; + path = History.prefPane; + refType = 3; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 035A4976079DC83E0084B05F = { + isa = PBXFileReference; + lastKnownFileType = text.xml; + name = "Info-HistoryPrefPane.plist"; + path = "/Users/josh/src/Camino_Project/camino_opt/mozilla/camino/Info-HistoryPrefPane.plist"; + refType = 0; + sourceTree = ""; + }; + 035A4981079DCA100084B05F = { + children = ( + 035A4982079DCA100084B05F, + 035A4986079DCA100084B05F, + 035A4988079DCA100084B05F, + 035A4989079DCA100084B05F, + 035A498A079DCA100084B05F, + ); + isa = PBXGroup; + name = History; + path = ../../PreferencePanes/History; + refType = 4; + sourceTree = ""; + }; + 035A4982079DCA100084B05F = { + children = ( + 035A4983079DCA100084B05F, + ); + isa = PBXVariantGroup; + name = History.nib; + path = ""; + refType = 4; + sourceTree = ""; + }; + 035A4983079DCA100084B05F = { + isa = PBXFileReference; + lastKnownFileType = wrapper.nib; + name = English; + path = English.lproj/History.nib; + refType = 4; + sourceTree = ""; + }; + 035A4986079DCA100084B05F = { + children = ( + 035A4987079DCA100084B05F, + ); + isa = PBXVariantGroup; + name = Localizable.strings; + path = ""; + refType = 4; + sourceTree = ""; + }; + 035A4987079DCA100084B05F = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text.plist.strings; + name = English; + path = English.lproj/Localizable.strings; + refType = 4; + sourceTree = ""; + }; + 035A4988079DCA100084B05F = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = History.h; + refType = 4; + sourceTree = ""; + }; + 035A4989079DCA100084B05F = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.cpp.objcpp; + path = History.mm; + refType = 4; + sourceTree = ""; + }; + 035A498A079DCA100084B05F = { + isa = PBXFileReference; + lastKnownFileType = image.tiff; + path = History.tiff; + refType = 4; + sourceTree = ""; + }; + 035A498B079DCA100084B05F = { + fileRef = 035A4982079DCA100084B05F; + isa = PBXBuildFile; + settings = { + }; + }; + 035A498D079DCA100084B05F = { + fileRef = 035A4986079DCA100084B05F; + isa = PBXBuildFile; + settings = { + }; + }; + 035A498E079DCA100084B05F = { + fileRef = 035A4988079DCA100084B05F; + isa = PBXBuildFile; + settings = { + }; + }; + 035A498F079DCA100084B05F = { + fileRef = 035A4989079DCA100084B05F; + isa = PBXBuildFile; + settings = { + }; + }; + 035A4990079DCA100084B05F = { + fileRef = 035A498A079DCA100084B05F; + isa = PBXBuildFile; + settings = { + }; + }; + 035A4991079DCA720084B05F = { + buildActionMask = 2147483647; + files = ( + 035A4992079DCA8A0084B05F, + 035A498E079DCA100084B05F, + ); + isa = PBXHeadersBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 035A4992079DCA8A0084B05F = { + fileRef = F5A8CE4102DFEF4C013CA8EC; + isa = PBXBuildFile; + settings = { + }; + }; + 035A4999079DCACD0084B05F = { + fileRef = F5A8CE4202DFEF4C013CA8EC; + isa = PBXBuildFile; + settings = { + }; + }; + 035A4AA0079DCB0B0084B05F = { + fileRef = 1058C7A1FEA54F0111CA2CBB; + isa = PBXBuildFile; + settings = { + }; + }; + 035A4AA1079DCB0B0084B05F = { + fileRef = F557193A022B4102010001CA; + isa = PBXBuildFile; + settings = { + }; + }; + 035A4AA2079DCB0B0084B05F = { + fileRef = F52D5CDB027D412A01A80166; + isa = PBXBuildFile; + settings = { + }; + }; + 035A4AA3079DCB0B0084B05F = { + fileRef = 29B97325FDCFA39411CA2CEA; + isa = PBXBuildFile; + settings = { + }; + }; + 035A4AA4079DCB790084B05F = { + fileRef = 035A4975079DC83D0084B05F; + isa = PBXBuildFile; + settings = { + }; + }; + 0380F470079DCCD90065A7AB = { + containerPortal = 29B97313FDCFA39411CA2CEA; + isa = PBXContainerItemProxy; + proxyType = 1; + remoteGlobalIDString = 035A4974079DC83D0084B05F; + remoteInfo = HistoryPrefPane; + }; + 0380F471079DCCD90065A7AB = { + isa = PBXTargetDependency; + target = 035A4974079DC83D0084B05F; + targetProxy = 0380F470079DCCD90065A7AB; + }; + 0380F472079DCCEC0065A7AB = { + containerPortal = 29B97313FDCFA39411CA2CEA; + isa = PBXContainerItemProxy; + proxyType = 1; + remoteGlobalIDString = 035A4974079DC83D0084B05F; + remoteInfo = HistoryPrefPane; + }; + 0380F473079DCCEC0065A7AB = { + isa = PBXTargetDependency; + target = 035A4974079DC83D0084B05F; + targetProxy = 0380F472079DCCEC0065A7AB; + }; 0382B4D907303CCA00A0228A = { isa = PBXFileReference; lastKnownFileType = image.tiff; @@ -1124,6 +1402,7 @@ 3F44AFD405BDFBA100CB4B08, 03E2D8530771F73F00BD2443, 03C5AB1007722DFC00EAF77D, + 035A4975079DC83D0084B05F, ); isa = PBXGroup; name = Products; @@ -1174,6 +1453,7 @@ 3F44AFC805BDFBA100CB4B08, 03E2D8520771F73F00BD2443, 03C5AB0F07722DFC00EAF77D, + 035A4974079DC83D0084B05F, ); }; 29B97314FDCFA39411CA2CEA = { @@ -1888,6 +2168,7 @@ 3F44AFE005BDFBA100CB4B08, 03E2D9900771FB9300BD2443, 03C5AB1307722EFC00EAF77D, + 0380F471079DCCD90065A7AB, ); isa = PBXNativeTarget; name = Camino; @@ -4699,6 +4980,7 @@ 3F44AFF205BDFBA100CB4B08, 03E2D9920771FBD400BD2443, 03C5AB1907722F3400EAF77D, + 035A4AA4079DCB790084B05F, ); isa = PBXCopyFilesBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -5815,6 +6097,7 @@ 3F44AFEC05BDFBA100CB4B08, 03C5AB1507722F1100EAF77D, 03C5AB1707722F1100EAF77D, + 0380F473079DCCEC0065A7AB, ); isa = PBXNativeTarget; name = CaminoStatic; @@ -9762,6 +10045,7 @@ 3F44AFD305BDFBA100CB4B08, 03E2D8540771F73F00BD2443, 03C5AB1107722DFD00EAF77D, + 035A4976079DC83E0084B05F, ); isa = PBXGroup; name = "Target Plists"; @@ -12707,6 +12991,7 @@ }; F53F21EB022B7C77010001CA = { children = ( + 035A4981079DCA100084B05F, 032FFDCC077351A800440548, 03E2D8590771F78500BD2443, F5CA1A1D02D4ECDA01F34900, diff --git a/mozilla/camino/PreferencePanes/History/English.lproj/History.nib/classes.nib b/mozilla/camino/PreferencePanes/History/English.lproj/History.nib/classes.nib new file mode 100644 index 00000000000..cd4aac2df4d --- /dev/null +++ b/mozilla/camino/PreferencePanes/History/English.lproj/History.nib/classes.nib @@ -0,0 +1,25 @@ +{ + IBClasses = ( + {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + { + CLASS = NSPreferencePane; + LANGUAGE = ObjC; + OUTLETS = { + "_firstKeyView" = NSView; + "_initialKeyView" = NSView; + "_lastKeyView" = NSView; + "_window" = NSWindow; + }; + SUPERCLASS = NSObject; + }, + { + ACTIONS = {clearDiskCache = id; clearGlobalHistory = id; historyDaysModified = id; }; + CLASS = OrgMozillaChimeraPreferenceHistory; + LANGUAGE = ObjC; + OUTLETS = {textFieldHistoryDays = NSTextField; }; + SUPERCLASS = PreferencePaneBase; + }, + {CLASS = PreferencePaneBase; LANGUAGE = ObjC; SUPERCLASS = NSPreferencePane; } + ); + IBVersion = 1; +} \ No newline at end of file diff --git a/mozilla/camino/PreferencePanes/History/English.lproj/History.nib/info.nib b/mozilla/camino/PreferencePanes/History/English.lproj/History.nib/info.nib new file mode 100644 index 00000000000..cddb067fe0a --- /dev/null +++ b/mozilla/camino/PreferencePanes/History/English.lproj/History.nib/info.nib @@ -0,0 +1,16 @@ + + + + + IBDocumentLocation + 111 35 522 320 0 0 1920 1178 + IBFramework Version + 364.0 + IBOpenObjects + + 5 + + IBSystem Version + 7S215 + + diff --git a/mozilla/camino/PreferencePanes/History/English.lproj/History.nib/keyedobjects.nib b/mozilla/camino/PreferencePanes/History/English.lproj/History.nib/keyedobjects.nib new file mode 100644 index 0000000000000000000000000000000000000000..0adfaefc4593e39dee6c128748ace8b5bb4a99eb GIT binary patch literal 6389 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 I`j)=`Kim|i+5i9m literal 0 HcmV?d00001 diff --git a/mozilla/camino/PreferencePanes/History/English.lproj/Localizable.strings b/mozilla/camino/PreferencePanes/History/English.lproj/Localizable.strings new file mode 100644 index 0000000000000000000000000000000000000000..03755554a023cbb55e6afe1eac05e17ec8c66052 GIT binary patch literal 74 zcmezOpFxQsfT4&Xl_3p?L3AENGLQ^lNCdJ{8FCnWfUG1iONl{&!4`;>7(5s<8HyQ7 O81jKSDuH}!1}*?xNDc`A literal 0 HcmV?d00001 diff --git a/mozilla/camino/PreferencePanes/History/History.h b/mozilla/camino/PreferencePanes/History/History.h new file mode 100644 index 00000000000..0d464946208 --- /dev/null +++ b/mozilla/camino/PreferencePanes/History/History.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 +#import + +@interface OrgMozillaChimeraPreferenceHistory : PreferencePaneBase +{ + IBOutlet NSTextField *textFieldHistoryDays; +} + +- (IBAction)historyDaysModified:(id)sender; +- (IBAction)clearGlobalHistory:(id)sender; +- (IBAction)clearDiskCache:(id)aSender; + +@end diff --git a/mozilla/camino/PreferencePanes/History/History.mm b/mozilla/camino/PreferencePanes/History/History.mm new file mode 100644 index 00000000000..ea7ecf134d5 --- /dev/null +++ b/mozilla/camino/PreferencePanes/History/History.mm @@ -0,0 +1,97 @@ +/* -*- 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 "History.h" + +#include "nsCOMPtr.h" +#include "nsIServiceManager.h" +#include "nsIBrowserHistory.h" +#include "nsICacheService.h" + +const int kDefaultExpireDays = 9; + +@implementation OrgMozillaChimeraPreferenceHistory + +- (id)initWithBundle:(NSBundle *)bundle +{ + self = [super initWithBundle:bundle]; + return self; +} + +- (void)dealloc +{ + [super dealloc]; +} + +- (void)mainViewDidLoad +{ + if (!mPrefService) + return; + + BOOL gotPref; + int expireDays = [self getIntPref:"browser.history_expire_days" withSuccess:&gotPref]; + if (!gotPref) + expireDays = kDefaultExpireDays; + + [textFieldHistoryDays setIntValue:expireDays]; +} + +- (IBAction)historyDaysModified:(id)sender +{ + if (!mPrefService) + return; + + if (sender == textFieldHistoryDays) { + // If any non-numeric characters were entered make some noise and spit it out. + if (([[textFieldHistoryDays stringValue] rangeOfCharacterFromSet:[[NSCharacterSet decimalDigitCharacterSet] invertedSet]]).length) { + BOOL gotPref; + int prefValue = [self getIntPref:"browser.history_expire_days" withSuccess:&gotPref]; + if (!gotPref) + prefValue = kDefaultExpireDays; + [textFieldHistoryDays setIntValue:prefValue]; + NSBeep (); + return; + } + } + + [self setPref:"browser.history_expire_days" toInt:[sender intValue]]; +} + +// Clear the user's disk cache +-(IBAction) clearDiskCache:(id)aSender +{ + nsCOMPtr cacheServ ( do_GetService("@mozilla.org/network/cache-service;1") ); + if ( cacheServ ) + cacheServ->EvictEntries(nsICache::STORE_ANYWHERE); +} + +// use the browser history service to clear out the user's global history +- (IBAction)clearGlobalHistory:(id)sender +{ + nsCOMPtr hist ( do_GetService("@mozilla.org/browser/global-history;2") ); + if ( hist ) + hist->RemoveAllPages(); +} + +@end diff --git a/mozilla/camino/PreferencePanes/History/History.tiff b/mozilla/camino/PreferencePanes/History/History.tiff new file mode 100644 index 0000000000000000000000000000000000000000..85b58107364c3d3038a53fed64dd2513aa214acc GIT binary patch literal 18186 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 literal 0 HcmV?d00001 diff --git a/mozilla/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/classes.nib b/mozilla/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/classes.nib index dd2acd223f6..d76a6cae30e 100644 --- a/mozilla/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/classes.nib +++ b/mozilla/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/classes.nib @@ -13,20 +13,13 @@ SUPERCLASS = NSObject; }, { - ACTIONS = { - checkboxStartPageClicked = id; - checkboxUseSystemHomePageClicked = id; - clearDiskCache = id; - clearGlobalHistory = id; - historyDaysModified = id; - }; + ACTIONS = {checkboxStartPageClicked = id; checkboxUseSystemHomePageClicked = id; }; CLASS = OrgMozillaChimeraPreferenceNavigation; LANGUAGE = ObjC; OUTLETS = { checkboxNewTabBlank = NSButton; checkboxNewWindowBlank = NSButton; checkboxUseSystemHomePage = NSButton; - textFieldHistoryDays = NSTextField; textFieldHomePage = NSTextField; }; SUPERCLASS = PreferencePaneBase; diff --git a/mozilla/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/info.nib b/mozilla/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/info.nib index 8a2a181cd24..241402ec34c 100644 --- a/mozilla/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/info.nib +++ b/mozilla/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/info.nib @@ -3,20 +3,13 @@ IBDocumentLocation - 140 56 522 320 0 0 1280 1002 + 257 71 522 320 0 0 1920 1178 IBFramework Version 364.0 - IBGroupedObjects - - 8 - - 331 - 321 - 334 - - - IBLastGroupID - 9 + IBOpenObjects + + 5 + IBSystem Version 7S215 diff --git a/mozilla/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/keyedobjects.nib b/mozilla/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/keyedobjects.nib index de2287f96732b3bb4d89bf1a65f5da7194e78d07..a015d298c16826e25316b45c103502ac509c6325 100644 GIT binary patch literal 5281 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 literal 9062 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 @@ -27,11 +28,6 @@ #import "Navigation.h" #import "NSString+Utils.h" -#include "nsCOMPtr.h" -#include "nsIServiceManager.h" -#include "nsIBrowserHistory.h" -#include "nsICacheService.h" - const int kDefaultExpireDays = 9; @interface OrgMozillaChimeraPreferenceNavigation(Private) @@ -42,7 +38,6 @@ const int kDefaultExpireDays = 9; @end - @implementation OrgMozillaChimeraPreferenceNavigation - (id)initWithBundle:(NSBundle *)bundle @@ -70,19 +65,13 @@ const int kDefaultExpireDays = 9; if (([self getIntPref:"browser.tabs.startPage" withSuccess:&gotPref] == 1)) [checkboxNewTabBlank setState:YES]; - - int expireDays = [self getIntPref:"browser.history_expire_days" withSuccess:&gotPref]; - if (!gotPref) - expireDays = kDefaultExpireDays; - - [textFieldHistoryDays setIntValue:expireDays]; BOOL useSystemHomePage = [self getBooleanPref:"chimera.use_system_home_page" withSuccess:&gotPref] && gotPref; if (useSystemHomePage) [textFieldHomePage setEnabled:NO]; [checkboxUseSystemHomePage setState:useSystemHomePage]; - [textFieldHomePage setStringValue: [self getCurrentHomePage]]; + [textFieldHomePage setStringValue:[self getCurrentHomePage]]; } - (void) didUnselect @@ -95,8 +84,8 @@ const int kDefaultExpireDays = 9; [self setPref: "browser.startup.homepage" toString: [textFieldHomePage stringValue]]; // ensure that the prefs exist - [self setPref:"browser.startup.page" toInt: [checkboxNewWindowBlank state] ? 1 : 0]; - [self setPref:"browser.tabs.startPage" toInt: [checkboxNewTabBlank state] ? 1 : 0]; + [self setPref:"browser.startup.page" toInt: [checkboxNewWindowBlank state] ? 1 : 0]; + [self setPref:"browser.tabs.startPage" toInt: [checkboxNewTabBlank state] ? 1 : 0]; } - (IBAction)checkboxUseSystemHomePageClicked:(id)sender @@ -108,12 +97,12 @@ const int kDefaultExpireDays = 9; // save the mozilla pref if (useSystemHomePage) - [self setPref: "browser.startup.homepage" toString: [textFieldHomePage stringValue]]; + [self setPref:"browser.startup.homepage" toString:[textFieldHomePage stringValue]]; - [self setPref:"chimera.use_system_home_page" toBoolean: useSystemHomePage]; - [textFieldHomePage setStringValue: [self getCurrentHomePage]]; + [self setPref:"chimera.use_system_home_page" toBoolean:useSystemHomePage]; + [textFieldHomePage setStringValue:[self getCurrentHomePage]]; - [textFieldHomePage setEnabled:!useSystemHomePage]; + [textFieldHomePage setEnabled:!useSystemHomePage]; } - (IBAction)checkboxStartPageClicked:(id)sender @@ -131,39 +120,10 @@ const int kDefaultExpireDays = 9; [self setPref:prefName toInt: [sender state] ? 1 : 0]; } -- (IBAction)historyDaysModified:(id)sender -{ - if (!mPrefService) - return; - - if (sender == textFieldHistoryDays) { - // If any non-numeric characters were entered make some noise and spit it out. - if (([[textFieldHistoryDays stringValue] rangeOfCharacterFromSet:[[NSCharacterSet decimalDigitCharacterSet] invertedSet]]).length) { - BOOL gotPref; - int prefValue = [self getIntPref:"browser.history_expire_days" withSuccess:&gotPref]; - if (!gotPref) - prefValue = kDefaultExpireDays; - [textFieldHistoryDays setIntValue:prefValue]; - NSBeep (); - return; - } - } - - [self setPref:"browser.history_expire_days" toInt:[sender intValue]]; -} - -// use the browser history service to clear out the user's global history -- (IBAction)clearGlobalHistory:(id)sender -{ - nsCOMPtr hist ( do_GetService("@mozilla.org/browser/global-history;2") ); - if ( hist ) - hist->RemoveAllPages(); -} - - (NSString*)getInternetConfigString:(ConstStr255Param)icPref { - NSString* resultString = @""; - ICInstance icInstance = NULL; + NSString* resultString = @""; + ICInstance icInstance = NULL; // it would be nice to use PreferenceManager, but I don't want to drag // all that code into the plugin @@ -173,12 +133,12 @@ const int kDefaultExpireDays = 9; return resultString; } - ICAttr dummyAttr; - Str255 homePagePStr; - long prefSize = sizeof(homePagePStr); + ICAttr dummyAttr; + Str255 homePagePStr; + long prefSize = sizeof(homePagePStr); error = ICGetPref(icInstance, icPref, &dummyAttr, homePagePStr, &prefSize); if (error == noErr) - resultString = [NSString stringWithCString: (const char*)&homePagePStr[1] length:homePagePStr[0]]; + resultString = [NSString stringWithCString:(const char*)&homePagePStr[1] length:homePagePStr[0]]; else NSLog(@"Error getting pref from Internet Config"); @@ -199,16 +159,7 @@ const int kDefaultExpireDays = 9; if ([self getBooleanPref:"chimera.use_system_home_page" withSuccess:&gotPref] && gotPref) return [self getSystemHomePage]; - return [self getStringPref: "browser.startup.homepage" withSuccess:&gotPref]; -} - - -// Clear the user's disk cache --(IBAction) clearDiskCache:(id)aSender -{ - nsCOMPtr cacheServ ( do_GetService("@mozilla.org/network/cache-service;1") ); - if ( cacheServ ) - cacheServ->EvictEntries(nsICache::STORE_ANYWHERE); + return [self getStringPref:"browser.startup.homepage" withSuccess:&gotPref]; } @end diff --git a/mozilla/camino/PreferencePanes/Navigation/Navigation.tiff b/mozilla/camino/PreferencePanes/Navigation/Navigation.tiff index 3bec440d1362b19e281ac68ba8e34aa2e2b31363..9be783420411c790723f6fe704705b55ea5b25e9 100644 GIT binary patch literal 17330 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 A4gdfE literal 4314 zcmeHJX;70_6ipBT>u#+}vDQw}s&%1`Yik#AER0rLYbokf%ZOSo_|0^xdaliXpL3|2E9w-R~~vym#MwUov^JXrM?W z>LU_aoMhu$hS5g!;;*CVFOemSh#BagVD}M=8`&13RxC`h9^zKq7E`j=>ZNVL?9PV# zbK-Yi`dNjzo59~l++DCciNx=UTECDK*@$fob|-PKM*RI7@qho1&FcRDw6Fv1J9e=h zJaU}tSSJ@>#~*(QBYZJ&#`+6)EBWR!#3?B$z}`-Uc9uObH_QoIkPrqL1x^i3DUQIS~OKXsO{1jqUT5OkwARuTv z2ifGK80ApzuR#YeY^;;Vn@nKbl-ZJPGClIjYLRjz559i>@L#_kYPA|gMMWqpE8`%W zd=#Ucr1Wg$m)C-7iKC^xuxxGBX8csw;LrmZD6YK7)+oWwox5=9(j`29{`|F|oRH8^ zUPHCvnxi1Dw(UFiXl^gqoTXHEtfCs;-s_;%YVqvZvnB`$2?4=WjB32R)^Lt!T`nBH za}92e{+J2V)^82hp|HG)Yu~zc3s0XuHHqNhU=SL|AK$yjpPxK=g1dL`VzrkSipr}Y zk?TR+ubV^1F5T=_ZjDA^MJ<9PJCK-|h)0hefw-E3oK>svh-o&?C5~+YL7bDg+5I(p zM?Z6P4vf+sMRcqh(a~}|e*C!E$X>Y;2~JKX^W`xyh>BGqQj-bNFx7+BR@Uu2{dXhx zWED1S+=%PfujApvhp*uB<;%Fo`fKdZS+fRNA`yxu5<~34g9iqi_K@yIerYvGgS3q2 zU^i&^%q@E~(57S|GE#>7_wP4BeSJMrQc_S=Rb`0f`S@_{Sf*dc?xCqV@=-qzCTD;& zNXuCNtI0DXWtt2`%9Y5;$w5OygGp3YRzj&%A}cEkxol0e?gtFAUcF4_3p{ywd5DOL zg(H16EFV-{&?X$af22|L@gK{3-VXGonh$80`v zojZ39yMjZZJ$xL~=B_?vtnae$x66qcC6KcBOifJTOrdV0^Lrlvxr zQn9=3g{6xZW6PvTP%-`J)vNj5gup#hZOpwrI_jIQ*W$4ebKsl z(hm*};ramq0U+GCaRXFaQBlG7B`GP1?PWCF-Q98F!UaS`L}2aGrBE;*osEKm0^YxC z*RJt;f#c%Ei`cnq7m_khV1~yZ4aWLY=d7q!r{p6%LdNG$_2!VAoD8{K4qEGC)&qJ6 zlFwW|`Ols`i@o6yIG9$1ALe;oGuEFl%{4PZm4+CF3WbG*xN_x+Sp)_KqO`OWo}Qkd zbEVhoA(P2aTwH9n=Gd`goLd%m7>>?vdB*xf$2e@-9HPMf_(SZym&AKceK!W(J<|2? z@Zfhqh@Uud0&#J1sIIPVQbRdq zKGUAlXdI)t(RZ@3pPpq=QHW#vOB$qQtWVF5F7wXN9w^ia?3}0ZIn=Pb&=^vwlz-PZ z_Whfko}SJ*iQ9RB7sO)r>)XV~ZqTqL%X}nICgwn)P~yy)GyLAsx(IZJ_U+rpZNc}t z@%;JooI{~dK&i{dQpQahCZr9n&nG%(ZjU?&g*F3fwx7Zr=>0+Wn#SgWYU4B-#&rZz zSvAQhyVl-*ktw_Po zOV;5d`;oq;w9NVX4j%ry^Sl+1gliyEABH+U83{TaGT1yyN=o=Sr!^Aj%#)8|loO{- zW;N-&mN@zi9nm6fVNSj62F#y4%N@&o{^Y%ovGc3c=#h{}b4i4bX%WaKAH^t#*1X(T z0;=uZci=*SucafqC)QThHa+^=j|!SHdl43UZ^H(u9DDbta)h&yAUsoyawvDeC!@Dp z+qAJIj+W{Q`Bqj|?^|12_an4x-(iH^$M%~>IZVoNa&d$6++~=tU=;`1Dp~#*X}*1637<(!bmk#OB^lL74li{S~FNN4x9f1 LswEDA&(!!g0>-l# diff --git a/mozilla/camino/src/preferences/MVPreferencePaneDefaults.plist b/mozilla/camino/src/preferences/MVPreferencePaneDefaults.plist index 0ac73d8c708..de834c9834a 100644 --- a/mozilla/camino/src/preferences/MVPreferencePaneDefaults.plist +++ b/mozilla/camino/src/preferences/MVPreferencePaneDefaults.plist @@ -2,7 +2,8 @@ org.mozilla.chimera.preference.appearance, org.mozilla.chimera.preference.privacy, org.mozilla.chimera.preference.security, - org.mozilla.chimera.preference.webfeatures, + org.mozilla.camino.preference.history, org.mozilla.camino.preference.tabs, org.mozilla.camino.preference.downloads, + org.mozilla.chimera.preference.webfeatures, )