[polari] entryArea: Use template for entry area
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [polari] entryArea: Use template for entry area
- Date: Thu, 28 Jan 2016 16:44:13 +0000 (UTC)
commit 9edeae9e3b6a1b4931225d4b952f3c244601eecc
Author: Florian Müllner <fmuellner gnome org>
Date: Tue Jan 19 23:57:49 2016 +0100
entryArea: Use template for entry area
With paste confirmation, the entry area became more complex than the original
box with two entries. Now we are about to move nick changing to a popover,
so this looks like a good time to move the UI to a template.
https://bugzilla.gnome.org/show_bug.cgi?id=760872
data/org.gnome.Polari.data.gresource.xml | 1 +
data/resources/entry-area.ui | 82 +++++++++++++++++
po/POTFILES.in | 1 +
src/entryArea.js | 142 ++++++++++++------------------
src/roomStack.js | 7 +-
5 files changed, 145 insertions(+), 88 deletions(-)
---
diff --git a/data/org.gnome.Polari.data.gresource.xml b/data/org.gnome.Polari.data.gresource.xml
index 12ae79d..9c195b2 100644
--- a/data/org.gnome.Polari.data.gresource.xml
+++ b/data/org.gnome.Polari.data.gresource.xml
@@ -5,6 +5,7 @@
<file alias="gtk/help-overlay.ui" preprocess="xml-stripblanks">resources/help-overlay.ui</file>
<file alias="connection-details.ui" preprocess="xml-stripblanks">resources/connection-details.ui</file>
<file alias="connection-list-dialog.ui"
preprocess="xml-stripblanks">resources/connection-list-dialog.ui</file>
+ <file alias="entry-area.ui" preprocess="xml-stripblanks">resources/entry-area.ui</file>
<file alias="join-room-dialog.ui" preprocess="xml-stripblanks">resources/join-room-dialog.ui</file>
<file alias="main-window.ui" preprocess="xml-stripblanks">resources/main-window.ui</file>
<file alias="message-user-dialog.ui" preprocess="xml-stripblanks">resources/message-user-dialog.ui</file>
diff --git a/data/resources/entry-area.ui b/data/resources/entry-area.ui
new file mode 100644
index 0000000..2e3f649
--- /dev/null
+++ b/data/resources/entry-area.ui
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.19.0 -->
+<interface>
+ <requires lib="gtk+" version="3.16"/>
+ <template class="Gjs_EntryArea" parent="GtkStack">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">end</property>
+ <property name="margin">6</property>
+ <property name="transition_type">crossfade</property>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkEntry" id="nickEntry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <style>
+ <class name="polari-nick-entry"/>
+ </style>
+ </object>
+ </child>
+ <child>
+ <object class="Gjs_ChatEntry" id="chatEntry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ </object>
+ </child>
+ <style>
+ <class name="linked"/>
+ </style>
+ </object>
+ <packing>
+ <property name="name">default</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="multiLineBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="multiLineLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
+ <property name="ellipsize">end</property>
+ <property name="xalign">0</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancelButton">
+ <property name="label" translatable="yes">_Cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkButton" id="pasteButton">
+ <property name="label" translatable="yes">_Paste</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="action_name">app.paste-text</property>
+ <property name="use_underline">True</property>
+ <style>
+ <class name="suggested-action"/>
+ </style>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="name">multiline</property>
+ </packing>
+ </child>
+ </template>
+</interface>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 066b657..f927680 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,6 +3,7 @@ data/org.gnome.Polari.desktop.in
data/org.gnome.Polari.gschema.xml
[type: gettext/glade]data/resources/connection-details.ui
[type: gettext/glade]data/resources/connection-list-dialog.ui
+[type: gettext/glade]data/resources/entry-area.ui
[type: gettext/glade]data/resources/help-overlay.ui
[type: gettext/glade]data/resources/join-room-dialog.ui
[type: gettext/glade]data/resources/main-window.ui
diff --git a/src/entryArea.js b/src/entryArea.js
index 95892d1..302729a 100644
--- a/src/entryArea.js
+++ b/src/entryArea.js
@@ -50,57 +50,38 @@ const ChatEntry = new Lang.Class({
const EntryArea = new Lang.Class({
Name: 'EntryArea',
+ Extends: Gtk.Stack,
+ Template: 'resource:///org/gnome/Polari/entry-area.ui',
+ InternalChildren: ['chatEntry',
+ 'nickEntry',
+ 'multiLineBox',
+ 'multiLineLabel',
+ 'cancelButton',
+ 'pasteButton'],
- _init: function(room) {
- this._createWidget();
+ _init: function(params) {
+ this._room = params.room;
+ delete params.room;
this._ircParser = new IrcParser.IrcParser();
- this._room = room;
-
- if (!room)
- return;
-
- this._completion = new TabCompletion.TabCompletion(this._entry);
- this._membersChangedId =
- this._room.connect('members-changed',
- Lang.bind(this, this._updateCompletions));
- this._channelChangedId =
- this._room.connect('notify::channel',
- Lang.bind(this, this._onChannelChanged));
- this._onChannelChanged(room);
-
- this._entry.connect('map', Lang.bind(this, this._updateCompletions));
- this._entry.connect('unmap', Lang.bind(this, this._updateCompletions));
- },
-
- _createWidget: function() {
- this.widget = new Gtk.Stack({ transition_type: Gtk.StackTransitionType.CROSSFADE,
- sensitive: false,
- margin: 6 });
+ this.parent(params);
- this.widget.connect('destroy', Lang.bind(this, this._onDestroy));
- this.widget.connect('notify::sensitive', Lang.bind(this, this._onSensitiveChanged));
- this.widget.connect('realize', Lang.bind(this,
+ this.connect('destroy', Lang.bind(this, this._onDestroy));
+ this.connect('notify::sensitive', Lang.bind(this, this._onSensitiveChanged));
+ this.connect('realize', Lang.bind(this,
function() {
- this._toplevel = this.widget.get_toplevel();
+ this._toplevel = this.get_toplevel();
this._keyPressId = this._toplevel.connect('key-press-event',
Lang.bind(this, this._onKeyPressEvent));
}));
- let chatBox = new Gtk.Box({ orientation: Gtk.Orientation.HORIZONTAL });
- chatBox.get_style_context().add_class('linked');
-
- this._nickEntry = new Gtk.Entry();
this._nickEntry.width_chars = ChatView.MAX_NICK_CHARS
- this._nickEntry.get_style_context().add_class('polari-nick-entry');
- chatBox.add(this._nickEntry);
-
this._nickEntry.connect('activate', Lang.bind(this,
function() {
if (this._nickEntry.text)
this._setNick(this._nickEntry.text);
- this._entry.grab_focus();
+ this._chatEntry.grab_focus();
}));
this._nickEntry.connect('focus-out-event', Lang.bind(this,
function() {
@@ -111,70 +92,61 @@ const EntryArea = new Lang.Class({
function(w, event) {
let [, keyval] = event.get_keyval();
if (keyval == Gdk.KEY_Escape) {
- this._entry.grab_focus();
+ this._chatEntry.grab_focus();
return Gdk.EVENT_STOP;
}
return Gdk.EVENT_PROPAGATE;
}));
- this._entry = new ChatEntry({ hexpand: true, activates_default: true });
- this._entry.connect('text-pasted', Lang.bind(this, this._onTextPasted));
- this._entry.connect('changed', Lang.bind(this, this._onEntryChanged));
- chatBox.add(this._entry);
+ this._chatEntry.connect('text-pasted', Lang.bind(this, this._onTextPasted));
+ this._chatEntry.connect('changed', Lang.bind(this, this._onEntryChanged));
- this._entry.connect('activate', Lang.bind(this,
+ this._chatEntry.connect('activate', Lang.bind(this,
function() {
- if (this._ircParser.process(this._entry.text)) {
- this._entry.text = '';
+ if (this._ircParser.process(this._chatEntry.text)) {
+ this._chatEntry.text = '';
} else {
- this._entry.get_style_context().add_class('error');
- this._entry.grab_focus(); // select text
+ this._chatEntry.get_style_context().add_class('error');
+ this._chatEntry.grab_focus(); // select text
}
}));
- this.widget.add_named(chatBox, 'default');
-
- let multiLineBox = new Gtk.Box({ orientation: Gtk.Orientation.HORIZONTAL,
- spacing: 6 });
-
- this._multiLinelabel = new Gtk.Label({ halign: Gtk.Align.START,
- xalign: 0, hexpand: true });
- multiLineBox.add(this._multiLinelabel);
-
- let cancelButton = new Gtk.Button({ label: _("_Cancel"),
- use_underline: true });
- cancelButton.connect('clicked', Lang.bind(this, this._onButtonClicked));
- multiLineBox.add(cancelButton);
+ this._cancelButton.connect('clicked', Lang.bind(this, this._onButtonClicked));
+ this._pasteButton.connect('clicked', Lang.bind(this, this._onButtonClicked));
- this._pasteButton = new Gtk.Button({ label: _("_Paste"),
- use_underline: true,
- action_name: 'app.paste-text' });
- this._pasteButton.get_style_context().add_class('suggested-action');
- this._pasteButton.connect('clicked',
- Lang.bind(this, this._onButtonClicked));
- multiLineBox.add(this._pasteButton);
-
- multiLineBox.connect_after('key-press-event', Lang.bind(this,
+ this._multiLineBox.connect_after('key-press-event', Lang.bind(this,
function(w, event) {
let [, keyval] = event.get_keyval();
let [, mods] = event.get_state();
if (keyval == Gdk.KEY_Escape || keyval == Gdk.KEY_BackSpace ||
keyval == Gdk.KEY_Delete ||
keyval == Gdk.KEY_z && mods & Gdk.ModifierType.CONTROL_MASK) {
- cancelButton.clicked();
+ this._cancelButton.clicked();
return Gdk.EVENT_STOP;
}
return Gdk.EVENT_PROPAGATE;
}));
- this.widget.add_named(multiLineBox, 'multiline');
- this.widget.show_all();
+ if (!this._room)
+ return;
+
+ this._completion = new TabCompletion.TabCompletion(this._chatEntry);
+ this._membersChangedId =
+ this._room.connect('members-changed',
+ Lang.bind(this, this._updateCompletions));
+ this._channelChangedId =
+ this._room.connect('notify::channel',
+ Lang.bind(this, this._onChannelChanged));
+ this._onChannelChanged(this._room);
+
+ this._chatEntry.connect('map', Lang.bind(this, this._updateCompletions));
+ this._chatEntry.connect('unmap', Lang.bind(this, this._updateCompletions));
},
_updateCompletions: function() {
let nicks = [];
- if (this._entry.get_mapped() &&
+ if (this._chatEntry.get_mapped() &&
this._room &&
this._room.channel &&
this._room.channel.has_interface(Tp.IFACE_CHANNEL_INTERFACE_GROUP)) {
@@ -185,16 +157,16 @@ const EntryArea = new Lang.Class({
},
_onKeyPressEvent: function(w, event) {
- if (!this._entry.get_mapped())
+ if (!this._chatEntry.get_mapped())
return Gdk.EVENT_PROPAGATE;
- if (!this.widget.sensitive)
+ if (!this.sensitive)
return Gdk.EVENT_PROPAGATE;
- if (this._entry.has_focus)
+ if (this._chatEntry.has_focus)
return Gdk.EVENT_PROPAGATE;
- if (this._entry.get_toplevel().get_focus() instanceof Gtk.Entry)
+ if (this._chatEntry.get_toplevel().get_focus() instanceof Gtk.Entry)
return Gdk.EVENT_PROPAGATE;
let [, keyval] = event.get_keyval();
@@ -214,37 +186,37 @@ const EntryArea = new Lang.Class({
if (activationKeys.indexOf(keyval) != -1)
return Gdk.EVENT_PROPAGATE;
- this._entry.grab_focus_without_selecting();
- this._entry.event(event);
+ this._chatEntry.grab_focus_without_selecting();
+ this._chatEntry.event(event);
return Gdk.EVENT_STOP;
},
_onEntryChanged: function() {
- this._entry.get_style_context().remove_class('error');
+ this._chatEntry.get_style_context().remove_class('error');
},
_onTextPasted: function(entry, text, nLines) {
- this._multiLinelabel.label =
+ this._multiLineLabel.label =
ngettext("Paste %s line of text to public paste service?",
"Paste %s lines of text to public paste service?",
nLines).format(nLines);
this._pasteButton.action_target = new GLib.Variant('s', text);
- this.widget.visible_child_name = 'multiline';
+ this.visible_child_name = 'multiline';
this._pasteButton.grab_focus();
},
_onButtonClicked: function() {
- this._entry.text = '';
- this.widget.visible_child_name = 'default';
+ this._chatEntry.text = '';
+ this.visible_child_name = 'default';
},
_onSensitiveChanged: function() {
- if (!this.widget.sensitive)
+ if (!this.sensitive)
return;
Mainloop.idle_add(Lang.bind(this,
function() {
- this._entry.grab_focus();
+ this._chatEntry.grab_focus();
return GLib.SOURCE_REMOVE;
}));
},
diff --git a/src/roomStack.js b/src/roomStack.js
index 173816b..b4ffa93 100644
--- a/src/roomStack.js
+++ b/src/roomStack.js
@@ -133,7 +133,8 @@ const RoomView = new Lang.Class({
this._view = room ? new ChatView.ChatView(room)
: new ChatPlaceholder();
- this._entryArea = new EntryArea.EntryArea(room);
+ this._entryArea = new EntryArea.EntryArea({ room: room,
+ sensitive: false });
this.widget = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL });
this.widget.add(this._view.widget);
@@ -142,12 +143,12 @@ const RoomView = new Lang.Class({
this.inputWidget.get_style_context().add_class('polari-input-area');
this.widget.add(this.inputWidget);
- this.inputWidget.add(this._entryArea.widget);
+ this.inputWidget.add(this._entryArea);
this.widget.show_all();
},
set inputSensitive(sensitive) {
- this._entryArea.widget.sensitive = sensitive;
+ this._entryArea.sensitive = sensitive;
}
});
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
