diff --git a/libdino/src/service/presence_manager.vala b/libdino/src/service/presence_manager.vala index 7e74f125..e3ece45f 100644 --- a/libdino/src/service/presence_manager.vala +++ b/libdino/src/service/presence_manager.vala @@ -46,15 +46,14 @@ public class PresenceManager : StreamInteractionModule, Object { if (stream != null) { Xmpp.Presence.Flag flag = stream.get_flag(Presence.Flag.IDENTITY); if (flag == null) return null; - Gee.List resources = flag.get_resources(jid.bare_jid.to_string()); + Gee.List? resources = flag.get_resources(jid.bare_jid.to_string()); if (resources == null) { return null; } ArrayList ret = new ArrayList(Jid.equals_func); - resources.foreach((resource) => { + foreach (string resource in resources) { ret.add(new Jid(resource)); - return true; - }); + } return ret; } return null; diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index b9b6fa29..bc4f3570 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -12,6 +12,7 @@ find_packages(MAIN_PACKAGES REQUIRED ) set(RESOURCE_LIST + icons/dino-changes-prevent-symbolic.svg icons/dino-double-tick-symbolic.svg icons/dino-status-away.svg icons/dino-status-chat.svg @@ -32,7 +33,6 @@ set(RESOURCE_LIST conversation_selector/chat_row_tooltip.ui conversation_selector/conversation_row.ui conversation_summary/image_toolbar.ui - conversation_summary/message_item.ui conversation_summary/view.ui manage_accounts/account_row.ui manage_accounts/add_account_dialog.ui @@ -159,6 +159,7 @@ install(FILES data/icons/dino-status-dnd.svg data/icons/dino-status-online.svg + data/icons/dino-changes-prevent-symbolic.svg data/icons/dino-double-tick-symbolic.svg data/icons/dino-tick-symbolic.svg DESTINATION diff --git a/main/data/conversation_summary/message_item.ui b/main/data/conversation_summary/message_item.ui deleted file mode 100644 index dd982ca9..00000000 --- a/main/data/conversation_summary/message_item.ui +++ /dev/null @@ -1,72 +0,0 @@ - - - - diff --git a/main/data/icons/dino-changes-prevent-symbolic.svg b/main/data/icons/dino-changes-prevent-symbolic.svg new file mode 100644 index 00000000..56312122 --- /dev/null +++ b/main/data/icons/dino-changes-prevent-symbolic.svg @@ -0,0 +1,67 @@ + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + diff --git a/main/src/ui/conversation_summary/conversation_item_skeleton.vala b/main/src/ui/conversation_summary/conversation_item_skeleton.vala index 585cfa7a..127f0179 100644 --- a/main/src/ui/conversation_summary/conversation_item_skeleton.vala +++ b/main/src/ui/conversation_summary/conversation_item_skeleton.vala @@ -7,42 +7,51 @@ using Dino.Entities; namespace Dino.Ui.ConversationSummary { -[GtkTemplate (ui = "/im/dino/Dino/conversation_summary/message_item.ui")] -public class ConversationItemSkeleton : Grid { +public class ConversationItemSkeleton : Box { - [GtkChild] private Image image; - [GtkChild] private Label time_label; - [GtkChild] private Image encryption_image; - [GtkChild] private Image received_image; + private Image image = new Image() { margin_top=2, valign=Align.START, visible=true }; public StreamInteractor stream_interactor; public Conversation conversation { get; set; } public ArrayList items = new ArrayList(); - private Box box = new Box(Orientation.VERTICAL, 2) { visible=true }; + private Grid grid = new Grid() { visible=true }; private HashMap item_widgets = new HashMap(); + private DefaultSkeletonHeader default_header; - public ConversationItemSkeleton(StreamInteractor stream_interactor, Conversation conversation) { + public ConversationItemSkeleton(StreamInteractor stream_interactor, Conversation conversation, Plugins.MetaConversationItem item) { this.conversation = conversation; this.stream_interactor = stream_interactor; - set_main_widget(box); + if (item.requires_avatar) { + Util.image_set_from_scaled_pixbuf(image, (new AvatarGenerator(32, 32, image.scale_factor)).set_greyscale(item.dim).draw_jid(stream_interactor, item.jid, conversation.account)); + } + if (item.display_time != null) { + default_header = new DefaultSkeletonHeader(stream_interactor, conversation, item) { visible=true }; + if (!item.requires_header) { + default_header.name_label.visible = false; + default_header.dot_label.visible = false; + } + grid.attach(default_header, 0, 0, 1, 1); + } + add_meta_item(item); + + Box image_content_box = new Box(Orientation.HORIZONTAL, 8) { visible=true }; + image_content_box.add(image); + image_content_box.add(grid); + this.add(image_content_box); } public void add_meta_item(Plugins.MetaConversationItem item) { items.add(item); - if (items.size == 1) { - setup(item); + if (default_header != null) { + default_header.add_item(item); } - Widget widget = (Widget) item.get_widget(Plugins.WidgetType.GTK); - if (item.requires_header) { - box.add(widget); + Widget? widget = item.get_widget(Plugins.WidgetType.GTK) as Widget; + if (widget != null) { + grid.attach(widget, 0, items.size, 1, 1); item_widgets[item] = widget; - } else { - set_title_widget(widget); } - item.notify["mark"].connect_after(update_received_mark); - update_received_mark(); } public void remove_meta_item(Plugins.MetaConversationItem item) { @@ -51,45 +60,74 @@ public class ConversationItemSkeleton : Grid { items.remove(item); } - public void set_title_widget(Widget w) { - attach(w, 1, 0, 1, 1); + public void update_time() { + if (default_header != null) { + default_header.update_time(); + } + } +} + +public class DefaultSkeletonHeader : Box { + private Box box = new Box(Orientation.HORIZONTAL, 4) { visible=true }; + public Label name_label = new Label("") { use_markup=true, xalign=0, visible=true }; + public Label time_label = new Label("") { use_markup=true, xalign=0, visible=true }; + public Label dot_label = new Label("ยท") { use_markup=true, xalign=0, visible=true }; + public Image encryption_image = new Image(); + public Image received_image = new Image(); + + private StreamInteractor stream_interactor; + private Conversation conversation; + private Plugins.MetaConversationItem item; + private ArrayList items = new ArrayList(); + + public static IconSize ICON_SIZE_HEADER = Gtk.icon_size_register("im.dino.Dino.HEADER_ICON", 17, 12); + public virtual string TEXT_SIZE { get { return "small"; } } + + construct { + time_label.get_style_context().add_class("dim-label"); + dot_label.get_style_context().add_class("dim-label"); + encryption_image.opacity = 0.4; + received_image.opacity = 0.4; } - public void set_main_widget(Widget w) { - attach(w, 1, 1, 2, 1); + public DefaultSkeletonHeader(StreamInteractor stream_interactor, Conversation conversation, Plugins.MetaConversationItem item) { + this.stream_interactor = stream_interactor; + this.conversation = conversation; + this.item = item; + + box.add(name_label); + box.add(dot_label); + box.add(time_label); + box.add(received_image); + box.add(encryption_image); + this.add(box); + + update_name_label(); + name_label.style_updated.connect(update_name_label); + if (item.encryption != null && item.encryption != Encryption.NONE) { + encryption_image.visible = true; + encryption_image.set_from_icon_name("dino-changes-prevent-symbolic", ICON_SIZE_HEADER); + } + update_time(); + add_item(item); + } + + public void add_item(Plugins.MetaConversationItem item) { + items.add(item); + item.notify["mark"].connect_after(update_received_mark); + update_received_mark(); } public void update_time() { - if (items.size > 0 && items[0].display_time != null) { - time_label.label = get_relative_time(items[0].display_time.to_local()); + if (item.display_time != null) { + time_label.label = @"" + get_relative_time(item.display_time.to_local()) + ""; } } - private void setup(Plugins.MetaConversationItem item) { - update_time(); - if (item.requires_avatar) { - image.visible = true; - Util.image_set_from_scaled_pixbuf(image, (new AvatarGenerator(30, 30, image.scale_factor)).set_greyscale(item.dim).draw_jid(stream_interactor, item.jid, conversation.account)); - } - if (item.requires_header) { - set_default_title_widget(item.jid); - } - if (item.encryption != null && item.encryption != Encryption.NONE) { - encryption_image.visible = true; - encryption_image.set_from_icon_name("changes-prevent-symbolic", IconSize.SMALL_TOOLBAR); - } - } - - private void set_default_title_widget(Jid jid) { - Label name_label = new Label("") { use_markup=true, xalign=0, hexpand=true, visible=true }; - string display_name = Util.get_display_name(stream_interactor, jid, conversation.account); - string color = Util.get_name_hex_color(stream_interactor, conversation.account, jid, Util.is_dark_theme(name_label)); - name_label.label = @"$display_name"; - name_label.style_updated.connect(() => { - string new_color = Util.get_name_hex_color(stream_interactor, conversation.account, jid, Util.is_dark_theme(name_label)); - name_label.set_markup(@"$display_name"); - }); - set_title_widget(name_label); + private void update_name_label() { + string display_name = Util.get_display_name(stream_interactor, item.jid, conversation.account); + string color = Util.get_name_hex_color(stream_interactor, conversation.account, item.jid, Util.is_dark_theme(name_label)); + name_label.label = @"$display_name"; } private void update_received_mark() { @@ -99,7 +137,7 @@ public class ConversationItemSkeleton : Grid { foreach (Plugins.MetaConversationItem item in items) { if (item.mark == Message.Marked.WONTSEND) { received_image.visible = true; - received_image.set_from_icon_name("dialog-warning-symbolic", IconSize.SMALL_TOOLBAR); + received_image.set_from_icon_name("dialog-warning-symbolic", ICON_SIZE_HEADER); Util.force_error_color(received_image); Util.force_error_color(encryption_image); Util.force_error_color(time_label); @@ -116,19 +154,20 @@ public class ConversationItemSkeleton : Grid { } if (all_read) { received_image.visible = true; - received_image.set_from_icon_name("dino-double-tick-symbolic", IconSize.SMALL_TOOLBAR); + received_image.set_from_icon_name("dino-double-tick-symbolic", ICON_SIZE_HEADER); } else if (all_received) { received_image.visible = true; - received_image.set_from_icon_name("dino-tick-symbolic", IconSize.SMALL_TOOLBAR); + received_image.set_from_icon_name("dino-tick-symbolic", ICON_SIZE_HEADER); } else if (!all_sent) { received_image.visible = true; - received_image.set_from_icon_name("image-loading-symbolic", IconSize.SMALL_TOOLBAR); + received_image.set_from_icon_name("image-loading-symbolic", ICON_SIZE_HEADER); } else if (received_image.visible) { - received_image.set_from_icon_name("image-loading-symbolic", IconSize.SMALL_TOOLBAR); + received_image.set_from_icon_name("image-loading-symbolic", ICON_SIZE_HEADER); + } } - private static string format_time(DateTime datetime, string format_24h, string format_12h) { + public static string format_time(DateTime datetime, string format_24h, string format_12h) { string format = Util.is_24h_format() ? format_24h : format_12h; if (!get_charset(null)) { // No UTF-8 support, use simple colon for time instead @@ -137,7 +176,7 @@ public class ConversationItemSkeleton : Grid { return datetime.format(format); } - private static string get_relative_time(DateTime datetime) { + public virtual string get_relative_time(DateTime datetime) { DateTime now = new DateTime.now_local(); TimeSpan timespan = now.difference(datetime); if (timespan > 365 * TimeSpan.DAY) { diff --git a/main/src/ui/conversation_summary/conversation_view.vala b/main/src/ui/conversation_summary/conversation_view.vala index 874605c8..03dbe554 100644 --- a/main/src/ui/conversation_summary/conversation_view.vala +++ b/main/src/ui/conversation_summary/conversation_view.vala @@ -161,8 +161,7 @@ public class ConversationView : Box, Plugins.ConversationItemCollection { } // Fill datastructure - ConversationItemSkeleton item_skeleton = new ConversationItemSkeleton(stream_interactor, conversation); - item_skeleton.add_meta_item(item); + ConversationItemSkeleton item_skeleton = new ConversationItemSkeleton(stream_interactor, conversation, item) { visible=true }; item_item_skeletons[item] = item_skeleton; int index = lower_item != null ? item_skeletons.index_of(item_item_skeletons[lower_item]) + 1 : 0; item_skeletons.insert(index, item_skeleton); diff --git a/main/src/ui/conversation_summary/slashme_message_display.vala b/main/src/ui/conversation_summary/slashme_message_display.vala index 92596936..f57950bb 100644 --- a/main/src/ui/conversation_summary/slashme_message_display.vala +++ b/main/src/ui/conversation_summary/slashme_message_display.vala @@ -59,8 +59,8 @@ public class MetaSlashmeItem : Plugins.MetaConversationItem { TextIter iter; text_view.buffer.get_start_iter(out iter); text_view.buffer.insert_with_tags(ref iter, display_name, display_name.length, nick_tag); - text_view.add_text(message.body.substring(3)); + text_view.style_updated.connect(update_style); text_view.realize.connect(update_style); return text_view;