# HG changeset patch
# User Ian Neal <iann_cvs@blueyonder.co.uk>
# Date 1635001085 -3600
# Parent  e4e533e7e6e53787970341b3d625c018c4c180e5
Bug 1736443 - Add connect button to cZ Networks Editor. r=frg a=frg

diff --git a/suite/extensions/irc/locales/en-US/chrome/networks.dtd b/suite/extensions/irc/locales/en-US/chrome/networks.dtd
--- a/suite/extensions/irc/locales/en-US/chrome/networks.dtd
+++ b/suite/extensions/irc/locales/en-US/chrome/networks.dtd
@@ -5,16 +5,18 @@
 <!-- Used in networks-edit dialog -->
 <!ENTITY networksEditDialog.title     "Networks Editor">
 <!-- LOCALIZATION NOTE
      - width should be 62ch + length of longest serverList*.label -->
 <!ENTITY networksEditDialog.size      "width: 75ch; height: 28em;">
 
 <!ENTITY restoreButton.label          "Restore Defaults">
 <!ENTITY restoreButton.accesskey      "f">
+<!ENTITY connectNetwork.label         "Connect to Network">
+<!ENTITY connectNetwork.accesskey     "N">
 
 <!ENTITY networkListAdd.label         "Add Network…">
 <!ENTITY networkListAdd.accesskey     "A">
 <!ENTITY networkListAdd.tooltip       "Add a new network">
 <!ENTITY networkListEdit.label        "Edit Network…">
 <!ENTITY networkListEdit.accesskey    "E">
 <!ENTITY networkListEdit.tooltip      "Edit the selected network">
 <!ENTITY networkListRemove.label      "Remove Network">
diff --git a/suite/extensions/irc/xul/content/networks-edit.js b/suite/extensions/irc/xul/content/networks-edit.js
--- a/suite/extensions/irc/xul/content/networks-edit.js
+++ b/suite/extensions/irc/xul/content/networks-edit.js
@@ -152,16 +152,27 @@ var gNetworkWindow = {
       return;
     }
 
     // Repopulate the network list.
     this.networkList = networksGetDefaults();
     this.refreshNetworks();
   },
 
+  // Connect to Network button.
+  onConnect: function() {
+    let selection = this.mNetworkList.selectedItem;
+    if (!selection)
+      return;
+
+    let network = this.networkList[selection.id];
+    if (this.onOK())
+      client.dispatch("server " + network.name);
+  },
+
   // Select a network listitem.
   onSelectNetwork: function(aId = 0) {
     let header = document.getElementById("network-header");
 
     // Remove all children.
     while (this.mServerList.hasChildNodes()) {
       this.mServerList.lastChild.remove();
     }
diff --git a/suite/extensions/irc/xul/content/networks-edit.xul b/suite/extensions/irc/xul/content/networks-edit.xul
--- a/suite/extensions/irc/xul/content/networks-edit.xul
+++ b/suite/extensions/irc/xul/content/networks-edit.xul
@@ -14,22 +14,25 @@
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         id="chatzilla-window"
         title="&networksEditDialog.title;"
         size="&networksEditDialog.size;"
         windowtype="irc:chatzilla:networks"
         onload="gNetworkWindow.onLoad();"
         onunload="gNetworkWindow.onClose();"
-        buttons="accept,cancel,extra1"
-        buttonlabelextra1="&restoreButton.label;"
-        buttonaccesskeyextra1="&restoreButton.accesskey;"
+        buttons="accept,cancel,extra1,extra2"
+        buttonlabelextra1="&connectNetwork.label;"
+        buttonaccesskeyextra1="&connectNetwork.accesskey;"
+        buttonlabelextra2="&restoreButton.label;"
+        buttonaccesskeyextra2="&restoreButton.accesskey;"
         ondialogaccept="return gNetworkWindow.onOK();"
         ondialogcancel="return gNetworkWindow.onCancel();"
-        ondialogextra1="gNetworkWindow.onRestore();"
+        ondialogextra1="gNetworkWindow.onConnect();"
+        ondialogextra2="gNetworkWindow.onRestore();"
         persist="screenX screenY width height">
 
   <script src="chrome://chatzilla/content/lib/js/utils.js"/>
   <script src="chrome://chatzilla/content/lib/js/file-utils.js"/>
   <script src="chrome://chatzilla/content/lib/js/json-serializer.js"/>
   <script src="chrome://chatzilla/content/lib/js/message-manager.js"/>
   <script src="chrome://chatzilla/content/lib/js/text-serializer.js"/>
   <script src="chrome://chatzilla/content/messages.js"/>