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/*
This commit is contained in:
mark%moxienet.com 2007-12-14 21:50:11 +00:00
Родитель 440250ff29
Коммит 89397192b2
19 изменённых файлов: 496 добавлений и 44 удалений

Просмотреть файл

@ -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 = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
3F44ADD905BDFBA000CB4B08 /* Info-PrivacyPrefPane.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-PrivacyPrefPane.plist"; sourceTree = "<group>"; };
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 = "<group>"; };
F527C90303BCD43601A80166 /* NSView+Utils.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = "NSView+Utils.m"; path = "src/extensions/NSView+Utils.m"; sourceTree = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
F5FDF167031AF47301DE816D /* DraggableImageAndTextCell.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = DraggableImageAndTextCell.mm; path = src/extensions/DraggableImageAndTextCell.mm; sourceTree = "<group>"; };
F5FEDBCB02AD8DD101A967F3 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = "<absolute>"; };
@ -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 = "<group>";
};
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 = "<group>";
};
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 */,

Просмотреть файл

@ -0,0 +1,32 @@
<?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">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>General</string>
<key>CFBundleGetInfoString</key>
<string></string>
<key>CFBundleIconFile</key>
<string>General.tiff</string>
<key>CFBundleIdentifier</key>
<string>org.mozilla.camino.preference.general</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>General</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string></string>
<key>CFBundleSignature</key>
<string>MOZC</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>NSMainNibFile</key>
<string>General</string>
<key>NSPrincipalClass</key>
<string>OrgMozillaCaminoPreferenceGeneral</string>
</dict>
</plist>

Просмотреть файл

Просмотреть файл

@ -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 \

45
camino/PreferencePanes/General/English.lproj/General.nib/classes.nib сгенерированный Normal file
Просмотреть файл

@ -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;
}

16
camino/PreferencePanes/General/English.lproj/General.nib/info.nib сгенерированный Normal file
Просмотреть файл

@ -0,0 +1,16 @@
<?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">
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>10 8 462 260 0 0 1024 746 </string>
<key>IBFramework Version</key>
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
<integer>5</integer>
</array>
<key>IBSystem Version</key>
<string>8S2167</string>
</dict>
</plist>

Двоичные данные
camino/PreferencePanes/General/English.lproj/General.nib/keyedobjects.nib сгенерированный Normal file

Двоичный файл не отображается.

Просмотреть файл

@ -0,0 +1 @@
"PreferencePanelLabel" = "General";

Просмотреть файл

@ -0,0 +1,72 @@
/* -*- 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)
*
* 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 <PreferencePaneBase.h>
@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

Просмотреть файл

@ -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 <Cocoa/Cocoa.h>
#import <ApplicationServices/ApplicationServices.h>
#import <Sparkle/Sparkle.h>
#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

Двоичные данные
camino/PreferencePanes/General/General.tiff Normal file

Двоичный файл не отображается.

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

@ -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";