Bug 40974 - Add away/nick menu to main menu for accessibility. Update links to website to new address. Add FAQ/homepage to Help menu. Work around bug 98997 (again).

ChatZilla only.
r=silver
p=gijskruitbosch+bugs@gmail.com (Gijs Kruitbosch)

extensions/irc/xpi/resources/install.rdf

@@ -41,7 +41,7 @@
 		<em:contributor>James Ross</em:contributor>
 		<em:contributor>Lim Chee Aun (graphics)</em:contributor>
 		<em:iconURL>chrome://chatzilla/skin/images/logo.png</em:iconURL>
-		<em:homepageURL>http://www.hacksrus.com/~ginda/chatzilla/</em:homepageURL>
+		<em:homepageURL>http://chatzilla.hacksrus.com/</em:homepageURL>
 		<em:optionsURL>javascript:opener.openDialog('chrome://chatzilla/content/config.xul','','chrome,modal,resizable');window.close();</em:optionsURL>
 		
 		<!-- package files -->

extensions/irc/xul/content/commands.js

@@ -209,6 +209,9 @@ function initCommands()
          ["j",                "join",                              CMD_CONSOLE],
          ["part",             "leave",                             CMD_CONSOLE],
          ["raw",              "quote",                             CMD_CONSOLE],
+         // Shortcuts to useful URLs:
+         ["faq",              "goto-url http://chatzilla.hacksrus.com/faq/", 0],
+         ["homepage",         "goto-url http://chatzilla.hacksrus.com/",     0],
          // Used to display a nickname in the menu only.
          ["label-user",       "echo",                                        0],
          // These are all the font family/size menu commands...
@@ -2108,7 +2111,7 @@ function cmdGotoURL(e)
         return;
     }
 
-    if (e.command.name == "goto-url-external")
+    if ((e.command.name == "goto-url-external") || (client.host == "XULrunner"))
     {
         const ioSvc = getService(IO_SVC, "nsIIOService");
         const extProtoSvc = getService(EXT_PROTO_SVC,

extensions/irc/xul/content/menus.js

@@ -167,6 +167,8 @@ function initMenus()
          // Planned future menu items, not implemented yet.
          //["-"]
          //[">popup:current_networks"]
+         [">popup:nickname"],
+         ["-"],
          ["leave",       {visibleif: ChannelActive}],
          ["rejoin",      {visibleif: ChannelInactive}],
          ["disconnect",  {visibleif: NetConnected}],
@@ -263,7 +265,11 @@ function initMenus()
         domID: "menu_Help",
         items:
         [
-         ["about"],
+         ["-", {visibleif: Mozilla}],
+         ["homepage"],
+         ["faq"],
+         ["-"],
+         ["about"]
         ]
     };
 
@@ -436,6 +442,12 @@ function initMenus()
         ]
     };
 
+    client.menuSpecs["popup:nickname"] = {
+        label: MSG_STATUS,
+        getContext: getDefaultContext,
+        items: client.menuSpecs["mainmenu:nickname"].items
+    };
+
 }
 
 function createMenus()
@@ -454,6 +466,15 @@ function createMenus()
     } else {
         comBar.collapsed = false;
     }
+
+    if (client.host == "XULrunner")
+    {
+        // This is a hack to work around Gecko bug 98997, which means that
+        // :empty causes menus to be hidden until we force a reflow.
+        var menuBar = document.getElementById("mainmenu");
+        menuBar.hidden = true;
+        menuBar.hidden = false;
+    }
 }
 
 function getCommandContext (id, event)

extensions/irc/xul/locale/en-US/chatzilla.properties

@@ -301,6 +301,8 @@ cmd.exit.help   = Disconnects from all active servers and networks,  providing t
 cmd.exit-mozilla.label = E&xit
 cmd.exit-mozilla.help  = Exit &brandShortName;.
 
+cmd.faq.label   = ChatZilla FAQ
+
 cmd.find.label  = &Find...
 cmd.find.key    = accel F
 cmd.find.params = [<rest>]
@@ -370,6 +372,8 @@ cmd.hide-view.label  = &Hide Tab
 cmd.hide-view.params = [<view>]
 cmd.hide-view.help   = Drop the current view's icon from the tab strip, but save its contents.  The icon will reappear the next time there is activity on the view.
 
+cmd.homepage.label = ChatZilla Homepage
+
 cmd.hop.label  = Give Half-operator Status
 cmd.hop.params = <nickname> [<...>]
 cmd.hop.help   = Gives half-operator status to <nickname> on current channel. Requires operator status.
@@ -858,7 +862,7 @@ msg.cmdmatch          = Commands matching ``%1$S'' are [%2$S].
 msg.default.alias.help = This command is an alias for |%1$S|.
 msg.extra.params      = Extra parameters ``%1$S'' ignored.
 msg.version.reply     = Chatzilla %S [%S]
-msg.source.reply      = http://hacksrus.com/~ginda/chatzilla/
+msg.source.reply      = http://chatzilla.hacksrus.com/
 msg.nothing.to.cancel = No connection or /list in progress, nothing to cancel.
 msg.cancelling        = Cancelling connection to ``%S''...
 msg.cancelling.list   = Cancelling /list request...
@@ -896,7 +900,7 @@ msg.channel.opened    = Channel view for ``%S'' opened.
 msg.commands.header   = Type /help <command-name> for information about a specific command.
 msg.matching.commands = Currently implemented commands matching the pattern ``%S'' are [%S].\nType /help <command-name> for information about a specific command.
 msg.all.commands      = Currently implemented commands are [%S].
-msg.help.intro        = Help is available from many places:\n  - |/commands| lists all the built-in commands in ChatZilla. Use |/help <command-name>| to get help on individual commands.\n  - The IRC Help website <http://www.irchelp.org/> provides introductory material for new IRC users. \n  - The ChatZilla FAQ <http://hacksrus.com/~ginda/chatzilla/faq> answers many common questions about using ChatZilla.\n  - The ChatZilla Support Channel <irc://moznet/chatzilla> is always available to answer any further questions.
+msg.help.intro        = Help is available from many places:\n  - |/commands| lists all the built-in commands in ChatZilla. Use |/help <command-name>| to get help on individual commands.\n  - The IRC Help website <http://www.irchelp.org/> provides introductory material for new IRC users. \n  - The ChatZilla FAQ <http://chatzilla.hacksrus.com/faq> answers many common questions about using ChatZilla.\n  - The ChatZilla Support Channel <irc://moznet/chatzilla> is always available to answer any further questions about ChatZilla.
 msg.homepage          = Please visit the ChatZilla homepage at <http://www.mozilla.org/projects/rt-messaging/chatzilla/> for more information.
 msg.client.opened     = JavaScript console for ``*client*'' opened.
 msg.newnick.you       = YOU are now known as %S
@@ -919,6 +923,7 @@ msg.stalk.add         = Now stalking %S.
 msg.stalk.del         = No longer stalking %S.
 msg.stalking.already  = Already stalking %S.
 
+msg.status         = Status
 msg.title.net.on   = User %S on ``%S'' (%S:%S)
 msg.title.net.off  = User %S, not connected to network ``%S''
 msg.title.nonick   = <unregistered-user>

extensions/irc/xul/locale/en-US/config.dtd

@@ -1,72 +0,0 @@
-<!-- ***** 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 ChatZilla.
-   -
-   - The Initial Developer of the Original Code is James Ross.
-   - Portions created by the Initial Developer are Copyright (C) 2004
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   James Ross <silver@warwickcompsoc.co.uk>
-   -
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!ENTITY window.title  "ChatZilla Preferences">
-
-<!ENTITY loading.label  "Please wait, loading...">
-
-<!ENTITY homepage.url   "http://www.hacksrus.com/~ginda/chatzilla/">
-<!ENTITY homepage.label "ChatZilla Homepage">
-
-<!ENTITY object.add.label       "Add...">
-<!ENTITY object.add.hint        "Add a new network, channel or user to set preferences on">
-<!ENTITY object.add.accesskey   "A">
-
-<!ENTITY object.del.label       "Remove">
-<!ENTITY object.del.hint        "Remove the current object, clearing all of its preferences">
-<!ENTITY object.del.accesskey   "R">
-
-<!ENTITY object.reset.label     "Reset">
-<!ENTITY object.reset.hint      "Reset this object's preferences to the defaults">
-<!ENTITY object.reset.accesskey "s">
-
-<!ENTITY dialog.apply   "Apply">
-
-<!ENTITY network "Network">
-<!ENTITY channel "Channel">
-<!ENTITY user    "User">
-
-<!ENTITY config.add.title "Add Preference Object">
-
-<!ENTITY config.type.label        "Type:">
-<!ENTITY config.type.hint         "Type of object to add preferences for">
-<!ENTITY config.type.accesskey    "T">
-<!ENTITY config.network.label     "Network:">
-<!ENTITY config.network.hint      "Known name of the network, or the server name">
-<!ENTITY config.network.accesskey "N">
-<!ENTITY config.target.label      "Target:">
-<!ENTITY config.target.hint       "Target channel or user name">
-<!ENTITY config.target.accesskey  "g">