diff --git a/main/data/conversation_selector/conversation_row.ui b/main/data/conversation_selector/conversation_row.ui index d37d8d4e..4c73e341 100644 --- a/main/data/conversation_selector/conversation_row.ui +++ b/main/data/conversation_selector/conversation_row.ui @@ -9,11 +9,10 @@ False True - + horizontal 7 14 - 10 True @@ -23,114 +22,117 @@ - + + 10 vertical True - - - 1 - end - True - 7 - 0 - True - - - 0 - 0 - 1 - 1 - - - - - slide-right - 100 - True - True - - - False - 1 - - - - - - - - 1 - 0 - 1 - 1 - - - - - 1 - end - True - 0 - - - - - - 0 - 1 - 2 - 1 - - - vertical True + horizontal - - True + + 1 + end + True + 7 + 0 True - - slide-left + + slide-right 100 - False + True True - - False - True - - - - window-close-symbolic - 1 - True - - + + False + 1 + + + + + + + + True + horizontal - - True - True + + 15 + end + 0 + + + + + + + + + + 1 + end + True + 0 + + + - - 2 - 0 - 1 - 2 - + + + + + + vertical + True + + + True + True + + + + + slide-left + 100 + False + True + + + False + True + + + + window-close-symbolic + 1 + True + + + + + + + + + True + True + diff --git a/main/src/ui/conversation_selector/chat_row.vala b/main/src/ui/conversation_selector/chat_row.vala index 0a8737f1..73636a19 100644 --- a/main/src/ui/conversation_selector/chat_row.vala +++ b/main/src/ui/conversation_selector/chat_row.vala @@ -2,7 +2,6 @@ using Gdk; using Gee; using Gtk; -using Xmpp; using Dino.Entities; namespace Dino.Ui.ConversationSelector { @@ -16,36 +15,24 @@ public class ChatRow : ConversationRow { tooltip.set_custom(generate_tooltip()); return true; }); - update_avatar(); + stream_interactor.get_module(RosterManager.IDENTITY).updated_roster_item.connect((account, jid, roster_item) => { + if (conversation.account.equals(account) && conversation.counterpart.equals(jid)) { + update_name_label(); + update_avatar(); + } + }); } - public override void on_show_received(Show show) { - update_avatar(); - } - - public override void network_connection(bool connected) { - if (!connected) { - set_avatar((new AvatarGenerator(AVATAR_SIZE, AVATAR_SIZE, image.scale_factor)).set_greyscale(true).draw_conversation(stream_interactor, conversation), image.scale_factor); + protected override void update_message_label() { + base.update_message_label(); + if (last_message != null && last_message.direction == Message.DIRECTION_SENT) { + nick_label.visible = true; + nick_label.label = _("Me") + ": "; } else { - update_avatar(); + nick_label.label = ""; } } - public void on_updated_roster_item(Roster.Item roster_item) { - if (roster_item.name != null) { - display_name = roster_item.name; - update_name(); - } - update_avatar(); - } - - public void update_avatar() { - ArrayList full_jids = stream_interactor.get_module(PresenceManager.IDENTITY).get_full_jids(conversation.counterpart, conversation.account); - set_avatar((new AvatarGenerator(AVATAR_SIZE, AVATAR_SIZE, image.scale_factor)) - .set_greyscale(full_jids == null) - .draw_conversation(stream_interactor, conversation), image.scale_factor); - } - private Widget generate_tooltip() { Builder builder = new Builder.from_resource("/im/dino/conversation_selector/chat_row_tooltip.ui"); Box main_box = builder.get_object("main_box") as Box; diff --git a/main/src/ui/conversation_selector/conversation_row.vala b/main/src/ui/conversation_selector/conversation_row.vala index ec00349b..da9dbf68 100644 --- a/main/src/ui/conversation_selector/conversation_row.vala +++ b/main/src/ui/conversation_selector/conversation_row.vala @@ -3,7 +3,6 @@ using Gdk; using Gtk; using Pango; -using Xmpp; using Dino.Entities; namespace Dino.Ui.ConversationSelector { @@ -14,21 +13,20 @@ public abstract class ConversationRow : ListBoxRow { public signal void closed(); [GtkChild] protected Image image; - [GtkChild] private Label name_label; - [GtkChild] private Label time_label; - [GtkChild] private Label message_label; + [GtkChild] protected Label name_label; + [GtkChild] protected Label time_label; + [GtkChild] protected Label nick_label; + [GtkChild] protected Label message_label; [GtkChild] protected Button x_button; - [GtkChild] private Revealer time_revealer; - [GtkChild] private Revealer xbutton_revealer; + [GtkChild] protected Revealer time_revealer; + [GtkChild] protected Revealer xbutton_revealer; [GtkChild] public Revealer main_revealer; public Conversation conversation { get; private set; } protected const int AVATAR_SIZE = 40; - protected string display_name; - protected string message; - protected DateTime time; + protected Message? last_message; protected bool read = true; @@ -42,27 +40,23 @@ public abstract class ConversationRow : ListBoxRow { this.conversation = conversation; this.stream_interactor = stream_interactor; - x_button.clicked.connect(on_x_button_clicked); + x_button.clicked.connect(close_conversation); + stream_interactor.connection_manager.connection_state_changed.connect(update_avatar); - update_name(Util.get_conversation_display_name(stream_interactor, conversation)); + update_name_label(); + update_avatar(); message_received(); + } public void update() { - update_time(); + update_time_label(); } public void message_received(Entities.Message? m = null) { - Entities.Message? message = stream_interactor.get_module(MessageStorage.IDENTITY).get_last_message(conversation); - if (message != null) { - update_message(message.body.replace("\n", " ")); - update_time(message.time); - } - } - - public void set_avatar(Pixbuf pixbuf, int scale_factor = 1) { - Util.image_set_from_scaled_pixbuf(image, pixbuf, scale_factor); - image.queue_draw(); + last_message = stream_interactor.get_module(MessageStorage.IDENTITY).get_last_message(conversation) ?? m; + update_message_label(); + update_time_label(); } public void mark_read() { @@ -73,33 +67,39 @@ public abstract class ConversationRow : ListBoxRow { update_read(false); } - public abstract void on_show_received(Show presence); - public abstract void network_connection(bool connected); - - protected void update_name(string? new_name = null) { - if (new_name != null) { - display_name = new_name; - } - name_label.label = display_name; + public virtual void on_show_received(Show presence) { + update_avatar(); } - protected void update_time(DateTime? new_time = null) { - time_label.visible = true; - if (new_time != null) { - time = new_time; - } - if (time != null) { - time_label.label = get_relative_time(time.to_local()); + public void update_avatar() { + bool self_online = stream_interactor.connection_manager.get_state(conversation.account) == ConnectionManager.ConnectionState.CONNECTED; + bool counterpart_online = stream_interactor.get_module(PresenceManager.IDENTITY).get_full_jids(conversation.counterpart, conversation.account) != null; + bool greyscale = !self_online || !counterpart_online; + + Idle.add(() => { + Pixbuf pixbuf = ((new AvatarGenerator(AVATAR_SIZE, AVATAR_SIZE, image.scale_factor)) + .set_greyscale(greyscale) + .draw_conversation(stream_interactor, conversation)); + Util.image_set_from_scaled_pixbuf(image, pixbuf, image.get_scale_factor()); + return false; + }); + } + + protected void update_name_label(string? new_name = null) { + name_label.label = Util.get_conversation_display_name(stream_interactor, conversation); + } + + protected void update_time_label(DateTime? new_time = null) { + if (last_message != null) { + time_label.visible = true; + time_label.label = get_relative_time(last_message.time.to_local()); } } - protected void update_message(string? new_message = null) { - if (new_message != null) { - message = new_message; - } - if (message != null) { + protected virtual void update_message_label() { + if (last_message != null) { message_label.visible = true; - message_label.label = message; + message_label.label = last_message.body.replace("\n", " "); } } @@ -108,14 +108,17 @@ public abstract class ConversationRow : ListBoxRow { if (read) { name_label.attributes.filter((attr) => attr.equal(attr_weight_new(Weight.BOLD))); time_label.attributes.filter((attr) => attr.equal(attr_weight_new(Weight.BOLD))); + nick_label.attributes.filter((attr) => attr.equal(attr_weight_new(Weight.BOLD))); message_label.attributes.filter((attr) => attr.equal(attr_weight_new(Weight.BOLD))); } else { name_label.attributes.insert(attr_weight_new(Weight.BOLD)); time_label.attributes.insert(attr_weight_new(Weight.BOLD)); + nick_label.attributes.insert(attr_weight_new(Weight.BOLD)); message_label.attributes.insert(attr_weight_new(Weight.BOLD)); } name_label.label = name_label.label; // TODO initializes redrawing, which would otherwise not happen. nicer? time_label.label = time_label.label; + nick_label.label = nick_label.label; message_label.label = message_label.label; } @@ -142,7 +145,7 @@ public abstract class ConversationRow : ListBoxRow { return box; } - private void on_x_button_clicked() { + private void close_conversation() { main_revealer.set_transition_type(RevealerTransitionType.SLIDE_UP); main_revealer.set_reveal_child(false); closed(); @@ -177,8 +180,8 @@ public abstract class ConversationRow : ListBoxRow { return _("Yesterday"); } else if (timespan > 9 * TimeSpan.MINUTE) { return datetime.format(Util.is_24h_format() ? - /* xgettext:no-c-format */ /* Time in 24h format (w/o seconds) */ _("%H\u2236%M") : - /* xgettext:no-c-format */ /* Time in 12h format (w/o seconds) */ _("%l\u2236%M %p")); + /* xgettext:no-c-format */ /* Time in 24h format (w/o seconds) */ _("%H∶%M") : + /* xgettext:no-c-format */ /* Time in 12h format (w/o seconds) */ _("%l∶%M %p")); } else if (timespan > 1 * TimeSpan.MINUTE) { ulong mins = (ulong) (timespan.abs() / TimeSpan.MINUTE); return n("%i min ago", "%i mins ago", mins).printf(mins); diff --git a/main/src/ui/conversation_selector/groupchat_pm_row.vala b/main/src/ui/conversation_selector/groupchat_pm_row.vala index b502501d..7e9e486b 100644 --- a/main/src/ui/conversation_selector/groupchat_pm_row.vala +++ b/main/src/ui/conversation_selector/groupchat_pm_row.vala @@ -2,7 +2,6 @@ using Gdk; using Gee; using Gtk; -using Xmpp; using Dino.Entities; namespace Dino.Ui.ConversationSelector { @@ -19,25 +18,16 @@ public class GroupchatPmRow : ConversationRow { update_avatar(); } - public override void on_show_received(Show show) { - update_avatar(); - } - - public override void network_connection(bool connected) { - if (!connected) { - set_avatar((new AvatarGenerator(AVATAR_SIZE, AVATAR_SIZE, image.scale_factor)).set_greyscale(true).draw_conversation(stream_interactor, conversation), image.scale_factor); + protected override void update_message_label() { + base.update_message_label(); + if (last_message != null && last_message.direction == Message.DIRECTION_SENT) { + nick_label.visible = true; + nick_label.label = _("Me") + ": "; } else { - update_avatar(); + nick_label.label = ""; } } - public void update_avatar() { - ArrayList full_jids = stream_interactor.get_module(PresenceManager.IDENTITY).get_full_jids(conversation.counterpart, conversation.account); - set_avatar((new AvatarGenerator(AVATAR_SIZE, AVATAR_SIZE, image.scale_factor)) - .set_greyscale(full_jids == null) - .draw_conversation(stream_interactor, conversation), image.scale_factor); - } - private Widget generate_tooltip() { Builder builder = new Builder.from_resource("/im/dino/conversation_selector/chat_row_tooltip.ui"); Box main_box = builder.get_object("main_box") as Box; diff --git a/main/src/ui/conversation_selector/groupchat_row.vala b/main/src/ui/conversation_selector/groupchat_row.vala index 07dabf06..0dfdfe66 100644 --- a/main/src/ui/conversation_selector/groupchat_row.vala +++ b/main/src/ui/conversation_selector/groupchat_row.vala @@ -10,37 +10,19 @@ public class GroupchatRow : ConversationRow { set_tooltip_text(conversation.counterpart.bare_jid.to_string()); update_avatar(); - x_button.clicked.connect(on_x_button_clicked); - stream_interactor.get_module(MucManager.IDENTITY).left.connect(() => { - Idle.add(() => { - update_avatar(); - return false; - }); + closed.connect(() => { + stream_interactor.get_module(MucManager.IDENTITY).part(conversation.account, conversation.counterpart); }); + stream_interactor.get_module(MucManager.IDENTITY).left.connect(update_avatar); } - - public override void on_show_received(Show show) { - set_avatar((new AvatarGenerator(AVATAR_SIZE, AVATAR_SIZE, image.scale_factor)) - .draw_conversation(stream_interactor, conversation), image.scale_factor); - } - - public override void network_connection(bool connected) { - update_avatar(); - } - - private void on_x_button_clicked() { - stream_interactor.get_module(MucManager.IDENTITY).part(conversation.account, conversation.counterpart); - } - - private void update_avatar() { - ConnectionManager.ConnectionState connection_state = stream_interactor.connection_manager.get_state(conversation.account); - bool is_joined = stream_interactor.get_module(MucManager.IDENTITY).is_joined(conversation.counterpart, conversation.account); - - set_avatar((new AvatarGenerator(AVATAR_SIZE, AVATAR_SIZE, image.scale_factor)) - .set_greyscale(connection_state != ConnectionManager.ConnectionState.CONNECTED || !is_joined) - .draw_conversation(stream_interactor, conversation), image.scale_factor); + protected override void update_message_label() { + base.update_message_label(); + if (last_message != null) { + nick_label.visible = true; + nick_label.label = Util.get_message_display_name(stream_interactor, last_message, conversation.account) + ": "; + } } } -} \ No newline at end of file +} diff --git a/main/src/ui/conversation_selector/list.vala b/main/src/ui/conversation_selector/list.vala index c46376ed..d49a009f 100644 --- a/main/src/ui/conversation_selector/list.vala +++ b/main/src/ui/conversation_selector/list.vala @@ -48,16 +48,6 @@ public class List : ListBox { return false; }); }); - stream_interactor.get_module(RosterManager.IDENTITY).updated_roster_item.connect((account, jid, roster_item) => { - Idle.add(() => { - Conversation? conversation = stream_interactor.get_module(ConversationManager.IDENTITY).get_conversation(jid, account); - if (conversation != null && rows.has_key(conversation)) { - ChatRow row = rows[conversation] as ChatRow; - if (row != null) row.on_updated_roster_item(roster_item); - } - return false; - }); - }); stream_interactor.get_module(AvatarManager.IDENTITY).received_avatar.connect((avatar, jid, account) => { Idle.add(() => { Conversation? conversation = stream_interactor.get_module(ConversationManager.IDENTITY).get_conversation(jid, account); @@ -68,14 +58,6 @@ public class List : ListBox { return false; }); }); - stream_interactor.connection_manager.connection_state_changed.connect((account, state) => { - Idle.add(() => { - foreach (ConversationRow row in rows.values) { - if (row.conversation.account.equals(account)) row.network_connection(state == ConnectionManager.ConnectionState.CONNECTED); - } - return false; - }); - }); Timeout.add_seconds(60, () => { foreach (ConversationRow row in rows.values) row.update(); return true;