diff --git a/data/resources/resources.gresource.xml b/data/resources/resources.gresource.xml
index 2339f435..1f0edb68 100644
--- a/data/resources/resources.gresource.xml
+++ b/data/resources/resources.gresource.xml
@@ -54,6 +54,8 @@
ui/content-invitee-row.ui
ui/content-markdown-popover.ui
ui/content-member-item.ui
+ ui/content-member-page-list-view.ui
+ ui/content-member-page-membership-subpage-row.ui
ui/content-member-page.ui
ui/content-member-row.ui
ui/content-message-audio.ui
diff --git a/data/resources/style.css b/data/resources/style.css
index c5727594..9ec71735 100644
--- a/data/resources/style.css
+++ b/data/resources/style.css
@@ -62,6 +62,9 @@ button.row {
border-radius: 12px;
}
+.round-corners {
+ border-radius: 6px;
+}
/* Components */
@@ -545,6 +548,13 @@ message-reactions .reaction-count {
font-size: 1.6em;
}
+.invite-search-results {
+ padding: 12px 0px;
+}
+
+.invite-search-results > row {
+ border-radius: 6px;
+}
/* Room Details */
@@ -552,6 +562,10 @@ message-reactions .reaction-count {
margin-bottom: 6px;
}
+.room-details listview {
+ background: transparent;
+}
+
.room-details-group avatar * {
/* Undo non-sensitive style. */
filter: none;
diff --git a/data/resources/ui/content-invite-subpage.ui b/data/resources/ui/content-invite-subpage.ui
index 8a0af478..b97a7849 100644
--- a/data/resources/ui/content-invite-subpage.ui
+++ b/data/resources/ui/content-invite-subpage.ui
@@ -34,10 +34,10 @@
30
30
6
- true
+ True
-
+
+
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6c9b4d2c..c75a4fbd 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -70,6 +70,7 @@ src/session/content/verification/identity_verification_widget.rs
src/session/content/verification/session_verification.rs
src/session/mod.rs
src/session/room/event_actions.rs
+src/session/room/member.rs
src/session/room/member_role.rs
src/session/room/mod.rs
src/session/room/timeline/timeline_day_divider.rs
diff --git a/src/session/content/room_details/invite_subpage/mod.rs b/src/session/content/room_details/invite_subpage/mod.rs
index ca3e8c84..42e86a67 100644
--- a/src/session/content/room_details/invite_subpage/mod.rs
+++ b/src/session/content/room_details/invite_subpage/mod.rs
@@ -11,7 +11,7 @@ use self::{
};
use crate::{
components::{Pill, SpinnerButton},
- session::{content::RoomDetails, Room, User},
+ session::{Room, User},
spawn,
};
@@ -246,8 +246,7 @@ impl InviteSubpage {
}
fn close(&self) {
- let window = self.root().unwrap().downcast::().unwrap();
- window.close_invite_subpage();
+ self.activate_action("details.previous-page", None).unwrap();
}
fn add_user_pill(&self, user: &Invitee) {
diff --git a/src/session/content/room_details/member_page/members_list_view/extra_lists.rs b/src/session/content/room_details/member_page/members_list_view/extra_lists.rs
new file mode 100644
index 00000000..49ec0507
--- /dev/null
+++ b/src/session/content/room_details/member_page/members_list_view/extra_lists.rs
@@ -0,0 +1,233 @@
+use gtk::{gio, glib, glib::clone, prelude::*, subclass::prelude::*};
+
+use crate::session::content::room_details::member_page::MembershipSubpageItem;
+
+mod imp {
+ use std::cell::Cell;
+
+ use once_cell::{sync::Lazy, unsync::OnceCell};
+
+ use super::*;
+
+ #[derive(Debug, Default)]
+ pub struct ExtraLists {
+ pub joined: OnceCell,
+ pub invited: OnceCell,
+ pub banned: OnceCell,
+ pub invited_is_empty: Cell,
+ pub banned_is_empty: Cell,
+ }
+
+ #[glib::object_subclass]
+ impl ObjectSubclass for ExtraLists {
+ const NAME: &'static str = "ContentMembersExtraLists";
+ type Type = super::ExtraLists;
+ type Interfaces = (gio::ListModel,);
+ }
+
+ impl ObjectImpl for ExtraLists {
+ fn properties() -> &'static [glib::ParamSpec] {
+ static PROPERTIES: Lazy> = Lazy::new(|| {
+ vec![
+ glib::ParamSpecObject::new(
+ "joined",
+ "Joined",
+ "The item for the subpage of joined members",
+ gio::ListModel::static_type(),
+ glib::ParamFlags::READWRITE | glib::ParamFlags::CONSTRUCT_ONLY,
+ ),
+ glib::ParamSpecObject::new(
+ "invited",
+ "Invited",
+ "The item for the subpage of invited members",
+ MembershipSubpageItem::static_type(),
+ glib::ParamFlags::READWRITE | glib::ParamFlags::CONSTRUCT_ONLY,
+ ),
+ glib::ParamSpecObject::new(
+ "banned",
+ "Banned",
+ "The item for the subpage of banned members",
+ MembershipSubpageItem::static_type(),
+ glib::ParamFlags::READWRITE | glib::ParamFlags::CONSTRUCT_ONLY,
+ ),
+ ]
+ });
+
+ PROPERTIES.as_ref()
+ }
+
+ fn set_property(
+ &self,
+ obj: &Self::Type,
+ _id: usize,
+ value: &glib::Value,
+ pspec: &glib::ParamSpec,
+ ) {
+ match pspec.name() {
+ "joined" => obj.set_joined(value.get().unwrap()),
+ "invited" => obj.set_invited(value.get().unwrap()),
+ "banned" => obj.set_banned(value.get().unwrap()),
+ _ => unimplemented!(),
+ }
+ }
+
+ fn property(&self, obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+ match pspec.name() {
+ "joined" => obj.joined().to_value(),
+ "invited" => obj.invited().to_value(),
+ "banned" => obj.banned().to_value(),
+ _ => unimplemented!(),
+ }
+ }
+
+ fn constructed(&self, obj: &Self::Type) {
+ self.parent_constructed(obj);
+
+ let joined_members = obj.joined();
+ let invited_members = obj.invited().model();
+ let banned_members = obj.banned().model();
+
+ joined_members.connect_items_changed(
+ clone!(@weak obj => move |_, position, removed, added| {
+ obj.items_changed(position + obj.n_visible_extras(), removed, added)
+ }),
+ );
+
+ invited_members.connect_items_changed(clone!(@weak obj => move |_, _, _, _| {
+ obj.update_items();
+ }));
+
+ banned_members.connect_items_changed(clone!(@weak obj => move |_, _, _, _| {
+ obj.update_items();
+ }));
+
+ self.invited_is_empty.set(invited_members.n_items() == 0);
+ self.banned_is_empty.set(banned_members.n_items() == 0);
+ }
+ }
+
+ impl ListModelImpl for ExtraLists {
+ fn item_type(&self, _list_model: &Self::Type) -> glib::Type {
+ glib::Object::static_type()
+ }
+
+ fn n_items(&self, list_model: &Self::Type) -> u32 {
+ list_model.joined().n_items() + list_model.n_visible_extras()
+ }
+
+ fn item(&self, list_model: &Self::Type, position: u32) -> Option {
+ if position == 0 && !self.invited_is_empty.get() {
+ let invited = self.invited.get().unwrap();
+ return Some(invited.clone().upcast());
+ }
+
+ if (position == 0 && self.invited_is_empty.get() && !self.banned_is_empty.get())
+ || (position == 1 && !self.banned_is_empty.get())
+ {
+ let banned = self.banned.get().unwrap();
+ return Some(banned.clone().upcast());
+ }
+
+ list_model
+ .joined()
+ .item(position - list_model.n_visible_extras())
+ }
+ }
+}
+
+glib::wrapper! {
+ pub struct ExtraLists(ObjectSubclass)
+ @implements gio::ListModel;
+}
+
+impl ExtraLists {
+ pub fn new(
+ joined: &impl IsA,
+ invited: &MembershipSubpageItem,
+ banned: &MembershipSubpageItem,
+ ) -> Self {
+ glib::Object::new(&[("joined", joined), ("invited", invited), ("banned", banned)])
+ .expect("Failed to create ExtraLists")
+ }
+
+ pub fn joined(&self) -> &gio::ListModel {
+ self.imp().joined.get().unwrap()
+ }
+
+ fn set_joined(&self, model: gio::ListModel) {
+ self.imp().joined.set(model).unwrap();
+ }
+
+ pub fn invited(&self) -> &MembershipSubpageItem {
+ self.imp().invited.get().unwrap()
+ }
+
+ fn set_invited(&self, item: MembershipSubpageItem) {
+ self.imp().invited.set(item).unwrap();
+ }
+
+ pub fn banned(&self) -> &MembershipSubpageItem {
+ self.imp().banned.get().unwrap()
+ }
+
+ fn set_banned(&self, item: MembershipSubpageItem) {
+ self.imp().banned.set(item).unwrap();
+ }
+
+ fn update_items(&self) {
+ let priv_ = self.imp();
+
+ let invited_was_empty = priv_.invited_is_empty.get();
+ let banned_was_empty = priv_.banned_is_empty.get();
+
+ let invited_is_empty = self.invited().model().n_items() == 0;
+ let banned_is_empty = self.banned().model().n_items() == 0;
+
+ let invited_changed = invited_was_empty != invited_is_empty;
+ let banned_changed = banned_was_empty != banned_is_empty;
+
+ if !invited_changed && !banned_changed {
+ // Nothing changed so don't do anything
+ return;
+ }
+
+ let mut position = 0;
+ let mut removed = 0;
+ let mut added = 0;
+
+ if invited_changed {
+ if invited_is_empty {
+ removed = 1;
+ } else {
+ added = 1;
+ }
+ } else if !invited_is_empty {
+ position = 1;
+ }
+
+ if banned_changed {
+ if banned_is_empty {
+ removed += 1;
+ } else {
+ added += 1;
+ }
+ }
+
+ priv_.invited_is_empty.set(invited_is_empty);
+ priv_.banned_is_empty.set(banned_is_empty);
+
+ self.items_changed(position, removed, added);
+ }
+
+ fn n_visible_extras(&self) -> u32 {
+ let priv_ = self.imp();
+ let mut len = 0;
+ if !priv_.invited_is_empty.get() {
+ len += 1;
+ }
+ if !priv_.banned_is_empty.get() {
+ len += 1;
+ }
+ len
+ }
+}
diff --git a/src/session/content/room_details/member_page/members_list_view/item_row.rs b/src/session/content/room_details/member_page/members_list_view/item_row.rs
new file mode 100644
index 00000000..4cfc4dbd
--- /dev/null
+++ b/src/session/content/room_details/member_page/members_list_view/item_row.rs
@@ -0,0 +1,121 @@
+use adw::{prelude::BinExt, subclass::prelude::*};
+use gtk::{glib, glib::prelude::*};
+
+use super::{MemberRow, MembershipSubpageItem, MembershipSubpageRow};
+use crate::session::room::Member;
+
+mod imp {
+ use std::cell::RefCell;
+
+ use super::*;
+
+ #[derive(Debug, Default)]
+ pub struct ItemRow {
+ pub item: RefCell>,
+ }
+
+ #[glib::object_subclass]
+ impl ObjectSubclass for ItemRow {
+ const NAME: &'static str = "ContentMemberItemRow";
+ type Type = super::ItemRow;
+ type ParentType = adw::Bin;
+ }
+
+ impl ObjectImpl for ItemRow {
+ fn properties() -> &'static [glib::ParamSpec] {
+ use once_cell::sync::Lazy;
+ static PROPERTIES: Lazy> = Lazy::new(|| {
+ vec![glib::ParamSpecObject::new(
+ "item",
+ "Item",
+ "The membership subpage item represented by this row",
+ glib::Object::static_type(),
+ glib::ParamFlags::READWRITE | glib::ParamFlags::EXPLICIT_NOTIFY,
+ )]
+ });
+
+ PROPERTIES.as_ref()
+ }
+
+ fn set_property(
+ &self,
+ obj: &Self::Type,
+ _id: usize,
+ value: &glib::Value,
+ pspec: &glib::ParamSpec,
+ ) {
+ match pspec.name() {
+ "item" => obj.set_item(value.get().unwrap()),
+ _ => unimplemented!(),
+ }
+ }
+
+ fn property(&self, obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+ match pspec.name() {
+ "item" => obj.item().to_value(),
+ _ => unimplemented!(),
+ }
+ }
+ }
+
+ impl WidgetImpl for ItemRow {}
+ impl BinImpl for ItemRow {}
+}
+
+glib::wrapper! {
+ pub struct ItemRow(ObjectSubclass)
+ @extends gtk::Widget, adw::Bin, @implements gtk::Accessible;
+}
+
+impl ItemRow {
+ pub fn new() -> Self {
+ glib::Object::new(&[]).expect("Failed to create ItemRow")
+ }
+
+ pub fn item(&self) -> Option {
+ self.imp().item.borrow().clone()
+ }
+
+ fn set_item(&self, item: Option) {
+ if self.item() == item {
+ return;
+ }
+
+ if let Some(item) = item.as_ref() {
+ if let Some(member) = item.downcast_ref::() {
+ let child = if let Some(Ok(child)) = self.child().map(|w| w.downcast::())
+ {
+ child
+ } else {
+ let child = MemberRow::new();
+ self.set_child(Some(&child));
+ child
+ };
+ child.set_member(Some(member.clone()));
+ } else if let Some(item) = item.downcast_ref::() {
+ let child = if let Some(Ok(child)) =
+ self.child().map(|w| w.downcast::())
+ {
+ child
+ } else {
+ let child = MembershipSubpageRow::new();
+ self.set_child(Some(&child));
+ child
+ };
+
+ child.set_item(Some(item.clone()));
+ } else {
+ unimplemented!("The object {:?} doesn't have a widget implementation", item);
+ }
+ }
+
+ self.imp().item.replace(item);
+ self.notify("item");
+ }
+}
+
+impl Default for ItemRow {
+ fn default() -> Self {
+ Self::new()
+ }
+}
diff --git a/src/session/content/room_details/member_page/member_row.rs b/src/session/content/room_details/member_page/members_list_view/member_row.rs
similarity index 82%
rename from src/session/content/room_details/member_page/member_row.rs
rename to src/session/content/room_details/member_page/members_list_view/member_row.rs
index 681be76c..6388e464 100644
--- a/src/session/content/room_details/member_page/member_row.rs
+++ b/src/session/content/room_details/member_page/members_list_view/member_row.rs
@@ -1,7 +1,10 @@
use adw::subclass::prelude::BinImpl;
use gtk::{glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
-use crate::session::{content::RoomDetails, room::Member};
+use crate::session::{
+ content::room_details::{member_page::MemberMenu, MemberPage},
+ room::Member,
+};
mod imp {
use std::cell::RefCell;
@@ -76,10 +79,8 @@ mod imp {
self.menu_btn
.connect_toggled(clone!(@weak obj => move |btn| {
- if let Some(details) = obj.details() {
- let page = details.member_page();
- let menu = page.member_menu();
- if btn.is_active() {
+ if btn.is_active() {
+ if let Some(menu) = obj.member_menu() {
menu.present_popover(btn, obj.member());
}
}
@@ -96,8 +97,8 @@ glib::wrapper! {
}
impl MemberRow {
- pub fn new(member: &Member) -> Self {
- glib::Object::new(&[("member", member)]).expect("Failed to create MemberRow")
+ pub fn new() -> Self {
+ glib::Object::new(&[]).expect("Failed to create MemberRow")
}
pub fn member(&self) -> Option {
@@ -113,10 +114,7 @@ impl MemberRow {
// We need to update the member of the menu if it's shown for this row
if priv_.menu_btn.is_active() {
- if let Some(details) = self.details() {
- let page = details.member_page();
- let menu = page.member_menu();
-
+ if let Some(menu) = self.member_menu() {
menu.set_member(member.clone());
}
}
@@ -125,7 +123,17 @@ impl MemberRow {
self.notify("member");
}
- fn details(&self) -> Option {
- Some(self.root()?.downcast::().unwrap())
+ fn member_menu(&self) -> Option {
+ let member_page = self
+ .ancestor(MemberPage::static_type())?
+ .downcast::()
+ .unwrap();
+ Some(member_page.member_menu().clone())
+ }
+}
+
+impl Default for MemberRow {
+ fn default() -> Self {
+ Self::new()
}
}
diff --git a/src/session/content/room_details/member_page/members_list_view/membership_subpage_item.rs b/src/session/content/room_details/member_page/members_list_view/membership_subpage_item.rs
new file mode 100644
index 00000000..5624f94d
--- /dev/null
+++ b/src/session/content/room_details/member_page/members_list_view/membership_subpage_item.rs
@@ -0,0 +1,101 @@
+use gtk::{
+ gio, glib,
+ glib::{prelude::*, subclass::prelude::*},
+};
+
+use crate::session::room::Membership;
+
+mod imp {
+ use std::cell::Cell;
+
+ use once_cell::{sync::Lazy, unsync::OnceCell};
+
+ use super::*;
+
+ #[derive(Debug, Default)]
+ pub struct MembershipSubpageItem {
+ pub state: Cell,
+ pub model: OnceCell,
+ }
+
+ #[glib::object_subclass]
+ impl ObjectSubclass for MembershipSubpageItem {
+ const NAME: &'static str = "ContentMemberPageMembershipSubpageItem";
+ type Type = super::MembershipSubpageItem;
+ }
+
+ impl ObjectImpl for MembershipSubpageItem {
+ fn properties() -> &'static [glib::ParamSpec] {
+ static PROPERTIES: Lazy> = Lazy::new(|| {
+ vec![
+ glib::ParamSpecEnum::new(
+ "state",
+ "State",
+ "The membership state this list contains",
+ Membership::static_type(),
+ Membership::default() as i32,
+ glib::ParamFlags::READWRITE | glib::ParamFlags::CONSTRUCT_ONLY,
+ ),
+ glib::ParamSpecObject::new(
+ "model",
+ "Model",
+ "The model used for this subview",
+ gio::ListModel::static_type(),
+ glib::ParamFlags::READWRITE | glib::ParamFlags::CONSTRUCT_ONLY,
+ ),
+ ]
+ });
+
+ PROPERTIES.as_ref()
+ }
+
+ fn set_property(
+ &self,
+ obj: &Self::Type,
+ _id: usize,
+ value: &glib::Value,
+ pspec: &glib::ParamSpec,
+ ) {
+ match pspec.name() {
+ "state" => obj.set_state(value.get().unwrap()),
+ "model" => obj.set_model(value.get().unwrap()),
+ _ => unimplemented!(),
+ }
+ }
+
+ fn property(&self, obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+ match pspec.name() {
+ "state" => obj.state().to_value(),
+ "model" => obj.model().to_value(),
+ _ => unimplemented!(),
+ }
+ }
+ }
+}
+
+glib::wrapper! {
+ pub struct MembershipSubpageItem(ObjectSubclass);
+}
+
+impl MembershipSubpageItem {
+ pub fn new(state: Membership, model: &impl IsA) -> Self {
+ glib::Object::new(&[("state", &state), ("model", model)])
+ .expect("Failed to create MembershipSubpageItem")
+ }
+
+ pub fn state(&self) -> Membership {
+ self.imp().state.get()
+ }
+
+ fn set_state(&self, state: Membership) {
+ self.imp().state.set(state);
+ }
+
+ pub fn model(&self) -> &gio::ListModel {
+ self.imp().model.get().unwrap()
+ }
+
+ fn set_model(&self, model: gio::ListModel) {
+ self.imp().model.set(model).unwrap();
+ }
+}
diff --git a/src/session/content/room_details/member_page/members_list_view/membership_subpage_row.rs b/src/session/content/room_details/member_page/members_list_view/membership_subpage_row.rs
new file mode 100644
index 00000000..e0f4ac96
--- /dev/null
+++ b/src/session/content/room_details/member_page/members_list_view/membership_subpage_row.rs
@@ -0,0 +1,172 @@
+use adw::subclass::prelude::*;
+use gtk::{gdk, glib, glib::clone, prelude::*, CompositeTemplate};
+
+use crate::session::content::room_details::member_page::MembershipSubpageItem;
+
+mod imp {
+ use std::cell::RefCell;
+
+ use glib::{signal::SignalHandlerId, subclass::InitializingObject};
+
+ use super::*;
+
+ #[derive(Debug, Default, CompositeTemplate)]
+ #[template(resource = "/org/gnome/Fractal/content-member-page-membership-subpage-row.ui")]
+ pub struct MembershipSubpageRow {
+ /// The item of this row.
+ pub item: RefCell>,
+ pub gesture: gtk::GestureClick,
+ #[template_child]
+ pub members_count: TemplateChild,
+ pub members_count_handler_id: RefCell>,
+ }
+
+ #[glib::object_subclass]
+ impl ObjectSubclass for MembershipSubpageRow {
+ const NAME: &'static str = "ContentMemberPageMembershipSubpageRow";
+ type Type = super::MembershipSubpageRow;
+ type ParentType = adw::ActionRow;
+
+ fn class_init(klass: &mut Self::Class) {
+ Self::bind_template(klass);
+ }
+
+ fn instance_init(obj: &InitializingObject) {
+ obj.init_template();
+ }
+ }
+
+ impl ObjectImpl for MembershipSubpageRow {
+ fn properties() -> &'static [glib::ParamSpec] {
+ use once_cell::sync::Lazy;
+ static PROPERTIES: Lazy> = Lazy::new(|| {
+ vec![
+ glib::ParamSpecObject::new(
+ "item",
+ "Item",
+ "The item of this row",
+ MembershipSubpageItem::static_type(),
+ glib::ParamFlags::READWRITE | glib::ParamFlags::EXPLICIT_NOTIFY,
+ ),
+ glib::ParamSpecString::new(
+ "label",
+ "Label",
+ "The label to show for this row",
+ None,
+ glib::ParamFlags::READABLE,
+ ),
+ ]
+ });
+
+ PROPERTIES.as_ref()
+ }
+
+ fn set_property(
+ &self,
+ obj: &Self::Type,
+ _id: usize,
+ value: &glib::Value,
+ pspec: &glib::ParamSpec,
+ ) {
+ match pspec.name() {
+ "item" => obj.set_item(value.get().unwrap()),
+ _ => unimplemented!(),
+ }
+ }
+
+ fn property(&self, obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+ match pspec.name() {
+ "item" => obj.item().to_value(),
+ "label" => obj.label().to_value(),
+ _ => unimplemented!(),
+ }
+ }
+
+ fn constructed(&self, obj: &Self::Type) {
+ self.parent_constructed(obj);
+
+ self.gesture.set_touch_only(false);
+ self.gesture.set_button(gdk::BUTTON_PRIMARY);
+
+ self.gesture
+ .connect_released(clone!(@weak obj => move |_, _, _, _| {
+ if let Some(item) = obj.item() {
+ obj.activate_action(
+ "members.subpage",
+ Some(&(item.state() as u32).to_variant()),
+ )
+ .unwrap();
+ }
+ }));
+
+ self.gesture
+ .set_propagation_phase(gtk::PropagationPhase::Capture);
+ obj.add_controller(&self.gesture);
+ }
+ }
+
+ impl WidgetImpl for MembershipSubpageRow {}
+ impl ListBoxRowImpl for MembershipSubpageRow {}
+ impl PreferencesRowImpl for MembershipSubpageRow {}
+ impl ActionRowImpl for MembershipSubpageRow {}
+}
+
+glib::wrapper! {
+ pub struct MembershipSubpageRow(ObjectSubclass)
+ @extends gtk::Widget, adw::ActionRow, @implements gtk::Accessible;
+}
+
+impl MembershipSubpageRow {
+ pub fn new() -> Self {
+ glib::Object::new(&[]).expect("Failed to create MembershipSubpageRow")
+ }
+
+ pub fn item(&self) -> Option {
+ self.imp().item.borrow().clone()
+ }
+
+ pub fn set_item(&self, item: Option) {
+ let priv_ = self.imp();
+ let prev_item = self.item();
+
+ if prev_item == item {
+ return;
+ }
+
+ if let Some(signal_id) = priv_.members_count_handler_id.take() {
+ if let Some(prev_item) = prev_item {
+ prev_item.disconnect(signal_id);
+ }
+ }
+
+ if let Some(item) = item.as_ref() {
+ let model = item.model();
+ let signal_id =
+ model.connect_items_changed(clone!(@weak self as obj => move |model, _, _, _| {
+ obj.member_count_changed(model.n_items());
+ }));
+
+ self.member_count_changed(model.n_items());
+
+ self.imp().members_count_handler_id.replace(Some(signal_id));
+ }
+
+ self.imp().item.replace(item);
+ self.notify("item");
+ self.notify("label");
+ }
+
+ pub fn label(&self) -> Option {
+ Some(self.item()?.state().to_string())
+ }
+
+ fn member_count_changed(&self, n: u32) {
+ self.imp().members_count.set_text(&format!("{}", n));
+ }
+}
+
+impl Default for MembershipSubpageRow {
+ fn default() -> Self {
+ Self::new()
+ }
+}
diff --git a/src/session/content/room_details/member_page/members_list_view/mod.rs b/src/session/content/room_details/member_page/members_list_view/mod.rs
new file mode 100644
index 00000000..286e0c70
--- /dev/null
+++ b/src/session/content/room_details/member_page/members_list_view/mod.rs
@@ -0,0 +1,119 @@
+use adw::{
+ prelude::*,
+ subclass::{bin::BinImpl, prelude::*},
+};
+use gtk::{gio, glib, CompositeTemplate};
+
+use crate::components::{Avatar, Badge};
+
+pub mod extra_lists;
+mod item_row;
+mod member_row;
+mod membership_subpage_item;
+mod membership_subpage_row;
+
+use item_row::ItemRow;
+use member_row::MemberRow;
+pub use membership_subpage_item::MembershipSubpageItem;
+use membership_subpage_row::MembershipSubpageRow;
+
+mod imp {
+ use glib::subclass::InitializingObject;
+ use once_cell::sync::Lazy;
+
+ use super::*;
+
+ #[derive(Debug, Default, CompositeTemplate)]
+ #[template(resource = "/org/gnome/Fractal/content-member-page-list-view.ui")]
+ pub struct MembersListView {
+ #[template_child]
+ pub members_list_view: TemplateChild,
+ pub model: glib::WeakRef,
+ }
+
+ #[glib::object_subclass]
+ impl ObjectSubclass for MembersListView {
+ const NAME: &'static str = "ContentMembersListView";
+ type Type = super::MembersListView;
+ type ParentType = adw::Bin;
+
+ fn class_init(klass: &mut Self::Class) {
+ Avatar::static_type();
+ Badge::static_type();
+ MemberRow::static_type();
+ ItemRow::static_type();
+ Self::bind_template(klass);
+ }
+
+ fn instance_init(obj: &InitializingObject) {
+ obj.init_template();
+ }
+ }
+
+ impl ObjectImpl for MembersListView {
+ fn properties() -> &'static [glib::ParamSpec] {
+ static PROPERTIES: Lazy> = Lazy::new(|| {
+ vec![glib::ParamSpecObject::new(
+ "model",
+ "Model",
+ "The model used for this view",
+ gio::ListModel::static_type(),
+ glib::ParamFlags::READWRITE | glib::ParamFlags::EXPLICIT_NOTIFY,
+ )]
+ });
+
+ PROPERTIES.as_ref()
+ }
+
+ fn set_property(
+ &self,
+ obj: &Self::Type,
+ _id: usize,
+ value: &glib::Value,
+ pspec: &glib::ParamSpec,
+ ) {
+ match pspec.name() {
+ "model" => obj.set_model(value.get::>().unwrap()),
+ _ => unimplemented!(),
+ }
+ }
+
+ fn property(&self, obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+ match pspec.name() {
+ "model" => obj.model().to_value(),
+ _ => unimplemented!(),
+ }
+ }
+ }
+ impl WidgetImpl for MembersListView {}
+ impl BinImpl for MembersListView {}
+}
+
+glib::wrapper! {
+ pub struct MembersListView(ObjectSubclass)
+ @extends gtk::Widget, adw::Bin;
+}
+
+impl MembersListView {
+ pub fn new(model: &impl IsA) -> Self {
+ glib::Object::new(&[("model", model)]).expect("Failed to create MembersListView")
+ }
+
+ pub fn model(&self) -> Option {
+ self.imp().model.upgrade()
+ }
+
+ pub fn set_model(&self, model: Option<&impl IsA>) {
+ let model: Option<&gio::ListModel> = model.map(|model| model.upcast_ref());
+ if self.model().as_ref() == model {
+ return;
+ }
+
+ self.imp()
+ .members_list_view
+ .set_model(Some(>k::NoSelection::new(model)));
+
+ self.imp().model.set(model);
+ self.notify("model");
+ }
+}
diff --git a/src/session/content/room_details/member_page/mod.rs b/src/session/content/room_details/member_page/mod.rs
index 795a287a..2a58f825 100644
--- a/src/session/content/room_details/member_page/mod.rs
+++ b/src/session/content/room_details/member_page/mod.rs
@@ -1,29 +1,37 @@
-use adw::{prelude::*, subclass::prelude::*};
+use adw::{
+ prelude::*,
+ subclass::{bin::BinImpl, prelude::*},
+};
+use gettextrs::gettext;
use gtk::{
+ gio,
glib::{self, clone, closure},
CompositeTemplate,
};
use log::warn;
mod member_menu;
-mod member_row;
+mod members_list_view;
-use self::{member_menu::MemberMenu, member_row::MemberRow};
+use members_list_view::{MembersListView, MembershipSubpageItem};
+
+use self::member_menu::MemberMenu;
use crate::{
- components::{Avatar, Badge},
- ngettext_f,
prelude::*,
session::{
- content::RoomDetails,
+ content::room_details::member_page::members_list_view::extra_lists::ExtraLists,
room::{Member, Membership, RoomAction},
Room, User, UserActions,
},
spawn,
};
-const MAX_LIST_HEIGHT: i32 = 300;
-
mod imp {
+ use std::{
+ cell::{Cell, RefCell},
+ collections::HashMap,
+ };
+
use glib::subclass::InitializingObject;
use once_cell::{sync::Lazy, unsync::OnceCell};
@@ -32,36 +40,27 @@ mod imp {
#[derive(Debug, Default, CompositeTemplate)]
#[template(resource = "/org/gnome/Fractal/content-member-page.ui")]
pub struct MemberPage {
- pub room: OnceCell,
- #[template_child]
- pub member_count: TemplateChild,
- #[template_child]
- pub invite_button: TemplateChild,
+ pub room: RefCell>,
#[template_child]
pub members_search_entry: TemplateChild,
#[template_child]
- pub members_list_view: TemplateChild,
+ pub list_stack: TemplateChild,
#[template_child]
- pub members_scroll: TemplateChild,
+ pub invite_button: TemplateChild,
pub member_menu: OnceCell,
- #[template_child]
- pub invited_section: TemplateChild,
- #[template_child]
- pub invited_list_view: TemplateChild,
- #[template_child]
- pub invited_scroll: TemplateChild,
+ pub list_stack_children: RefCell>>,
+ pub state: Cell,
+ pub invite_action_watch: RefCell>,
}
#[glib::object_subclass]
impl ObjectSubclass for MemberPage {
const NAME: &'static str = "ContentMemberPage";
type Type = super::MemberPage;
- type ParentType = adw::PreferencesPage;
+ type ParentType = adw::Bin;
fn class_init(klass: &mut Self::Class) {
- Avatar::static_type();
- Badge::static_type();
- MemberRow::static_type();
+ MembersListView::static_type();
Self::bind_template(klass);
klass.install_action("member.verify", None, move |widget, _, _| {
@@ -71,6 +70,28 @@ mod imp {
warn!("No member was selected to be verified");
}
});
+
+ klass.install_action("members.subpage", Some("u"), move |widget, _, param| {
+ use std::convert::TryFrom;
+
+ let state = param
+ .and_then(|variant| variant.get::())
+ .and_then(|u| Membership::try_from(u).ok());
+
+ if let Some(state) = state {
+ widget.set_state(state);
+ }
+ });
+
+ klass.install_action("members.previous", None, move |widget, _, _| {
+ if widget.state() == Membership::Join {
+ widget
+ .activate_action("details.previous-page", None)
+ .unwrap();
+ } else {
+ widget.set_state(Membership::Join);
+ }
+ });
}
fn instance_init(obj: &InitializingObject) {
@@ -87,7 +108,7 @@ mod imp {
"Room",
"The room backing all details of the member page",
Room::static_type(),
- glib::ParamFlags::READWRITE | glib::ParamFlags::CONSTRUCT_ONLY,
+ glib::ParamFlags::READWRITE | glib::ParamFlags::EXPLICIT_NOTIFY,
),
glib::ParamSpecObject::new(
"member-menu",
@@ -96,6 +117,14 @@ mod imp {
MemberMenu::static_type(),
glib::ParamFlags::READABLE,
),
+ glib::ParamSpecEnum::new(
+ "state",
+ "State",
+ "The membership state of the displayed members",
+ Membership::static_type(),
+ Membership::default() as i32,
+ glib::ParamFlags::READWRITE | glib::ParamFlags::EXPLICIT_NOTIFY,
+ ),
]
});
@@ -111,33 +140,35 @@ mod imp {
) {
match pspec.name() {
"room" => obj.set_room(value.get().unwrap()),
+ "state" => obj.set_state(value.get().unwrap()),
+
_ => unimplemented!(),
}
}
fn property(&self, obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
match pspec.name() {
- "room" => self.room.get().to_value(),
+ "room" => obj.room().to_value(),
"member-menu" => obj.member_menu().to_value(),
+ "state" => obj.state().to_value(),
_ => unimplemented!(),
}
}
- fn constructed(&self, obj: &Self::Type) {
- self.parent_constructed(obj);
-
- obj.init_members_list();
- obj.init_invited_list();
- obj.init_invite_button();
+ fn dispose(&self, _: &Self::Type) {
+ if let Some(invite_action) = self.invite_action_watch.take() {
+ invite_action.unwatch();
+ }
}
}
+
impl WidgetImpl for MemberPage {}
- impl PreferencesPageImpl for MemberPage {}
+ impl BinImpl for MemberPage {}
}
glib::wrapper! {
pub struct MemberPage(ObjectSubclass)
- @extends gtk::Widget, adw::PreferencesPage;
+ @extends gtk::Widget, adw::Bin;
}
impl MemberPage {
@@ -145,35 +176,34 @@ impl MemberPage {
glib::Object::new(&[("room", room)]).expect("Failed to create MemberPage")
}
- pub fn room(&self) -> &Room {
- self.imp().room.get().unwrap()
+ pub fn room(&self) -> Option {
+ self.imp().room.borrow().as_ref().cloned()
}
- fn set_room(&self, room: Room) {
- self.imp().room.set(room).expect("Room already initialized");
- }
-
- fn init_members_list(&self) {
+ pub fn set_room(&self, room: Option) {
let priv_ = self.imp();
- let members = self.room().members();
+ let prev_room = self.room();
- // Only keep the members that are in the join membership state
- let joined_expression = gtk::PropertyExpression::new(
- Member::static_type(),
- gtk::Expression::NONE,
- "membership",
- )
- .chain_closure::(closure!(
- |_: Option, membership: Membership| { membership == Membership::Join }
- ));
- let joined_filter = gtk::BoolFilter::new(Some(joined_expression));
- let joined_members = gtk::FilterListModel::new(Some(members), Some(&joined_filter));
+ if prev_room == room {
+ return;
+ }
- // Set up the members count.
- self.member_count_changed(joined_members.n_items());
- joined_members.connect_items_changed(clone!(@weak self as obj => move |members, _, _, _| {
- obj.member_count_changed(members.n_items());
- }));
+ if let Some(invite_action) = priv_.invite_action_watch.take() {
+ invite_action.unwatch();
+ }
+
+ if let Some(room) = room.as_ref() {
+ self.init_members_list(room);
+ self.init_invite_button(room);
+ self.set_state(Membership::Join);
+ }
+
+ priv_.room.replace(room);
+ self.notify("room");
+ }
+
+ fn init_members_list(&self, room: &Room) {
+ let priv_ = self.imp();
// Sort the members list by power level, then display name.
let sorter = gtk::MultiSorter::new();
@@ -187,6 +217,7 @@ impl MemberPage {
.sort_order(gtk::SortType::Descending)
.build(),
);
+
sorter.append(>k::StringSorter::new(Some(
>k::PropertyExpression::new(
Member::static_type(),
@@ -194,134 +225,29 @@ impl MemberPage {
"display-name",
),
)));
- let sorted_members = gtk::SortListModel::new(Some(&joined_members), Some(&sorter));
- fn search_string(member: Member) -> String {
- format!(
- "{} {} {} {}",
- member.display_name(),
- member.user_id(),
- member.role(),
- member.power_level(),
- )
- }
+ let members = gtk::SortListModel::new(Some(room.members()), Some(&sorter));
- let member_expr = gtk::ClosureExpression::new::(
- &[],
- closure!(|member: Option| { member.map(search_string).unwrap_or_default() }),
- );
- let filter = gtk::StringFilter::builder()
- .match_mode(gtk::StringFilterMatchMode::Substring)
- .expression(&member_expr)
- .ignore_case(true)
- .build();
- priv_
- .members_search_entry
- .bind_property("text", &filter, "search")
- .flags(glib::BindingFlags::SYNC_CREATE)
- .build();
+ let joined_members = self.build_filtered_list(&members, Membership::Join);
+ let invited_members = self.build_filtered_list(&members, Membership::Invite);
+ let banned_members = self.build_filtered_list(&members, Membership::Ban);
- let filter_model = gtk::FilterListModel::new(Some(&sorted_members), Some(&filter));
- let model = gtk::NoSelection::new(Some(&filter_model));
- priv_.members_list_view.set_model(Some(&model));
- }
-
- fn member_count_changed(&self, n: u32) {
- let priv_ = self.imp();
- priv_
- .member_count
- // Translators: Do NOT translate the content between '{' and '}', this is a variable
- // name.
- .set_text(&ngettext_f(
- "1 Member",
- "{n} Members",
- n,
- &[("n", &n.to_string())],
- ));
- // FIXME: This won't be needed when we can request the natural height
- // on AdwPreferencesPage
- // See: https://gitlab.gnome.org/GNOME/libadwaita/-/issues/77
- if n > 5 {
- priv_.members_scroll.set_min_content_height(MAX_LIST_HEIGHT);
- } else {
- priv_.members_scroll.set_min_content_height(-1);
- }
- }
-
- fn init_invited_list(&self) {
- let priv_ = self.imp();
- let members = self.room().members();
-
- // Only keep the members that are in the join membership state
- let invited_expression = gtk::PropertyExpression::new(
- Member::static_type(),
- gtk::Expression::NONE,
- "membership",
- )
- .chain_closure::(closure!(
- |_: Option, membership: Membership| { membership == Membership::Invite }
- ));
- let invited_filter = gtk::BoolFilter::new(Some(invited_expression));
- let invited_members = gtk::FilterListModel::new(Some(members), Some(&invited_filter));
-
- // Set up the invited section visibility and the invited count.
- self.invited_count_changed(invited_members.n_items());
- invited_members.connect_items_changed(
- clone!(@weak self as obj => move |members, _, _, _| {
- obj.invited_count_changed(members.n_items());
- }),
+ let main_list = ExtraLists::new(
+ &joined_members,
+ &MembershipSubpageItem::new(Membership::Invite, &invited_members),
+ &MembershipSubpageItem::new(Membership::Ban, &banned_members),
);
- // Sort the invited list by display name.
- let sorter = gtk::StringSorter::new(Some(>k::PropertyExpression::new(
- Member::static_type(),
- gtk::Expression::NONE,
- "display-name",
- )));
- let sorted_invited = gtk::SortListModel::new(Some(&invited_members), Some(&sorter));
-
- let model = gtk::NoSelection::new(Some(&sorted_invited));
- priv_.invited_list_view.set_model(Some(&model));
- }
-
- fn invited_count_changed(&self, n: u32) {
- let priv_ = self.imp();
- priv_.invited_section.set_visible(n > 0);
- priv_
- .invited_section
- // Translators: Do NOT translate the content between '{' and '}', this is a variable
- // name.
- .set_title(&ngettext_f(
- "1 Invited",
- "{n} Invited",
- n,
- &[("n", &n.to_string())],
- ));
- // FIXME: This won't be needed when we can request the natural height
- // on AdwPreferencesPage
- // See: https://gitlab.gnome.org/GNOME/libadwaita/-/issues/77
- if n > 5 {
- priv_.invited_scroll.set_min_content_height(MAX_LIST_HEIGHT);
- } else {
- priv_.invited_scroll.set_min_content_height(-1);
- }
- }
-
- fn init_invite_button(&self) {
- let invite_button = &*self.imp().invite_button;
-
- let invite_possible = self.room().new_allowed_expr(RoomAction::Invite);
- const NONE_OBJECT: Option<&glib::Object> = None;
- invite_possible.bind(invite_button, "sensitive", NONE_OBJECT);
-
- invite_button.connect_clicked(clone!(@weak self as obj => move |_| {
- let window = obj
- .root()
- .unwrap()
- .downcast::()
- .unwrap();
- window.present_invite_subpage();
- }));
+ let mut list_stack_children = priv_.list_stack_children.borrow_mut();
+ let joined_view = MembersListView::new(&main_list);
+ priv_.list_stack.add_child(&joined_view);
+ list_stack_children.insert(Membership::Join, joined_view.downgrade());
+ let invited_view = MembersListView::new(&invited_members);
+ priv_.list_stack.add_child(&invited_view);
+ list_stack_children.insert(Membership::Invite, invited_view.downgrade());
+ let banned_view = MembersListView::new(&banned_members);
+ priv_.list_stack.add_child(&banned_view);
+ list_stack_children.insert(Membership::Ban, banned_view.downgrade());
}
pub fn member_menu(&self) -> &MemberMenu {
@@ -352,4 +278,120 @@ impl MemberPage {
member.upcast::().verify_identity().await;
}));
}
+
+ pub fn state(&self) -> Membership {
+ self.imp().state.get()
+ }
+
+ pub fn set_state(&self, state: Membership) {
+ let priv_ = self.imp();
+
+ if self.state() == state {
+ return;
+ }
+
+ if state == Membership::Join {
+ priv_
+ .list_stack
+ .set_transition_type(gtk::StackTransitionType::SlideRight)
+ } else {
+ priv_
+ .list_stack
+ .set_transition_type(gtk::StackTransitionType::SlideLeft)
+ }
+
+ if let Some(window) = self.root().and_then(|w| w.downcast::().ok()) {
+ match state {
+ Membership::Invite => window.set_title(Some(&gettext("Invited Room Members"))),
+ Membership::Ban => window.set_title(Some(&gettext("Banned Room Members"))),
+ _ => window.set_title(Some(&gettext("Room Members"))),
+ }
+ }
+
+ if let Some(view) = priv_
+ .list_stack_children
+ .borrow()
+ .get(&state)
+ .and_then(glib::WeakRef::upgrade)
+ {
+ priv_.list_stack.set_visible_child(&view);
+ }
+
+ self.imp().state.set(state);
+ self.notify("state");
+ }
+
+ fn build_filtered_list(
+ &self,
+ model: &impl IsA,
+ state: Membership,
+ ) -> gio::ListModel {
+ let membership_expression = gtk::PropertyExpression::new(
+ Member::static_type(),
+ gtk::Expression::NONE,
+ "membership",
+ )
+ .chain_closure::(closure!(
+ |_: Option, this_state: Membership| this_state == state
+ ));
+
+ let membership_filter = gtk::BoolFilter::new(Some(&membership_expression));
+
+ fn search_string(member: Member) -> String {
+ format!(
+ "{} {} {} {}",
+ member.display_name(),
+ member.user_id(),
+ member.role(),
+ member.power_level(),
+ )
+ }
+
+ let member_expr = gtk::ClosureExpression::new::(
+ &[],
+ closure!(|member: Option| { member.map(search_string).unwrap_or_default() }),
+ );
+ let search_filter = gtk::StringFilter::builder()
+ .match_mode(gtk::StringFilterMatchMode::Substring)
+ .expression(&member_expr)
+ .ignore_case(true)
+ .build();
+
+ self.imp()
+ .members_search_entry
+ .bind_property("text", &search_filter, "search")
+ .flags(glib::BindingFlags::SYNC_CREATE)
+ .build();
+
+ let filter = gtk::EveryFilter::new();
+
+ filter.append(&membership_filter);
+ filter.append(&search_filter);
+
+ let filter_model = gtk::FilterListModel::new(Some(model), Some(&filter));
+ filter_model.upcast()
+ }
+
+ fn init_invite_button(&self, room: &Room) {
+ let invite_possible = room.new_allowed_expr(RoomAction::Invite);
+
+ let watch = invite_possible.watch(
+ glib::Object::NONE,
+ clone!(@weak self as obj => move || {
+ obj.update_invite_button();
+ }),
+ );
+
+ self.imp().invite_action_watch.replace(Some(watch));
+ self.update_invite_button();
+ }
+
+ fn update_invite_button(&self) {
+ if let Some(invite_action) = &*self.imp().invite_action_watch.borrow() {
+ let allow_invite = invite_action
+ .evaluate_as::()
+ .expect("Created expression needs to be valid and a boolean");
+ self.imp().invite_button.set_visible(allow_invite);
+ };
+ }
}
diff --git a/src/session/content/room_details/mod.rs b/src/session/content/room_details/mod.rs
index 9fc0e990..e5043991 100644
--- a/src/session/content/room_details/mod.rs
+++ b/src/session/content/room_details/mod.rs
@@ -1,6 +1,8 @@
mod invite_subpage;
mod member_page;
+use std::convert::From;
+
use adw::{prelude::*, subclass::prelude::*};
use gettextrs::gettext;
use gtk::{
@@ -17,8 +19,54 @@ use crate::{
utils::{and_expr, or_expr},
};
+#[derive(Debug, Hash, Eq, PartialEq, Clone, Copy, glib::Enum)]
+#[repr(u32)]
+#[enum_type(name = "RoomDetailsPageName")]
+pub enum PageName {
+ General,
+ Members,
+ Invite,
+}
+
+impl Default for PageName {
+ fn default() -> Self {
+ Self::General
+ }
+}
+
+impl glib::variant::StaticVariantType for PageName {
+ fn static_variant_type() -> std::borrow::Cow<'static, glib::VariantTy> {
+ String::static_variant_type()
+ }
+}
+
+impl glib::variant::FromVariant for PageName {
+ fn from_variant(variant: &glib::variant::Variant) -> Option {
+ match variant.str()? {
+ "general" => Some(PageName::General),
+ "members" => Some(PageName::Members),
+ "invite" => Some(PageName::Invite),
+ _ => None,
+ }
+ }
+}
+
+impl glib::variant::ToVariant for PageName {
+ fn to_variant(&self) -> glib::variant::Variant {
+ match self {
+ PageName::General => "general",
+ PageName::Members => "members",
+ PageName::Invite => "invite",
+ }
+ .to_variant()
+ }
+}
+
mod imp {
- use std::cell::Cell;
+ use std::{
+ cell::{Cell, RefCell},
+ collections::HashMap,
+ };
use glib::subclass::InitializingObject;
use once_cell::unsync::OnceCell;
@@ -31,6 +79,8 @@ mod imp {
pub room: OnceCell,
pub avatar_chooser: OnceCell,
#[template_child]
+ pub main_stack: TemplateChild,
+ #[template_child]
pub avatar_remove_button: TemplateChild,
#[template_child]
pub avatar_edit_button: TemplateChild,
@@ -44,15 +94,19 @@ mod imp {
pub room_topic_entry: TemplateChild,
#[template_child]
pub room_topic_label: TemplateChild,
- pub member_page: OnceCell,
+ #[template_child]
+ pub members_count: TemplateChild,
pub edit_mode: Cell,
+ pub list_stack_children: RefCell>>,
+ pub visible_page: Cell,
+ pub previous_visible_page: RefCell>,
}
#[glib::object_subclass]
impl ObjectSubclass for RoomDetails {
const NAME: &'static str = "RoomDetails";
type Type = super::RoomDetails;
- type ParentType = adw::PreferencesWindow;
+ type ParentType = adw::Window;
fn class_init(klass: &mut Self::Class) {
CustomEntry::static_type();
@@ -63,6 +117,16 @@ mod imp {
klass.install_action("details.remove-avatar", None, move |widget, _, _| {
widget.room().store_avatar(None)
});
+ klass.install_action("details.next-page", Some("s"), move |widget, _, param| {
+ let page = param
+ .and_then(|variant| variant.get::())
+ .expect("The parameter need to be a valid PageName");
+
+ widget.next_page(page);
+ });
+ klass.install_action("details.previous-page", None, move |widget, _, _| {
+ widget.previous_page();
+ });
}
fn instance_init(obj: &InitializingObject) {
@@ -74,13 +138,23 @@ mod imp {
fn properties() -> &'static [glib::ParamSpec] {
use once_cell::sync::Lazy;
static PROPERTIES: Lazy> = Lazy::new(|| {
- vec![glib::ParamSpecObject::new(
- "room",
- "Room",
- "The room backing all details of the preference window",
- Room::static_type(),
- glib::ParamFlags::READWRITE | glib::ParamFlags::CONSTRUCT_ONLY,
- )]
+ vec![
+ glib::ParamSpecObject::new(
+ "room",
+ "Room",
+ "The room backing all details of the preference window",
+ Room::static_type(),
+ glib::ParamFlags::READWRITE | glib::ParamFlags::CONSTRUCT_ONLY,
+ ),
+ glib::ParamSpecEnum::new(
+ "visible-page",
+ "Visible Page",
+ "The page currently visible",
+ PageName::static_type(),
+ PageName::default() as i32,
+ glib::ParamFlags::READWRITE | glib::ParamFlags::EXPLICIT_NOTIFY,
+ ),
+ ]
});
PROPERTIES.as_ref()
@@ -95,13 +169,15 @@ mod imp {
) {
match pspec.name() {
"room" => obj.set_room(value.get().unwrap()),
+ "visible-page" => obj.set_visible_page(value.get().unwrap()),
_ => unimplemented!(),
}
}
- fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+ fn property(&self, obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
match pspec.name() {
"room" => self.room.get().to_value(),
+ "visible-page" => obj.visible_page().to_value(),
_ => unimplemented!(),
}
}
@@ -109,26 +185,34 @@ mod imp {
fn constructed(&self, obj: &Self::Type) {
self.parent_constructed(obj);
- let member_page = MemberPage::new(obj.room());
- obj.add(&member_page);
- self.member_page.set(member_page).unwrap();
-
obj.init_avatar();
obj.init_edit_toggle();
obj.init_avatar_chooser();
+ obj.init_member_action();
+
+ self.main_stack
+ .connect_visible_child_notify(clone!(@weak obj => move |_| {
+ obj.notify("visible-page");
+ }));
+
+ let members = obj.room().members();
+ members.connect_items_changed(clone!(@weak obj => move |members, _, _, _| {
+ obj.member_count_changed(members.n_items());
+ }));
+
+ obj.member_count_changed(members.n_items());
}
}
impl WidgetImpl for RoomDetails {}
impl WindowImpl for RoomDetails {}
impl AdwWindowImpl for RoomDetails {}
- impl PreferencesWindowImpl for RoomDetails {}
}
glib::wrapper! {
/// Preference Window to display and update room details.
pub struct RoomDetails(ObjectSubclass)
- @extends gtk::Widget, gtk::Window, adw::Window, gtk::Root, adw::PreferencesWindow, @implements gtk::Accessible;
+ @extends gtk::Widget, gtk::Window, adw::Window, gtk::Root, @implements gtk::Accessible;
}
impl RoomDetails {
@@ -146,6 +230,63 @@ impl RoomDetails {
self.imp().room.set(room).expect("Room already initialized");
}
+ pub fn visible_page(&self) -> PageName {
+ self.imp().visible_page.get()
+ }
+
+ pub fn set_visible_page(&self, name: PageName) {
+ let priv_ = self.imp();
+ let prev_name = self.visible_page();
+ let mut list_stack_children = priv_.list_stack_children.borrow_mut();
+
+ if prev_name == name {
+ return;
+ }
+
+ match name {
+ PageName::General => {
+ self.set_title(Some(&gettext("Room Details")));
+ priv_.main_stack.set_visible_child_name("general");
+ }
+ PageName::Members => {
+ let members_page = if let Some(members_page) = list_stack_children
+ .get(&PageName::Members)
+ .and_then(glib::object::WeakRef::upgrade)
+ {
+ members_page
+ } else {
+ let members_page = MemberPage::new(self.room()).upcast::();
+ list_stack_children.insert(PageName::Members, members_page.downgrade());
+ self.imp().main_stack.add_child(&members_page);
+ members_page
+ };
+
+ self.set_title(Some(&gettext("Room Members")));
+ priv_.main_stack.set_visible_child(&members_page);
+ }
+ PageName::Invite => {
+ priv_.main_stack.set_visible_child_name("general");
+ let invite_page = if let Some(invite_page) = list_stack_children
+ .get(&PageName::Invite)
+ .and_then(glib::object::WeakRef::upgrade)
+ {
+ invite_page
+ } else {
+ let invite_page = InviteSubpage::new(self.room()).upcast::();
+ list_stack_children.insert(PageName::Invite, invite_page.downgrade());
+ priv_.main_stack.add_child(&invite_page);
+ invite_page
+ };
+
+ self.set_title(Some(&gettext("Invite new Members")));
+ priv_.main_stack.set_visible_child(&invite_page);
+ }
+ }
+
+ priv_.visible_page.set(name);
+ self.notify("visible-page");
+ }
+
fn init_avatar(&self) {
let priv_ = self.imp();
let avatar_remove_button = &priv_.avatar_remove_button;
@@ -254,18 +395,39 @@ impl RoomDetails {
self.avatar_chooser().show();
}
- pub fn present_invite_subpage(&self) {
- self.set_title(Some(&gettext("Invite new Members")));
- let subpage = InviteSubpage::new(self.room());
- self.present_subpage(&subpage);
+ fn member_count_changed(&self, n: u32) {
+ self.imp().members_count.set_text(&format!("{}", n));
}
- pub fn close_invite_subpage(&self) {
- self.set_title(Some(&gettext("Room Details")));
- self.close_subpage();
+ fn next_page(&self, next_page: PageName) {
+ let priv_ = self.imp();
+ let prev_page = self.visible_page();
+
+ if prev_page == next_page {
+ return;
+ }
+
+ priv_
+ .main_stack
+ .set_transition_type(gtk::StackTransitionType::SlideLeft);
+
+ priv_.previous_visible_page.borrow_mut().push(prev_page);
+ self.set_visible_page(next_page);
}
- pub fn member_page(&self) -> &MemberPage {
- self.imp().member_page.get().unwrap()
+ fn previous_page(&self) {
+ let priv_ = self.imp();
+
+ priv_
+ .main_stack
+ .set_transition_type(gtk::StackTransitionType::SlideRight);
+
+ if let Some(prev_page) = priv_.previous_visible_page.borrow_mut().pop() {
+ self.set_visible_page(prev_page);
+ } else {
+ // If there isn't any previous page close the dialog since it was opened on a
+ // specific page
+ self.close();
+ };
}
}
diff --git a/src/session/content/room_history/mod.rs b/src/session/content/room_history/mod.rs
index bd0e0ead..d27bffe4 100644
--- a/src/session/content/room_history/mod.rs
+++ b/src/session/content/room_history/mod.rs
@@ -37,7 +37,7 @@ use crate::{
components::{CustomEntry, DragOverlay, Pill, ReactionChooser, RoomTitle},
i18n::gettext_f,
session::{
- content::{MarkdownPopover, RoomDetails},
+ content::{room_details, MarkdownPopover, RoomDetails},
room::{Room, RoomType, SupportedEvent, Timeline, TimelineItem, TimelineState},
user::UserExt,
},
@@ -135,10 +135,10 @@ mod imp {
});
klass.install_action("room-history.details", None, move |widget, _, _| {
- widget.open_room_details("general");
+ widget.open_room_details(room_details::PageName::General);
});
klass.install_action("room-history.invite-members", None, move |widget, _, _| {
- widget.open_invite_members();
+ widget.open_room_details(room_details::PageName::Invite);
});
klass.install_action("room-history.scroll-down", None, move |widget, _, _| {
@@ -574,19 +574,10 @@ impl RoomHistory {
}
/// Opens the room details on the page with the given name.
- pub fn open_room_details(&self, page_name: &str) {
+ pub fn open_room_details(&self, page_name: room_details::PageName) {
if let Some(room) = self.room() {
let window = RoomDetails::new(&self.parent_window(), &room);
- window.set_property("visible-page-name", page_name);
- window.show();
- }
- }
-
- pub fn open_invite_members(&self) {
- if let Some(room) = self.room() {
- let window = RoomDetails::new(&self.parent_window(), &room);
- window.set_property("visible-page-name", "members");
- window.present_invite_subpage();
+ window.set_visible_page(page_name);
window.show();
}
}
diff --git a/src/session/room/member.rs b/src/session/room/member.rs
index 00630d53..488265a7 100644
--- a/src/session/room/member.rs
+++ b/src/session/room/member.rs
@@ -1,3 +1,4 @@
+use gettextrs::gettext;
use gtk::{glib, prelude::*, subclass::prelude::*};
use matrix_sdk::{
room::RoomMember,
@@ -9,6 +10,7 @@ use matrix_sdk::{
OwnedMxcUri, UserId,
},
};
+use num_enum::{IntoPrimitive, TryFromPrimitive};
use crate::{
prelude::*,
@@ -21,7 +23,7 @@ use crate::{
},
};
-#[derive(Debug, Hash, Eq, PartialEq, Clone, Copy, glib::Enum)]
+#[derive(Debug, Hash, Eq, PartialEq, Clone, Copy, glib::Enum, IntoPrimitive, TryFromPrimitive)]
#[repr(u32)]
#[enum_type(name = "Membership")]
pub enum Membership {
@@ -39,6 +41,20 @@ impl Default for Membership {
}
}
+impl std::fmt::Display for Membership {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ let label = match self {
+ Membership::Leave => gettext("Left"),
+ Membership::Join => gettext("Joined"),
+ Membership::Invite => gettext("Invited"),
+ Membership::Ban => gettext("Banned"),
+ Membership::Knock => gettext("Knocked"),
+ Membership::Custom => gettext("Custom"),
+ };
+ f.write_str(&label)
+ }
+}
+
impl From<&MembershipState> for Membership {
fn from(state: &MembershipState) -> Self {
match state {