[polari] ui: Remove send button

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

commit d907cbe574395ee5115fbf5251b3977c07b5af6c
Author: Florian Müllner <fmuellner gnome org>
Date:   Tue Jul 30 15:58:14 2013 +0200

    ui: Remove send button
    
    While it spots prominently in the mockups, the designers have
    suggested on irc to drop it.

 data/resources/main-window.ui |   47 +++++++---------------------------------
 src/mainWindow.js             |    4 +--
 2 files changed, 10 insertions(+), 41 deletions(-)
---
diff --git a/data/resources/main-window.ui b/data/resources/main-window.ui
index cde6887..67cb9d5 100644
--- a/data/resources/main-window.ui
+++ b/data/resources/main-window.ui
@@ -298,41 +298,16 @@
                 <property name="margin_right">6</property>
                 <property name="margin_top">6</property>
                 <property name="margin_bottom">6</property>
-                <property name="spacing">6</property>
+                <style>
+                  <class name="linked"/>
+                </style>
                 <child>
-                  <object class="GtkBox" id="box3">
+                  <object class="GtkEntry" id="nick_entry">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can_focus">True</property>
                     <style>
-                      <class name="linked"/>
+                      <class name="dim-label"/>
                     </style>
-                    <child>
-                      <object class="GtkEntry" id="nick_entry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="message_entry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hexpand">True</property>
-                        <property name="activates_default">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -341,15 +316,11 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="send_button">
-                    <property name="label" translatable="yes">Send</property>
+                  <object class="GtkEntry" id="message_entry">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="can_default">True</property>
-                    <property name="receives_default">True</property>
-                    <style>
-                      <class name="suggested-action"/>
-                    </style>
+                    <property name="hexpand">True</property>
+                    <property name="activates_default">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/src/mainWindow.js b/src/mainWindow.js
index 9e5d887..0f81e6e 100644
--- a/src/mainWindow.js
+++ b/src/mainWindow.js
@@ -62,7 +62,6 @@ const MainWindow = new Lang.Class({
         this._inputArea = builder.get_object('main_input_area');
         this._nickEntry = builder.get_object('nick_entry');
         this._entry = builder.get_object('message_entry');
-        this._sendButton = builder.get_object('send_button');
 
         this._nickEntry.width_chars = ChatView.MAX_NICK_CHARS
 
@@ -78,7 +77,7 @@ const MainWindow = new Lang.Class({
                 revealer.reveal_child = value.get_boolean();
             }));
 
-        this._sendButton.connect('clicked', Lang.bind(this,
+        this._entry.connect('activate', Lang.bind(this,
             function() {
                 this._ircParser.process(this._entry.text);
                 this._entry.text = '';
@@ -244,7 +243,6 @@ const MainWindow = new Lang.Class({
         if (!this._inputArea.sensitive)
             return;
 
-        this._sendButton.grab_default();
         this._entry.grab_focus();
     }
 });