[polari] connections: Split out connection details

[Florian Müllner <fmuellner src gnome org>]

commit 03765f5ebf883dadafe431871f92a7a1e4afabc2
Author: Florian Müllner <fmuellner gnome org>
Date:   Thu Nov 21 02:30:47 2013 +0100

    connections: Split out connection details
    
    The join dialog will gain an option to create new connections
    from within the dialog. In order to reuse the existing code
    from ConnectionDetailsDialog, split out a ConnectionDetails
    class which can be shared between the two dialogs.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=711833

 data/resources/connection-details-dialog.ui |    2 +-
 src/connections.js                          |   72 ++++++++++++++++++++------
 2 files changed, 56 insertions(+), 18 deletions(-)
---
diff --git a/data/resources/connection-details-dialog.ui b/data/resources/connection-details-dialog.ui
index 5caac6d..6416962 100644
--- a/data/resources/connection-details-dialog.ui
+++ b/data/resources/connection-details-dialog.ui
@@ -25,7 +25,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkGrid" id="grid1">
+          <object class="GtkGrid" id="connection_details_content">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_left">12</property>
diff --git a/src/connections.js b/src/connections.js
index 9d35dac..7b8d5fd 100644
--- a/src/connections.js
+++ b/src/connections.js
@@ -7,6 +7,7 @@ const Tp = imports.gi.TelepathyGLib;
 
 const AccountsMonitor = imports.accountsMonitor;
 const Lang = imports.lang;
+const Signals = imports.signals;
 
 const ConnectionsDialog = new Lang.Class({
     Name: 'ConnectionsDialog',
@@ -159,20 +160,16 @@ const ConnectionsDialog = new Lang.Class({
     }
 });
 
-const ConnectionDetailsDialog = new Lang.Class({
-    Name: 'ConnectionDetailsDialog',
+const ConnectionDetails = new Lang.Class({
+    Name: 'ConnectionDetails',
 
     _init: function(account) {
-        this._createWindow();
+        this._createWidget();
 
         this._account = account;
 
-        if (account) {
-            this.widget.title = _("Edit Connection");
-            this._confirmButton.label = _("A_pply");
-
+        if (account)
             this._populateFromAccount(account);
-        }
     },
 
     _getParams: function() {
@@ -193,22 +190,36 @@ const ConnectionDetailsDialog = new Lang.Class({
         return params;
     },
 
-    _createWindow: function() {
+    setCancelVisible: function(visible) {
+        this._cancelButton.visible = visible;
+    },
+
+    reset: function() {
+        this._serverEntry.text = '';
+        this._descEntry.text = '';
+        this._nickEntry.text = '';
+        this._realnameEntry.text = '';
+    },
+
+    _createWidget: function() {
         let builder = new Gtk.Builder();
         builder.add_from_resource('/org/gnome/polari/connection-details-dialog.ui');
 
-        this.widget = builder.get_object('connection_details_dialog');
+        this.widget = builder.get_object('connection_details_content');
+        this.widget.unparent();
 
         this._serverEntry = builder.get_object('server_entry');
         this._descEntry = builder.get_object('description_entry');
         this._nickEntry = builder.get_object('nickname_entry');
         this._realnameEntry = builder.get_object('realname_entry');
-        this._confirmButton = builder.get_object('confirm_button');
+        this.confirmButton = builder.get_object('confirm_button');
+        this._cancelButton = builder.get_object('cancel_button');
 
-        this.widget.connect('response', Lang.bind(this,
-            function(w, response) {
-                if (response == Gtk.ResponseType.OK)
-                    this._onConfirm();
+        this.confirmButton.connect('clicked',
+                                    Lang.bind(this, this._onConfirmClicked));
+        this._cancelButton.connect('clicked', Lang.bind(this,
+            function() {
+                this.emit('response', Gtk.ResponseType.CANCEL);
             }));
 
         this._serverEntry.connect('changed',
@@ -221,7 +232,7 @@ const ConnectionDetailsDialog = new Lang.Class({
     _updateSensitivity: function() {
         let sensitive = this._serverEntry.get_text_length() > 0 &&
                         this._nickEntry.get_text_length() > 0;
-        this._confirmButton.sensitive = sensitive;
+        this.confirmButton.sensitive = sensitive;
     },
 
     _populateFromAccount: function(account) {
@@ -245,11 +256,13 @@ const ConnectionDetailsDialog = new Lang.Class({
             this._descEntry.text = account.display_name;
     },
 
-    _onConfirm: function() {
+    _onConfirmClicked: function() {
         if (this._account)
             this._updateAccount();
         else
             this._createAccount();
+
+        this.emit('response', Gtk.ResponseType.OK);
     },
 
     _createAccount: function() {
@@ -307,3 +320,28 @@ const ConnectionDetailsDialog = new Lang.Class({
         return [details, removed];
     }
 });
+Signals.addSignalMethods(ConnectionDetails.prototype);
+
+
+const ConnectionDetailsDialog = new Lang.Class({
+    Name: 'ConnectionDetailsDialog',
+
+    _init: function(account) {
+        let title = account ? _("Edit Connection")
+                            : _("New Connection");
+        this.widget = new Gtk.Dialog({ title: title,
+                                       modal: true,
+                                       destroy_with_parent: true });
+
+        this._details = new ConnectionDetails(account);
+        this.widget.get_content_area().add(this._details.widget);
+
+        this._details.confirmButton.label = account ? _("A_pply")
+                                                    : _("Cr_eate");
+
+        this._details.connect('response', Lang.bind(this,
+            function(details, response) {
+                this.widget.response(response);
+            }));
+    }
+});