diff --git a/camino/Camino.xcode/project.pbxproj b/camino/Camino.xcode/project.pbxproj index 17e7678e0dba..4639cd90b3cc 100644 --- a/camino/Camino.xcode/project.pbxproj +++ b/camino/Camino.xcode/project.pbxproj @@ -71,7 +71,7 @@ sourceTree = ""; }; 032FFDD3077351A800440548 = { - fileEncoding = 30; + fileEncoding = 10; isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; @@ -257,7 +257,7 @@ sourceTree = ""; }; 035A4987079DCA100084B05F = { - fileEncoding = 30; + fileEncoding = 10; isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; @@ -747,7 +747,7 @@ sourceTree = ""; }; 03E2D85B0771F78500BD2443 = { - fileEncoding = 30; + fileEncoding = 10; isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; @@ -10531,7 +10531,7 @@ sourceTree = SOURCE_ROOT; }; 3F8C005006800D8D00658CBC = { - fileEncoding = 30; + fileEncoding = 10; isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; @@ -10556,7 +10556,7 @@ sourceTree = SOURCE_ROOT; }; 3F8C005606800E1300658CBC = { - fileEncoding = 30; + fileEncoding = 10; isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; @@ -14230,7 +14230,7 @@ sourceTree = SOURCE_ROOT; }; F5170530034B5E9701026D5D = { - fileEncoding = 30; + fileEncoding = 10; isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; @@ -15685,7 +15685,7 @@ sourceTree = SOURCE_ROOT; }; F56F837202E47CCD01EF35C9 = { - fileEncoding = 30; + fileEncoding = 10; isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = RegionNames.strings; @@ -16735,7 +16735,7 @@ sourceTree = SOURCE_ROOT; }; F5FCDD5D03A035E001A9666E = { - fileEncoding = 30; + fileEncoding = 10; isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Localizable.strings; diff --git a/camino/Info-AppearancePrefPane.plist b/camino/Info-AppearancePrefPane.plist index db563a17c446..1ab7785163e0 100644 --- a/camino/Info-AppearancePrefPane.plist +++ b/camino/Info-AppearancePrefPane.plist @@ -11,7 +11,7 @@ CFBundleIconFile Appearance.tiff CFBundleIdentifier - org.mozilla.chimera.preference.appearance + org.mozilla.camino.preference.appearance CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/camino/Info-NavigationPrefPane.plist b/camino/Info-NavigationPrefPane.plist index 7ab3da8af202..2d20bcfea2dc 100644 --- a/camino/Info-NavigationPrefPane.plist +++ b/camino/Info-NavigationPrefPane.plist @@ -11,7 +11,7 @@ CFBundleIconFile Navigation.tiff CFBundleIdentifier - org.mozilla.chimera.preference.navigation + org.mozilla.camino.preference.navigation CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/camino/Info-PrivacyPrefPane.plist b/camino/Info-PrivacyPrefPane.plist index e334cd21756c..a8acd2a8b326 100644 --- a/camino/Info-PrivacyPrefPane.plist +++ b/camino/Info-PrivacyPrefPane.plist @@ -11,7 +11,7 @@ CFBundleIconFile Privacy.tiff CFBundleIdentifier - org.mozilla.chimera.preference.privacy + org.mozilla.camino.preference.privacy CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/camino/Info-SecurityPrefPane.plist b/camino/Info-SecurityPrefPane.plist index 8b4036bb705a..51b95e08de39 100644 --- a/camino/Info-SecurityPrefPane.plist +++ b/camino/Info-SecurityPrefPane.plist @@ -11,7 +11,7 @@ CFBundleIconFile Security.tiff CFBundleIdentifier - org.mozilla.chimera.preference.security + org.mozilla.camino.preference.security CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/camino/Info-WebFeaturesPrefPane.plist b/camino/Info-WebFeaturesPrefPane.plist index 4ce69a4270ad..5986cc7b387b 100644 --- a/camino/Info-WebFeaturesPrefPane.plist +++ b/camino/Info-WebFeaturesPrefPane.plist @@ -11,7 +11,7 @@ CFBundleIconFile WebFeatures.tiff CFBundleIdentifier - org.mozilla.chimera.preference.webfeatures + org.mozilla.camino.preference.webfeatures CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/camino/resources/localized/English.lproj/Localizable.strings b/camino/resources/localized/English.lproj/Localizable.strings index 059cb34dfbf4..35063b5baec7 100644 Binary files a/camino/resources/localized/English.lproj/Localizable.strings and b/camino/resources/localized/English.lproj/Localizable.strings differ diff --git a/camino/resources/localized/English.lproj/MVPreferences.nib/info.nib b/camino/resources/localized/English.lproj/MVPreferences.nib/info.nib index eb7caadd8271..c8d190b4c586 100644 --- a/camino/resources/localized/English.lproj/MVPreferences.nib/info.nib +++ b/camino/resources/localized/English.lproj/MVPreferences.nib/info.nib @@ -3,7 +3,7 @@ IBDocumentLocation - 74 32 356 240 0 0 1280 1002 + 100 32 356 240 0 0 1600 1002 IBEditorPositions 11 @@ -11,11 +11,7 @@ IBFramework Version 437.0 - IBOpenObjects - - 7 - IBSystem Version - 8B15 + 8C46 diff --git a/camino/resources/localized/English.lproj/MVPreferences.nib/keyedobjects.nib b/camino/resources/localized/English.lproj/MVPreferences.nib/keyedobjects.nib index 87d1a7a4bbba..8f82161a8069 100644 Binary files a/camino/resources/localized/English.lproj/MVPreferences.nib/keyedobjects.nib and b/camino/resources/localized/English.lproj/MVPreferences.nib/keyedobjects.nib differ diff --git a/camino/src/browser/BrowserWindowController.mm b/camino/src/browser/BrowserWindowController.mm index 721b859ce5db..ad3d8cf38799 100644 --- a/camino/src/browser/BrowserWindowController.mm +++ b/camino/src/browser/BrowserWindowController.mm @@ -3392,7 +3392,7 @@ enum BWCOpenDest { - (IBAction)configurePopupBlocking:(id)sender { [[MVPreferencesController sharedInstance] showPreferences:nil]; - [[MVPreferencesController sharedInstance] selectPreferencePaneByIdentifier:@"org.mozilla.chimera.preference.webfeatures"]; + [[MVPreferencesController sharedInstance] selectPreferencePaneByIdentifier:@"org.mozilla.camino.preference.webfeatures"]; } // updateLock: diff --git a/camino/src/preferences/MVPreferencePaneDefaults.plist b/camino/src/preferences/MVPreferencePaneDefaults.plist index de834c9834a6..ae57a476894b 100644 --- a/camino/src/preferences/MVPreferencePaneDefaults.plist +++ b/camino/src/preferences/MVPreferencePaneDefaults.plist @@ -1,9 +1,9 @@ -( org.mozilla.chimera.preference.navigation, - org.mozilla.chimera.preference.appearance, - org.mozilla.chimera.preference.privacy, - org.mozilla.chimera.preference.security, +( org.mozilla.camino.preference.navigation, + org.mozilla.camino.preference.appearance, + org.mozilla.camino.preference.privacy, + org.mozilla.camino.preference.security, org.mozilla.camino.preference.history, org.mozilla.camino.preference.tabs, org.mozilla.camino.preference.downloads, - org.mozilla.chimera.preference.webfeatures, + org.mozilla.camino.preference.webfeatures, ) diff --git a/camino/src/preferences/MVPreferencesController.mm b/camino/src/preferences/MVPreferencesController.mm index 09a5a2c9afc7..89f80df1a76c 100644 --- a/camino/src/preferences/MVPreferencesController.mm +++ b/camino/src/preferences/MVPreferencesController.mm @@ -161,7 +161,7 @@ static NSString* const CacheInfoPaneSeenKey = @"MVPreferencePaneSeen"; // N - (void) awakeFromNib { - NSToolbar *toolbar = [[[NSToolbar alloc] initWithIdentifier:@"preferences.toolbar"] autorelease]; + NSToolbar *toolbar = [[[NSToolbar alloc] initWithIdentifier:@"preferences.toolbar.1"] autorelease]; [mWindow setDelegate:self]; [mWindow setFrameAutosaveName:@"CaminoPreferenceWindowFrame"]; @@ -192,8 +192,8 @@ static NSString* const CacheInfoPaneSeenKey = @"MVPreferencePaneSeen"; // N // If a pref pane is not showing, then show the general pane if (!mCurrentPaneIdentifier && (![[mWindow contentView] isEqual:mMainView])) - [self selectPreferencePaneByIdentifier:@"org.mozilla.chimera.preference.navigation"]; - + [self selectPreferencePaneByIdentifier:@"org.mozilla.camino.preference.navigation"]; + [mWindow makeKeyAndOrderFront:nil]; }