diff --git a/po/POTFILES.in b/po/POTFILES.in index 98040bb9..52781eca 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -109,96 +109,96 @@ src/session/model/room_list/mod.rs src/session/model/sidebar_data/section/name.rs src/session/model/sidebar_data/icon_item.rs src/session/model/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/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/media_viewer.rs -src/session/view/media_viewer.blp -src/session/view/sidebar/mod.rs -src/session/view/sidebar/mod.blp -src/session/view/sidebar/room_row.rs -src/session/view/sidebar/row.rs -src/session/view/sidebar/section_row.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/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/media_viewer.rs +src/session_view/media_viewer.blp +src/session_view/sidebar/mod.rs +src/session_view/sidebar/mod.blp +src/session_view/sidebar/room_row.rs +src/session_view/sidebar/row.rs +src/session_view/sidebar/section_row.rs src/session_list/mod.rs src/shortcuts-dialog.blp src/user_facing_error.rs diff --git a/src/components/pill/mod.rs b/src/components/pill/mod.rs index 7d36660b..192bd77e 100644 --- a/src/components/pill/mod.rs +++ b/src/components/pill/mod.rs @@ -15,10 +15,8 @@ pub use self::{ use super::{Avatar, AvatarImageSafetySetting, RoomPreviewDialog, UserProfileDialog}; use crate::{ prelude::*, - session::{ - model::{Member, RemoteRoom, Room}, - view::SessionView, - }, + session::model::{Member, RemoteRoom, Room}, + session_view::SessionView, utils::{BoundObject, key_bindings}, }; diff --git a/src/main.rs b/src/main.rs index b657ded0..992feb20 100644 --- a/src/main.rs +++ b/src/main.rs @@ -20,6 +20,7 @@ mod prelude; mod secret; mod session; mod session_list; +mod session_view; mod system_settings; mod user_facing_error; mod utils; diff --git a/src/session/mod.rs b/src/session/mod.rs index 47c7b81e..65880be0 100644 --- a/src/session/mod.rs +++ b/src/session/mod.rs @@ -1,2 +1 @@ pub mod model; -pub mod view; diff --git a/src/session/view/mod.rs b/src/session/view/mod.rs deleted file mode 100644 index 30ce4939..00000000 --- a/src/session/view/mod.rs +++ /dev/null @@ -1,12 +0,0 @@ -mod content; -mod create_direct_chat_dialog; -mod create_room_dialog; -mod media_viewer; -mod session_view; -mod sidebar; - -pub use self::session_view::SessionView; -use self::{ - content::Content, create_direct_chat_dialog::CreateDirectChatDialog, - create_room_dialog::CreateRoomDialog, media_viewer::MediaViewer, sidebar::Sidebar, -}; diff --git a/src/session/view/content/explore/mod.blp b/src/session_view/content/explore/mod.blp similarity index 100% rename from src/session/view/content/explore/mod.blp rename to src/session_view/content/explore/mod.blp diff --git a/src/session/view/content/explore/mod.rs b/src/session_view/content/explore/mod.rs similarity index 99% rename from src/session/view/content/explore/mod.rs rename to src/session_view/content/explore/mod.rs index ed524216..489e9bd8 100644 --- a/src/session/view/content/explore/mod.rs +++ b/src/session_view/content/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/content/explore/mod.ui")] #[properties(wrapper_type = super::Explore)] pub struct Explore { #[template_child] diff --git a/src/session/view/content/explore/public_room_row.blp b/src/session_view/content/explore/public_room_row.blp similarity index 100% rename from src/session/view/content/explore/public_room_row.blp rename to src/session_view/content/explore/public_room_row.blp diff --git a/src/session/view/content/explore/public_room_row.rs b/src/session_view/content/explore/public_room_row.rs similarity index 99% rename from src/session/view/content/explore/public_room_row.rs rename to src/session_view/content/explore/public_room_row.rs index 3a90745d..1d5ca37a 100644 --- a/src/session/view/content/explore/public_room_row.rs +++ b/src/session_view/content/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/content/explore/public_room_row.ui")] #[properties(wrapper_type = super::PublicRoomRow)] pub struct PublicRoomRow { #[template_child] diff --git a/src/session/view/content/explore/search.rs b/src/session_view/content/explore/search.rs similarity index 100% rename from src/session/view/content/explore/search.rs rename to src/session_view/content/explore/search.rs diff --git a/src/session/view/content/explore/server.rs b/src/session_view/content/explore/server.rs similarity index 100% rename from src/session/view/content/explore/server.rs rename to src/session_view/content/explore/server.rs diff --git a/src/session/view/content/explore/server_list.rs b/src/session_view/content/explore/server_list.rs similarity index 100% rename from src/session/view/content/explore/server_list.rs rename to src/session_view/content/explore/server_list.rs diff --git a/src/session/view/content/explore/server_row.blp b/src/session_view/content/explore/server_row.blp similarity index 100% rename from src/session/view/content/explore/server_row.blp rename to src/session_view/content/explore/server_row.blp diff --git a/src/session/view/content/explore/server_row.rs b/src/session_view/content/explore/server_row.rs similarity index 97% rename from src/session/view/content/explore/server_row.rs rename to src/session_view/content/explore/server_row.rs index 2315e2e2..15685085 100644 --- a/src/session/view/content/explore/server_row.rs +++ b/src/session_view/content/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/content/explore/server_row.ui")] #[properties(wrapper_type = super::ExploreServerRow)] pub struct ExploreServerRow { #[template_child] diff --git a/src/session/view/content/explore/servers_popover.blp b/src/session_view/content/explore/servers_popover.blp similarity index 100% rename from src/session/view/content/explore/servers_popover.blp rename to src/session_view/content/explore/servers_popover.blp diff --git a/src/session/view/content/explore/servers_popover.rs b/src/session_view/content/explore/servers_popover.rs similarity index 99% rename from src/session/view/content/explore/servers_popover.rs rename to src/session_view/content/explore/servers_popover.rs index 331ab9ca..0822a969 100644 --- a/src/session/view/content/explore/servers_popover.rs +++ b/src/session_view/content/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/content/explore/servers_popover.ui")] #[properties(wrapper_type = super::ExploreServersPopover)] pub struct ExploreServersPopover { #[template_child] diff --git a/src/session/view/content/invite.blp b/src/session_view/content/invite.blp similarity index 100% rename from src/session/view/content/invite.blp rename to src/session_view/content/invite.blp diff --git a/src/session/view/content/invite.rs b/src/session_view/content/invite.rs similarity index 99% rename from src/session/view/content/invite.rs rename to src/session_view/content/invite.rs index 79359050..d8da7225 100644 --- a/src/session/view/content/invite.rs +++ b/src/session_view/content/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/content/invite.ui")] #[properties(wrapper_type = super::Invite)] pub struct Invite { #[template_child] diff --git a/src/session/view/content/invite_request.blp b/src/session_view/content/invite_request.blp similarity index 100% rename from src/session/view/content/invite_request.blp rename to src/session_view/content/invite_request.blp diff --git a/src/session/view/content/invite_request.rs b/src/session_view/content/invite_request.rs similarity index 99% rename from src/session/view/content/invite_request.rs rename to src/session_view/content/invite_request.rs index 09451dec..94ea177e 100644 --- a/src/session/view/content/invite_request.rs +++ b/src/session_view/content/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/content/invite_request.ui")] #[properties(wrapper_type = super::InviteRequest)] pub struct InviteRequest { #[template_child] diff --git a/src/session/view/content/mod.blp b/src/session_view/content/mod.blp similarity index 100% rename from src/session/view/content/mod.blp rename to src/session_view/content/mod.blp diff --git a/src/session/view/content/mod.rs b/src/session_view/content/mod.rs similarity index 99% rename from src/session/view/content/mod.rs rename to src/session_view/content/mod.rs index d13eb6fe..68126cc3 100644 --- a/src/session/view/content/mod.rs +++ b/src/session_view/content/mod.rs @@ -45,7 +45,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/mod.ui")] #[properties(wrapper_type = super::Content)] pub struct Content { #[template_child] diff --git a/src/session/view/content/room_details/addresses_subpage/completion_popover.blp b/src/session_view/content/room_details/addresses_subpage/completion_popover.blp similarity index 100% rename from src/session/view/content/room_details/addresses_subpage/completion_popover.blp rename to src/session_view/content/room_details/addresses_subpage/completion_popover.blp diff --git a/src/session/view/content/room_details/addresses_subpage/completion_popover.rs b/src/session_view/content/room_details/addresses_subpage/completion_popover.rs similarity index 99% rename from src/session/view/content/room_details/addresses_subpage/completion_popover.rs rename to src/session_view/content/room_details/addresses_subpage/completion_popover.rs index d23cb15d..aa6442d3 100644 --- a/src/session/view/content/room_details/addresses_subpage/completion_popover.rs +++ b/src/session_view/content/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/content/room_details/addresses_subpage/completion_popover.ui" )] #[properties(wrapper_type = super::CompletionPopover)] pub struct CompletionPopover { diff --git a/src/session/view/content/room_details/addresses_subpage/mod.blp b/src/session_view/content/room_details/addresses_subpage/mod.blp similarity index 100% rename from src/session/view/content/room_details/addresses_subpage/mod.blp rename to src/session_view/content/room_details/addresses_subpage/mod.blp diff --git a/src/session/view/content/room_details/addresses_subpage/mod.rs b/src/session_view/content/room_details/addresses_subpage/mod.rs similarity index 99% rename from src/session/view/content/room_details/addresses_subpage/mod.rs rename to src/session_view/content/room_details/addresses_subpage/mod.rs index 65a9c3e2..4f5656c7 100644 --- a/src/session/view/content/room_details/addresses_subpage/mod.rs +++ b/src/session_view/content/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/content/room_details/addresses_subpage/mod.ui" )] #[properties(wrapper_type = super::AddressesSubpage)] pub struct AddressesSubpage { diff --git a/src/session/view/content/room_details/addresses_subpage/public_address.rs b/src/session_view/content/room_details/addresses_subpage/public_address.rs similarity index 100% rename from src/session/view/content/room_details/addresses_subpage/public_address.rs rename to src/session_view/content/room_details/addresses_subpage/public_address.rs diff --git a/src/session/view/content/room_details/edit_details_subpage.blp b/src/session_view/content/room_details/edit_details_subpage.blp similarity index 100% rename from src/session/view/content/room_details/edit_details_subpage.blp rename to src/session_view/content/room_details/edit_details_subpage.blp diff --git a/src/session/view/content/room_details/edit_details_subpage.rs b/src/session_view/content/room_details/edit_details_subpage.rs similarity index 99% rename from src/session/view/content/room_details/edit_details_subpage.rs rename to src/session_view/content/room_details/edit_details_subpage.rs index 2e227449..7299f0e7 100644 --- a/src/session/view/content/room_details/edit_details_subpage.rs +++ b/src/session_view/content/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/content/room_details/edit_details_subpage.ui" )] #[properties(wrapper_type = super::EditDetailsSubpage)] pub struct EditDetailsSubpage { diff --git a/src/session/view/content/room_details/general_page.blp b/src/session_view/content/room_details/general_page.blp similarity index 100% rename from src/session/view/content/room_details/general_page.blp rename to src/session_view/content/room_details/general_page.blp diff --git a/src/session/view/content/room_details/general_page.rs b/src/session_view/content/room_details/general_page.rs similarity index 99% rename from src/session/view/content/room_details/general_page.rs rename to src/session_view/content/room_details/general_page.rs index 8f7dd58b..c328a56b 100644 --- a/src/session/view/content/room_details/general_page.rs +++ b/src/session_view/content/room_details/general_page.rs @@ -49,7 +49,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session/view/content/room_details/general_page.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_details/general_page.ui" )] #[properties(wrapper_type = super::GeneralPage)] pub struct GeneralPage { diff --git a/src/session/view/content/room_details/history_viewer/audio.blp b/src/session_view/content/room_details/history_viewer/audio.blp similarity index 100% rename from src/session/view/content/room_details/history_viewer/audio.blp rename to src/session_view/content/room_details/history_viewer/audio.blp diff --git a/src/session/view/content/room_details/history_viewer/audio.rs b/src/session_view/content/room_details/history_viewer/audio.rs similarity index 99% rename from src/session/view/content/room_details/history_viewer/audio.rs rename to src/session_view/content/room_details/history_viewer/audio.rs index 97dea86a..95a6c312 100644 --- a/src/session/view/content/room_details/history_viewer/audio.rs +++ b/src/session_view/content/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/content/room_details/history_viewer/audio.ui" )] #[properties(wrapper_type = super::AudioHistoryViewer)] pub struct AudioHistoryViewer { diff --git a/src/session/view/content/room_details/history_viewer/audio_row.blp b/src/session_view/content/room_details/history_viewer/audio_row.blp similarity index 100% rename from src/session/view/content/room_details/history_viewer/audio_row.blp rename to src/session_view/content/room_details/history_viewer/audio_row.blp diff --git a/src/session/view/content/room_details/history_viewer/audio_row.rs b/src/session_view/content/room_details/history_viewer/audio_row.rs similarity index 97% rename from src/session/view/content/room_details/history_viewer/audio_row.rs rename to src/session_view/content/room_details/history_viewer/audio_row.rs index 7b34e64e..85585508 100644 --- a/src/session/view/content/room_details/history_viewer/audio_row.rs +++ b/src/session_view/content/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/content/room_details/history_viewer/audio_row.ui" )] #[properties(wrapper_type = super::AudioRow)] pub struct AudioRow { diff --git a/src/session/view/content/room_details/history_viewer/event.rs b/src/session_view/content/room_details/history_viewer/event.rs similarity index 100% rename from src/session/view/content/room_details/history_viewer/event.rs rename to src/session_view/content/room_details/history_viewer/event.rs diff --git a/src/session/view/content/room_details/history_viewer/file.blp b/src/session_view/content/room_details/history_viewer/file.blp similarity index 100% rename from src/session/view/content/room_details/history_viewer/file.blp rename to src/session_view/content/room_details/history_viewer/file.blp diff --git a/src/session/view/content/room_details/history_viewer/file.rs b/src/session_view/content/room_details/history_viewer/file.rs similarity index 99% rename from src/session/view/content/room_details/history_viewer/file.rs rename to src/session_view/content/room_details/history_viewer/file.rs index e0ff7581..1d3a0ad7 100644 --- a/src/session/view/content/room_details/history_viewer/file.rs +++ b/src/session_view/content/room_details/history_viewer/file.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/file.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_details/history_viewer/file.ui" )] #[properties(wrapper_type = super::FileHistoryViewer)] pub struct FileHistoryViewer { diff --git a/src/session/view/content/room_details/history_viewer/file_row.blp b/src/session_view/content/room_details/history_viewer/file_row.blp similarity index 100% rename from src/session/view/content/room_details/history_viewer/file_row.blp rename to src/session_view/content/room_details/history_viewer/file_row.blp diff --git a/src/session/view/content/room_details/history_viewer/file_row.rs b/src/session_view/content/room_details/history_viewer/file_row.rs similarity index 98% rename from src/session/view/content/room_details/history_viewer/file_row.rs rename to src/session_view/content/room_details/history_viewer/file_row.rs index 6aaed6d0..e6d8face 100644 --- a/src/session/view/content/room_details/history_viewer/file_row.rs +++ b/src/session_view/content/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/content/room_details/history_viewer/file_row.ui" )] #[properties(wrapper_type = super::FileRow)] pub struct FileRow { diff --git a/src/session/view/content/room_details/history_viewer/mod.rs b/src/session_view/content/room_details/history_viewer/mod.rs similarity index 100% rename from src/session/view/content/room_details/history_viewer/mod.rs rename to src/session_view/content/room_details/history_viewer/mod.rs diff --git a/src/session/view/content/room_details/history_viewer/timeline.rs b/src/session_view/content/room_details/history_viewer/timeline.rs similarity index 100% rename from src/session/view/content/room_details/history_viewer/timeline.rs rename to src/session_view/content/room_details/history_viewer/timeline.rs diff --git a/src/session/view/content/room_details/history_viewer/visual_media.blp b/src/session_view/content/room_details/history_viewer/visual_media.blp similarity index 100% rename from src/session/view/content/room_details/history_viewer/visual_media.blp rename to src/session_view/content/room_details/history_viewer/visual_media.blp diff --git a/src/session/view/content/room_details/history_viewer/visual_media.rs b/src/session_view/content/room_details/history_viewer/visual_media.rs similarity index 98% rename from src/session/view/content/room_details/history_viewer/visual_media.rs rename to src/session_view/content/room_details/history_viewer/visual_media.rs index 662fdc85..8d41ad28 100644 --- a/src/session/view/content/room_details/history_viewer/visual_media.rs +++ b/src/session_view/content/room_details/history_viewer/visual_media.rs @@ -6,7 +6,7 @@ use super::{HistoryViewerEvent, HistoryViewerEventType, HistoryViewerTimeline, V use crate::{ components::LoadingRow, prelude::*, - session::view::MediaViewer, + session_view::MediaViewer, spawn, utils::{BoundConstructOnlyObject, LoadingState}, }; @@ -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/content/room_details/history_viewer/visual_media.ui" )] #[properties(wrapper_type = super::VisualMediaHistoryViewer)] pub struct VisualMediaHistoryViewer { diff --git a/src/session/view/content/room_details/history_viewer/visual_media_item.blp b/src/session_view/content/room_details/history_viewer/visual_media_item.blp similarity index 100% rename from src/session/view/content/room_details/history_viewer/visual_media_item.blp rename to src/session_view/content/room_details/history_viewer/visual_media_item.blp diff --git a/src/session/view/content/room_details/history_viewer/visual_media_item.rs b/src/session_view/content/room_details/history_viewer/visual_media_item.rs similarity index 99% rename from src/session/view/content/room_details/history_viewer/visual_media_item.rs rename to src/session_view/content/room_details/history_viewer/visual_media_item.rs index 421ccf6c..81a45af1 100644 --- a/src/session/view/content/room_details/history_viewer/visual_media_item.rs +++ b/src/session_view/content/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/content/room_details/history_viewer/visual_media_item.ui" )] #[properties(wrapper_type = super::VisualMediaItem)] pub struct VisualMediaItem { diff --git a/src/session/view/content/room_details/history_visibility_subpage.blp b/src/session_view/content/room_details/history_visibility_subpage.blp similarity index 100% rename from src/session/view/content/room_details/history_visibility_subpage.blp rename to src/session_view/content/room_details/history_visibility_subpage.blp diff --git a/src/session/view/content/room_details/history_visibility_subpage.rs b/src/session_view/content/room_details/history_visibility_subpage.rs similarity index 99% rename from src/session/view/content/room_details/history_visibility_subpage.rs rename to src/session_view/content/room_details/history_visibility_subpage.rs index 25405c1b..99e7bd30 100644 --- a/src/session/view/content/room_details/history_visibility_subpage.rs +++ b/src/session_view/content/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/content/room_details/history_visibility_subpage.ui" )] #[properties(wrapper_type = super::HistoryVisibilitySubpage)] pub struct HistoryVisibilitySubpage { diff --git a/src/session/view/content/room_details/invite_subpage/item.rs b/src/session_view/content/room_details/invite_subpage/item.rs similarity index 100% rename from src/session/view/content/room_details/invite_subpage/item.rs rename to src/session_view/content/room_details/invite_subpage/item.rs diff --git a/src/session/view/content/room_details/invite_subpage/list.rs b/src/session_view/content/room_details/invite_subpage/list.rs similarity index 100% rename from src/session/view/content/room_details/invite_subpage/list.rs rename to src/session_view/content/room_details/invite_subpage/list.rs diff --git a/src/session/view/content/room_details/invite_subpage/mod.blp b/src/session_view/content/room_details/invite_subpage/mod.blp similarity index 100% rename from src/session/view/content/room_details/invite_subpage/mod.blp rename to src/session_view/content/room_details/invite_subpage/mod.blp diff --git a/src/session/view/content/room_details/invite_subpage/mod.rs b/src/session_view/content/room_details/invite_subpage/mod.rs similarity index 99% rename from src/session/view/content/room_details/invite_subpage/mod.rs rename to src/session_view/content/room_details/invite_subpage/mod.rs index ba436279..8c4a48e8 100644 --- a/src/session/view/content/room_details/invite_subpage/mod.rs +++ b/src/session_view/content/room_details/invite_subpage/mod.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/invite_subpage/mod.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_details/invite_subpage/mod.ui" )] #[properties(wrapper_type = super::InviteSubpage)] pub struct InviteSubpage { diff --git a/src/session/view/content/room_details/invite_subpage/row.blp b/src/session_view/content/room_details/invite_subpage/row.blp similarity index 100% rename from src/session/view/content/room_details/invite_subpage/row.blp rename to src/session_view/content/room_details/invite_subpage/row.blp diff --git a/src/session/view/content/room_details/invite_subpage/row.rs b/src/session_view/content/room_details/invite_subpage/row.rs similarity index 97% rename from src/session/view/content/room_details/invite_subpage/row.rs rename to src/session_view/content/room_details/invite_subpage/row.rs index a03011fb..633c12fd 100644 --- a/src/session/view/content/room_details/invite_subpage/row.rs +++ b/src/session_view/content/room_details/invite_subpage/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/invite_subpage/row.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_details/invite_subpage/row.ui" )] #[properties(wrapper_type = super::InviteRow)] pub struct InviteRow { diff --git a/src/session/view/content/room_details/join_rule_subpage.blp b/src/session_view/content/room_details/join_rule_subpage.blp similarity index 100% rename from src/session/view/content/room_details/join_rule_subpage.blp rename to src/session_view/content/room_details/join_rule_subpage.blp diff --git a/src/session/view/content/room_details/join_rule_subpage.rs b/src/session_view/content/room_details/join_rule_subpage.rs similarity index 99% rename from src/session/view/content/room_details/join_rule_subpage.rs rename to src/session_view/content/room_details/join_rule_subpage.rs index 4da2526e..ab8ec654 100644 --- a/src/session/view/content/room_details/join_rule_subpage.rs +++ b/src/session_view/content/room_details/join_rule_subpage.rs @@ -21,7 +21,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session/view/content/room_details/join_rule_subpage.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_details/join_rule_subpage.ui" )] #[properties(wrapper_type = super::JoinRuleSubpage)] pub struct JoinRuleSubpage { diff --git a/src/session/view/content/room_details/member_row.blp b/src/session_view/content/room_details/member_row.blp similarity index 100% rename from src/session/view/content/room_details/member_row.blp rename to src/session_view/content/room_details/member_row.blp diff --git a/src/session/view/content/room_details/member_row.rs b/src/session_view/content/room_details/member_row.rs similarity index 97% rename from src/session/view/content/room_details/member_row.rs rename to src/session_view/content/room_details/member_row.rs index 5bc3f45f..8bfd0554 100644 --- a/src/session/view/content/room_details/member_row.rs +++ b/src/session_view/content/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/content/room_details/member_row.ui")] #[properties(wrapper_type = super::MemberRow)] pub struct MemberRow { #[template_child] diff --git a/src/session/view/content/room_details/members_page/members_list_view/item_row.rs b/src/session_view/content/room_details/members_page/members_list_view/item_row.rs similarity index 96% rename from src/session/view/content/room_details/members_page/members_list_view/item_row.rs rename to src/session_view/content/room_details/members_page/members_list_view/item_row.rs index 4cf93891..67358c93 100644 --- a/src/session/view/content/room_details/members_page/members_list_view/item_row.rs +++ b/src/session_view/content/room_details/members_page/members_list_view/item_row.rs @@ -4,10 +4,8 @@ use gtk::glib; use super::MembershipSubpageRow; use crate::{ prelude::*, - session::{ - model::Member, - view::content::room_details::{MemberRow, MembershipSubpageItem}, - }, + session::model::Member, + session_view::content::room_details::{MemberRow, MembershipSubpageItem}, }; mod imp { diff --git a/src/session/view/content/room_details/members_page/members_list_view/membership_subpage_row.blp b/src/session_view/content/room_details/members_page/members_list_view/membership_subpage_row.blp similarity index 100% rename from src/session/view/content/room_details/members_page/members_list_view/membership_subpage_row.blp rename to src/session_view/content/room_details/members_page/members_list_view/membership_subpage_row.blp diff --git a/src/session/view/content/room_details/members_page/members_list_view/membership_subpage_row.rs b/src/session_view/content/room_details/members_page/members_list_view/membership_subpage_row.rs similarity index 95% rename from src/session/view/content/room_details/members_page/members_list_view/membership_subpage_row.rs rename to src/session_view/content/room_details/members_page/members_list_view/membership_subpage_row.rs index c81e9f92..9281958c 100644 --- a/src/session/view/content/room_details/members_page/members_list_view/membership_subpage_row.rs +++ b/src/session_view/content/room_details/members_page/members_list_view/membership_subpage_row.rs @@ -1,9 +1,9 @@ use gettextrs::npgettext; use gtk::{glib, glib::clone, prelude::*, subclass::prelude::*}; -use crate::session::{ - model::MembershipListKind, - view::content::room_details::membership_subpage_item::MembershipSubpageItem, +use crate::{ + session::model::MembershipListKind, + session_view::content::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/content/room_details/members_page/members_list_view/membership_subpage_row.ui" )] #[properties(wrapper_type = super::MembershipSubpageRow)] pub struct MembershipSubpageRow { diff --git a/src/session/view/content/room_details/members_page/members_list_view/mod.blp b/src/session_view/content/room_details/members_page/members_list_view/mod.blp similarity index 100% rename from src/session/view/content/room_details/members_page/members_list_view/mod.blp rename to src/session_view/content/room_details/members_page/members_list_view/mod.blp diff --git a/src/session/view/content/room_details/members_page/members_list_view/mod.rs b/src/session_view/content/room_details/members_page/members_list_view/mod.rs similarity index 98% rename from src/session/view/content/room_details/members_page/members_list_view/mod.rs rename to src/session_view/content/room_details/members_page/members_list_view/mod.rs index 0c872767..8bc7a89b 100644 --- a/src/session/view/content/room_details/members_page/members_list_view/mod.rs +++ b/src/session_view/content/room_details/members_page/members_list_view/mod.rs @@ -12,10 +12,8 @@ use self::{item_row::ItemRow, membership_subpage_row::MembershipSubpageRow}; use crate::{ components::LoadingRow, prelude::*, - session::{ - model::{Member, MemberList, MembershipListKind, Room}, - view::content::room_details::MembershipSubpageItem, - }, + session::model::{Member, MemberList, MembershipListKind, Room}, + session_view::content::room_details::MembershipSubpageItem, utils::{BoundObjectWeakRef, ExpressionListModel, LoadingState, expression}, }; @@ -31,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/content/room_details/members_page/members_list_view/mod.ui" )] #[properties(wrapper_type = super::MembersListView)] pub struct MembersListView { diff --git a/src/session/view/content/room_details/members_page/mod.blp b/src/session_view/content/room_details/members_page/mod.blp similarity index 100% rename from src/session/view/content/room_details/members_page/mod.blp rename to src/session_view/content/room_details/members_page/mod.blp diff --git a/src/session/view/content/room_details/members_page/mod.rs b/src/session_view/content/room_details/members_page/mod.rs similarity index 98% rename from src/session/view/content/room_details/members_page/mod.rs rename to src/session_view/content/room_details/members_page/mod.rs index 380e90ee..886a19b0 100644 --- a/src/session/view/content/room_details/members_page/mod.rs +++ b/src/session_view/content/room_details/members_page/mod.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/members_page/mod.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_details/members_page/mod.ui" )] #[properties(wrapper_type = super::MembersPage)] pub struct MembersPage { diff --git a/src/session/view/content/room_details/membership_subpage_item.rs b/src/session_view/content/room_details/membership_subpage_item.rs similarity index 100% rename from src/session/view/content/room_details/membership_subpage_item.rs rename to src/session_view/content/room_details/membership_subpage_item.rs diff --git a/src/session/view/content/room_details/mod.blp b/src/session_view/content/room_details/mod.blp similarity index 100% rename from src/session/view/content/room_details/mod.blp rename to src/session_view/content/room_details/mod.blp diff --git a/src/session/view/content/room_details/mod.rs b/src/session_view/content/room_details/mod.rs similarity index 99% rename from src/session/view/content/room_details/mod.rs rename to src/session_view/content/room_details/mod.rs index 12e2b534..94deec34 100644 --- a/src/session/view/content/room_details/mod.rs +++ b/src/session_view/content/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/content/room_details/mod.ui")] #[properties(wrapper_type = super::RoomDetails)] pub struct RoomDetails { /// The room to show the details for. diff --git a/src/session/view/content/room_details/permissions/add_members_subpage.blp b/src/session_view/content/room_details/permissions/add_members_subpage.blp similarity index 100% rename from src/session/view/content/room_details/permissions/add_members_subpage.blp rename to src/session_view/content/room_details/permissions/add_members_subpage.blp diff --git a/src/session/view/content/room_details/permissions/add_members_subpage.rs b/src/session_view/content/room_details/permissions/add_members_subpage.rs similarity index 99% rename from src/session/view/content/room_details/permissions/add_members_subpage.rs rename to src/session_view/content/room_details/permissions/add_members_subpage.rs index 355788f7..3911c405 100644 --- a/src/session/view/content/room_details/permissions/add_members_subpage.rs +++ b/src/session_view/content/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/content/room_details/permissions/add_members_subpage.ui" )] #[properties(wrapper_type = super::PermissionsAddMembersSubpage)] pub struct PermissionsAddMembersSubpage { diff --git a/src/session/view/content/room_details/permissions/member_power_level.rs b/src/session_view/content/room_details/permissions/member_power_level.rs similarity index 100% rename from src/session/view/content/room_details/permissions/member_power_level.rs rename to src/session_view/content/room_details/permissions/member_power_level.rs diff --git a/src/session/view/content/room_details/permissions/member_row.blp b/src/session_view/content/room_details/permissions/member_row.blp similarity index 100% rename from src/session/view/content/room_details/permissions/member_row.blp rename to src/session_view/content/room_details/permissions/member_row.blp diff --git a/src/session/view/content/room_details/permissions/member_row.rs b/src/session_view/content/room_details/permissions/member_row.rs similarity index 99% rename from src/session/view/content/room_details/permissions/member_row.rs rename to src/session_view/content/room_details/permissions/member_row.rs index 5383fe09..9274fd68 100644 --- a/src/session/view/content/room_details/permissions/member_row.rs +++ b/src/session_view/content/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/content/room_details/permissions/member_row.ui" )] #[properties(wrapper_type = super::PermissionsMemberRow)] pub struct PermissionsMemberRow { diff --git a/src/session/view/content/room_details/permissions/members_subpage.blp b/src/session_view/content/room_details/permissions/members_subpage.blp similarity index 100% rename from src/session/view/content/room_details/permissions/members_subpage.blp rename to src/session_view/content/room_details/permissions/members_subpage.blp diff --git a/src/session/view/content/room_details/permissions/members_subpage.rs b/src/session_view/content/room_details/permissions/members_subpage.rs similarity index 99% rename from src/session/view/content/room_details/permissions/members_subpage.rs rename to src/session_view/content/room_details/permissions/members_subpage.rs index 92c3e519..0a978d47 100644 --- a/src/session/view/content/room_details/permissions/members_subpage.rs +++ b/src/session_view/content/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/content/room_details/permissions/members_subpage.ui" )] #[properties(wrapper_type = super::PermissionsMembersSubpage)] pub struct PermissionsMembersSubpage { diff --git a/src/session/view/content/room_details/permissions/mod.rs b/src/session_view/content/room_details/permissions/mod.rs similarity index 100% rename from src/session/view/content/room_details/permissions/mod.rs rename to src/session_view/content/room_details/permissions/mod.rs diff --git a/src/session/view/content/room_details/permissions/permissions_subpage.blp b/src/session_view/content/room_details/permissions/permissions_subpage.blp similarity index 100% rename from src/session/view/content/room_details/permissions/permissions_subpage.blp rename to src/session_view/content/room_details/permissions/permissions_subpage.blp diff --git a/src/session/view/content/room_details/permissions/permissions_subpage.rs b/src/session_view/content/room_details/permissions/permissions_subpage.rs similarity index 99% rename from src/session/view/content/room_details/permissions/permissions_subpage.rs rename to src/session_view/content/room_details/permissions/permissions_subpage.rs index 5010c85c..4ff40fa2 100644 --- a/src/session/view/content/room_details/permissions/permissions_subpage.rs +++ b/src/session_view/content/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/content/room_details/permissions/permissions_subpage.ui" )] #[properties(wrapper_type = super::PermissionsSubpage)] pub struct PermissionsSubpage { diff --git a/src/session/view/content/room_details/permissions/privileged_members.rs b/src/session_view/content/room_details/permissions/privileged_members.rs similarity index 100% rename from src/session/view/content/room_details/permissions/privileged_members.rs rename to src/session_view/content/room_details/permissions/privileged_members.rs diff --git a/src/session/view/content/room_details/permissions/select_member_row.blp b/src/session_view/content/room_details/permissions/select_member_row.blp similarity index 100% rename from src/session/view/content/room_details/permissions/select_member_row.blp rename to src/session_view/content/room_details/permissions/select_member_row.blp diff --git a/src/session/view/content/room_details/permissions/select_member_row.rs b/src/session_view/content/room_details/permissions/select_member_row.rs similarity index 97% rename from src/session/view/content/room_details/permissions/select_member_row.rs rename to src/session_view/content/room_details/permissions/select_member_row.rs index e73b6915..93ef74cb 100644 --- a/src/session/view/content/room_details/permissions/select_member_row.rs +++ b/src/session_view/content/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/content/room_details/permissions/select_member_row.ui" )] #[properties(wrapper_type = super::PermissionsSelectMemberRow)] pub struct PermissionsSelectMemberRow { diff --git a/src/session/view/content/room_details/upgrade_dialog/mod.blp b/src/session_view/content/room_details/upgrade_dialog/mod.blp similarity index 100% rename from src/session/view/content/room_details/upgrade_dialog/mod.blp rename to src/session_view/content/room_details/upgrade_dialog/mod.blp diff --git a/src/session/view/content/room_details/upgrade_dialog/mod.rs b/src/session_view/content/room_details/upgrade_dialog/mod.rs similarity index 99% rename from src/session/view/content/room_details/upgrade_dialog/mod.rs rename to src/session_view/content/room_details/upgrade_dialog/mod.rs index c064adbf..c01946e6 100644 --- a/src/session/view/content/room_details/upgrade_dialog/mod.rs +++ b/src/session_view/content/room_details/upgrade_dialog/mod.rs @@ -23,7 +23,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate)] #[template( - resource = "/org/gnome/Fractal/ui/session/view/content/room_details/upgrade_dialog/mod.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_details/upgrade_dialog/mod.ui" )] pub struct UpgradeDialog { #[template_child] diff --git a/src/session/view/content/room_details/upgrade_dialog/room_version.rs b/src/session_view/content/room_details/upgrade_dialog/room_version.rs similarity index 100% rename from src/session/view/content/room_details/upgrade_dialog/room_version.rs rename to src/session_view/content/room_details/upgrade_dialog/room_version.rs diff --git a/src/session/view/content/room_history/divider_row.blp b/src/session_view/content/room_history/divider_row.blp similarity index 100% rename from src/session/view/content/room_history/divider_row.blp rename to src/session_view/content/room_history/divider_row.blp diff --git a/src/session/view/content/room_history/divider_row.rs b/src/session_view/content/room_history/divider_row.rs similarity index 98% rename from src/session/view/content/room_history/divider_row.rs rename to src/session_view/content/room_history/divider_row.rs index a9a74143..456290e8 100644 --- a/src/session/view/content/room_history/divider_row.rs +++ b/src/session_view/content/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/content/room_history/divider_row.ui")] #[properties(wrapper_type = super::DividerRow)] pub struct DividerRow { #[template_child] diff --git a/src/session/view/content/room_history/event_actions/context_menu.blp b/src/session_view/content/room_history/event_actions/context_menu.blp similarity index 100% rename from src/session/view/content/room_history/event_actions/context_menu.blp rename to src/session_view/content/room_history/event_actions/context_menu.blp diff --git a/src/session/view/content/room_history/event_actions/context_menu.rs b/src/session_view/content/room_history/event_actions/context_menu.rs similarity index 98% rename from src/session/view/content/room_history/event_actions/context_menu.rs rename to src/session_view/content/room_history/event_actions/context_menu.rs index 1832f9ae..c9743370 100644 --- a/src/session/view/content/room_history/event_actions/context_menu.rs +++ b/src/session_view/content/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/content/room_history/event_actions/context_menu.ui", ) .object::("event-actions-menu") .expect("GResource and menu should exist"); diff --git a/src/session/view/content/room_history/event_actions/group.rs b/src/session_view/content/room_history/event_actions/group.rs similarity index 100% rename from src/session/view/content/room_history/event_actions/group.rs rename to src/session_view/content/room_history/event_actions/group.rs diff --git a/src/session/view/content/room_history/event_actions/mod.rs b/src/session_view/content/room_history/event_actions/mod.rs similarity index 100% rename from src/session/view/content/room_history/event_actions/mod.rs rename to src/session_view/content/room_history/event_actions/mod.rs diff --git a/src/session/view/content/room_history/event_actions/properties_dialog.blp b/src/session_view/content/room_history/event_actions/properties_dialog.blp similarity index 100% rename from src/session/view/content/room_history/event_actions/properties_dialog.blp rename to src/session_view/content/room_history/event_actions/properties_dialog.blp diff --git a/src/session/view/content/room_history/event_actions/properties_dialog.rs b/src/session_view/content/room_history/event_actions/properties_dialog.rs similarity index 98% rename from src/session/view/content/room_history/event_actions/properties_dialog.rs rename to src/session_view/content/room_history/event_actions/properties_dialog.rs index fe84152f..03855378 100644 --- a/src/session/view/content/room_history/event_actions/properties_dialog.rs +++ b/src/session_view/content/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/content/room_history/event_actions/properties_dialog.ui" )] #[properties(wrapper_type = super::EventPropertiesDialog)] pub struct EventPropertiesDialog { diff --git a/src/session/view/content/room_history/event_actions/quick_reaction_chooser.blp b/src/session_view/content/room_history/event_actions/quick_reaction_chooser.blp similarity index 100% rename from src/session/view/content/room_history/event_actions/quick_reaction_chooser.blp rename to src/session_view/content/room_history/event_actions/quick_reaction_chooser.blp diff --git a/src/session/view/content/room_history/event_actions/quick_reaction_chooser.rs b/src/session_view/content/room_history/event_actions/quick_reaction_chooser.rs similarity index 99% rename from src/session/view/content/room_history/event_actions/quick_reaction_chooser.rs rename to src/session_view/content/room_history/event_actions/quick_reaction_chooser.rs index df7999fd..15b6a3df 100644 --- a/src/session/view/content/room_history/event_actions/quick_reaction_chooser.rs +++ b/src/session_view/content/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/content/room_history/event_actions/quick_reaction_chooser.ui" )] #[properties(wrapper_type = super::QuickReactionChooser)] pub struct QuickReactionChooser { diff --git a/src/session/view/content/room_history/event_row.rs b/src/session_view/content/room_history/event_row.rs similarity index 99% rename from src/session/view/content/room_history/event_row.rs rename to src/session_view/content/room_history/event_row.rs index 2aed2be2..514be85d 100644 --- a/src/session/view/content/room_history/event_row.rs +++ b/src/session_view/content/room_history/event_row.rs @@ -6,7 +6,8 @@ use super::{EventActionsGroup, MessageRow, RoomHistory, StateRow}; use crate::{ components::ContextMenuBin, prelude::*, - session::{model::Event, view::content::room_history::message_toolbar::ComposerState}, + session::model::Event, + session_view::content::room_history::message_toolbar::ComposerState, utils::{BoundObject, BoundObjectWeakRef}, }; diff --git a/src/session/view/content/room_history/member_timestamp/mod.rs b/src/session_view/content/room_history/member_timestamp/mod.rs similarity index 100% rename from src/session/view/content/room_history/member_timestamp/mod.rs rename to src/session_view/content/room_history/member_timestamp/mod.rs diff --git a/src/session/view/content/room_history/member_timestamp/row.blp b/src/session_view/content/room_history/member_timestamp/row.blp similarity index 100% rename from src/session/view/content/room_history/member_timestamp/row.blp rename to src/session_view/content/room_history/member_timestamp/row.blp diff --git a/src/session/view/content/room_history/member_timestamp/row.rs b/src/session_view/content/room_history/member_timestamp/row.rs similarity index 98% rename from src/session/view/content/room_history/member_timestamp/row.rs rename to src/session_view/content/room_history/member_timestamp/row.rs index 9c715a0d..03832418 100644 --- a/src/session/view/content/room_history/member_timestamp/row.rs +++ b/src/session_view/content/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/content/room_history/member_timestamp/row.ui" )] #[properties(wrapper_type = super::MemberTimestampRow)] pub struct MemberTimestampRow { diff --git a/src/session/view/content/room_history/message_row/audio.blp b/src/session_view/content/room_history/message_row/audio.blp similarity index 100% rename from src/session/view/content/room_history/message_row/audio.blp rename to src/session_view/content/room_history/message_row/audio.blp diff --git a/src/session/view/content/room_history/message_row/audio.rs b/src/session_view/content/room_history/message_row/audio.rs similarity index 98% rename from src/session/view/content/room_history/message_row/audio.rs rename to src/session_view/content/room_history/message_row/audio.rs index 2abf40da..362ac795 100644 --- a/src/session/view/content/room_history/message_row/audio.rs +++ b/src/session_view/content/room_history/message_row/audio.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/message_row/audio.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_history/message_row/audio.ui" )] #[properties(wrapper_type = super::MessageAudio)] pub struct MessageAudio { diff --git a/src/session/view/content/room_history/message_row/caption.rs b/src/session_view/content/room_history/message_row/caption.rs similarity index 100% rename from src/session/view/content/room_history/message_row/caption.rs rename to src/session_view/content/room_history/message_row/caption.rs diff --git a/src/session/view/content/room_history/message_row/content.rs b/src/session_view/content/room_history/message_row/content.rs similarity index 99% rename from src/session/view/content/room_history/message_row/content.rs rename to src/session_view/content/room_history/message_row/content.rs index 605b1a4c..7d0bdd83 100644 --- a/src/session/view/content/room_history/message_row/content.rs +++ b/src/session_view/content/room_history/message_row/content.rs @@ -12,10 +12,8 @@ use super::{ use crate::{ components::AudioPlayerMessage, prelude::*, - session::{ - model::{Event, Member, Room}, - view::content::room_history::message_toolbar::MessageEventSource, - }, + session::model::{Event, Member, Room}, + session_view::content::room_history::message_toolbar::MessageEventSource, spawn, utils::matrix::{MediaMessage, MessageCacheKey}, }; diff --git a/src/session/view/content/room_history/message_row/file.blp b/src/session_view/content/room_history/message_row/file.blp similarity index 100% rename from src/session/view/content/room_history/message_row/file.blp rename to src/session_view/content/room_history/message_row/file.blp diff --git a/src/session/view/content/room_history/message_row/file.rs b/src/session_view/content/room_history/message_row/file.rs similarity index 97% rename from src/session/view/content/room_history/message_row/file.rs rename to src/session_view/content/room_history/message_row/file.rs index a5465a12..3eb7b12a 100644 --- a/src/session/view/content/room_history/message_row/file.rs +++ b/src/session_view/content/room_history/message_row/file.rs @@ -14,7 +14,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session/view/content/room_history/message_row/file.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_history/message_row/file.ui" )] #[properties(wrapper_type = super::MessageFile)] pub struct MessageFile { diff --git a/src/session/view/content/room_history/message_row/location.blp b/src/session_view/content/room_history/message_row/location.blp similarity index 100% rename from src/session/view/content/room_history/message_row/location.blp rename to src/session_view/content/room_history/message_row/location.blp diff --git a/src/session/view/content/room_history/message_row/location.rs b/src/session_view/content/room_history/message_row/location.rs similarity index 98% rename from src/session/view/content/room_history/message_row/location.rs rename to src/session_view/content/room_history/message_row/location.rs index a2694306..b723f565 100644 --- a/src/session/view/content/room_history/message_row/location.rs +++ b/src/session_view/content/room_history/message_row/location.rs @@ -14,7 +14,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate)] #[template( - resource = "/org/gnome/Fractal/ui/session/view/content/room_history/message_row/location.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_history/message_row/location.ui" )] pub struct MessageLocation { #[template_child] diff --git a/src/session/view/content/room_history/message_row/message_state_stack.blp b/src/session_view/content/room_history/message_row/message_state_stack.blp similarity index 100% rename from src/session/view/content/room_history/message_row/message_state_stack.blp rename to src/session_view/content/room_history/message_row/message_state_stack.blp diff --git a/src/session/view/content/room_history/message_row/message_state_stack.rs b/src/session_view/content/room_history/message_row/message_state_stack.rs similarity index 98% rename from src/session/view/content/room_history/message_row/message_state_stack.rs rename to src/session_view/content/room_history/message_row/message_state_stack.rs index a49d89ea..6406ddd1 100644 --- a/src/session/view/content/room_history/message_row/message_state_stack.rs +++ b/src/session_view/content/room_history/message_row/message_state_stack.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/message_row/message_state_stack.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_history/message_row/message_state_stack.ui" )] #[properties(wrapper_type = super::MessageStateStack)] pub struct MessageStateStack { diff --git a/src/session/view/content/room_history/message_row/mod.blp b/src/session_view/content/room_history/message_row/mod.blp similarity index 100% rename from src/session/view/content/room_history/message_row/mod.blp rename to src/session_view/content/room_history/message_row/mod.blp diff --git a/src/session/view/content/room_history/message_row/mod.rs b/src/session_view/content/room_history/message_row/mod.rs similarity index 99% rename from src/session/view/content/room_history/message_row/mod.rs rename to src/session_view/content/room_history/message_row/mod.rs index 17003a01..a1ace2bb 100644 --- a/src/session/view/content/room_history/message_row/mod.rs +++ b/src/session_view/content/room_history/message_row/mod.rs @@ -40,7 +40,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session/view/content/room_history/message_row/mod.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_history/message_row/mod.ui" )] #[properties(wrapper_type = super::MessageRow)] pub struct MessageRow { diff --git a/src/session/view/content/room_history/message_row/reaction/mod.blp b/src/session_view/content/room_history/message_row/reaction/mod.blp similarity index 100% rename from src/session/view/content/room_history/message_row/reaction/mod.blp rename to src/session_view/content/room_history/message_row/reaction/mod.blp diff --git a/src/session/view/content/room_history/message_row/reaction/mod.rs b/src/session_view/content/room_history/message_row/reaction/mod.rs similarity index 97% rename from src/session/view/content/room_history/message_row/reaction/mod.rs rename to src/session_view/content/room_history/message_row/reaction/mod.rs index 996991be..1ac1cd6b 100644 --- a/src/session/view/content/room_history/message_row/reaction/mod.rs +++ b/src/session_view/content/room_history/message_row/reaction/mod.rs @@ -6,10 +6,8 @@ use self::reaction_popover::ReactionPopover; use crate::{ gettext_f, ngettext_f, prelude::*, - session::{ - model::{Member, MemberList, ReactionData, ReactionGroup}, - view::content::room_history::member_timestamp::MemberTimestamp, - }, + session::model::{Member, MemberList, ReactionData, ReactionGroup}, + session_view::content::room_history::member_timestamp::MemberTimestamp, utils::{BoundObjectWeakRef, EMOJI_REGEX, key_bindings}, }; @@ -22,7 +20,7 @@ mod imp { #[derive(Debug, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session/view/content/room_history/message_row/reaction/mod.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_history/message_row/reaction/mod.ui" )] #[properties(wrapper_type = super::MessageReaction)] pub struct MessageReaction { diff --git a/src/session/view/content/room_history/message_row/reaction/reaction_popover.blp b/src/session_view/content/room_history/message_row/reaction/reaction_popover.blp similarity index 100% rename from src/session/view/content/room_history/message_row/reaction/reaction_popover.blp rename to src/session_view/content/room_history/message_row/reaction/reaction_popover.blp diff --git a/src/session/view/content/room_history/message_row/reaction/reaction_popover.rs b/src/session_view/content/room_history/message_row/reaction/reaction_popover.rs similarity index 95% rename from src/session/view/content/room_history/message_row/reaction/reaction_popover.rs rename to src/session_view/content/room_history/message_row/reaction/reaction_popover.rs index 95454c26..d95349d6 100644 --- a/src/session/view/content/room_history/message_row/reaction/reaction_popover.rs +++ b/src/session_view/content/room_history/message_row/reaction/reaction_popover.rs @@ -3,7 +3,7 @@ use gtk::{gio, glib, glib::clone}; use crate::{ components::UserProfileDialog, - session::view::content::room_history::member_timestamp::{ + session_view::content::room_history::member_timestamp::{ MemberTimestamp, row::MemberTimestampRow, }, }; @@ -15,7 +15,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session/view/content/room_history/message_row/reaction/reaction_popover.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_history/message_row/reaction/reaction_popover.ui" )] #[properties(wrapper_type = super::ReactionPopover)] pub struct ReactionPopover { diff --git a/src/session/view/content/room_history/message_row/reaction_list.blp b/src/session_view/content/room_history/message_row/reaction_list.blp similarity index 100% rename from src/session/view/content/room_history/message_row/reaction_list.blp rename to src/session_view/content/room_history/message_row/reaction_list.blp diff --git a/src/session/view/content/room_history/message_row/reaction_list.rs b/src/session_view/content/room_history/message_row/reaction_list.rs similarity index 97% rename from src/session/view/content/room_history/message_row/reaction_list.rs rename to src/session_view/content/room_history/message_row/reaction_list.rs index 1c0356d3..33f12365 100644 --- a/src/session/view/content/room_history/message_row/reaction_list.rs +++ b/src/session_view/content/room_history/message_row/reaction_list.rs @@ -11,7 +11,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate)] #[template( - resource = "/org/gnome/Fractal/ui/session/view/content/room_history/message_row/reaction_list.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_history/message_row/reaction_list.ui" )] pub struct MessageReactionList { #[template_child] diff --git a/src/session/view/content/room_history/message_row/reply.blp b/src/session_view/content/room_history/message_row/reply.blp similarity index 100% rename from src/session/view/content/room_history/message_row/reply.blp rename to src/session_view/content/room_history/message_row/reply.blp diff --git a/src/session/view/content/room_history/message_row/reply.rs b/src/session_view/content/room_history/message_row/reply.rs similarity index 98% rename from src/session/view/content/room_history/message_row/reply.rs rename to src/session_view/content/room_history/message_row/reply.rs index 9b11a9c5..36a6d4e9 100644 --- a/src/session/view/content/room_history/message_row/reply.rs +++ b/src/session_view/content/room_history/message_row/reply.rs @@ -12,7 +12,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session/view/content/room_history/message_row/reply.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_history/message_row/reply.ui" )] #[properties(wrapper_type = super::MessageReply)] pub struct MessageReply { diff --git a/src/session/view/content/room_history/message_row/sender_name.blp b/src/session_view/content/room_history/message_row/sender_name.blp similarity index 100% rename from src/session/view/content/room_history/message_row/sender_name.blp rename to src/session_view/content/room_history/message_row/sender_name.blp diff --git a/src/session/view/content/room_history/message_row/sender_name.rs b/src/session_view/content/room_history/message_row/sender_name.rs similarity index 97% rename from src/session/view/content/room_history/message_row/sender_name.rs rename to src/session_view/content/room_history/message_row/sender_name.rs index 7a4c4004..e1db1a40 100644 --- a/src/session/view/content/room_history/message_row/sender_name.rs +++ b/src/session_view/content/room_history/message_row/sender_name.rs @@ -4,10 +4,8 @@ use gtk::{glib, glib::clone}; use crate::{ prelude::*, - session::{ - model::{Member, Membership}, - view::content::RoomHistory, - }, + session::model::{Member, Membership}, + session_view::content::RoomHistory, utils::{BoundObject, key_bindings}, }; @@ -20,7 +18,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session/view/content/room_history/message_row/sender_name.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_history/message_row/sender_name.ui" )] #[properties(wrapper_type = super::MessageSenderName)] pub struct MessageSenderName { diff --git a/src/session/view/content/room_history/message_row/text/inline_html.rs b/src/session_view/content/room_history/message_row/text/inline_html.rs similarity index 100% rename from src/session/view/content/room_history/message_row/text/inline_html.rs rename to src/session_view/content/room_history/message_row/text/inline_html.rs diff --git a/src/session/view/content/room_history/message_row/text/mod.rs b/src/session_view/content/room_history/message_row/text/mod.rs similarity index 100% rename from src/session/view/content/room_history/message_row/text/mod.rs rename to src/session_view/content/room_history/message_row/text/mod.rs diff --git a/src/session/view/content/room_history/message_row/text/tests.rs b/src/session_view/content/room_history/message_row/text/tests.rs similarity index 100% rename from src/session/view/content/room_history/message_row/text/tests.rs rename to src/session_view/content/room_history/message_row/text/tests.rs diff --git a/src/session/view/content/room_history/message_row/text/widgets.rs b/src/session_view/content/room_history/message_row/text/widgets.rs similarity index 100% rename from src/session/view/content/room_history/message_row/text/widgets.rs rename to src/session_view/content/room_history/message_row/text/widgets.rs diff --git a/src/session/view/content/room_history/message_row/visual_media.blp b/src/session_view/content/room_history/message_row/visual_media.blp similarity index 100% rename from src/session/view/content/room_history/message_row/visual_media.blp rename to src/session_view/content/room_history/message_row/visual_media.blp diff --git a/src/session/view/content/room_history/message_row/visual_media.rs b/src/session_view/content/room_history/message_row/visual_media.rs similarity index 99% rename from src/session/view/content/room_history/message_row/visual_media.rs rename to src/session_view/content/room_history/message_row/visual_media.rs index 5dcef9eb..ae48f275 100644 --- a/src/session/view/content/room_history/message_row/visual_media.rs +++ b/src/session_view/content/room_history/message_row/visual_media.rs @@ -50,7 +50,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session/view/content/room_history/message_row/visual_media.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_history/message_row/visual_media.ui" )] #[properties(wrapper_type = super::MessageVisualMedia)] pub struct MessageVisualMedia { diff --git a/src/session/view/content/room_history/message_toolbar/attachment_dialog.blp b/src/session_view/content/room_history/message_toolbar/attachment_dialog.blp similarity index 100% rename from src/session/view/content/room_history/message_toolbar/attachment_dialog.blp rename to src/session_view/content/room_history/message_toolbar/attachment_dialog.blp diff --git a/src/session/view/content/room_history/message_toolbar/attachment_dialog.rs b/src/session_view/content/room_history/message_toolbar/attachment_dialog.rs similarity index 98% rename from src/session/view/content/room_history/message_toolbar/attachment_dialog.rs rename to src/session_view/content/room_history/message_toolbar/attachment_dialog.rs index e9691c48..c1ae5961 100644 --- a/src/session/view/content/room_history/message_toolbar/attachment_dialog.rs +++ b/src/session_view/content/room_history/message_toolbar/attachment_dialog.rs @@ -10,7 +10,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate)] #[template( - resource = "/org/gnome/Fractal/ui/session/view/content/room_history/message_toolbar/attachment_dialog.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_history/message_toolbar/attachment_dialog.ui" )] pub struct AttachmentDialog { #[template_child] diff --git a/src/session/view/content/room_history/message_toolbar/completion/completion_popover.blp b/src/session_view/content/room_history/message_toolbar/completion/completion_popover.blp similarity index 100% rename from src/session/view/content/room_history/message_toolbar/completion/completion_popover.blp rename to src/session_view/content/room_history/message_toolbar/completion/completion_popover.blp diff --git a/src/session/view/content/room_history/message_toolbar/completion/completion_popover.rs b/src/session_view/content/room_history/message_toolbar/completion/completion_popover.rs similarity index 99% rename from src/session/view/content/room_history/message_toolbar/completion/completion_popover.rs rename to src/session_view/content/room_history/message_toolbar/completion/completion_popover.rs index b1f7ec07..bd3ae3eb 100644 --- a/src/session/view/content/room_history/message_toolbar/completion/completion_popover.rs +++ b/src/session_view/content/room_history/message_toolbar/completion/completion_popover.rs @@ -6,7 +6,8 @@ use secular::normalized_lower_lay_string; use super::{CompletionMemberList, CompletionRoomList}; use crate::{ components::{AvatarImageSafetySetting, Pill, PillSource, PillSourceRow}, - session::{model::Room, view::content::room_history::message_toolbar::MessageToolbar}, + session::model::Room, + session_view::content::room_history::message_toolbar::MessageToolbar, utils::BoundObject, }; @@ -29,7 +30,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session/view/content/room_history/message_toolbar/completion/completion_popover.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_history/message_toolbar/completion/completion_popover.ui" )] #[properties(wrapper_type = super::CompletionPopover)] pub struct CompletionPopover { diff --git a/src/session/view/content/room_history/message_toolbar/completion/member_list.rs b/src/session_view/content/room_history/message_toolbar/completion/member_list.rs similarity index 100% rename from src/session/view/content/room_history/message_toolbar/completion/member_list.rs rename to src/session_view/content/room_history/message_toolbar/completion/member_list.rs diff --git a/src/session/view/content/room_history/message_toolbar/completion/mod.rs b/src/session_view/content/room_history/message_toolbar/completion/mod.rs similarity index 100% rename from src/session/view/content/room_history/message_toolbar/completion/mod.rs rename to src/session_view/content/room_history/message_toolbar/completion/mod.rs diff --git a/src/session/view/content/room_history/message_toolbar/completion/room_list.rs b/src/session_view/content/room_history/message_toolbar/completion/room_list.rs similarity index 100% rename from src/session/view/content/room_history/message_toolbar/completion/room_list.rs rename to src/session_view/content/room_history/message_toolbar/completion/room_list.rs diff --git a/src/session/view/content/room_history/message_toolbar/composer_parser.rs b/src/session_view/content/room_history/message_toolbar/composer_parser.rs similarity index 100% rename from src/session/view/content/room_history/message_toolbar/composer_parser.rs rename to src/session_view/content/room_history/message_toolbar/composer_parser.rs diff --git a/src/session/view/content/room_history/message_toolbar/composer_state.rs b/src/session_view/content/room_history/message_toolbar/composer_state.rs similarity index 100% rename from src/session/view/content/room_history/message_toolbar/composer_state.rs rename to src/session_view/content/room_history/message_toolbar/composer_state.rs diff --git a/src/session/view/content/room_history/message_toolbar/mod.blp b/src/session_view/content/room_history/message_toolbar/mod.blp similarity index 100% rename from src/session/view/content/room_history/message_toolbar/mod.blp rename to src/session_view/content/room_history/message_toolbar/mod.blp diff --git a/src/session/view/content/room_history/message_toolbar/mod.rs b/src/session_view/content/room_history/message_toolbar/mod.rs similarity index 99% rename from src/session/view/content/room_history/message_toolbar/mod.rs rename to src/session_view/content/room_history/message_toolbar/mod.rs index 50020aa6..15eb8403 100644 --- a/src/session/view/content/room_history/message_toolbar/mod.rs +++ b/src/session_view/content/room_history/message_toolbar/mod.rs @@ -77,7 +77,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session/view/content/room_history/message_toolbar/mod.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_history/message_toolbar/mod.ui" )] #[properties(wrapper_type = super::MessageToolbar)] pub struct MessageToolbar { diff --git a/src/session/view/content/room_history/mod.blp b/src/session_view/content/room_history/mod.blp similarity index 100% rename from src/session/view/content/room_history/mod.blp rename to src/session_view/content/room_history/mod.blp diff --git a/src/session/view/content/room_history/mod.rs b/src/session_view/content/room_history/mod.rs similarity index 99% rename from src/session/view/content/room_history/mod.rs rename to src/session_view/content/room_history/mod.rs index c166c517..54a9b58b 100644 --- a/src/session/view/content/room_history/mod.rs +++ b/src/session_view/content/room_history/mod.rs @@ -66,7 +66,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template(resource = "/org/gnome/Fractal/ui/session/view/content/room_history/mod.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/content/room_history/mod.ui")] #[properties(wrapper_type = super::RoomHistory)] pub struct RoomHistory { #[template_child] diff --git a/src/session/view/content/room_history/read_receipts_list/mod.blp b/src/session_view/content/room_history/read_receipts_list/mod.blp similarity index 100% rename from src/session/view/content/room_history/read_receipts_list/mod.blp rename to src/session_view/content/room_history/read_receipts_list/mod.blp 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 similarity index 99% rename from src/session/view/content/room_history/read_receipts_list/mod.rs rename to src/session_view/content/room_history/read_receipts_list/mod.rs index ebf9394b..0e518e03 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 @@ -25,7 +25,7 @@ mod imp { #[derive(Debug, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session/view/content/room_history/read_receipts_list/mod.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_history/read_receipts_list/mod.ui" )] #[properties(wrapper_type = super::ReadReceiptsList)] pub struct ReadReceiptsList { diff --git a/src/session/view/content/room_history/read_receipts_list/read_receipts_popover.blp b/src/session_view/content/room_history/read_receipts_list/read_receipts_popover.blp similarity index 100% rename from src/session/view/content/room_history/read_receipts_list/read_receipts_popover.blp rename to src/session_view/content/room_history/read_receipts_list/read_receipts_popover.blp diff --git a/src/session/view/content/room_history/read_receipts_list/read_receipts_popover.rs b/src/session_view/content/room_history/read_receipts_list/read_receipts_popover.rs similarity index 96% rename from src/session/view/content/room_history/read_receipts_list/read_receipts_popover.rs rename to src/session_view/content/room_history/read_receipts_list/read_receipts_popover.rs index 3d2ae992..339de05b 100644 --- a/src/session/view/content/room_history/read_receipts_list/read_receipts_popover.rs +++ b/src/session_view/content/room_history/read_receipts_list/read_receipts_popover.rs @@ -3,7 +3,7 @@ use gtk::{gio, glib, glib::clone, subclass::prelude::*}; use crate::{ components::UserProfileDialog, - session::view::content::room_history::member_timestamp::{ + session_view::content::room_history::member_timestamp::{ MemberTimestamp, row::MemberTimestampRow, }, }; @@ -15,7 +15,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session/view/content/room_history/read_receipts_list/read_receipts_popover.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_history/read_receipts_list/read_receipts_popover.ui" )] #[properties(wrapper_type = super::ReadReceiptsPopover)] pub struct ReadReceiptsPopover { diff --git a/src/session/view/content/room_history/state/content.rs b/src/session_view/content/room_history/state/content.rs similarity index 100% rename from src/session/view/content/room_history/state/content.rs rename to src/session_view/content/room_history/state/content.rs diff --git a/src/session/view/content/room_history/state/creation.blp b/src/session_view/content/room_history/state/creation.blp similarity index 100% rename from src/session/view/content/room_history/state/creation.blp rename to src/session_view/content/room_history/state/creation.blp diff --git a/src/session/view/content/room_history/state/creation.rs b/src/session_view/content/room_history/state/creation.rs similarity index 97% rename from src/session/view/content/room_history/state/creation.rs rename to src/session_view/content/room_history/state/creation.rs index 600e9a7c..89605e42 100644 --- a/src/session/view/content/room_history/state/creation.rs +++ b/src/session_view/content/room_history/state/creation.rs @@ -11,7 +11,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate)] #[template( - resource = "/org/gnome/Fractal/ui/session/view/content/room_history/state/creation.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_history/state/creation.ui" )] pub struct StateCreation { #[template_child] diff --git a/src/session/view/content/room_history/state/group_item_row.rs b/src/session_view/content/room_history/state/group_item_row.rs similarity index 98% rename from src/session/view/content/room_history/state/group_item_row.rs rename to src/session_view/content/room_history/state/group_item_row.rs index f3f3ec9c..0db5ea05 100644 --- a/src/session/view/content/room_history/state/group_item_row.rs +++ b/src/session_view/content/room_history/state/group_item_row.rs @@ -4,10 +4,8 @@ use tracing::error; use super::StateContent; use crate::{ prelude::*, - session::{ - model::Event, - view::content::room_history::{EventActionsGroup, RoomHistory}, - }, + session::model::Event, + session_view::content::room_history::{EventActionsGroup, RoomHistory}, utils::{BoundObject, BoundObjectWeakRef, key_bindings}, }; diff --git a/src/session/view/content/room_history/state/group_row.blp b/src/session_view/content/room_history/state/group_row.blp similarity index 100% rename from src/session/view/content/room_history/state/group_row.blp rename to src/session_view/content/room_history/state/group_row.blp diff --git a/src/session/view/content/room_history/state/group_row.rs b/src/session_view/content/room_history/state/group_row.rs similarity index 98% rename from src/session/view/content/room_history/state/group_row.rs rename to src/session_view/content/room_history/state/group_row.rs index 1def959e..93c3d021 100644 --- a/src/session/view/content/room_history/state/group_row.rs +++ b/src/session_view/content/room_history/state/group_row.rs @@ -5,10 +5,8 @@ use super::StateGroupItemRow; use crate::{ ngettext_f, prelude::*, - session::{ - model::{Event, Room}, - view::content::room_history::ReadReceiptsList, - }, + session::model::{Event, Room}, + session_view::content::room_history::ReadReceiptsList, utils::{BoundObject, GroupingListGroup, key_bindings}, }; @@ -24,7 +22,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session/view/content/room_history/state/group_row.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_history/state/group_row.ui" )] #[properties(wrapper_type = super::StateGroupRow)] pub struct StateGroupRow { diff --git a/src/session/view/content/room_history/state/mod.rs b/src/session_view/content/room_history/state/mod.rs similarity index 100% rename from src/session/view/content/room_history/state/mod.rs rename to src/session_view/content/room_history/state/mod.rs diff --git a/src/session/view/content/room_history/state/row.blp b/src/session_view/content/room_history/state/row.blp similarity index 100% rename from src/session/view/content/room_history/state/row.blp rename to src/session_view/content/room_history/state/row.blp diff --git a/src/session/view/content/room_history/state/row.rs b/src/session_view/content/room_history/state/row.rs similarity index 90% rename from src/session/view/content/room_history/state/row.rs rename to src/session_view/content/room_history/state/row.rs index 724a16c9..523ed4ce 100644 --- a/src/session/view/content/room_history/state/row.rs +++ b/src/session_view/content/room_history/state/row.rs @@ -2,7 +2,7 @@ use adw::{prelude::*, subclass::prelude::*}; use gtk::glib; use super::StateContent; -use crate::session::{model::Event, view::content::room_history::ReadReceiptsList}; +use crate::{session::model::Event, session_view::content::room_history::ReadReceiptsList}; mod imp { use std::cell::RefCell; @@ -12,7 +12,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template(resource = "/org/gnome/Fractal/ui/session/view/content/room_history/state/row.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/content/room_history/state/row.ui")] #[properties(wrapper_type = super::StateRow)] pub struct StateRow { /// The state event displayed by this widget. diff --git a/src/session/view/content/room_history/title.blp b/src/session_view/content/room_history/title.blp similarity index 100% rename from src/session/view/content/room_history/title.blp rename to src/session_view/content/room_history/title.blp diff --git a/src/session/view/content/room_history/title.rs b/src/session_view/content/room_history/title.rs similarity index 98% rename from src/session/view/content/room_history/title.rs rename to src/session_view/content/room_history/title.rs index 7fb308d9..06c990c3 100644 --- a/src/session/view/content/room_history/title.rs +++ b/src/session_view/content/room_history/title.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/room_history/title.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/content/room_history/title.ui")] #[properties(wrapper_type = super::RoomHistoryTitle)] pub struct RoomHistoryTitle { #[template_child] diff --git a/src/session/view/content/room_history/typing_row.blp b/src/session_view/content/room_history/typing_row.blp similarity index 100% rename from src/session/view/content/room_history/typing_row.blp rename to src/session_view/content/room_history/typing_row.blp diff --git a/src/session/view/content/room_history/typing_row.rs b/src/session_view/content/room_history/typing_row.rs similarity index 98% rename from src/session/view/content/room_history/typing_row.rs rename to src/session_view/content/room_history/typing_row.rs index 5051fdc1..03f34418 100644 --- a/src/session/view/content/room_history/typing_row.rs +++ b/src/session_view/content/room_history/typing_row.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/room_history/typing_row.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/content/room_history/typing_row.ui")] #[properties(wrapper_type = super::TypingRow)] pub struct TypingRow { #[template_child] diff --git a/src/session/view/content/room_history/verification_info_bar.blp b/src/session_view/content/room_history/verification_info_bar.blp similarity index 100% rename from src/session/view/content/room_history/verification_info_bar.blp rename to src/session_view/content/room_history/verification_info_bar.blp diff --git a/src/session/view/content/room_history/verification_info_bar.rs b/src/session_view/content/room_history/verification_info_bar.rs similarity index 99% rename from src/session/view/content/room_history/verification_info_bar.rs rename to src/session_view/content/room_history/verification_info_bar.rs index 1bbc1ec3..152e8f86 100644 --- a/src/session/view/content/room_history/verification_info_bar.rs +++ b/src/session_view/content/room_history/verification_info_bar.rs @@ -21,7 +21,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session/view/content/room_history/verification_info_bar.ui" + resource = "/org/gnome/Fractal/ui/session_view/content/room_history/verification_info_bar.ui" )] #[properties(wrapper_type = super::VerificationInfoBar)] pub struct VerificationInfoBar { diff --git a/src/session/view/create_direct_chat_dialog/mod.blp b/src/session_view/create_direct_chat_dialog/mod.blp similarity index 100% rename from src/session/view/create_direct_chat_dialog/mod.blp rename to src/session_view/create_direct_chat_dialog/mod.blp diff --git a/src/session/view/create_direct_chat_dialog/mod.rs b/src/session_view/create_direct_chat_dialog/mod.rs similarity index 99% rename from src/session/view/create_direct_chat_dialog/mod.rs rename to src/session_view/create_direct_chat_dialog/mod.rs index fc21b40d..b63b4040 100644 --- a/src/session/view/create_direct_chat_dialog/mod.rs +++ b/src/session_view/create_direct_chat_dialog/mod.rs @@ -35,7 +35,7 @@ mod imp { use crate::utils::LoadingState; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template(resource = "/org/gnome/Fractal/ui/session/view/create_direct_chat_dialog/mod.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/create_direct_chat_dialog/mod.ui")] #[properties(wrapper_type = super::CreateDirectChatDialog)] pub struct CreateDirectChatDialog { #[template_child] diff --git a/src/session/view/create_direct_chat_dialog/user.rs b/src/session_view/create_direct_chat_dialog/user.rs similarity index 100% rename from src/session/view/create_direct_chat_dialog/user.rs rename to src/session_view/create_direct_chat_dialog/user.rs diff --git a/src/session/view/create_direct_chat_dialog/user_list.rs b/src/session_view/create_direct_chat_dialog/user_list.rs similarity index 100% rename from src/session/view/create_direct_chat_dialog/user_list.rs rename to src/session_view/create_direct_chat_dialog/user_list.rs diff --git a/src/session/view/create_room_dialog.blp b/src/session_view/create_room_dialog.blp similarity index 100% rename from src/session/view/create_room_dialog.blp rename to src/session_view/create_room_dialog.blp diff --git a/src/session/view/create_room_dialog.rs b/src/session_view/create_room_dialog.rs similarity index 99% rename from src/session/view/create_room_dialog.rs rename to src/session_view/create_room_dialog.rs index 718090e2..7b552822 100644 --- a/src/session/view/create_room_dialog.rs +++ b/src/session_view/create_room_dialog.rs @@ -31,7 +31,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template(resource = "/org/gnome/Fractal/ui/session/view/create_room_dialog.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/create_room_dialog.ui")] #[properties(wrapper_type = super::CreateRoomDialog)] pub struct CreateRoomDialog { #[template_child] diff --git a/src/session/view/media_viewer.blp b/src/session_view/media_viewer.blp similarity index 100% rename from src/session/view/media_viewer.blp rename to src/session_view/media_viewer.blp diff --git a/src/session/view/media_viewer.rs b/src/session_view/media_viewer.rs similarity index 99% rename from src/session/view/media_viewer.rs rename to src/session_view/media_viewer.rs index 19a4f4d8..404918d1 100644 --- a/src/session/view/media_viewer.rs +++ b/src/session_view/media_viewer.rs @@ -27,7 +27,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template(resource = "/org/gnome/Fractal/ui/session/view/media_viewer.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/media_viewer.ui")] #[properties(wrapper_type = super::MediaViewer)] pub struct MediaViewer { #[template_child] diff --git a/src/session/view/session_view.blp b/src/session_view/mod.blp similarity index 100% rename from src/session/view/session_view.blp rename to src/session_view/mod.blp diff --git a/src/session/view/session_view.rs b/src/session_view/mod.rs similarity index 98% rename from src/session/view/session_view.rs rename to src/session_view/mod.rs index 479f3399..996b56bd 100644 --- a/src/session/view/session_view.rs +++ b/src/session_view/mod.rs @@ -3,7 +3,16 @@ use gtk::{gdk, glib, glib::clone}; use ruma::{OwnedEventId, OwnedUserId, RoomId, RoomOrAliasId}; use tracing::{error, warn}; -use super::{Content, CreateDirectChatDialog, CreateRoomDialog, MediaViewer, Sidebar}; +mod content; +mod create_direct_chat_dialog; +mod create_room_dialog; +mod media_viewer; +mod sidebar; + +use self::{ + content::Content, create_direct_chat_dialog::CreateDirectChatDialog, + create_room_dialog::CreateRoomDialog, media_viewer::MediaViewer, sidebar::Sidebar, +}; use crate::{ Window, components::{RoomPreviewDialog, UserProfileDialog}, @@ -24,7 +33,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template(resource = "/org/gnome/Fractal/ui/session/view/session_view.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/mod.ui")] #[properties(wrapper_type = super::SessionView)] pub struct SessionView { #[template_child] diff --git a/src/session/view/sidebar/icon_item_row.blp b/src/session_view/sidebar/icon_item_row.blp similarity index 100% rename from src/session/view/sidebar/icon_item_row.blp rename to src/session_view/sidebar/icon_item_row.blp diff --git a/src/session/view/sidebar/icon_item_row.rs b/src/session_view/sidebar/icon_item_row.rs similarity index 97% rename from src/session/view/sidebar/icon_item_row.rs rename to src/session_view/sidebar/icon_item_row.rs index c6fe5038..e0db9340 100644 --- a/src/session/view/sidebar/icon_item_row.rs +++ b/src/session_view/sidebar/icon_item_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/sidebar/icon_item_row.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/sidebar/icon_item_row.ui")] #[properties(wrapper_type = super::SidebarIconItemRow)] pub struct SidebarIconItemRow { /// The [`SidebarIconItem`] of this row. diff --git a/src/session/view/sidebar/mod.blp b/src/session_view/sidebar/mod.blp similarity index 100% rename from src/session/view/sidebar/mod.blp rename to src/session_view/sidebar/mod.blp diff --git a/src/session/view/sidebar/mod.rs b/src/session_view/sidebar/mod.rs similarity index 99% rename from src/session/view/sidebar/mod.rs rename to src/session_view/sidebar/mod.rs index ec19a63e..30612b61 100644 --- a/src/session/view/sidebar/mod.rs +++ b/src/session_view/sidebar/mod.rs @@ -38,7 +38,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template(resource = "/org/gnome/Fractal/ui/session/view/sidebar/mod.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/sidebar/mod.ui")] #[properties(wrapper_type = super::Sidebar)] pub struct Sidebar { #[template_child] diff --git a/src/session/view/sidebar/room_row.blp b/src/session_view/sidebar/room_row.blp similarity index 100% rename from src/session/view/sidebar/room_row.blp rename to src/session_view/sidebar/room_row.blp diff --git a/src/session/view/sidebar/room_row.rs b/src/session_view/sidebar/room_row.rs similarity index 99% rename from src/session/view/sidebar/room_row.rs rename to src/session_view/sidebar/room_row.rs index 84401c6f..fd00b42f 100644 --- a/src/session/view/sidebar/room_row.rs +++ b/src/session_view/sidebar/room_row.rs @@ -18,7 +18,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template(resource = "/org/gnome/Fractal/ui/session/view/sidebar/room_row.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/sidebar/room_row.ui")] #[properties(wrapper_type = super::SidebarRoomRow)] pub struct SidebarRoomRow { /// The room represented by this row. diff --git a/src/session/view/sidebar/row.rs b/src/session_view/sidebar/row.rs similarity index 100% rename from src/session/view/sidebar/row.rs rename to src/session_view/sidebar/row.rs diff --git a/src/session/view/sidebar/section_row.blp b/src/session_view/sidebar/section_row.blp similarity index 100% rename from src/session/view/sidebar/section_row.blp rename to src/session_view/sidebar/section_row.blp diff --git a/src/session/view/sidebar/section_row.rs b/src/session_view/sidebar/section_row.rs similarity index 99% rename from src/session/view/sidebar/section_row.rs rename to src/session_view/sidebar/section_row.rs index 2313ebfa..6248204f 100644 --- a/src/session/view/sidebar/section_row.rs +++ b/src/session_view/sidebar/section_row.rs @@ -18,7 +18,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template(resource = "/org/gnome/Fractal/ui/session/view/sidebar/section_row.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/sidebar/section_row.ui")] #[properties(wrapper_type = super::SidebarSectionRow)] pub struct SidebarSectionRow { /// The section of this row. diff --git a/src/session/view/sidebar/verification_row.blp b/src/session_view/sidebar/verification_row.blp similarity index 100% rename from src/session/view/sidebar/verification_row.blp rename to src/session_view/sidebar/verification_row.blp diff --git a/src/session/view/sidebar/verification_row.rs b/src/session_view/sidebar/verification_row.rs similarity index 97% rename from src/session/view/sidebar/verification_row.rs rename to src/session_view/sidebar/verification_row.rs index f40c1786..cc7dc0bb 100644 --- a/src/session/view/sidebar/verification_row.rs +++ b/src/session_view/sidebar/verification_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/sidebar/verification_row.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/sidebar/verification_row.ui")] #[properties(wrapper_type = super::SidebarVerificationRow)] pub struct SidebarVerificationRow { /// The identity verification represented by this row. diff --git a/src/ui-blueprint-resources.in b/src/ui-blueprint-resources.in index 9c1e8f46..6822c5c9 100644 --- a/src/ui-blueprint-resources.in +++ b/src/ui-blueprint-resources.in @@ -75,74 +75,74 @@ login/method_page.blp login/mod.blp login/session_setup_view.blp login/sso_idp_button.blp -session/view/content/explore/mod.blp -session/view/content/explore/public_room_row.blp -session/view/content/explore/server_row.blp -session/view/content/explore/servers_popover.blp -session/view/content/invite.blp -session/view/content/invite_request.blp -session/view/content/mod.blp -session/view/content/room_details/addresses_subpage/completion_popover.blp -session/view/content/room_details/addresses_subpage/mod.blp -session/view/content/room_details/edit_details_subpage.blp -session/view/content/room_details/general_page.blp -session/view/content/room_details/history_viewer/audio.blp -session/view/content/room_details/history_viewer/audio_row.blp -session/view/content/room_details/history_viewer/file.blp -session/view/content/room_details/history_viewer/file_row.blp -session/view/content/room_details/history_viewer/visual_media.blp -session/view/content/room_details/history_viewer/visual_media_item.blp -session/view/content/room_details/history_visibility_subpage.blp -session/view/content/room_details/invite_subpage/mod.blp -session/view/content/room_details/invite_subpage/row.blp -session/view/content/room_details/join_rule_subpage.blp -session/view/content/room_details/member_row.blp -session/view/content/room_details/members_page/members_list_view/membership_subpage_row.blp -session/view/content/room_details/members_page/members_list_view/mod.blp -session/view/content/room_details/members_page/mod.blp -session/view/content/room_details/mod.blp -session/view/content/room_details/permissions/add_members_subpage.blp -session/view/content/room_details/permissions/member_row.blp -session/view/content/room_details/permissions/members_subpage.blp -session/view/content/room_details/permissions/permissions_subpage.blp -session/view/content/room_details/permissions/select_member_row.blp -session/view/content/room_details/upgrade_dialog/mod.blp -session/view/content/room_history/divider_row.blp -session/view/content/room_history/event_actions/context_menu.blp -session/view/content/room_history/event_actions/properties_dialog.blp -session/view/content/room_history/event_actions/quick_reaction_chooser.blp -session/view/content/room_history/member_timestamp/row.blp -session/view/content/room_history/message_row/audio.blp -session/view/content/room_history/message_row/file.blp -session/view/content/room_history/message_row/location.blp -session/view/content/room_history/message_row/message_state_stack.blp -session/view/content/room_history/message_row/mod.blp -session/view/content/room_history/message_row/reaction/mod.blp -session/view/content/room_history/message_row/reaction/reaction_popover.blp -session/view/content/room_history/message_row/reaction_list.blp -session/view/content/room_history/message_row/reply.blp -session/view/content/room_history/message_row/sender_name.blp -session/view/content/room_history/message_row/visual_media.blp -session/view/content/room_history/message_toolbar/attachment_dialog.blp -session/view/content/room_history/message_toolbar/completion/completion_popover.blp -session/view/content/room_history/message_toolbar/mod.blp -session/view/content/room_history/mod.blp -session/view/content/room_history/read_receipts_list/mod.blp -session/view/content/room_history/read_receipts_list/read_receipts_popover.blp -session/view/content/room_history/state/creation.blp -session/view/content/room_history/state/group_row.blp -session/view/content/room_history/state/row.blp -session/view/content/room_history/title.blp -session/view/content/room_history/typing_row.blp -session/view/content/room_history/verification_info_bar.blp -session/view/create_direct_chat_dialog/mod.blp -session/view/create_room_dialog.blp -session/view/media_viewer.blp -session/view/session_view.blp -session/view/sidebar/icon_item_row.blp -session/view/sidebar/mod.blp -session/view/sidebar/room_row.blp -session/view/sidebar/section_row.blp -session/view/sidebar/verification_row.blp +session_view/content/explore/mod.blp +session_view/content/explore/public_room_row.blp +session_view/content/explore/server_row.blp +session_view/content/explore/servers_popover.blp +session_view/content/invite.blp +session_view/content/invite_request.blp +session_view/content/mod.blp +session_view/content/room_details/addresses_subpage/completion_popover.blp +session_view/content/room_details/addresses_subpage/mod.blp +session_view/content/room_details/edit_details_subpage.blp +session_view/content/room_details/general_page.blp +session_view/content/room_details/history_viewer/audio.blp +session_view/content/room_details/history_viewer/audio_row.blp +session_view/content/room_details/history_viewer/file.blp +session_view/content/room_details/history_viewer/file_row.blp +session_view/content/room_details/history_viewer/visual_media.blp +session_view/content/room_details/history_viewer/visual_media_item.blp +session_view/content/room_details/history_visibility_subpage.blp +session_view/content/room_details/invite_subpage/mod.blp +session_view/content/room_details/invite_subpage/row.blp +session_view/content/room_details/join_rule_subpage.blp +session_view/content/room_details/member_row.blp +session_view/content/room_details/members_page/members_list_view/membership_subpage_row.blp +session_view/content/room_details/members_page/members_list_view/mod.blp +session_view/content/room_details/members_page/mod.blp +session_view/content/room_details/mod.blp +session_view/content/room_details/permissions/add_members_subpage.blp +session_view/content/room_details/permissions/member_row.blp +session_view/content/room_details/permissions/members_subpage.blp +session_view/content/room_details/permissions/permissions_subpage.blp +session_view/content/room_details/permissions/select_member_row.blp +session_view/content/room_details/upgrade_dialog/mod.blp +session_view/content/room_history/divider_row.blp +session_view/content/room_history/event_actions/context_menu.blp +session_view/content/room_history/event_actions/properties_dialog.blp +session_view/content/room_history/event_actions/quick_reaction_chooser.blp +session_view/content/room_history/member_timestamp/row.blp +session_view/content/room_history/message_row/audio.blp +session_view/content/room_history/message_row/file.blp +session_view/content/room_history/message_row/location.blp +session_view/content/room_history/message_row/message_state_stack.blp +session_view/content/room_history/message_row/mod.blp +session_view/content/room_history/message_row/reaction/mod.blp +session_view/content/room_history/message_row/reaction/reaction_popover.blp +session_view/content/room_history/message_row/reaction_list.blp +session_view/content/room_history/message_row/reply.blp +session_view/content/room_history/message_row/sender_name.blp +session_view/content/room_history/message_row/visual_media.blp +session_view/content/room_history/message_toolbar/attachment_dialog.blp +session_view/content/room_history/message_toolbar/completion/completion_popover.blp +session_view/content/room_history/message_toolbar/mod.blp +session_view/content/room_history/mod.blp +session_view/content/room_history/read_receipts_list/mod.blp +session_view/content/room_history/read_receipts_list/read_receipts_popover.blp +session_view/content/room_history/state/creation.blp +session_view/content/room_history/state/group_row.blp +session_view/content/room_history/state/row.blp +session_view/content/room_history/title.blp +session_view/content/room_history/typing_row.blp +session_view/content/room_history/verification_info_bar.blp +session_view/create_direct_chat_dialog/mod.blp +session_view/create_room_dialog.blp +session_view/media_viewer.blp +session_view/mod.blp +session_view/sidebar/icon_item_row.blp +session_view/sidebar/mod.blp +session_view/sidebar/room_row.blp +session_view/sidebar/section_row.blp +session_view/sidebar/verification_row.blp shortcuts-dialog.blp window.blp diff --git a/src/window.rs b/src/window.rs index 0520742a..dee7c865 100644 --- a/src/window.rs +++ b/src/window.rs @@ -15,11 +15,9 @@ use crate::{ login::Login, prelude::*, secret::SESSION_ID_LENGTH, - session::{ - model::{Session, SessionState}, - view::SessionView, - }, + session::model::{Session, SessionState}, session_list::{FailedSession, SessionInfo}, + session_view::SessionView, toast, utils::{FixedSelection, LoadingState}, };