session-view: Move submodules of content up

To reduce nesting.

po/POTFILES.in

@@ -109,91 +109,91 @@ src/session/room_list/mod.rs
 src/session/sidebar_data/section/name.rs
 src/session/sidebar_data/icon_item.rs
 src/session/user_sessions_list/user_session.rs
-src/session_view/content/explore/mod.blp
-src/session_view/content/explore/public_room_row.rs
-src/session_view/content/explore/servers_popover.blp
-src/session_view/content/explore/server_row.blp
-src/session_view/content/invite.rs
-src/session_view/content/invite.blp
-src/session_view/content/invite_request.rs
-src/session_view/content/invite_request.blp
-src/session_view/content/mod.blp
-src/session_view/content/room_details/addresses_subpage/completion_popover.blp
-src/session_view/content/room_details/addresses_subpage/mod.rs
-src/session_view/content/room_details/addresses_subpage/mod.blp
-src/session_view/content/room_details/edit_details_subpage.rs
-src/session_view/content/room_details/edit_details_subpage.blp
-src/session_view/content/room_details/general_page.rs
-src/session_view/content/room_details/general_page.blp
-src/session_view/content/room_details/history_viewer/audio.blp
-src/session_view/content/room_details/history_viewer/file_row.rs
-src/session_view/content/room_details/history_viewer/file_row.blp
-src/session_view/content/room_details/history_viewer/file.blp
-src/session_view/content/room_details/history_viewer/visual_media.blp
-src/session_view/content/room_details/history_visibility_subpage.blp
-src/session_view/content/room_details/history_visibility_subpage.rs
-src/session_view/content/room_details/invite_subpage/list.rs
-src/session_view/content/room_details/invite_subpage/mod.rs
-src/session_view/content/room_details/invite_subpage/mod.blp
-src/session_view/content/room_details/join_rule_subpage.rs
-src/session_view/content/room_details/join_rule_subpage.blp
-src/session_view/content/room_details/member_row.blp
-src/session_view/content/room_details/members_page/members_list_view/membership_subpage_row.rs
-src/session_view/content/room_details/members_page/members_list_view/mod.rs
-src/session_view/content/room_details/members_page/members_list_view/mod.blp
-src/session_view/content/room_details/mod.rs
-src/session_view/content/room_details/mod.blp
-src/session_view/content/room_details/permissions/add_members_subpage.blp
-src/session_view/content/room_details/permissions/members_subpage.rs
-src/session_view/content/room_details/permissions/members_subpage.blp
-src/session_view/content/room_details/permissions/permissions_subpage.rs
-src/session_view/content/room_details/permissions/permissions_subpage.blp
-src/session_view/content/room_details/upgrade_dialog/mod.rs
-src/session_view/content/room_details/upgrade_dialog/mod.blp
-src/session_view/content/room_history/divider_row.rs
-src/session_view/content/room_history/event_actions/context_menu.rs
-src/session_view/content/room_history/event_actions/context_menu.blp
-src/session_view/content/room_history/event_actions/group.rs
-src/session_view/content/room_history/event_actions/properties_dialog.rs
-src/session_view/content/room_history/event_actions/properties_dialog.blp
-src/session_view/content/room_history/event_actions/quick_reaction_chooser.blp
-src/session_view/content/room_history/message_row/audio.rs
-src/session_view/content/room_history/message_row/content.rs
-src/session_view/content/room_history/message_row/file.rs
-src/session_view/content/room_history/message_row/file.blp
-src/session_view/content/room_history/message_row/location.rs
-src/session_view/content/room_history/message_row/location.blp
-src/session_view/content/room_history/message_row/message_state_stack.blp
-src/session_view/content/room_history/message_row/mod.rs
-src/session_view/content/room_history/message_row/mod.blp
-src/session_view/content/room_history/message_row/reaction/mod.rs
-src/session_view/content/room_history/message_row/reaction_list.blp
-src/session_view/content/room_history/message_row/reply.blp
-src/session_view/content/room_history/message_row/sender_name.rs
-src/session_view/content/room_history/message_row/text/widgets.rs
-src/session_view/content/room_history/message_row/visual_media.rs
-src/session_view/content/room_history/message_row/visual_media.blp
-src/session_view/content/room_history/message_toolbar/attachment_dialog.blp
-src/session_view/content/room_history/message_toolbar/completion/completion_popover.rs
-src/session_view/content/room_history/message_toolbar/mod.rs
-src/session_view/content/room_history/message_toolbar/mod.blp
-src/session_view/content/room_history/member_timestamp/row.rs
-src/session_view/content/room_history/mod.rs
-src/session_view/content/room_history/mod.blp
-src/session_view/content/room_history/read_receipts_list/mod.rs
-src/session_view/content/room_history/state/content.rs
-src/session_view/content/room_history/state/creation.rs
-src/session_view/content/room_history/state/creation.blp
-src/session_view/content/room_history/state/group_row.rs
-src/session_view/content/room_history/title.blp
-src/session_view/content/room_history/typing_row.rs
-src/session_view/content/room_history/verification_info_bar.rs
+src/session_view/content.blp
 src/session_view/create_direct_chat_dialog/mod.rs
 src/session_view/create_direct_chat_dialog/mod.blp
 src/session_view/create_room_dialog.rs
 src/session_view/create_room_dialog.blp
+src/session_view/explore/mod.blp
+src/session_view/explore/public_room_row.rs
+src/session_view/explore/servers_popover.blp
+src/session_view/explore/server_row.blp
+src/session_view/invite.rs
+src/session_view/invite.blp
+src/session_view/invite_request.rs
+src/session_view/invite_request.blp
 src/session_view/media_viewer.rs
 src/session_view/media_viewer.blp
+src/session_view/room_details/addresses_subpage/completion_popover.blp
+src/session_view/room_details/addresses_subpage/mod.rs
+src/session_view/room_details/addresses_subpage/mod.blp
+src/session_view/room_details/edit_details_subpage.rs
+src/session_view/room_details/edit_details_subpage.blp
+src/session_view/room_details/general_page.rs
+src/session_view/room_details/general_page.blp
+src/session_view/room_details/history_viewer/audio.blp
+src/session_view/room_details/history_viewer/file_row.rs
+src/session_view/room_details/history_viewer/file_row.blp
+src/session_view/room_details/history_viewer/file.blp
+src/session_view/room_details/history_viewer/visual_media.blp
+src/session_view/room_details/history_visibility_subpage.blp
+src/session_view/room_details/history_visibility_subpage.rs
+src/session_view/room_details/invite_subpage/list.rs
+src/session_view/room_details/invite_subpage/mod.rs
+src/session_view/room_details/invite_subpage/mod.blp
+src/session_view/room_details/join_rule_subpage.rs
+src/session_view/room_details/join_rule_subpage.blp
+src/session_view/room_details/member_row.blp
+src/session_view/room_details/members_page/members_list_view/membership_subpage_row.rs
+src/session_view/room_details/members_page/members_list_view/mod.rs
+src/session_view/room_details/members_page/members_list_view/mod.blp
+src/session_view/room_details/mod.rs
+src/session_view/room_details/mod.blp
+src/session_view/room_details/permissions/add_members_subpage.blp
+src/session_view/room_details/permissions/members_subpage.rs
+src/session_view/room_details/permissions/members_subpage.blp
+src/session_view/room_details/permissions/permissions_subpage.rs
+src/session_view/room_details/permissions/permissions_subpage.blp
+src/session_view/room_details/upgrade_dialog/mod.rs
+src/session_view/room_details/upgrade_dialog/mod.blp
+src/session_view/room_history/divider_row.rs
+src/session_view/room_history/event_actions/context_menu.rs
+src/session_view/room_history/event_actions/context_menu.blp
+src/session_view/room_history/event_actions/group.rs
+src/session_view/room_history/event_actions/properties_dialog.rs
+src/session_view/room_history/event_actions/properties_dialog.blp
+src/session_view/room_history/event_actions/quick_reaction_chooser.blp
+src/session_view/room_history/message_row/audio.rs
+src/session_view/room_history/message_row/content.rs
+src/session_view/room_history/message_row/file.rs
+src/session_view/room_history/message_row/file.blp
+src/session_view/room_history/message_row/location.rs
+src/session_view/room_history/message_row/location.blp
+src/session_view/room_history/message_row/message_state_stack.blp
+src/session_view/room_history/message_row/mod.rs
+src/session_view/room_history/message_row/mod.blp
+src/session_view/room_history/message_row/reaction/mod.rs
+src/session_view/room_history/message_row/reaction_list.blp
+src/session_view/room_history/message_row/reply.blp
+src/session_view/room_history/message_row/sender_name.rs
+src/session_view/room_history/message_row/text/widgets.rs
+src/session_view/room_history/message_row/visual_media.rs
+src/session_view/room_history/message_row/visual_media.blp
+src/session_view/room_history/message_toolbar/attachment_dialog.blp
+src/session_view/room_history/message_toolbar/completion/completion_popover.rs
+src/session_view/room_history/message_toolbar/mod.rs
+src/session_view/room_history/message_toolbar/mod.blp
+src/session_view/room_history/member_timestamp/row.rs
+src/session_view/room_history/mod.rs
+src/session_view/room_history/mod.blp
+src/session_view/room_history/read_receipts_list/mod.rs
+src/session_view/room_history/state/content.rs
+src/session_view/room_history/state/creation.rs
+src/session_view/room_history/state/creation.blp
+src/session_view/room_history/state/group_row.rs
+src/session_view/room_history/title.blp
+src/session_view/room_history/typing_row.rs
+src/session_view/room_history/verification_info_bar.rs
 src/session_view/sidebar/mod.rs
 src/session_view/sidebar/mod.blp
 src/session_view/sidebar/room_row.rs

src/session_view/content.rs

@@ -1,16 +1,7 @@
 use adw::{prelude::*, subclass::prelude::*};
 use gtk::{glib, glib::clone};
 
-mod explore;
-mod invite;
-mod invite_request;
-mod room_details;
-mod room_history;
-
-use self::{
-    explore::Explore, invite::Invite, invite_request::InviteRequest, room_details::RoomDetails,
-    room_history::RoomHistory,
-};
+use super::{Explore, Invite, InviteRequest, RoomHistory};
 use crate::{
     identity_verification_view::IdentityVerificationView,
     session::{
@@ -45,7 +36,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/session_view/content/mod.ui")]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/content.ui")]
     #[properties(wrapper_type = super::Content)]
     pub struct Content {
         #[template_child]

src/session_view/explore/mod.rs

@@ -29,7 +29,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/session_view/content/explore/mod.ui")]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/explore/mod.ui")]
     #[properties(wrapper_type = super::Explore)]
     pub struct Explore {
         #[template_child]

src/session_view/explore/public_room_row.rs

@@ -20,7 +20,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/session_view/content/explore/public_room_row.ui")]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/explore/public_room_row.ui")]
     #[properties(wrapper_type = super::PublicRoomRow)]
     pub struct PublicRoomRow {
         #[template_child]

src/session_view/explore/server_row.rs

@@ -11,7 +11,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/session_view/content/explore/server_row.ui")]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/explore/server_row.ui")]
     #[properties(wrapper_type = super::ExploreServerRow)]
     pub struct ExploreServerRow {
         #[template_child]

src/session_view/explore/servers_popover.rs

@@ -14,7 +14,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/session_view/content/explore/servers_popover.ui")]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/explore/servers_popover.ui")]
     #[properties(wrapper_type = super::ExploreServersPopover)]
     pub struct ExploreServersPopover {
         #[template_child]

src/session_view/invite.rs

@@ -22,7 +22,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/session_view/content/invite.ui")]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/invite.ui")]
     #[properties(wrapper_type = super::Invite)]
     pub struct Invite {
         #[template_child]

src/session_view/invite_request.rs

@@ -17,7 +17,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/session_view/content/invite_request.ui")]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/invite_request.ui")]
     #[properties(wrapper_type = super::InviteRequest)]
     pub struct InviteRequest {
         #[template_child]

src/session_view/mod.rs

@@ -6,12 +6,19 @@ use tracing::{error, warn};
 mod content;
 mod create_direct_chat_dialog;
 mod create_room_dialog;
+mod explore;
+mod invite;
+mod invite_request;
 mod media_viewer;
+mod room_details;
+mod room_history;
 mod sidebar;
 
 use self::{
     content::Content, create_direct_chat_dialog::CreateDirectChatDialog,
-    create_room_dialog::CreateRoomDialog, media_viewer::MediaViewer, sidebar::Sidebar,
+    create_room_dialog::CreateRoomDialog, explore::Explore, invite::Invite,
+    invite_request::InviteRequest, media_viewer::MediaViewer, room_details::RoomDetails,
+    room_history::RoomHistory, sidebar::Sidebar,
 };
 use crate::{
     Window,

src/session_view/room_details/addresses_subpage/completion_popover.rs

@@ -13,7 +13,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/addresses_subpage/completion_popover.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/room_details/addresses_subpage/completion_popover.ui"
     )]
     #[properties(wrapper_type = super::CompletionPopover)]
     pub struct CompletionPopover {

src/session_view/room_details/addresses_subpage/mod.rs

@@ -29,7 +29,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/addresses_subpage/mod.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/room_details/addresses_subpage/mod.ui"
     )]
     #[properties(wrapper_type = super::AddressesSubpage)]
     pub struct AddressesSubpage {

src/session_view/room_details/edit_details_subpage.rs

@@ -28,7 +28,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/edit_details_subpage.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/room_details/edit_details_subpage.ui"
     )]
     #[properties(wrapper_type = super::EditDetailsSubpage)]
     pub struct EditDetailsSubpage {

src/session_view/room_details/general_page.rs

@@ -48,9 +48,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/general_page.ui"
-    )]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/room_details/general_page.ui")]
     #[properties(wrapper_type = super::GeneralPage)]
     pub struct GeneralPage {
         #[template_child]

src/session_view/room_details/history_viewer/audio.rs

@@ -22,7 +22,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/history_viewer/audio.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/room_details/history_viewer/audio.ui"
     )]
     #[properties(wrapper_type = super::AudioHistoryViewer)]
     pub struct AudioHistoryViewer {

src/session_view/room_details/history_viewer/audio_row.rs

@@ -13,7 +13,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/history_viewer/audio_row.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/room_details/history_viewer/audio_row.ui"
     )]
     #[properties(wrapper_type = super::AudioRow)]
     pub struct AudioRow {

src/session_view/room_details/history_viewer/file.rs

@@ -21,9 +21,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/history_viewer/file.ui"
-    )]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/room_details/history_viewer/file.ui")]
     #[properties(wrapper_type = super::FileHistoryViewer)]
     pub struct FileHistoryViewer {
         #[template_child]

src/session_view/room_details/history_viewer/file_row.rs

@@ -15,7 +15,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/history_viewer/file_row.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/room_details/history_viewer/file_row.ui"
     )]
     #[properties(wrapper_type = super::FileRow)]
     pub struct FileRow {

src/session_view/room_details/history_viewer/visual_media.rs

@@ -25,7 +25,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/history_viewer/visual_media.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/room_details/history_viewer/visual_media.ui"
     )]
     #[properties(wrapper_type = super::VisualMediaHistoryViewer)]
     pub struct VisualMediaHistoryViewer {

src/session_view/room_details/history_viewer/visual_media_item.rs

@@ -44,7 +44,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/history_viewer/visual_media_item.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/room_details/history_viewer/visual_media_item.ui"
     )]
     #[properties(wrapper_type = super::VisualMediaItem)]
     pub struct VisualMediaItem {

src/session_view/room_details/history_visibility_subpage.rs

@@ -23,7 +23,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/history_visibility_subpage.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/room_details/history_visibility_subpage.ui"
     )]
     #[properties(wrapper_type = super::HistoryVisibilitySubpage)]
     pub struct HistoryVisibilitySubpage {

src/session_view/room_details/invite_subpage/mod.rs

@@ -27,9 +27,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/invite_subpage/mod.ui"
-    )]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/room_details/invite_subpage/mod.ui")]
     #[properties(wrapper_type = super::InviteSubpage)]
     pub struct InviteSubpage {
         #[template_child]

src/session_view/room_details/invite_subpage/row.rs

@@ -12,9 +12,7 @@ mod imp {
     use crate::utils::TemplateCallbacks;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/invite_subpage/row.ui"
-    )]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/room_details/invite_subpage/row.ui")]
     #[properties(wrapper_type = super::InviteRow)]
     pub struct InviteRow {
         #[template_child]

src/session_view/room_details/join_rule_subpage.rs

@@ -20,9 +20,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/join_rule_subpage.ui"
-    )]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/room_details/join_rule_subpage.ui")]
     #[properties(wrapper_type = super::JoinRuleSubpage)]
     pub struct JoinRuleSubpage {
         #[template_child]

src/session_view/room_details/member_row.rs

@@ -14,7 +14,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/session_view/content/room_details/member_row.ui")]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/room_details/member_row.ui")]
     #[properties(wrapper_type = super::MemberRow)]
     pub struct MemberRow {
         #[template_child]

src/session_view/room_details/members_page/members_list_view/item_row.rs

@@ -5,7 +5,7 @@ use super::MembershipSubpageRow;
 use crate::{
     prelude::*,
     session::Member,
-    session_view::content::room_details::{MemberRow, MembershipSubpageItem},
+    session_view::room_details::{MemberRow, MembershipSubpageItem},
 };
 
 mod imp {

src/session_view/room_details/members_page/members_list_view/membership_subpage_row.rs

@@ -3,7 +3,7 @@ use gtk::{glib, glib::clone, prelude::*, subclass::prelude::*};
 
 use crate::{
     session::MembershipListKind,
-    session_view::content::room_details::membership_subpage_item::MembershipSubpageItem,
+    session_view::room_details::membership_subpage_item::MembershipSubpageItem,
 };
 
 mod imp {
@@ -15,7 +15,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/members_page/members_list_view/membership_subpage_row.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/room_details/members_page/members_list_view/membership_subpage_row.ui"
     )]
     #[properties(wrapper_type = super::MembershipSubpageRow)]
     pub struct MembershipSubpageRow {

src/session_view/room_details/members_page/members_list_view/mod.rs

@@ -13,7 +13,7 @@ use crate::{
     components::LoadingRow,
     prelude::*,
     session::{Member, MemberList, MembershipListKind, Room},
-    session_view::content::room_details::MembershipSubpageItem,
+    session_view::room_details::MembershipSubpageItem,
     utils::{BoundObjectWeakRef, ExpressionListModel, LoadingState, expression},
 };
 
@@ -29,7 +29,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/members_page/members_list_view/mod.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/room_details/members_page/members_list_view/mod.ui"
     )]
     #[properties(wrapper_type = super::MembersListView)]
     pub struct MembersListView {

src/session_view/room_details/members_page/mod.rs

@@ -12,9 +12,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/members_page/mod.ui"
-    )]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/room_details/members_page/mod.ui")]
     #[properties(wrapper_type = super::MembersPage)]
     pub struct MembersPage {
         #[template_child]

src/session_view/room_details/mod.rs

@@ -89,7 +89,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/session_view/content/room_details/mod.ui")]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/room_details/mod.ui")]
     #[properties(wrapper_type = super::RoomDetails)]
     pub struct RoomDetails {
         /// The room to show the details for.

src/session_view/room_details/permissions/add_members_subpage.rs

@@ -26,7 +26,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/permissions/add_members_subpage.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/room_details/permissions/add_members_subpage.ui"
     )]
     #[properties(wrapper_type = super::PermissionsAddMembersSubpage)]
     pub struct PermissionsAddMembersSubpage {

src/session_view/room_details/permissions/member_row.rs

@@ -23,7 +23,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/permissions/member_row.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/room_details/permissions/member_row.ui"
     )]
     #[properties(wrapper_type = super::PermissionsMemberRow)]
     pub struct PermissionsMemberRow {

src/session_view/room_details/permissions/members_subpage.rs

@@ -18,7 +18,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/permissions/members_subpage.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/room_details/permissions/members_subpage.ui"
     )]
     #[properties(wrapper_type = super::PermissionsMembersSubpage)]
     pub struct PermissionsMembersSubpage {

src/session_view/room_details/permissions/permissions_subpage.rs

@@ -30,7 +30,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/permissions/permissions_subpage.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/room_details/permissions/permissions_subpage.ui"
     )]
     #[properties(wrapper_type = super::PermissionsSubpage)]
     pub struct PermissionsSubpage {

src/session_view/room_details/permissions/select_member_row.rs

@@ -12,7 +12,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/permissions/select_member_row.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/room_details/permissions/select_member_row.ui"
     )]
     #[properties(wrapper_type = super::PermissionsSelectMemberRow)]
     pub struct PermissionsSelectMemberRow {

src/session_view/room_details/upgrade_dialog/mod.rs

@@ -22,9 +22,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate)]
-    #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/upgrade_dialog/mod.ui"
-    )]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/room_details/upgrade_dialog/mod.ui")]
     pub struct UpgradeDialog {
         #[template_child]
         version_combo: TemplateChild<adw::ComboRow>,

src/session_view/room_history/divider_row.rs

@@ -13,7 +13,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/session_view/content/room_history/divider_row.ui")]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/room_history/divider_row.ui")]
     #[properties(wrapper_type = super::DividerRow)]
     pub struct DividerRow {
         #[template_child]

src/session_view/room_history/event_actions/context_menu.rs

@@ -70,7 +70,7 @@ impl EventActionsContextMenu {
 impl Default for EventActionsContextMenu {
     fn default() -> Self {
         let menu_model = gtk::Builder::from_resource(
-            "/org/gnome/Fractal/ui/session_view/content/room_history/event_actions/context_menu.ui",
+            "/org/gnome/Fractal/ui/session_view/room_history/event_actions/context_menu.ui",
         )
         .object::<gio::Menu>("event-actions-menu")
         .expect("GResource and menu should exist");

src/session_view/room_history/event_actions/properties_dialog.rs

@@ -20,7 +20,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_history/event_actions/properties_dialog.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/room_history/event_actions/properties_dialog.ui"
     )]
     #[properties(wrapper_type = super::EventPropertiesDialog)]
     pub struct EventPropertiesDialog {

src/session_view/room_history/event_actions/quick_reaction_chooser.rs

@@ -70,7 +70,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_history/event_actions/quick_reaction_chooser.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/room_history/event_actions/quick_reaction_chooser.ui"
     )]
     #[properties(wrapper_type = super::QuickReactionChooser)]
     pub struct QuickReactionChooser {

src/session_view/room_history/event_row.rs

@@ -7,7 +7,7 @@ use crate::{
     components::ContextMenuBin,
     prelude::*,
     session::Event,
-    session_view::content::room_history::message_toolbar::ComposerState,
+    session_view::room_history::message_toolbar::ComposerState,
     utils::{BoundObject, BoundObjectWeakRef},
 };
 

src/session_view/room_history/member_timestamp/row.rs

@@ -16,7 +16,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_history/member_timestamp/row.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/room_history/member_timestamp/row.ui"
     )]
     #[properties(wrapper_type = super::MemberTimestampRow)]
     pub struct MemberTimestampRow {

src/session_view/room_history/message_row/audio.rs

@@ -15,9 +15,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(
-        resource = "/org/gnome/Fractal/ui/session_view/content/room_history/message_row/audio.ui"
-    )]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/room_history/message_row/audio.ui")]
     #[properties(wrapper_type = super::MessageAudio)]
     pub struct MessageAudio {
         #[template_child]

src/session_view/room_history/message_row/content.rs

@@ -13,7 +13,7 @@ use crate::{
     components::AudioPlayerMessage,
     prelude::*,
     session::{Event, Member, Room},
-    session_view::content::room_history::message_toolbar::MessageEventSource,
+    session_view::room_history::message_toolbar::MessageEventSource,
     spawn,
     utils::matrix::{MediaMessage, MessageCacheKey},
 };