diff --git a/mozilla/camino/English.lproj/MainMenu.nib/classes.nib b/mozilla/camino/English.lproj/MainMenu.nib/classes.nib index dd8fbeb97b1..ddf148a1f38 100644 --- a/mozilla/camino/English.lproj/MainMenu.nib/classes.nib +++ b/mozilla/camino/English.lproj/MainMenu.nib/classes.nib @@ -24,6 +24,7 @@ goForward = id; goHome = id; importBookmarks = id; + infoLink = id; manageBookmarks = id; newTab = id; newWindow = id; diff --git a/mozilla/camino/English.lproj/MainMenu.nib/info.nib b/mozilla/camino/English.lproj/MainMenu.nib/info.nib index 782014e2063..fb46796ffa1 100644 --- a/mozilla/camino/English.lproj/MainMenu.nib/info.nib +++ b/mozilla/camino/English.lproj/MainMenu.nib/info.nib @@ -3,13 +3,13 @@ IBDocumentLocation - 95 100 356 240 0 0 1152 746 + 73 360 356 240 0 0 1152 848 IBEditorPositions 266 418 452 277 90 0 0 1152 746 29 - 9 701 446 44 0 0 1152 746 + 8 803 446 44 0 0 1152 848 IBFramework Version 248.0 @@ -29,10 +29,6 @@ IBLastGroupID 2 - IBOpenObjects - - 29 - IBSystem Version 5S66 diff --git a/mozilla/camino/English.lproj/MainMenu.nib/objects.nib b/mozilla/camino/English.lproj/MainMenu.nib/objects.nib index 33b6e687009..bc7ee2881f2 100644 Binary files a/mozilla/camino/English.lproj/MainMenu.nib/objects.nib and b/mozilla/camino/English.lproj/MainMenu.nib/objects.nib differ diff --git a/mozilla/camino/MainController.h b/mozilla/camino/MainController.h index b6bbe4ef807..3272d825f23 100644 --- a/mozilla/camino/MainController.h +++ b/mozilla/camino/MainController.h @@ -122,6 +122,7 @@ class BookmarksService; -(IBAction) closeTab:(id)aSender; //Help menu actions +-(IBAction) infoLink:(id)aSender; -(IBAction) feedbackLink:(id)aSender; -(BrowserWindowController*)openBrowserWindowWithURL: (NSString*)aURL andReferrer: (NSString*)aReferrer; diff --git a/mozilla/camino/MainController.mm b/mozilla/camino/MainController.mm index 74fcc3a0aa2..cc75c5c1581 100644 --- a/mozilla/camino/MainController.mm +++ b/mozilla/camino/MainController.mm @@ -691,6 +691,13 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1"; [defaults setInteger: ((showToolbar) ? 0 : 1) forKey: USER_DEFAULTS_HIDE_PERS_TOOLBAR_KEY]; } +-(IBAction) infoLink:(id)aSender +{ + NSString* pageToLoad = NSLocalizedStringFromTable(@"InfoPageDefault", @"WebsiteDefaults", nil); + if (![pageToLoad isEqualToString:@"InfoPageDefault"]) + [self openNewWindowOrTabWithURL:pageToLoad andReferrer:nil]; +} + -(IBAction) feedbackLink:(id)aSender { NSString *pageToLoad = NSLocalizedStringFromTable(@"FeedbackPageDefault", @"WebsiteDefaults", nil); diff --git a/mozilla/camino/MainMenu.nib/classes.nib b/mozilla/camino/MainMenu.nib/classes.nib index dd8fbeb97b1..ddf148a1f38 100644 --- a/mozilla/camino/MainMenu.nib/classes.nib +++ b/mozilla/camino/MainMenu.nib/classes.nib @@ -24,6 +24,7 @@ goForward = id; goHome = id; importBookmarks = id; + infoLink = id; manageBookmarks = id; newTab = id; newWindow = id; diff --git a/mozilla/camino/MainMenu.nib/info.nib b/mozilla/camino/MainMenu.nib/info.nib index 782014e2063..fb46796ffa1 100644 --- a/mozilla/camino/MainMenu.nib/info.nib +++ b/mozilla/camino/MainMenu.nib/info.nib @@ -3,13 +3,13 @@ IBDocumentLocation - 95 100 356 240 0 0 1152 746 + 73 360 356 240 0 0 1152 848 IBEditorPositions 266 418 452 277 90 0 0 1152 746 29 - 9 701 446 44 0 0 1152 746 + 8 803 446 44 0 0 1152 848 IBFramework Version 248.0 @@ -29,10 +29,6 @@ IBLastGroupID 2 - IBOpenObjects - - 29 - IBSystem Version 5S66 diff --git a/mozilla/camino/MainMenu.nib/objects.nib b/mozilla/camino/MainMenu.nib/objects.nib index 33b6e687009..bc7ee2881f2 100644 Binary files a/mozilla/camino/MainMenu.nib/objects.nib and b/mozilla/camino/MainMenu.nib/objects.nib differ diff --git a/mozilla/camino/WebsiteDefaults.strings b/mozilla/camino/WebsiteDefaults.strings index d55e9b66cf7..feb62610cff 100644 --- a/mozilla/camino/WebsiteDefaults.strings +++ b/mozilla/camino/WebsiteDefaults.strings @@ -3,3 +3,4 @@ SearchPageDefault = "http://www.dmoz.org"; StartPageDefault = "about:blank"; ThrobberPageDefault = "http://www.mozilla.org"; FeedbackPageDefault = "http://chimera.mozdev.org"; +InfoPageDefault = "http://chimera.mozdev.org/installation.html"; diff --git a/mozilla/camino/resources/application/WebsiteDefaults.strings b/mozilla/camino/resources/application/WebsiteDefaults.strings index d55e9b66cf7..feb62610cff 100644 --- a/mozilla/camino/resources/application/WebsiteDefaults.strings +++ b/mozilla/camino/resources/application/WebsiteDefaults.strings @@ -3,3 +3,4 @@ SearchPageDefault = "http://www.dmoz.org"; StartPageDefault = "about:blank"; ThrobberPageDefault = "http://www.mozilla.org"; FeedbackPageDefault = "http://chimera.mozdev.org"; +InfoPageDefault = "http://chimera.mozdev.org/installation.html"; diff --git a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib index dd8fbeb97b1..ddf148a1f38 100644 --- a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib +++ b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib @@ -24,6 +24,7 @@ goForward = id; goHome = id; importBookmarks = id; + infoLink = id; manageBookmarks = id; newTab = id; newWindow = id; diff --git a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/info.nib b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/info.nib index 782014e2063..fb46796ffa1 100644 --- a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/info.nib +++ b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/info.nib @@ -3,13 +3,13 @@ IBDocumentLocation - 95 100 356 240 0 0 1152 746 + 73 360 356 240 0 0 1152 848 IBEditorPositions 266 418 452 277 90 0 0 1152 746 29 - 9 701 446 44 0 0 1152 746 + 8 803 446 44 0 0 1152 848 IBFramework Version 248.0 @@ -29,10 +29,6 @@ IBLastGroupID 2 - IBOpenObjects - - 29 - IBSystem Version 5S66 diff --git a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib index 33b6e687009..bc7ee2881f2 100644 Binary files a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib and b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib differ diff --git a/mozilla/camino/src/application/MainController.h b/mozilla/camino/src/application/MainController.h index b6bbe4ef807..3272d825f23 100644 --- a/mozilla/camino/src/application/MainController.h +++ b/mozilla/camino/src/application/MainController.h @@ -122,6 +122,7 @@ class BookmarksService; -(IBAction) closeTab:(id)aSender; //Help menu actions +-(IBAction) infoLink:(id)aSender; -(IBAction) feedbackLink:(id)aSender; -(BrowserWindowController*)openBrowserWindowWithURL: (NSString*)aURL andReferrer: (NSString*)aReferrer; diff --git a/mozilla/camino/src/application/MainController.mm b/mozilla/camino/src/application/MainController.mm index 74fcc3a0aa2..cc75c5c1581 100644 --- a/mozilla/camino/src/application/MainController.mm +++ b/mozilla/camino/src/application/MainController.mm @@ -691,6 +691,13 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1"; [defaults setInteger: ((showToolbar) ? 0 : 1) forKey: USER_DEFAULTS_HIDE_PERS_TOOLBAR_KEY]; } +-(IBAction) infoLink:(id)aSender +{ + NSString* pageToLoad = NSLocalizedStringFromTable(@"InfoPageDefault", @"WebsiteDefaults", nil); + if (![pageToLoad isEqualToString:@"InfoPageDefault"]) + [self openNewWindowOrTabWithURL:pageToLoad andReferrer:nil]; +} + -(IBAction) feedbackLink:(id)aSender { NSString *pageToLoad = NSLocalizedStringFromTable(@"FeedbackPageDefault", @"WebsiteDefaults", nil); diff --git a/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib b/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib index dd8fbeb97b1..ddf148a1f38 100644 --- a/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib +++ b/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib @@ -24,6 +24,7 @@ goForward = id; goHome = id; importBookmarks = id; + infoLink = id; manageBookmarks = id; newTab = id; newWindow = id; diff --git a/mozilla/chimera/English.lproj/MainMenu.nib/info.nib b/mozilla/chimera/English.lproj/MainMenu.nib/info.nib index 782014e2063..fb46796ffa1 100644 --- a/mozilla/chimera/English.lproj/MainMenu.nib/info.nib +++ b/mozilla/chimera/English.lproj/MainMenu.nib/info.nib @@ -3,13 +3,13 @@ IBDocumentLocation - 95 100 356 240 0 0 1152 746 + 73 360 356 240 0 0 1152 848 IBEditorPositions 266 418 452 277 90 0 0 1152 746 29 - 9 701 446 44 0 0 1152 746 + 8 803 446 44 0 0 1152 848 IBFramework Version 248.0 @@ -29,10 +29,6 @@ IBLastGroupID 2 - IBOpenObjects - - 29 - IBSystem Version 5S66 diff --git a/mozilla/chimera/English.lproj/MainMenu.nib/objects.nib b/mozilla/chimera/English.lproj/MainMenu.nib/objects.nib index 33b6e687009..bc7ee2881f2 100644 Binary files a/mozilla/chimera/English.lproj/MainMenu.nib/objects.nib and b/mozilla/chimera/English.lproj/MainMenu.nib/objects.nib differ diff --git a/mozilla/chimera/MainController.h b/mozilla/chimera/MainController.h index b6bbe4ef807..3272d825f23 100644 --- a/mozilla/chimera/MainController.h +++ b/mozilla/chimera/MainController.h @@ -122,6 +122,7 @@ class BookmarksService; -(IBAction) closeTab:(id)aSender; //Help menu actions +-(IBAction) infoLink:(id)aSender; -(IBAction) feedbackLink:(id)aSender; -(BrowserWindowController*)openBrowserWindowWithURL: (NSString*)aURL andReferrer: (NSString*)aReferrer; diff --git a/mozilla/chimera/MainController.mm b/mozilla/chimera/MainController.mm index 74fcc3a0aa2..cc75c5c1581 100644 --- a/mozilla/chimera/MainController.mm +++ b/mozilla/chimera/MainController.mm @@ -691,6 +691,13 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1"; [defaults setInteger: ((showToolbar) ? 0 : 1) forKey: USER_DEFAULTS_HIDE_PERS_TOOLBAR_KEY]; } +-(IBAction) infoLink:(id)aSender +{ + NSString* pageToLoad = NSLocalizedStringFromTable(@"InfoPageDefault", @"WebsiteDefaults", nil); + if (![pageToLoad isEqualToString:@"InfoPageDefault"]) + [self openNewWindowOrTabWithURL:pageToLoad andReferrer:nil]; +} + -(IBAction) feedbackLink:(id)aSender { NSString *pageToLoad = NSLocalizedStringFromTable(@"FeedbackPageDefault", @"WebsiteDefaults", nil); diff --git a/mozilla/chimera/MainMenu.nib/classes.nib b/mozilla/chimera/MainMenu.nib/classes.nib index dd8fbeb97b1..ddf148a1f38 100644 --- a/mozilla/chimera/MainMenu.nib/classes.nib +++ b/mozilla/chimera/MainMenu.nib/classes.nib @@ -24,6 +24,7 @@ goForward = id; goHome = id; importBookmarks = id; + infoLink = id; manageBookmarks = id; newTab = id; newWindow = id; diff --git a/mozilla/chimera/MainMenu.nib/info.nib b/mozilla/chimera/MainMenu.nib/info.nib index 782014e2063..fb46796ffa1 100644 --- a/mozilla/chimera/MainMenu.nib/info.nib +++ b/mozilla/chimera/MainMenu.nib/info.nib @@ -3,13 +3,13 @@ IBDocumentLocation - 95 100 356 240 0 0 1152 746 + 73 360 356 240 0 0 1152 848 IBEditorPositions 266 418 452 277 90 0 0 1152 746 29 - 9 701 446 44 0 0 1152 746 + 8 803 446 44 0 0 1152 848 IBFramework Version 248.0 @@ -29,10 +29,6 @@ IBLastGroupID 2 - IBOpenObjects - - 29 - IBSystem Version 5S66 diff --git a/mozilla/chimera/MainMenu.nib/objects.nib b/mozilla/chimera/MainMenu.nib/objects.nib index 33b6e687009..bc7ee2881f2 100644 Binary files a/mozilla/chimera/MainMenu.nib/objects.nib and b/mozilla/chimera/MainMenu.nib/objects.nib differ diff --git a/mozilla/chimera/WebsiteDefaults.strings b/mozilla/chimera/WebsiteDefaults.strings index d55e9b66cf7..feb62610cff 100644 --- a/mozilla/chimera/WebsiteDefaults.strings +++ b/mozilla/chimera/WebsiteDefaults.strings @@ -3,3 +3,4 @@ SearchPageDefault = "http://www.dmoz.org"; StartPageDefault = "about:blank"; ThrobberPageDefault = "http://www.mozilla.org"; FeedbackPageDefault = "http://chimera.mozdev.org"; +InfoPageDefault = "http://chimera.mozdev.org/installation.html"; diff --git a/mozilla/chimera/resources/application/WebsiteDefaults.strings b/mozilla/chimera/resources/application/WebsiteDefaults.strings index d55e9b66cf7..feb62610cff 100644 --- a/mozilla/chimera/resources/application/WebsiteDefaults.strings +++ b/mozilla/chimera/resources/application/WebsiteDefaults.strings @@ -3,3 +3,4 @@ SearchPageDefault = "http://www.dmoz.org"; StartPageDefault = "about:blank"; ThrobberPageDefault = "http://www.mozilla.org"; FeedbackPageDefault = "http://chimera.mozdev.org"; +InfoPageDefault = "http://chimera.mozdev.org/installation.html"; diff --git a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib index dd8fbeb97b1..ddf148a1f38 100644 --- a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib +++ b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib @@ -24,6 +24,7 @@ goForward = id; goHome = id; importBookmarks = id; + infoLink = id; manageBookmarks = id; newTab = id; newWindow = id; diff --git a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/info.nib b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/info.nib index 782014e2063..fb46796ffa1 100644 --- a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/info.nib +++ b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/info.nib @@ -3,13 +3,13 @@ IBDocumentLocation - 95 100 356 240 0 0 1152 746 + 73 360 356 240 0 0 1152 848 IBEditorPositions 266 418 452 277 90 0 0 1152 746 29 - 9 701 446 44 0 0 1152 746 + 8 803 446 44 0 0 1152 848 IBFramework Version 248.0 @@ -29,10 +29,6 @@ IBLastGroupID 2 - IBOpenObjects - - 29 - IBSystem Version 5S66 diff --git a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib index 33b6e687009..bc7ee2881f2 100644 Binary files a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib and b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib differ diff --git a/mozilla/chimera/src/application/MainController.h b/mozilla/chimera/src/application/MainController.h index b6bbe4ef807..3272d825f23 100644 --- a/mozilla/chimera/src/application/MainController.h +++ b/mozilla/chimera/src/application/MainController.h @@ -122,6 +122,7 @@ class BookmarksService; -(IBAction) closeTab:(id)aSender; //Help menu actions +-(IBAction) infoLink:(id)aSender; -(IBAction) feedbackLink:(id)aSender; -(BrowserWindowController*)openBrowserWindowWithURL: (NSString*)aURL andReferrer: (NSString*)aReferrer; diff --git a/mozilla/chimera/src/application/MainController.mm b/mozilla/chimera/src/application/MainController.mm index 74fcc3a0aa2..cc75c5c1581 100644 --- a/mozilla/chimera/src/application/MainController.mm +++ b/mozilla/chimera/src/application/MainController.mm @@ -691,6 +691,13 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1"; [defaults setInteger: ((showToolbar) ? 0 : 1) forKey: USER_DEFAULTS_HIDE_PERS_TOOLBAR_KEY]; } +-(IBAction) infoLink:(id)aSender +{ + NSString* pageToLoad = NSLocalizedStringFromTable(@"InfoPageDefault", @"WebsiteDefaults", nil); + if (![pageToLoad isEqualToString:@"InfoPageDefault"]) + [self openNewWindowOrTabWithURL:pageToLoad andReferrer:nil]; +} + -(IBAction) feedbackLink:(id)aSender { NSString *pageToLoad = NSLocalizedStringFromTable(@"FeedbackPageDefault", @"WebsiteDefaults", nil);