From 89397192b2ee13800491ab39d5d9302eb670551d Mon Sep 17 00:00:00 2001 From: "mark%moxienet.com" Date: Fri, 14 Dec 2007 21:50:11 +0000 Subject: [PATCH] 408400 Rename Navigation preference pane to General. r=smorgan sr=me a/1.6b1=me For older/newer CVS history, map (in mozilla/camino): Info-NavigationPrefPane.plist Info-GeneralPrefPane.plist PreferencePanes/Navigation/* PreferencePanes/General/* --- camino/Camino.xcodeproj/project.pbxproj | 84 ++--- camino/Info-GeneralPrefPane.plist | 32 ++ camino/Info-NavigationPrefPane.plist | 0 camino/Makefile.in | 2 +- .../English.lproj/General.nib/classes.nib | 45 +++ .../English.lproj/General.nib/info.nib | 16 + .../General.nib/keyedobjects.nib | Bin 0 -> 12064 bytes .../English.lproj/Localizable.strings.in | 1 + camino/PreferencePanes/General/General.h | 72 +++++ camino/PreferencePanes/General/General.mm | 286 ++++++++++++++++++ camino/PreferencePanes/General/General.tiff | Bin 0 -> 1754 bytes .../English.lproj/Localizable.strings.in | 0 .../English.lproj/Navigation.nib/classes.nib | 0 .../English.lproj/Navigation.nib/info.nib | 0 .../Navigation.nib/keyedobjects.nib | 0 .../PreferencePanes/Navigation/Navigation.h | 0 .../PreferencePanes/Navigation/Navigation.mm | 0 .../Navigation/Navigation.tiff | 0 .../preferences/MVPreferencesController.mm | 2 +- 19 files changed, 496 insertions(+), 44 deletions(-) create mode 100644 camino/Info-GeneralPrefPane.plist delete mode 100644 camino/Info-NavigationPrefPane.plist create mode 100644 camino/PreferencePanes/General/English.lproj/General.nib/classes.nib create mode 100644 camino/PreferencePanes/General/English.lproj/General.nib/info.nib create mode 100644 camino/PreferencePanes/General/English.lproj/General.nib/keyedobjects.nib create mode 100644 camino/PreferencePanes/General/English.lproj/Localizable.strings.in create mode 100644 camino/PreferencePanes/General/General.h create mode 100644 camino/PreferencePanes/General/General.mm create mode 100644 camino/PreferencePanes/General/General.tiff delete mode 100644 camino/PreferencePanes/Navigation/English.lproj/Localizable.strings.in delete mode 100644 camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/classes.nib delete mode 100644 camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/info.nib delete mode 100644 camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/keyedobjects.nib delete mode 100644 camino/PreferencePanes/Navigation/Navigation.h delete mode 100644 camino/PreferencePanes/Navigation/Navigation.mm delete mode 100644 camino/PreferencePanes/Navigation/Navigation.tiff diff --git a/camino/Camino.xcodeproj/project.pbxproj b/camino/Camino.xcodeproj/project.pbxproj index 5c5b2ffed8d..719bd8d3673 100644 --- a/camino/Camino.xcodeproj/project.pbxproj +++ b/camino/Camino.xcodeproj/project.pbxproj @@ -670,11 +670,11 @@ 3F44AD9605BDFB9F00CB4B08 /* Appearance.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5A8CE4F02DFF167013CA8EC /* Appearance.mm */; }; 3F44AD9905BDFB9F00CB4B08 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97325FDCFA39411CA2CEA /* Foundation.framework */; }; 3F44AD9A05BDFB9F00CB4B08 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; - 3F44ADA305BDFB9F00CB4B08 /* Navigation.h in Headers */ = {isa = PBXBuildFile; fileRef = F52627D4027E982201000102 /* Navigation.h */; }; - 3F44ADA505BDFB9F00CB4B08 /* Navigation.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F52627D8027E984501000102 /* Navigation.tiff */; }; - 3F44ADA605BDFB9F00CB4B08 /* Navigation.nib in Resources */ = {isa = PBXBuildFile; fileRef = F507A85B0311895401026D5D /* Navigation.nib */; }; + 3F44ADA305BDFB9F00CB4B08 /* General.h in Headers */ = {isa = PBXBuildFile; fileRef = F52627D4027E982201000102 /* General.h */; }; + 3F44ADA505BDFB9F00CB4B08 /* General.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F52627D8027E984501000102 /* General.tiff */; }; + 3F44ADA605BDFB9F00CB4B08 /* General.nib in Resources */ = {isa = PBXBuildFile; fileRef = F507A85B0311895401026D5D /* General.nib */; }; 3F44ADA705BDFB9F00CB4B08 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F5FCDD5F03A035E501A9666E /* Localizable.strings */; }; - 3F44ADAA05BDFB9F00CB4B08 /* Navigation.mm in Sources */ = {isa = PBXBuildFile; fileRef = F52627D5027E982201000102 /* Navigation.mm */; }; + 3F44ADAA05BDFB9F00CB4B08 /* General.mm in Sources */ = {isa = PBXBuildFile; fileRef = F52627D5027E982201000102 /* General.mm */; }; 3F44ADAD05BDFB9F00CB4B08 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97325FDCFA39411CA2CEA /* Foundation.framework */; }; 3F44ADAE05BDFB9F00CB4B08 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; 3F44ADB105BDFB9F00CB4B08 /* layout_printing.xpt in Copy Component XPTs */ = {isa = PBXBuildFile; fileRef = F6BD63F201B313EE01A962F7 /* layout_printing.xpt */; }; @@ -1445,7 +1445,7 @@ containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; proxyType = 1; remoteGlobalIDString = 3F44ADA005BDFB9F00CB4B08; - remoteInfo = NavigationPrefPane; + remoteInfo = GeneralPrefPane; }; 7BDD26E70D0DC31C00BA05C6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -1501,7 +1501,7 @@ containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; proxyType = 1; remoteGlobalIDString = 3F44ADA005BDFB9F00CB4B08; - remoteInfo = NavigationPrefPane; + remoteInfo = GeneralPrefPane; }; 7BDD26F70D0DC31C00BA05C6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -2502,8 +2502,8 @@ 3F44AD8805BDFB9F00CB4B08 /* Camino.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = Camino.app; sourceTree = BUILT_PRODUCTS_DIR; }; 3F44AD9E05BDFB9F00CB4B08 /* Info-AppearancePrefPane.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-AppearancePrefPane.plist"; sourceTree = ""; }; 3F44AD9F05BDFB9F00CB4B08 /* Appearance.prefPane */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Appearance.prefPane; sourceTree = BUILT_PRODUCTS_DIR; }; - 3F44ADB205BDFBA000CB4B08 /* Info-NavigationPrefPane.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-NavigationPrefPane.plist"; sourceTree = ""; }; - 3F44ADB305BDFBA000CB4B08 /* Navigation.prefPane */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Navigation.prefPane; sourceTree = BUILT_PRODUCTS_DIR; }; + 3F44ADB205BDFBA000CB4B08 /* Info-GeneralPrefPane.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-GeneralPrefPane.plist"; sourceTree = ""; }; + 3F44ADB305BDFBA000CB4B08 /* General.prefPane */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = General.prefPane; sourceTree = BUILT_PRODUCTS_DIR; }; 3F44ADC105BDFBA000CB4B08 /* Info-PersonalPrefPane.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-PersonalPrefPane.plist"; sourceTree = ""; }; 3F44ADD905BDFBA000CB4B08 /* Info-PrivacyPrefPane.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-PrivacyPrefPane.plist"; sourceTree = ""; }; 3F44ADDA05BDFBA000CB4B08 /* Privacy.prefPane */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Privacy.prefPane; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -2766,10 +2766,10 @@ F5247C4C0228BBB2013DD99A /* pipboot.xpt */ = {isa = PBXFileReference; lastKnownFileType = file; name = pipboot.xpt; path = ../dist/Embed/components/pipboot.xpt; sourceTree = SOURCE_ROOT; }; F5247C4D0228BBB2013DD99A /* pipnss.xpt */ = {isa = PBXFileReference; lastKnownFileType = file; name = pipnss.xpt; path = ../dist/Embed/components/pipnss.xpt; sourceTree = SOURCE_ROOT; }; F524EF6702AD8B9301A967F3 /* libgkgfx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgkgfx.a; path = ../dist/lib/libgkgfx.a; sourceTree = SOURCE_ROOT; }; - F52627D4027E982201000102 /* Navigation.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = Navigation.h; path = PreferencePanes/Navigation/Navigation.h; sourceTree = SOURCE_ROOT; tabWidth = 2; }; - F52627D5027E982201000102 /* Navigation.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.cpp.objcpp; name = Navigation.mm; path = PreferencePanes/Navigation/Navigation.mm; sourceTree = SOURCE_ROOT; tabWidth = 2; }; - F52627D8027E984501000102 /* Navigation.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Navigation.tiff; path = PreferencePanes/Navigation/Navigation.tiff; sourceTree = SOURCE_ROOT; }; - F52627DA027E98A401000102 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = PreferencePanes/Navigation/English.lproj/Navigation.nib; sourceTree = SOURCE_ROOT; }; + F52627D4027E982201000102 /* General.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = General.h; path = PreferencePanes/General/General.h; sourceTree = SOURCE_ROOT; tabWidth = 2; }; + F52627D5027E982201000102 /* General.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.cpp.objcpp; name = General.mm; path = PreferencePanes/General/General.mm; sourceTree = SOURCE_ROOT; tabWidth = 2; }; + F52627D8027E984501000102 /* General.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = General.tiff; path = PreferencePanes/General/General.tiff; sourceTree = SOURCE_ROOT; }; + F52627DA027E98A401000102 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = PreferencePanes/General/English.lproj/General.nib; sourceTree = SOURCE_ROOT; }; F527C90203BCD43601A80166 /* NSView+Utils.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = "NSView+Utils.h"; path = "src/extensions/NSView+Utils.h"; sourceTree = ""; }; F527C90303BCD43601A80166 /* NSView+Utils.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = "NSView+Utils.m"; path = "src/extensions/NSView+Utils.m"; sourceTree = ""; }; F528E216020FD5D80168DE43 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = resources/localized/English.lproj/FindDialog.nib; sourceTree = SOURCE_ROOT; }; @@ -2943,7 +2943,7 @@ F5F94B910332532801026D5D /* KeychainService.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = KeychainService.mm; path = src/formfill/KeychainService.mm; sourceTree = ""; }; F5F94BEF0338E8C501026D5D /* add_to_bookmark.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = add_to_bookmark.tif; path = resources/images/toolbar/add_to_bookmark.tif; sourceTree = SOURCE_ROOT; }; F5F9FBD902E13767012B5DB7 /* RegionMapping.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist; name = RegionMapping.plist; path = PreferencePanes/Appearance/RegionMapping.plist; sourceTree = SOURCE_ROOT; }; - F5FCDD5D03A035E001A9666E /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = generated/PreferencePanes/Navigation/English.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; }; + F5FCDD5D03A035E001A9666E /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = generated/PreferencePanes/General/English.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; }; F5FDF166031AF47301DE816D /* DraggableImageAndTextCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DraggableImageAndTextCell.h; path = src/extensions/DraggableImageAndTextCell.h; sourceTree = ""; }; F5FDF167031AF47301DE816D /* DraggableImageAndTextCell.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = DraggableImageAndTextCell.mm; path = src/extensions/DraggableImageAndTextCell.mm; sourceTree = ""; }; F5FEDBCB02AD8DD101A967F3 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = ""; }; @@ -3483,7 +3483,7 @@ children = ( 3F44AD8805BDFB9F00CB4B08 /* Camino.app */, 3F44AD9F05BDFB9F00CB4B08 /* Appearance.prefPane */, - 3F44ADB305BDFBA000CB4B08 /* Navigation.prefPane */, + 3F44ADB305BDFBA000CB4B08 /* General.prefPane */, 3F44ADDA05BDFBA000CB4B08 /* Privacy.prefPane */, 3F44ADF105BDFBA000CB4B08 /* Security.prefPane */, 3F44AE0805BDFBA000CB4B08 /* WebFeatures.prefPane */, @@ -3834,7 +3834,7 @@ children = ( 3F44AD8705BDFB9F00CB4B08 /* generated/Info-Camino.plist */, 3F44AD9E05BDFB9F00CB4B08 /* Info-AppearancePrefPane.plist */, - 3F44ADB205BDFBA000CB4B08 /* Info-NavigationPrefPane.plist */, + 3F44ADB205BDFBA000CB4B08 /* Info-GeneralPrefPane.plist */, 3F44ADC105BDFBA000CB4B08 /* Info-PersonalPrefPane.plist */, 3F44ADD905BDFBA000CB4B08 /* Info-PrivacyPrefPane.plist */, 3F44ADF005BDFBA000CB4B08 /* Info-SecurityPrefPane.plist */, @@ -4138,17 +4138,17 @@ name = "Components Level"; sourceTree = ""; }; - F52627CC027E96AE01000102 /* Navigation */ = { + F52627CC027E96AE01000102 /* General */ = { isa = PBXGroup; children = ( - F52627D4027E982201000102 /* Navigation.h */, - F52627D5027E982201000102 /* Navigation.mm */, - F52627D8027E984501000102 /* Navigation.tiff */, - F507A85B0311895401026D5D /* Navigation.nib */, + F52627D4027E982201000102 /* General.h */, + F52627D5027E982201000102 /* General.mm */, + F52627D8027E984501000102 /* General.tiff */, + F507A85B0311895401026D5D /* General.nib */, F5FCDD5F03A035E501A9666E /* Localizable.strings */, ); - name = Navigation; - path = PreferencePanes/Navigation; + name = General; + path = PreferencePanes/General; sourceTree = SOURCE_ROOT; }; F5264FCB020D4C25010001CA /* Toolbar-Browser */ = { @@ -4198,7 +4198,7 @@ isa = PBXGroup; children = ( F5CA1A1D02D4ECDA01F34900 /* Prefs window */, - F52627CC027E96AE01000102 /* Navigation */, + F52627CC027E96AE01000102 /* General */, F5A8CE4D02DFF167013CA8EC /* Appearance */, 035A4981079DCA100084B05F /* History */, 032FFDCC077351A800440548 /* Downloads */, @@ -4778,7 +4778,7 @@ buildActionMask = 2147483647; files = ( DE74F75D0AB2605B00FD1D5B /* AppListMenuFactory.h in Headers */, - 3F44ADA305BDFB9F00CB4B08 /* Navigation.h in Headers */, + 3F44ADA305BDFB9F00CB4B08 /* General.h in Headers */, 7B06E8180D0DC91A0032E38A /* PreferencePaneBase.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -5053,9 +5053,9 @@ productReference = 3F44AD9F05BDFB9F00CB4B08 /* Appearance.prefPane */; productType = "com.apple.product-type.bundle"; }; - 3F44ADA005BDFB9F00CB4B08 /* NavigationPrefPane */ = { + 3F44ADA005BDFB9F00CB4B08 /* GeneralPrefPane */ = { isa = PBXNativeTarget; - buildConfigurationList = 332377610C4D0F9600A34879 /* Build configuration list for PBXNativeTarget "NavigationPrefPane" */; + buildConfigurationList = 332377610C4D0F9600A34879 /* Build configuration list for PBXNativeTarget "GeneralPrefPane" */; buildPhases = ( 3F44ADA105BDFB9F00CB4B08 /* Headers */, 3F44ADA405BDFB9F00CB4B08 /* Resources */, @@ -5068,10 +5068,10 @@ dependencies = ( 7B64B7DA0CCFDA280098406C /* PBXTargetDependency */, ); - name = NavigationPrefPane; + name = GeneralPrefPane; productInstallPath = "$(USER_LIBRARY_DIR)/Bundles"; - productName = NavigationPrefPane; - productReference = 3F44ADB305BDFBA000CB4B08 /* Navigation.prefPane */; + productName = GeneralPrefPane; + productReference = 3F44ADB305BDFBA000CB4B08 /* General.prefPane */; productType = "com.apple.product-type.bundle"; }; 3F44ADC305BDFBA000CB4B08 /* PrivacyPrefPane */ = { @@ -5204,7 +5204,7 @@ 7BDD26E30D0DC30600BA05C6 /* CaminoStatic */, 3F44ABD005BDFB9E00CB4B08 /* CaminoApp */, 3F44AE0905BDFBA000CB4B08 /* CaminoStaticApp */, - 3F44ADA005BDFB9F00CB4B08 /* NavigationPrefPane */, + 3F44ADA005BDFB9F00CB4B08 /* GeneralPrefPane */, 3F44AD8A05BDFB9F00CB4B08 /* AppearancePrefPane */, 3F44ADC305BDFBA000CB4B08 /* PrivacyPrefPane */, 3F44ADDB05BDFBA000CB4B08 /* SecurityPrefPane */, @@ -5414,8 +5414,8 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 3F44ADA505BDFB9F00CB4B08 /* Navigation.tiff in Resources */, - 3F44ADA605BDFB9F00CB4B08 /* Navigation.nib in Resources */, + 3F44ADA505BDFB9F00CB4B08 /* General.tiff in Resources */, + 3F44ADA605BDFB9F00CB4B08 /* General.nib in Resources */, 3F44ADA705BDFB9F00CB4B08 /* Localizable.strings in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -5811,7 +5811,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 3F44ADAA05BDFB9F00CB4B08 /* Navigation.mm in Sources */, + 3F44ADAA05BDFB9F00CB4B08 /* General.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -6024,7 +6024,7 @@ }; 7BDD26E10D0DC2E400BA05C6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 3F44ADA005BDFB9F00CB4B08 /* NavigationPrefPane */; + target = 3F44ADA005BDFB9F00CB4B08 /* GeneralPrefPane */; targetProxy = 7BDD26E00D0DC2E400BA05C6 /* PBXContainerItemProxy */; }; 7BDD26E80D0DC31C00BA05C6 /* PBXTargetDependency */ = { @@ -6064,7 +6064,7 @@ }; 7BDD26F60D0DC31C00BA05C6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 3F44ADA005BDFB9F00CB4B08 /* NavigationPrefPane */; + target = 3F44ADA005BDFB9F00CB4B08 /* GeneralPrefPane */; targetProxy = 7BDD26F50D0DC31C00BA05C6 /* PBXContainerItemProxy */; }; 7BDD26F80D0DC31C00BA05C6 /* PBXTargetDependency */ = { @@ -6366,12 +6366,12 @@ path = PreferencePanes/Appearance; sourceTree = SOURCE_ROOT; }; - F507A85B0311895401026D5D /* Navigation.nib */ = { + F507A85B0311895401026D5D /* General.nib */ = { isa = PBXVariantGroup; children = ( F52627DA027E98A401000102 /* English */, ); - name = Navigation.nib; + name = General.nib; sourceTree = ""; }; F507A85D0311948201026D5D /* Privacy.nib */ = { @@ -6494,14 +6494,14 @@ buildSettings = { FRAMEWORK_SEARCH_PATHS = sparkle/build/Release; HEADER_SEARCH_PATHS = ../dist/include; - INFOPLIST_FILE = "Info-NavigationPrefPane.plist"; + INFOPLIST_FILE = "Info-GeneralPrefPane.plist"; OTHER_CFLAGS = ( "$(OTHER_CFLAGS)", "-DDEBUG", "-DMOZ_DEBUG", "-DTRACING", ); - PRODUCT_NAME = Navigation; + PRODUCT_NAME = General; }; name = Development; }; @@ -6511,8 +6511,8 @@ buildSettings = { FRAMEWORK_SEARCH_PATHS = sparkle/build/Release; HEADER_SEARCH_PATHS = ../dist/include; - INFOPLIST_FILE = "Info-NavigationPrefPane.plist"; - PRODUCT_NAME = Navigation; + INFOPLIST_FILE = "Info-GeneralPrefPane.plist"; + PRODUCT_NAME = General; }; name = Deployment; }; @@ -6900,7 +6900,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Development; }; - 332377610C4D0F9600A34879 /* Build configuration list for PBXNativeTarget "NavigationPrefPane" */ = { + 332377610C4D0F9600A34879 /* Build configuration list for PBXNativeTarget "GeneralPrefPane" */ = { isa = XCConfigurationList; buildConfigurations = ( 332377620C4D0F9600A34879 /* Development */, diff --git a/camino/Info-GeneralPrefPane.plist b/camino/Info-GeneralPrefPane.plist new file mode 100644 index 00000000000..248f918e6b6 --- /dev/null +++ b/camino/Info-GeneralPrefPane.plist @@ -0,0 +1,32 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + General + CFBundleGetInfoString + + CFBundleIconFile + General.tiff + CFBundleIdentifier + org.mozilla.camino.preference.general + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + General + CFBundlePackageType + BNDL + CFBundleShortVersionString + + CFBundleSignature + MOZC + CFBundleVersion + 1.0 + NSMainNibFile + General + NSPrincipalClass + OrgMozillaCaminoPreferenceGeneral + + diff --git a/camino/Info-NavigationPrefPane.plist b/camino/Info-NavigationPrefPane.plist deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/camino/Makefile.in b/camino/Makefile.in index 8e11ded3a27..cc11e19ce12 100644 --- a/camino/Makefile.in +++ b/camino/Makefile.in @@ -68,8 +68,8 @@ STRINGS_FILES = resources/localized/English.lproj/CertificateDialogs.strings \ PreferencePanes/Appearance/English.lproj/Localizable.strings \ PreferencePanes/Appearance/English.lproj/RegionNames.strings \ PreferencePanes/Downloads/English.lproj/Localizable.strings \ + PreferencePanes/General/English.lproj/Localizable.strings \ PreferencePanes/History/English.lproj/Localizable.strings \ - PreferencePanes/Navigation/English.lproj/Localizable.strings \ PreferencePanes/Privacy/English.lproj/Localizable.strings \ PreferencePanes/Security/English.lproj/Localizable.strings \ PreferencePanes/Tabs/English.lproj/Localizable.strings \ diff --git a/camino/PreferencePanes/General/English.lproj/General.nib/classes.nib b/camino/PreferencePanes/General/English.lproj/General.nib/classes.nib new file mode 100644 index 00000000000..74777fb9470 --- /dev/null +++ b/camino/PreferencePanes/General/English.lproj/General.nib/classes.nib @@ -0,0 +1,45 @@ +{ + IBClasses = ( + {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + { + CLASS = NSPreferencePane; + LANGUAGE = ObjC; + OUTLETS = { + "_firstKeyView" = NSView; + "_initialKeyView" = NSView; + "_lastKeyView" = NSView; + "_window" = NSWindow; + }; + SUPERCLASS = NSObject; + }, + { + ACTIONS = { + autoUpdateCheckboxClicked = id; + checkDefaultBrowserOnLaunchClicked = id; + checkboxStartPageClicked = id; + defaultBrowserChange = id; + defaultFeedViewerChange = id; + rememberWindowStateCheckboxClicked = id; + runOpenDialogToSelectBrowser = id; + runOpenDialogToSelectFeedViewer = id; + warningCheckboxClicked = id; + }; + CLASS = OrgMozillaCaminoPreferenceGeneral; + LANGUAGE = ObjC; + OUTLETS = { + checkboxAutoUpdate = NSButton; + checkboxCheckDefaultBrowserOnLaunch = NSButton; + checkboxNewTabBlank = NSButton; + checkboxNewWindowBlank = NSButton; + checkboxRememberWindowState = NSButton; + checkboxWarnWhenClosing = NSButton; + defaultBrowserPopUp = NSPopUpButton; + defaultFeedViewerPopUp = NSPopUpButton; + textFieldHomePage = NSTextField; + }; + SUPERCLASS = PreferencePaneBase; + }, + {CLASS = PreferencePaneBase; LANGUAGE = ObjC; SUPERCLASS = NSPreferencePane; } + ); + IBVersion = 1; +} \ No newline at end of file diff --git a/camino/PreferencePanes/General/English.lproj/General.nib/info.nib b/camino/PreferencePanes/General/English.lproj/General.nib/info.nib new file mode 100644 index 00000000000..5bd515b0e1a --- /dev/null +++ b/camino/PreferencePanes/General/English.lproj/General.nib/info.nib @@ -0,0 +1,16 @@ + + + + + IBDocumentLocation + 10 8 462 260 0 0 1024 746 + IBFramework Version + 446.1 + IBOpenObjects + + 5 + + IBSystem Version + 8S2167 + + diff --git a/camino/PreferencePanes/General/English.lproj/General.nib/keyedobjects.nib b/camino/PreferencePanes/General/English.lproj/General.nib/keyedobjects.nib new file mode 100644 index 0000000000000000000000000000000000000000..62096debe2b457131c897d6185a90f527b0d43f6 GIT binary patch literal 12064 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 VFGA8E14o78A2}$0Hod2p{U2w7 + +@interface OrgMozillaCaminoPreferenceGeneral : PreferencePaneBase +{ + IBOutlet NSTextField* textFieldHomePage; + + IBOutlet NSButton* checkboxNewTabBlank; + IBOutlet NSButton* checkboxNewWindowBlank; + IBOutlet NSPopUpButton* defaultBrowserPopUp; + IBOutlet NSPopUpButton* defaultFeedViewerPopUp; + IBOutlet NSButton* checkboxCheckDefaultBrowserOnLaunch; + IBOutlet NSButton* checkboxWarnWhenClosing; + IBOutlet NSButton* checkboxRememberWindowState; + IBOutlet NSButton* checkboxAutoUpdate; +} + +- (IBAction)checkboxStartPageClicked:(id)sender; +- (IBAction)defaultBrowserChange:(id)sender; +- (IBAction)defaultFeedViewerChange:(id)sender; +- (IBAction)warningCheckboxClicked:(id)sender; +- (IBAction)rememberWindowStateCheckboxClicked:(id)sender; +- (IBAction)checkDefaultBrowserOnLaunchClicked:(id)sender; +- (IBAction)autoUpdateCheckboxClicked:(id)sender; + +// method to be called so that when the default feed viewer is modified +// in FeedServiceController, we can rebuild the list here as well. +-(void)updateDefaultFeedViewerMenu; + +-(IBAction)defaultFeedViewerChange:(id)sender; +-(IBAction)runOpenDialogToSelectBrowser:(id)sender; +-(IBAction)runOpenDialogToSelectFeedViewer:(id)sender; + +@end diff --git a/camino/PreferencePanes/General/General.mm b/camino/PreferencePanes/General/General.mm new file mode 100644 index 00000000000..5aea69c1c82 --- /dev/null +++ b/camino/PreferencePanes/General/General.mm @@ -0,0 +1,286 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * 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 the Initial Developer are Copyright (C) 2002 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * william@dell.wisner.name (William Dell Wisner) + * josh@mozilla.com (Josh Aas) + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#import +#import +#import + +#import "NSWorkspace+Utils.h" +#import "AppListMenuFactory.h" +#import "UserDefaults.h" + +#import "General.h" + +const int kDefaultExpireDays = 9; + +@interface OrgMozillaCaminoPreferenceGeneral(Private) + +- (NSString*)currentHomePage; +- (void)updateDefaultBrowserMenu; +- (void)browserSelectionPanelDidEnd:(NSOpenPanel*)sheet returnCode:(int)returnCode contextInfo:(void*)contextInfo; +- (void)feedSelectionPanelDidEnd:(NSOpenPanel*)sheet returnCode:(int)returnCode contextInfo:(void*)contextInfo; + +@end + +@implementation OrgMozillaCaminoPreferenceGeneral + +- (id)initWithBundle:(NSBundle *)bundle +{ + if ((self = [super initWithBundle:bundle])) { + [[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWithObject:[NSArray array] + forKey:kUserChosenBrowserUserDefaultsKey]]; + [[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWithObject:[NSArray array] + forKey:kUserChosenFeedViewerUserDefaultsKey]]; + } + return self; +} + +- (void)dealloc +{ + [[NSNotificationCenter defaultCenter] removeObserver:self]; + [super dealloc]; +} + +- (void)mainViewDidLoad +{ + if (!mPrefService) + return; + + BOOL gotPref; + + // 0: blank page. 1: home page. 2: last page visited. Our behaviour here should + // match what the browser does when the prefs don't exist. + if (([self getIntPref:"browser.startup.page" withSuccess:&gotPref] == 1) || !gotPref) + [checkboxNewWindowBlank setState:NSOnState]; + + if (([self getIntPref:"browser.tabs.startPage" withSuccess:&gotPref] == 1)) + [checkboxNewTabBlank setState:NSOnState]; + + if ([self getBooleanPref:"camino.check_default_browser" withSuccess:&gotPref] || !gotPref) + [checkboxCheckDefaultBrowserOnLaunch setState:NSOnState]; + + if ([self getBooleanPref:"camino.warn_when_closing" withSuccess:&gotPref]) + [checkboxWarnWhenClosing setState:NSOnState]; + + if ([self getBooleanPref:"camino.remember_window_state" withSuccess:&gotPref]) + [checkboxRememberWindowState setState:NSOnState]; + + if ([[NSUserDefaults standardUserDefaults] integerForKey:SUScheduledCheckIntervalKey] > 0) + [checkboxAutoUpdate setState:NSOnState]; + + [textFieldHomePage setStringValue:[self currentHomePage]]; + + // set up default browser menu + [self updateDefaultBrowserMenu]; + + // set up the feed viewer menu + [self updateDefaultFeedViewerMenu]; + + // register notification if the default feed viewer is changed in the FeedServiceController + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(updateDefaultFeedViewerMenu) + name:kDefaultFeedViewerChanged + object:nil]; +} + +- (void) didUnselect +{ + if (!mPrefService) + return; + + [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]; +} + +- (IBAction)checkboxStartPageClicked:(id)sender +{ + if (!mPrefService) + return; + + char *prefName = NULL; + if (sender == checkboxNewTabBlank) + prefName = "browser.tabs.startPage"; + else if (sender == checkboxNewWindowBlank) + prefName = "browser.startup.page"; + + if (prefName) + [self setPref:prefName toInt: [sender state] ? 1 : 0]; +} + +- (IBAction)warningCheckboxClicked:(id)sender +{ + if (sender == checkboxWarnWhenClosing) + [self setPref:"camino.warn_when_closing" toBoolean:([sender state] == NSOnState)]; +} + +- (IBAction)rememberWindowStateCheckboxClicked:(id)sender +{ + if (sender == checkboxRememberWindowState) + [self setPref:"camino.remember_window_state" toBoolean:([sender state] == NSOnState)]; +} + +- (IBAction)checkDefaultBrowserOnLaunchClicked:(id)sender +{ + if (sender == checkboxCheckDefaultBrowserOnLaunch) + [self setPref:"camino.check_default_browser" toBoolean:([sender state] == NSOnState)]; +} + +- (IBAction)autoUpdateCheckboxClicked:(id)sender +{ + if (sender == checkboxAutoUpdate) { + NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults]; + if ([sender state] == NSOnState) { + [defaults setInteger:USER_DEFAULTS_UPDATE_INTERVAL_DEFAULT + forKey:SUScheduledCheckIntervalKey]; + } + else { + [defaults setInteger:0 forKey:SUScheduledCheckIntervalKey]; + } + } +} + +- (NSString*)currentHomePage +{ + BOOL gotPref; + return [self getStringPref:"browser.startup.homepage" withSuccess:&gotPref]; +} + +// called when the users changes the selection in the default browser menu +- (IBAction)defaultBrowserChange:(id)sender +{ + [[AppListMenuFactory sharedAppListMenuFactory] validateAndRegisterDefaultBrowser:[sender representedObject]]; + [self updateDefaultBrowserMenu]; +} + +-(IBAction)defaultFeedViewerChange:(id)sender +{ + [[AppListMenuFactory sharedAppListMenuFactory] validateAndRegisterDefaultFeedViewer:[sender representedObject]]; + [self updateDefaultFeedViewerMenu]; +} + +-(IBAction)runOpenDialogToSelectBrowser:(id)sender +{ + NSOpenPanel *op = [NSOpenPanel openPanel]; + [op setCanChooseDirectories:NO]; + [op setAllowsMultipleSelection:NO]; + [op beginSheetForDirectory:nil + file:nil + types:[NSArray arrayWithObject:@"app"] + modalForWindow:[defaultBrowserPopUp window] + modalDelegate:self + didEndSelector:@selector(browserSelectionPanelDidEnd:returnCode:contextInfo:) + contextInfo:nil]; +} + +-(IBAction)runOpenDialogToSelectFeedViewer:(id)sender +{ + NSOpenPanel *op = [NSOpenPanel openPanel]; + [op setCanChooseDirectories:NO]; + [op setAllowsMultipleSelection:NO]; + [op beginSheetForDirectory:nil + file:nil + types:[NSArray arrayWithObject:@"app"] + modalForWindow:[defaultFeedViewerPopUp window] + modalDelegate:self + didEndSelector:@selector(feedSelectionPanelDidEnd:returnCode:contextInfo:) + contextInfo:nil]; +} + +- (void)browserSelectionPanelDidEnd:(NSOpenPanel*)sheet returnCode:(int)returnCode contextInfo:(void*)contextInfo +{ + if (returnCode == NSOKButton) { + NSString *chosenBundleID = [[NSWorkspace sharedWorkspace] identifierForBundle:[[sheet URLs] objectAtIndex:0]]; + if (chosenBundleID) { + // add this browser to a list of apps we should always consider as browsers + NSMutableArray *userChosenBundleIDs = [NSMutableArray arrayWithCapacity:2]; + [userChosenBundleIDs addObjectsFromArray:[[NSUserDefaults standardUserDefaults] objectForKey:kUserChosenBrowserUserDefaultsKey]]; + if (![userChosenBundleIDs containsObject:chosenBundleID]) { + [userChosenBundleIDs addObject:chosenBundleID]; + [[NSUserDefaults standardUserDefaults] setObject:userChosenBundleIDs forKey:kUserChosenBrowserUserDefaultsKey]; + } + // make it the default browser + [[NSWorkspace sharedWorkspace] setDefaultBrowserWithIdentifier:chosenBundleID]; + } + } + [self updateDefaultBrowserMenu]; +} + +- (void)feedSelectionPanelDidEnd:(NSOpenPanel*)sheet returnCode:(int)returnCode contextInfo:(void*)contextInfo +{ + if (returnCode == NSOKButton) { + NSString* chosenBundleID = [[NSWorkspace sharedWorkspace] identifierForBundle:[[sheet URLs] objectAtIndex:0]]; + if (chosenBundleID) { + // add this browser to a list of apps we should always consider as browsers + NSMutableArray* userChosenBundleIDs = [NSMutableArray arrayWithCapacity:2]; + [userChosenBundleIDs addObjectsFromArray:[[NSUserDefaults standardUserDefaults] objectForKey:kUserChosenFeedViewerUserDefaultsKey]]; + if (![userChosenBundleIDs containsObject:chosenBundleID]) { + [userChosenBundleIDs addObject:chosenBundleID]; + [[NSUserDefaults standardUserDefaults] setObject:userChosenBundleIDs forKey:kUserChosenFeedViewerUserDefaultsKey]; + } + // set the default feed viewer + [[NSWorkspace sharedWorkspace] setDefaultFeedViewerWithIdentifier:chosenBundleID]; + [self updateDefaultFeedViewerMenu]; + } + } + // The open action was cancelled, re-select the default application + else + [defaultFeedViewerPopUp selectItemAtIndex:0]; +} + +-(void)updateDefaultBrowserMenu +{ + [[AppListMenuFactory sharedAppListMenuFactory] buildBrowserAppsMenuForPopup:defaultBrowserPopUp + andAction:@selector(defaultBrowserChange:) + andSelectAction:@selector(runOpenDialogToSelectBrowser:) + andTarget:self]; +} + +-(void)updateDefaultFeedViewerMenu +{ + [[AppListMenuFactory sharedAppListMenuFactory] buildFeedAppsMenuForPopup:defaultFeedViewerPopUp + andAction:@selector(defaultFeedViewerChange:) + andSelectAction:@selector(runOpenDialogToSelectFeedViewer:) + andTarget:self]; +} + +@end diff --git a/camino/PreferencePanes/General/General.tiff b/camino/PreferencePanes/General/General.tiff new file mode 100644 index 0000000000000000000000000000000000000000..aed3186f1c6c4f97b0a47aa2082173589fe0e671 GIT binary patch literal 1754 zcmYk7do-Kb8i&8QBveUMg%T4TqbAfPEutJW5>>Zx5009wk!b2tot9SB#1|E#N{du! zT11CX9duk;mQkZa#C0ewia}I@-Vn5+5hrt&IcL^hd+%pG@B4fApWE9TFa-eUeglcdu* z!IiI;H>C6#%X4FbH7UJ~13set+cl3$X-j7j*@t*&EB75Gj@2n`D1IpRpz5=gYGXAQ ztA31HNA3%(dWYqzjF?9Zgr=L6v&6}~3~5L*?|Cd)w@b6=>;cy@r38>qP)ai3*GcJy z#Vm|0u?HquGVWr|NlTN)R=Rb|OkhjyI^GByTqD)g_xiuz*x0iwQ$MZHO*#+peHa!9It8#X9Eq;wO+7%c#$x zc`|%1)0~k;WQN&Zo`G$zT%HLY_>?kJC{qT>#v1D90+pusg975TX3#88&7X=Evt{wG zb)hz?vv$UtXYS(8E8r1{chyd49-hig>=u6$Tp(npL>8WAQz6M(>>e3~#-2_tx|Jb| z1Mh5Mc5?MhBz;_wUL5U?sKv2i!8`~&!j zADlX~>4Z+7lYC*4VlT;%1T1hw3tT539<3U@Io%`s?sJCZ-ZEza#(VukiBFF3a(D^L z5l&gS07Q3cy&aq?#4UZ6%?#qD35qnS^Mt~j*^tU;J7NqnF#Al`v@TeE5w%U8+`5YJ z-g3Z}I(M`u!F`@~T+@2f1#{4$SY6e0(REi9pfJpXPmpl&)kAJlWb$CDnaS}%b^d01 z20dY#{YlHELVR?#IWf($)yXdY%`o50BP!1Y zEp?r5im9~)``SW1Ln-FMvTD?kcVN4qmG@2e&aDe)vxtxuXW_V@Al@R(lU=mb_5C1P z&>PUUvJB1b@4o1#tG+V*#Xz7p8QTbBPL(}Xf^mpU4uP!eX;0P?nvFSz9YrN zVGS+6PZ?3QKhhkEa1}DfP%s}~>8esq5OdSgBAYEO7b7$cZlMySC;occUeKsnt;46 z&jNr7M0?lE4FvhOhX4?rzZt3q(F5cY{_2PJLiGQ~!w}SNR$hU8{g3(n|M&8o{FU9c NN6G*I69lk({|Acn7{dSn literal 0 HcmV?d00001 diff --git a/camino/PreferencePanes/Navigation/English.lproj/Localizable.strings.in b/camino/PreferencePanes/Navigation/English.lproj/Localizable.strings.in deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/classes.nib b/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/classes.nib deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/info.nib b/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/info.nib deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/keyedobjects.nib b/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/keyedobjects.nib deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/camino/PreferencePanes/Navigation/Navigation.h b/camino/PreferencePanes/Navigation/Navigation.h deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/camino/PreferencePanes/Navigation/Navigation.mm b/camino/PreferencePanes/Navigation/Navigation.mm deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/camino/PreferencePanes/Navigation/Navigation.tiff b/camino/PreferencePanes/Navigation/Navigation.tiff deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/camino/src/preferences/MVPreferencesController.mm b/camino/src/preferences/MVPreferencesController.mm index b9410a5e350..be632bb5ddb 100644 --- a/camino/src/preferences/MVPreferencesController.mm +++ b/camino/src/preferences/MVPreferencesController.mm @@ -52,7 +52,7 @@ NSString* const MVPreferencesWindowNotification = @"MVPreferencesWindowNotificat static NSString* const kPrefsWindowLocationDefaultsKey = @"CaminoWindow TopLeftLocation PreferencesWindow"; static NSString* const kLastUsedPaneKey = @"Last Selected Preference Pane"; -static NSString* const kDefaultPaneIdentifier = @"org.mozilla.camino.preference.navigation"; +static NSString* const kDefaultPaneIdentifier = @"org.mozilla.camino.preference.general"; static NSString* const CacheInfoPaneImageKey = @"MVPreferencePaneImage"; static NSString* const CacheInfoPaneLabelKey = @"MVPreferencePaneLabel";