From 4fcaa2da7fb1ba846f135e8c12886ac3267acb67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Sat, 28 Oct 2023 13:52:21 +0200 Subject: [PATCH] room-history: Show tooltip for read receipts details --- po/POTFILES.in | 1 + .../room_history/read_receipts_list/mod.rs | 58 ++++++++++++++++++- .../room_history/read_receipts_list/mod.ui | 2 +- 3 files changed, 59 insertions(+), 2 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 4e55ac46..45dac061 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -91,6 +91,7 @@ src/session/view/content/room_history/message_toolbar/mod.rs src/session/view/content/room_history/message_toolbar/mod.ui src/session/view/content/room_history/mod.rs src/session/view/content/room_history/mod.ui +src/session/view/content/room_history/read_receipts_list/mod.rs src/session/view/content/room_history/state_row/creation.rs src/session/view/content/room_history/state_row/creation.ui src/session/view/content/room_history/state_row/mod.rs diff --git a/src/session/view/content/room_history/read_receipts_list/mod.rs b/src/session/view/content/room_history/read_receipts_list/mod.rs index 252acd88..893ef7b6 100644 --- a/src/session/view/content/room_history/read_receipts_list/mod.rs +++ b/src/session/view/content/room_history/read_receipts_list/mod.rs @@ -6,8 +6,9 @@ mod member_read_receipt; use self::member_read_receipt::MemberReadReceipt; use crate::{ components::{Avatar, OverlappingBox}, + i18n::{gettext_f, ngettext_f}, prelude::*, - session::model::{MemberList, UserReadReceipt}, + session::model::{Member, MemberList, UserReadReceipt}, utils::BoundObjectWeakRef, }; @@ -28,6 +29,8 @@ mod imp { resource = "/org/gnome/Fractal/ui/session/view/content/room_history/read_receipts_list/mod.ui" )] pub struct ReadReceiptsList { + #[template_child] + pub container: TemplateChild, #[template_child] pub label: TemplateChild, #[template_child] @@ -38,16 +41,20 @@ mod imp { pub list: gio::ListStore, /// The read receipts used as a source. pub source: BoundObjectWeakRef, + /// The displayed member if there is only one receipt. + pub receipt_member: BoundObjectWeakRef, } impl Default for ReadReceiptsList { fn default() -> Self { Self { + container: Default::default(), label: Default::default(), overlapping_box: Default::default(), members: Default::default(), list: gio::ListStore::new::(), source: Default::default(), + receipt_member: Default::default(), } } } @@ -122,6 +129,7 @@ mod imp { self.list .connect_items_changed(clone!(@weak obj => move |_, _,_,_| { + obj.update_tooltip(); obj.update_label(); })); } @@ -214,6 +222,54 @@ impl ReadReceiptsList { self.list().splice(pos, removed, &new_receipts); } + fn update_tooltip(&self) { + let imp = self.imp(); + imp.receipt_member.disconnect_signals(); + let n_items = self.list().n_items(); + + if n_items == 1 { + if let Some(member) = self + .list() + .item(0) + .and_downcast::() + .and_then(|r| r.member()) + { + // Listen to changes of the display name. + let handler_id = member.connect_notify_local( + Some("display-name"), + clone!(@weak self as obj => move |member, _| { + obj.update_member_tooltip(member); + }), + ); + + imp.receipt_member.set(&member, vec![handler_id]); + self.update_member_tooltip(&member); + return; + } + } + + let text = (n_items > 0).then(|| { + ngettext_f( + // Translators: Do NOT translate the content between '{' and '}', this is a + // variable name. + "Seen by 1 member", + "Seen by {n} members", + n_items, + &[("n", &n_items.to_string())], + ) + }); + + self.imp().container.set_tooltip_text(text.as_deref()) + } + + fn update_member_tooltip(&self, member: &Member) { + // Translators: Do NOT translate the content between '{' and '}', this is a + // variable name. + let text = gettext_f("Seen by {name}", &[("name", &member.display_name())]); + + self.imp().container.set_tooltip_text(Some(&text)); + } + fn update_label(&self) { let label = &self.imp().label; let n_items = self.list().n_items(); diff --git a/src/session/view/content/room_history/read_receipts_list/mod.ui b/src/session/view/content/room_history/read_receipts_list/mod.ui index 58aa1b36..5b623959 100644 --- a/src/session/view/content/room_history/read_receipts_list/mod.ui +++ b/src/session/view/content/room_history/read_receipts_list/mod.ui @@ -2,7 +2,7 @@