Add a feedback link to the help menu. r=smfr.

camino/BrowserWindowController.mm

@@ -721,7 +721,8 @@ static NSArray* sToolbarDefaults = nil;
 - (void)clickThrobber:(id)aSender
 {
   NSString *pageToLoad = NSLocalizedStringFromTable(@"ThrobberPageDefault", @"WebsiteDefaults", nil);
-  [self loadURL:pageToLoad];
+  if (![pageToLoad isEqualToString:@"ThrobberPageDefault"])
+    [self loadURL:pageToLoad];
 }
 
 - (void)startThrobber

camino/English.lproj/MainMenu.nib/classes.nib

@@ -17,6 +17,7 @@
                 displayPreferencesWindow = id; 
                 doReload = id; 
                 doStop = id; 
+                feedbackLink = id; 
                 findAgain = id; 
                 findInPage = id; 
                 goBack = id; 
@@ -38,7 +39,6 @@
                 smallerTextSize = id; 
                 toggleBookmarksToolbar = id; 
                 toggleOfflineMode = id; 
-                toggleSmoothText = id; 
                 viewSource = id; 
             }; 
             CLASS = MainController; 

camino/English.lproj/MainMenu.nib/info.nib

@@ -3,7 +3,7 @@
 <plist version="0.9">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>73 160 356 240 0 0 1152 848 </string>
+	<string>100 383 356 240 0 0 1152 848 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>266</key>
@@ -34,6 +34,6 @@
 		<integer>29</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>5S60</string>
+	<string>5S66</string>
 </dict>
 </plist>

camino/MainController.h

@@ -116,6 +116,9 @@ class BookmarksService;
 -(IBAction) newTab:(id)aSender;
 -(IBAction) closeTab:(id)aSender;
 
+//Help menu actions
+-(IBAction) feedbackLink:(id)aSender;
+
 -(BrowserWindowController*)openBrowserWindowWithURL: (NSString*)aURL;
 - (void)openNewWindowOrTabWithURL:(NSString*)inURLString;
 

camino/MainController.mm

@@ -646,6 +646,13 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
   [defaults setInteger: ((showToolbar) ? 0 : 1) forKey: USER_DEFAULTS_HIDE_PERS_TOOLBAR_KEY];
 }
 
+-(IBAction) feedbackLink:(id)aSender
+{
+  NSString *pageToLoad = NSLocalizedStringFromTable(@"FeedbackPageDefault", @"WebsiteDefaults", nil);
+  if (![pageToLoad isEqualToString:@"FeedbackPageDefault"])
+    [self openNewWindowOrTabWithURL:pageToLoad];
+}
+
 + (NSImage*)createImageForDragging:(NSImage*)aIcon title:(NSString*)aTitle
 {
   NSImage* image;

camino/MainMenu.nib/classes.nib

@@ -17,6 +17,7 @@
                 displayPreferencesWindow = id; 
                 doReload = id; 
                 doStop = id; 
+                feedbackLink = id; 
                 findAgain = id; 
                 findInPage = id; 
                 goBack = id; 
@@ -38,7 +39,6 @@
                 smallerTextSize = id; 
                 toggleBookmarksToolbar = id; 
                 toggleOfflineMode = id; 
-                toggleSmoothText = id; 
                 viewSource = id; 
             }; 
             CLASS = MainController; 

camino/MainMenu.nib/info.nib

@@ -3,7 +3,7 @@
 <plist version="0.9">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>73 160 356 240 0 0 1152 848 </string>
+	<string>100 383 356 240 0 0 1152 848 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>266</key>
@@ -34,6 +34,6 @@
 		<integer>29</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>5S60</string>
+	<string>5S66</string>
 </dict>
 </plist>

camino/WebsiteDefaults.strings

@@ -2,3 +2,4 @@ HomePageDefault = "http://www.mozilla.org";
 SearchPageDefault = "http://www.dmoz.org";
 StartPageDefault = "about:blank";
 ThrobberPageDefault = "http://www.mozilla.org";
+FeedbackPageDefault = "http://chimera.mozdev.org";

camino/resources/application/WebsiteDefaults.strings

@@ -2,3 +2,4 @@ HomePageDefault = "http://www.mozilla.org";
 SearchPageDefault = "http://www.dmoz.org";
 StartPageDefault = "about:blank";
 ThrobberPageDefault = "http://www.mozilla.org";
+FeedbackPageDefault = "http://chimera.mozdev.org";

camino/resources/localized/English.lproj/MainMenu.nib/classes.nib

@@ -17,6 +17,7 @@
                 displayPreferencesWindow = id; 
                 doReload = id; 
                 doStop = id; 
+                feedbackLink = id; 
                 findAgain = id; 
                 findInPage = id; 
                 goBack = id; 
@@ -38,7 +39,6 @@
                 smallerTextSize = id; 
                 toggleBookmarksToolbar = id; 
                 toggleOfflineMode = id; 
-                toggleSmoothText = id; 
                 viewSource = id; 
             }; 
             CLASS = MainController; 

camino/resources/localized/English.lproj/MainMenu.nib/info.nib

@@ -3,7 +3,7 @@
 <plist version="0.9">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>73 160 356 240 0 0 1152 848 </string>
+	<string>100 383 356 240 0 0 1152 848 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>266</key>
@@ -34,6 +34,6 @@
 		<integer>29</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>5S60</string>
+	<string>5S66</string>
 </dict>
 </plist>

camino/src/application/MainController.h

@@ -116,6 +116,9 @@ class BookmarksService;
 -(IBAction) newTab:(id)aSender;
 -(IBAction) closeTab:(id)aSender;
 
+//Help menu actions
+-(IBAction) feedbackLink:(id)aSender;
+
 -(BrowserWindowController*)openBrowserWindowWithURL: (NSString*)aURL;
 - (void)openNewWindowOrTabWithURL:(NSString*)inURLString;
 

camino/src/application/MainController.mm

@@ -646,6 +646,13 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
   [defaults setInteger: ((showToolbar) ? 0 : 1) forKey: USER_DEFAULTS_HIDE_PERS_TOOLBAR_KEY];
 }
 
+-(IBAction) feedbackLink:(id)aSender
+{
+  NSString *pageToLoad = NSLocalizedStringFromTable(@"FeedbackPageDefault", @"WebsiteDefaults", nil);
+  if (![pageToLoad isEqualToString:@"FeedbackPageDefault"])
+    [self openNewWindowOrTabWithURL:pageToLoad];
+}
+
 + (NSImage*)createImageForDragging:(NSImage*)aIcon title:(NSString*)aTitle
 {
   NSImage* image;

camino/src/browser/BrowserWindowController.mm

@@ -721,7 +721,8 @@ static NSArray* sToolbarDefaults = nil;
 - (void)clickThrobber:(id)aSender
 {
   NSString *pageToLoad = NSLocalizedStringFromTable(@"ThrobberPageDefault", @"WebsiteDefaults", nil);
-  [self loadURL:pageToLoad];
+  if (![pageToLoad isEqualToString:@"ThrobberPageDefault"])
+    [self loadURL:pageToLoad];
 }
 
 - (void)startThrobber

chimera/BrowserWindowController.mm

@@ -721,7 +721,8 @@ static NSArray* sToolbarDefaults = nil;
 - (void)clickThrobber:(id)aSender
 {
   NSString *pageToLoad = NSLocalizedStringFromTable(@"ThrobberPageDefault", @"WebsiteDefaults", nil);
-  [self loadURL:pageToLoad];
+  if (![pageToLoad isEqualToString:@"ThrobberPageDefault"])
+    [self loadURL:pageToLoad];
 }
 
 - (void)startThrobber

chimera/English.lproj/MainMenu.nib/classes.nib

@@ -17,6 +17,7 @@
                 displayPreferencesWindow = id; 
                 doReload = id; 
                 doStop = id; 
+                feedbackLink = id; 
                 findAgain = id; 
                 findInPage = id; 
                 goBack = id; 
@@ -38,7 +39,6 @@
                 smallerTextSize = id; 
                 toggleBookmarksToolbar = id; 
                 toggleOfflineMode = id; 
-                toggleSmoothText = id; 
                 viewSource = id; 
             }; 
             CLASS = MainController; 

chimera/English.lproj/MainMenu.nib/info.nib

@@ -3,7 +3,7 @@
 <plist version="0.9">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>73 160 356 240 0 0 1152 848 </string>
+	<string>100 383 356 240 0 0 1152 848 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>266</key>
@@ -34,6 +34,6 @@
 		<integer>29</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>5S60</string>
+	<string>5S66</string>
 </dict>
 </plist>

chimera/MainController.h

@@ -116,6 +116,9 @@ class BookmarksService;
 -(IBAction) newTab:(id)aSender;
 -(IBAction) closeTab:(id)aSender;
 
+//Help menu actions
+-(IBAction) feedbackLink:(id)aSender;
+
 -(BrowserWindowController*)openBrowserWindowWithURL: (NSString*)aURL;
 - (void)openNewWindowOrTabWithURL:(NSString*)inURLString;
 

chimera/MainController.mm

@@ -646,6 +646,13 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
   [defaults setInteger: ((showToolbar) ? 0 : 1) forKey: USER_DEFAULTS_HIDE_PERS_TOOLBAR_KEY];
 }
 
+-(IBAction) feedbackLink:(id)aSender
+{
+  NSString *pageToLoad = NSLocalizedStringFromTable(@"FeedbackPageDefault", @"WebsiteDefaults", nil);
+  if (![pageToLoad isEqualToString:@"FeedbackPageDefault"])
+    [self openNewWindowOrTabWithURL:pageToLoad];
+}
+
 + (NSImage*)createImageForDragging:(NSImage*)aIcon title:(NSString*)aTitle
 {
   NSImage* image;

chimera/MainMenu.nib/classes.nib

@@ -17,6 +17,7 @@
                 displayPreferencesWindow = id; 
                 doReload = id; 
                 doStop = id; 
+                feedbackLink = id; 
                 findAgain = id; 
                 findInPage = id; 
                 goBack = id; 
@@ -38,7 +39,6 @@
                 smallerTextSize = id; 
                 toggleBookmarksToolbar = id; 
                 toggleOfflineMode = id; 
-                toggleSmoothText = id; 
                 viewSource = id; 
             }; 
             CLASS = MainController; 

chimera/MainMenu.nib/info.nib

@@ -3,7 +3,7 @@
 <plist version="0.9">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>73 160 356 240 0 0 1152 848 </string>
+	<string>100 383 356 240 0 0 1152 848 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>266</key>
@@ -34,6 +34,6 @@
 		<integer>29</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>5S60</string>
+	<string>5S66</string>
 </dict>
 </plist>

chimera/WebsiteDefaults.strings

@@ -2,3 +2,4 @@ HomePageDefault = "http://www.mozilla.org";
 SearchPageDefault = "http://www.dmoz.org";
 StartPageDefault = "about:blank";
 ThrobberPageDefault = "http://www.mozilla.org";
+FeedbackPageDefault = "http://chimera.mozdev.org";

chimera/resources/application/WebsiteDefaults.strings

@@ -2,3 +2,4 @@ HomePageDefault = "http://www.mozilla.org";
 SearchPageDefault = "http://www.dmoz.org";
 StartPageDefault = "about:blank";
 ThrobberPageDefault = "http://www.mozilla.org";
+FeedbackPageDefault = "http://chimera.mozdev.org";

chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib

@@ -17,6 +17,7 @@
                 displayPreferencesWindow = id; 
                 doReload = id; 
                 doStop = id; 
+                feedbackLink = id; 
                 findAgain = id; 
                 findInPage = id; 
                 goBack = id; 
@@ -38,7 +39,6 @@
                 smallerTextSize = id; 
                 toggleBookmarksToolbar = id; 
                 toggleOfflineMode = id; 
-                toggleSmoothText = id; 
                 viewSource = id; 
             }; 
             CLASS = MainController; 

chimera/resources/localized/English.lproj/MainMenu.nib/info.nib

@@ -3,7 +3,7 @@
 <plist version="0.9">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>73 160 356 240 0 0 1152 848 </string>
+	<string>100 383 356 240 0 0 1152 848 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>266</key>
@@ -34,6 +34,6 @@
 		<integer>29</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>5S60</string>
+	<string>5S66</string>
 </dict>
 </plist>

chimera/src/application/MainController.h

@@ -116,6 +116,9 @@ class BookmarksService;
 -(IBAction) newTab:(id)aSender;
 -(IBAction) closeTab:(id)aSender;
 
+//Help menu actions
+-(IBAction) feedbackLink:(id)aSender;
+
 -(BrowserWindowController*)openBrowserWindowWithURL: (NSString*)aURL;
 - (void)openNewWindowOrTabWithURL:(NSString*)inURLString;
 

chimera/src/application/MainController.mm

@@ -646,6 +646,13 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
   [defaults setInteger: ((showToolbar) ? 0 : 1) forKey: USER_DEFAULTS_HIDE_PERS_TOOLBAR_KEY];
 }
 
+-(IBAction) feedbackLink:(id)aSender
+{
+  NSString *pageToLoad = NSLocalizedStringFromTable(@"FeedbackPageDefault", @"WebsiteDefaults", nil);
+  if (![pageToLoad isEqualToString:@"FeedbackPageDefault"])
+    [self openNewWindowOrTabWithURL:pageToLoad];
+}
+
 + (NSImage*)createImageForDragging:(NSImage*)aIcon title:(NSString*)aTitle
 {
   NSImage* image;

chimera/src/browser/BrowserWindowController.mm

@@ -721,7 +721,8 @@ static NSArray* sToolbarDefaults = nil;
 - (void)clickThrobber:(id)aSender
 {
   NSString *pageToLoad = NSLocalizedStringFromTable(@"ThrobberPageDefault", @"WebsiteDefaults", nil);
-  [self loadURL:pageToLoad];
+  if (![pageToLoad isEqualToString:@"ThrobberPageDefault"])
+    [self loadURL:pageToLoad];
 }
 
 - (void)startThrobber