From aff0c93ea1caae085e2a493e18e7b8b495786ef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Tue, 7 Oct 2025 12:13:48 +0200 Subject: [PATCH] session-view: Move submodules of content up To reduce nesting. --- po/POTFILES.in | 158 +++++++++--------- .../{content/mod.blp => content.blp} | 0 .../{content/mod.rs => content.rs} | 13 +- .../{content => }/explore/mod.blp | 0 src/session_view/{content => }/explore/mod.rs | 2 +- .../{content => }/explore/public_room_row.blp | 0 .../{content => }/explore/public_room_row.rs | 2 +- .../{content => }/explore/search.rs | 0 .../{content => }/explore/server.rs | 0 .../{content => }/explore/server_list.rs | 0 .../{content => }/explore/server_row.blp | 0 .../{content => }/explore/server_row.rs | 2 +- .../{content => }/explore/servers_popover.blp | 0 .../{content => }/explore/servers_popover.rs | 2 +- src/session_view/{content => }/invite.blp | 0 src/session_view/{content => }/invite.rs | 2 +- .../{content => }/invite_request.blp | 0 .../{content => }/invite_request.rs | 2 +- src/session_view/mod.rs | 9 +- .../addresses_subpage/completion_popover.blp | 0 .../addresses_subpage/completion_popover.rs | 2 +- .../room_details/addresses_subpage/mod.blp | 0 .../room_details/addresses_subpage/mod.rs | 2 +- .../addresses_subpage/public_address.rs | 0 .../room_details/edit_details_subpage.blp | 0 .../room_details/edit_details_subpage.rs | 2 +- .../room_details/general_page.blp | 0 .../room_details/general_page.rs | 4 +- .../room_details/history_viewer/audio.blp | 0 .../room_details/history_viewer/audio.rs | 2 +- .../room_details/history_viewer/audio_row.blp | 0 .../room_details/history_viewer/audio_row.rs | 2 +- .../room_details/history_viewer/event.rs | 0 .../room_details/history_viewer/file.blp | 0 .../room_details/history_viewer/file.rs | 4 +- .../room_details/history_viewer/file_row.blp | 0 .../room_details/history_viewer/file_row.rs | 2 +- .../room_details/history_viewer/mod.rs | 0 .../room_details/history_viewer/timeline.rs | 0 .../history_viewer/visual_media.blp | 0 .../history_viewer/visual_media.rs | 2 +- .../history_viewer/visual_media_item.blp | 0 .../history_viewer/visual_media_item.rs | 2 +- .../history_visibility_subpage.blp | 0 .../history_visibility_subpage.rs | 2 +- .../room_details/invite_subpage/item.rs | 0 .../room_details/invite_subpage/list.rs | 0 .../room_details/invite_subpage/mod.blp | 0 .../room_details/invite_subpage/mod.rs | 4 +- .../room_details/invite_subpage/row.blp | 0 .../room_details/invite_subpage/row.rs | 4 +- .../room_details/join_rule_subpage.blp | 0 .../room_details/join_rule_subpage.rs | 4 +- .../{content => }/room_details/member_row.blp | 0 .../{content => }/room_details/member_row.rs | 2 +- .../members_list_view/item_row.rs | 2 +- .../membership_subpage_row.blp | 0 .../membership_subpage_row.rs | 4 +- .../members_page/members_list_view/mod.blp | 0 .../members_page/members_list_view/mod.rs | 4 +- .../room_details/members_page/mod.blp | 0 .../room_details/members_page/mod.rs | 4 +- .../room_details/membership_subpage_item.rs | 0 .../{content => }/room_details/mod.blp | 0 .../{content => }/room_details/mod.rs | 2 +- .../permissions/add_members_subpage.blp | 0 .../permissions/add_members_subpage.rs | 2 +- .../permissions/member_power_level.rs | 0 .../room_details/permissions/member_row.blp | 0 .../room_details/permissions/member_row.rs | 2 +- .../permissions/members_subpage.blp | 0 .../permissions/members_subpage.rs | 2 +- .../room_details/permissions/mod.rs | 0 .../permissions/permissions_subpage.blp | 0 .../permissions/permissions_subpage.rs | 2 +- .../permissions/privileged_members.rs | 0 .../permissions/select_member_row.blp | 0 .../permissions/select_member_row.rs | 2 +- .../room_details/upgrade_dialog/mod.blp | 0 .../room_details/upgrade_dialog/mod.rs | 4 +- .../upgrade_dialog/room_version.rs | 0 .../room_history/divider_row.blp | 0 .../{content => }/room_history/divider_row.rs | 2 +- .../event_actions/context_menu.blp | 0 .../event_actions/context_menu.rs | 2 +- .../room_history/event_actions/group.rs | 0 .../room_history/event_actions/mod.rs | 0 .../event_actions/properties_dialog.blp | 0 .../event_actions/properties_dialog.rs | 2 +- .../event_actions/quick_reaction_chooser.blp | 0 .../event_actions/quick_reaction_chooser.rs | 2 +- .../{content => }/room_history/event_row.rs | 2 +- .../room_history/member_timestamp/mod.rs | 0 .../room_history/member_timestamp/row.blp | 0 .../room_history/member_timestamp/row.rs | 2 +- .../room_history/message_row/audio.blp | 0 .../room_history/message_row/audio.rs | 4 +- .../room_history/message_row/caption.rs | 0 .../room_history/message_row/content.rs | 2 +- .../room_history/message_row/file.blp | 0 .../room_history/message_row/file.rs | 4 +- .../room_history/message_row/location.blp | 0 .../room_history/message_row/location.rs | 2 +- .../message_row/message_state_stack.blp | 0 .../message_row/message_state_stack.rs | 2 +- .../room_history/message_row/mod.blp | 0 .../room_history/message_row/mod.rs | 4 +- .../room_history/message_row/reaction/mod.blp | 0 .../room_history/message_row/reaction/mod.rs | 4 +- .../message_row/reaction/reaction_popover.blp | 0 .../message_row/reaction/reaction_popover.rs | 6 +- .../message_row/reaction_list.blp | 0 .../room_history/message_row/reaction_list.rs | 2 +- .../room_history/message_row/reply.blp | 0 .../room_history/message_row/reply.rs | 4 +- .../room_history/message_row/sender_name.blp | 0 .../room_history/message_row/sender_name.rs | 4 +- .../message_row/text/inline_html.rs | 0 .../room_history/message_row/text/mod.rs | 0 .../room_history/message_row/text/tests.rs | 0 .../room_history/message_row/text/widgets.rs | 0 .../room_history/message_row/visual_media.blp | 0 .../room_history/message_row/visual_media.rs | 2 +- .../message_toolbar/attachment_dialog.blp | 0 .../message_toolbar/attachment_dialog.rs | 2 +- .../completion/completion_popover.blp | 0 .../completion/completion_popover.rs | 4 +- .../message_toolbar/completion/member_list.rs | 0 .../message_toolbar/completion/mod.rs | 0 .../message_toolbar/completion/room_list.rs | 0 .../message_toolbar/composer_parser.rs | 0 .../message_toolbar/composer_state.rs | 0 .../room_history/message_toolbar/mod.blp | 0 .../room_history/message_toolbar/mod.rs | 4 +- .../{content => }/room_history/mod.blp | 0 .../{content => }/room_history/mod.rs | 2 +- .../room_history/read_receipts_list/mod.blp | 0 .../room_history/read_receipts_list/mod.rs | 2 +- .../read_receipts_popover.blp | 0 .../read_receipts_popover.rs | 6 +- .../room_history/state/content.rs | 0 .../room_history/state/creation.blp | 0 .../room_history/state/creation.rs | 4 +- .../room_history/state/group_item_row.rs | 2 +- .../room_history/state/group_row.blp | 0 .../room_history/state/group_row.rs | 6 +- .../{content => }/room_history/state/mod.rs | 0 .../{content => }/room_history/state/row.blp | 0 .../{content => }/room_history/state/row.rs | 4 +- .../{content => }/room_history/title.blp | 0 .../{content => }/room_history/title.rs | 2 +- .../{content => }/room_history/typing_row.blp | 0 .../{content => }/room_history/typing_row.rs | 2 +- .../room_history/verification_info_bar.blp | 0 .../room_history/verification_info_bar.rs | 2 +- src/ui-blueprint-resources.in | 120 ++++++------- 156 files changed, 221 insertions(+), 255 deletions(-) rename src/session_view/{content/mod.blp => content.blp} (100%) rename src/session_view/{content/mod.rs => content.rs} (97%) rename src/session_view/{content => }/explore/mod.blp (100%) rename src/session_view/{content => }/explore/mod.rs (99%) rename src/session_view/{content => }/explore/public_room_row.blp (100%) rename src/session_view/{content => }/explore/public_room_row.rs (98%) rename src/session_view/{content => }/explore/search.rs (100%) rename src/session_view/{content => }/explore/server.rs (100%) rename src/session_view/{content => }/explore/server_list.rs (100%) rename src/session_view/{content => }/explore/server_row.blp (100%) rename src/session_view/{content => }/explore/server_row.rs (95%) rename src/session_view/{content => }/explore/servers_popover.blp (100%) rename src/session_view/{content => }/explore/servers_popover.rs (98%) rename src/session_view/{content => }/invite.blp (100%) rename src/session_view/{content => }/invite.rs (99%) rename src/session_view/{content => }/invite_request.blp (100%) rename src/session_view/{content => }/invite_request.rs (98%) rename src/session_view/{content => }/room_details/addresses_subpage/completion_popover.blp (100%) rename src/session_view/{content => }/room_details/addresses_subpage/completion_popover.rs (99%) rename src/session_view/{content => }/room_details/addresses_subpage/mod.blp (100%) rename src/session_view/{content => }/room_details/addresses_subpage/mod.rs (99%) rename src/session_view/{content => }/room_details/addresses_subpage/public_address.rs (100%) rename src/session_view/{content => }/room_details/edit_details_subpage.blp (100%) rename src/session_view/{content => }/room_details/edit_details_subpage.rs (99%) rename src/session_view/{content => }/room_details/general_page.blp (100%) rename src/session_view/{content => }/room_details/general_page.rs (99%) rename src/session_view/{content => }/room_details/history_viewer/audio.blp (100%) rename src/session_view/{content => }/room_details/history_viewer/audio.rs (98%) rename src/session_view/{content => }/room_details/history_viewer/audio_row.blp (100%) rename src/session_view/{content => }/room_details/history_viewer/audio_row.rs (95%) rename src/session_view/{content => }/room_details/history_viewer/event.rs (100%) rename src/session_view/{content => }/room_details/history_viewer/file.blp (100%) rename src/session_view/{content => }/room_details/history_viewer/file.rs (98%) rename src/session_view/{content => }/room_details/history_viewer/file_row.blp (100%) rename src/session_view/{content => }/room_details/history_viewer/file_row.rs (98%) rename src/session_view/{content => }/room_details/history_viewer/mod.rs (100%) rename src/session_view/{content => }/room_details/history_viewer/timeline.rs (100%) rename src/session_view/{content => }/room_details/history_viewer/visual_media.blp (100%) rename src/session_view/{content => }/room_details/history_viewer/visual_media.rs (98%) rename src/session_view/{content => }/room_details/history_viewer/visual_media_item.blp (100%) rename src/session_view/{content => }/room_details/history_viewer/visual_media_item.rs (98%) rename src/session_view/{content => }/room_details/history_visibility_subpage.blp (100%) rename src/session_view/{content => }/room_details/history_visibility_subpage.rs (98%) rename src/session_view/{content => }/room_details/invite_subpage/item.rs (100%) rename src/session_view/{content => }/room_details/invite_subpage/list.rs (100%) rename src/session_view/{content => }/room_details/invite_subpage/mod.blp (100%) rename src/session_view/{content => }/room_details/invite_subpage/mod.rs (98%) rename src/session_view/{content => }/room_details/invite_subpage/row.blp (100%) rename src/session_view/{content => }/room_details/invite_subpage/row.rs (95%) rename src/session_view/{content => }/room_details/join_rule_subpage.blp (100%) rename src/session_view/{content => }/room_details/join_rule_subpage.rs (98%) rename src/session_view/{content => }/room_details/member_row.blp (100%) rename src/session_view/{content => }/room_details/member_row.rs (96%) rename src/session_view/{content => }/room_details/members_page/members_list_view/item_row.rs (97%) rename src/session_view/{content => }/room_details/members_page/members_list_view/membership_subpage_row.blp (100%) rename src/session_view/{content => }/room_details/members_page/members_list_view/membership_subpage_row.rs (95%) rename src/session_view/{content => }/room_details/members_page/members_list_view/mod.blp (100%) rename src/session_view/{content => }/room_details/members_page/members_list_view/mod.rs (99%) rename src/session_view/{content => }/room_details/members_page/mod.blp (100%) rename src/session_view/{content => }/room_details/members_page/mod.rs (96%) rename src/session_view/{content => }/room_details/membership_subpage_item.rs (100%) rename src/session_view/{content => }/room_details/mod.blp (100%) rename src/session_view/{content => }/room_details/mod.rs (99%) rename src/session_view/{content => }/room_details/permissions/add_members_subpage.blp (100%) rename src/session_view/{content => }/room_details/permissions/add_members_subpage.rs (99%) rename src/session_view/{content => }/room_details/permissions/member_power_level.rs (100%) rename src/session_view/{content => }/room_details/permissions/member_row.blp (100%) rename src/session_view/{content => }/room_details/permissions/member_row.rs (98%) rename src/session_view/{content => }/room_details/permissions/members_subpage.blp (100%) rename src/session_view/{content => }/room_details/permissions/members_subpage.rs (98%) rename src/session_view/{content => }/room_details/permissions/mod.rs (100%) rename src/session_view/{content => }/room_details/permissions/permissions_subpage.blp (100%) rename src/session_view/{content => }/room_details/permissions/permissions_subpage.rs (99%) rename src/session_view/{content => }/room_details/permissions/privileged_members.rs (100%) rename src/session_view/{content => }/room_details/permissions/select_member_row.blp (100%) rename src/session_view/{content => }/room_details/permissions/select_member_row.rs (95%) rename src/session_view/{content => }/room_details/upgrade_dialog/mod.blp (100%) rename src/session_view/{content => }/room_details/upgrade_dialog/mod.rs (99%) rename src/session_view/{content => }/room_details/upgrade_dialog/room_version.rs (100%) rename src/session_view/{content => }/room_history/divider_row.blp (100%) rename src/session_view/{content => }/room_history/divider_row.rs (98%) rename src/session_view/{content => }/room_history/event_actions/context_menu.blp (100%) rename src/session_view/{content => }/room_history/event_actions/context_menu.rs (96%) rename src/session_view/{content => }/room_history/event_actions/group.rs (100%) rename src/session_view/{content => }/room_history/event_actions/mod.rs (100%) rename src/session_view/{content => }/room_history/event_actions/properties_dialog.blp (100%) rename src/session_view/{content => }/room_history/event_actions/properties_dialog.rs (97%) rename src/session_view/{content => }/room_history/event_actions/quick_reaction_chooser.blp (100%) rename src/session_view/{content => }/room_history/event_actions/quick_reaction_chooser.rs (98%) rename src/session_view/{content => }/room_history/event_row.rs (99%) rename src/session_view/{content => }/room_history/member_timestamp/mod.rs (100%) rename src/session_view/{content => }/room_history/member_timestamp/row.blp (100%) rename src/session_view/{content => }/room_history/member_timestamp/row.rs (97%) rename src/session_view/{content => }/room_history/message_row/audio.blp (100%) rename src/session_view/{content => }/room_history/message_row/audio.rs (96%) rename src/session_view/{content => }/room_history/message_row/caption.rs (100%) rename src/session_view/{content => }/room_history/message_row/content.rs (99%) rename src/session_view/{content => }/room_history/message_row/file.blp (100%) rename src/session_view/{content => }/room_history/message_row/file.rs (96%) rename src/session_view/{content => }/room_history/message_row/location.blp (100%) rename src/session_view/{content => }/room_history/message_row/location.rs (97%) rename src/session_view/{content => }/room_history/message_row/message_state_stack.blp (100%) rename src/session_view/{content => }/room_history/message_row/message_state_stack.rs (97%) rename src/session_view/{content => }/room_history/message_row/mod.blp (100%) rename src/session_view/{content => }/room_history/message_row/mod.rs (98%) rename src/session_view/{content => }/room_history/message_row/reaction/mod.blp (100%) rename src/session_view/{content => }/room_history/message_row/reaction/mod.rs (98%) rename src/session_view/{content => }/room_history/message_row/reaction/reaction_popover.blp (100%) rename src/session_view/{content => }/room_history/message_row/reaction/reaction_popover.rs (92%) rename src/session_view/{content => }/room_history/message_row/reaction_list.blp (100%) rename src/session_view/{content => }/room_history/message_row/reaction_list.rs (95%) rename src/session_view/{content => }/room_history/message_row/reply.blp (100%) rename src/session_view/{content => }/room_history/message_row/reply.rs (96%) rename src/session_view/{content => }/room_history/message_row/sender_name.blp (100%) rename src/session_view/{content => }/room_history/message_row/sender_name.rs (97%) rename src/session_view/{content => }/room_history/message_row/text/inline_html.rs (100%) rename src/session_view/{content => }/room_history/message_row/text/mod.rs (100%) rename src/session_view/{content => }/room_history/message_row/text/tests.rs (100%) rename src/session_view/{content => }/room_history/message_row/text/widgets.rs (100%) rename src/session_view/{content => }/room_history/message_row/visual_media.blp (100%) rename src/session_view/{content => }/room_history/message_row/visual_media.rs (99%) rename src/session_view/{content => }/room_history/message_toolbar/attachment_dialog.blp (100%) rename src/session_view/{content => }/room_history/message_toolbar/attachment_dialog.rs (97%) rename src/session_view/{content => }/room_history/message_toolbar/completion/completion_popover.blp (100%) rename src/session_view/{content => }/room_history/message_toolbar/completion/completion_popover.rs (99%) rename src/session_view/{content => }/room_history/message_toolbar/completion/member_list.rs (100%) rename src/session_view/{content => }/room_history/message_toolbar/completion/mod.rs (100%) rename src/session_view/{content => }/room_history/message_toolbar/completion/room_list.rs (100%) rename src/session_view/{content => }/room_history/message_toolbar/composer_parser.rs (100%) rename src/session_view/{content => }/room_history/message_toolbar/composer_state.rs (100%) rename src/session_view/{content => }/room_history/message_toolbar/mod.blp (100%) rename src/session_view/{content => }/room_history/message_toolbar/mod.rs (99%) rename src/session_view/{content => }/room_history/mod.blp (100%) rename src/session_view/{content => }/room_history/mod.rs (99%) rename src/session_view/{content => }/room_history/read_receipts_list/mod.blp (100%) rename src/session_view/{content => }/room_history/read_receipts_list/mod.rs (99%) rename src/session_view/{content => }/room_history/read_receipts_list/read_receipts_popover.blp (100%) rename src/session_view/{content => }/room_history/read_receipts_list/read_receipts_popover.rs (92%) rename src/session_view/{content => }/room_history/state/content.rs (100%) rename src/session_view/{content => }/room_history/state/creation.blp (100%) rename src/session_view/{content => }/room_history/state/creation.rs (95%) rename src/session_view/{content => }/room_history/state/group_item_row.rs (99%) rename src/session_view/{content => }/room_history/state/group_row.blp (100%) rename src/session_view/{content => }/room_history/state/group_row.rs (97%) rename src/session_view/{content => }/room_history/state/mod.rs (100%) rename src/session_view/{content => }/room_history/state/row.blp (100%) rename src/session_view/{content => }/room_history/state/row.rs (89%) rename src/session_view/{content => }/room_history/title.blp (100%) rename src/session_view/{content => }/room_history/title.rs (98%) rename src/session_view/{content => }/room_history/typing_row.blp (100%) rename src/session_view/{content => }/room_history/typing_row.rs (98%) rename src/session_view/{content => }/room_history/verification_info_bar.blp (100%) rename src/session_view/{content => }/room_history/verification_info_bar.rs (98%) diff --git a/po/POTFILES.in b/po/POTFILES.in index 7a74c2d8..dc372a39 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -109,91 +109,91 @@ src/session/room_list/mod.rs src/session/sidebar_data/section/name.rs src/session/sidebar_data/icon_item.rs src/session/user_sessions_list/user_session.rs -src/session_view/content/explore/mod.blp -src/session_view/content/explore/public_room_row.rs -src/session_view/content/explore/servers_popover.blp -src/session_view/content/explore/server_row.blp -src/session_view/content/invite.rs -src/session_view/content/invite.blp -src/session_view/content/invite_request.rs -src/session_view/content/invite_request.blp -src/session_view/content/mod.blp -src/session_view/content/room_details/addresses_subpage/completion_popover.blp -src/session_view/content/room_details/addresses_subpage/mod.rs -src/session_view/content/room_details/addresses_subpage/mod.blp -src/session_view/content/room_details/edit_details_subpage.rs -src/session_view/content/room_details/edit_details_subpage.blp -src/session_view/content/room_details/general_page.rs -src/session_view/content/room_details/general_page.blp -src/session_view/content/room_details/history_viewer/audio.blp -src/session_view/content/room_details/history_viewer/file_row.rs -src/session_view/content/room_details/history_viewer/file_row.blp -src/session_view/content/room_details/history_viewer/file.blp -src/session_view/content/room_details/history_viewer/visual_media.blp -src/session_view/content/room_details/history_visibility_subpage.blp -src/session_view/content/room_details/history_visibility_subpage.rs -src/session_view/content/room_details/invite_subpage/list.rs -src/session_view/content/room_details/invite_subpage/mod.rs -src/session_view/content/room_details/invite_subpage/mod.blp -src/session_view/content/room_details/join_rule_subpage.rs -src/session_view/content/room_details/join_rule_subpage.blp -src/session_view/content/room_details/member_row.blp -src/session_view/content/room_details/members_page/members_list_view/membership_subpage_row.rs -src/session_view/content/room_details/members_page/members_list_view/mod.rs -src/session_view/content/room_details/members_page/members_list_view/mod.blp -src/session_view/content/room_details/mod.rs -src/session_view/content/room_details/mod.blp -src/session_view/content/room_details/permissions/add_members_subpage.blp -src/session_view/content/room_details/permissions/members_subpage.rs -src/session_view/content/room_details/permissions/members_subpage.blp -src/session_view/content/room_details/permissions/permissions_subpage.rs -src/session_view/content/room_details/permissions/permissions_subpage.blp -src/session_view/content/room_details/upgrade_dialog/mod.rs -src/session_view/content/room_details/upgrade_dialog/mod.blp -src/session_view/content/room_history/divider_row.rs -src/session_view/content/room_history/event_actions/context_menu.rs -src/session_view/content/room_history/event_actions/context_menu.blp -src/session_view/content/room_history/event_actions/group.rs -src/session_view/content/room_history/event_actions/properties_dialog.rs -src/session_view/content/room_history/event_actions/properties_dialog.blp -src/session_view/content/room_history/event_actions/quick_reaction_chooser.blp -src/session_view/content/room_history/message_row/audio.rs -src/session_view/content/room_history/message_row/content.rs -src/session_view/content/room_history/message_row/file.rs -src/session_view/content/room_history/message_row/file.blp -src/session_view/content/room_history/message_row/location.rs -src/session_view/content/room_history/message_row/location.blp -src/session_view/content/room_history/message_row/message_state_stack.blp -src/session_view/content/room_history/message_row/mod.rs -src/session_view/content/room_history/message_row/mod.blp -src/session_view/content/room_history/message_row/reaction/mod.rs -src/session_view/content/room_history/message_row/reaction_list.blp -src/session_view/content/room_history/message_row/reply.blp -src/session_view/content/room_history/message_row/sender_name.rs -src/session_view/content/room_history/message_row/text/widgets.rs -src/session_view/content/room_history/message_row/visual_media.rs -src/session_view/content/room_history/message_row/visual_media.blp -src/session_view/content/room_history/message_toolbar/attachment_dialog.blp -src/session_view/content/room_history/message_toolbar/completion/completion_popover.rs -src/session_view/content/room_history/message_toolbar/mod.rs -src/session_view/content/room_history/message_toolbar/mod.blp -src/session_view/content/room_history/member_timestamp/row.rs -src/session_view/content/room_history/mod.rs -src/session_view/content/room_history/mod.blp -src/session_view/content/room_history/read_receipts_list/mod.rs -src/session_view/content/room_history/state/content.rs -src/session_view/content/room_history/state/creation.rs -src/session_view/content/room_history/state/creation.blp -src/session_view/content/room_history/state/group_row.rs -src/session_view/content/room_history/title.blp -src/session_view/content/room_history/typing_row.rs -src/session_view/content/room_history/verification_info_bar.rs +src/session_view/content.blp src/session_view/create_direct_chat_dialog/mod.rs src/session_view/create_direct_chat_dialog/mod.blp src/session_view/create_room_dialog.rs src/session_view/create_room_dialog.blp +src/session_view/explore/mod.blp +src/session_view/explore/public_room_row.rs +src/session_view/explore/servers_popover.blp +src/session_view/explore/server_row.blp +src/session_view/invite.rs +src/session_view/invite.blp +src/session_view/invite_request.rs +src/session_view/invite_request.blp src/session_view/media_viewer.rs src/session_view/media_viewer.blp +src/session_view/room_details/addresses_subpage/completion_popover.blp +src/session_view/room_details/addresses_subpage/mod.rs +src/session_view/room_details/addresses_subpage/mod.blp +src/session_view/room_details/edit_details_subpage.rs +src/session_view/room_details/edit_details_subpage.blp +src/session_view/room_details/general_page.rs +src/session_view/room_details/general_page.blp +src/session_view/room_details/history_viewer/audio.blp +src/session_view/room_details/history_viewer/file_row.rs +src/session_view/room_details/history_viewer/file_row.blp +src/session_view/room_details/history_viewer/file.blp +src/session_view/room_details/history_viewer/visual_media.blp +src/session_view/room_details/history_visibility_subpage.blp +src/session_view/room_details/history_visibility_subpage.rs +src/session_view/room_details/invite_subpage/list.rs +src/session_view/room_details/invite_subpage/mod.rs +src/session_view/room_details/invite_subpage/mod.blp +src/session_view/room_details/join_rule_subpage.rs +src/session_view/room_details/join_rule_subpage.blp +src/session_view/room_details/member_row.blp +src/session_view/room_details/members_page/members_list_view/membership_subpage_row.rs +src/session_view/room_details/members_page/members_list_view/mod.rs +src/session_view/room_details/members_page/members_list_view/mod.blp +src/session_view/room_details/mod.rs +src/session_view/room_details/mod.blp +src/session_view/room_details/permissions/add_members_subpage.blp +src/session_view/room_details/permissions/members_subpage.rs +src/session_view/room_details/permissions/members_subpage.blp +src/session_view/room_details/permissions/permissions_subpage.rs +src/session_view/room_details/permissions/permissions_subpage.blp +src/session_view/room_details/upgrade_dialog/mod.rs +src/session_view/room_details/upgrade_dialog/mod.blp +src/session_view/room_history/divider_row.rs +src/session_view/room_history/event_actions/context_menu.rs +src/session_view/room_history/event_actions/context_menu.blp +src/session_view/room_history/event_actions/group.rs +src/session_view/room_history/event_actions/properties_dialog.rs +src/session_view/room_history/event_actions/properties_dialog.blp +src/session_view/room_history/event_actions/quick_reaction_chooser.blp +src/session_view/room_history/message_row/audio.rs +src/session_view/room_history/message_row/content.rs +src/session_view/room_history/message_row/file.rs +src/session_view/room_history/message_row/file.blp +src/session_view/room_history/message_row/location.rs +src/session_view/room_history/message_row/location.blp +src/session_view/room_history/message_row/message_state_stack.blp +src/session_view/room_history/message_row/mod.rs +src/session_view/room_history/message_row/mod.blp +src/session_view/room_history/message_row/reaction/mod.rs +src/session_view/room_history/message_row/reaction_list.blp +src/session_view/room_history/message_row/reply.blp +src/session_view/room_history/message_row/sender_name.rs +src/session_view/room_history/message_row/text/widgets.rs +src/session_view/room_history/message_row/visual_media.rs +src/session_view/room_history/message_row/visual_media.blp +src/session_view/room_history/message_toolbar/attachment_dialog.blp +src/session_view/room_history/message_toolbar/completion/completion_popover.rs +src/session_view/room_history/message_toolbar/mod.rs +src/session_view/room_history/message_toolbar/mod.blp +src/session_view/room_history/member_timestamp/row.rs +src/session_view/room_history/mod.rs +src/session_view/room_history/mod.blp +src/session_view/room_history/read_receipts_list/mod.rs +src/session_view/room_history/state/content.rs +src/session_view/room_history/state/creation.rs +src/session_view/room_history/state/creation.blp +src/session_view/room_history/state/group_row.rs +src/session_view/room_history/title.blp +src/session_view/room_history/typing_row.rs +src/session_view/room_history/verification_info_bar.rs src/session_view/sidebar/mod.rs src/session_view/sidebar/mod.blp src/session_view/sidebar/room_row.rs diff --git a/src/session_view/content/mod.blp b/src/session_view/content.blp similarity index 100% rename from src/session_view/content/mod.blp rename to src/session_view/content.blp diff --git a/src/session_view/content/mod.rs b/src/session_view/content.rs similarity index 97% rename from src/session_view/content/mod.rs rename to src/session_view/content.rs index 30c44f3f..7d3756ae 100644 --- a/src/session_view/content/mod.rs +++ b/src/session_view/content.rs @@ -1,16 +1,7 @@ use adw::{prelude::*, subclass::prelude::*}; use gtk::{glib, glib::clone}; -mod explore; -mod invite; -mod invite_request; -mod room_details; -mod room_history; - -use self::{ - explore::Explore, invite::Invite, invite_request::InviteRequest, room_details::RoomDetails, - room_history::RoomHistory, -}; +use super::{Explore, Invite, InviteRequest, RoomHistory}; use crate::{ identity_verification_view::IdentityVerificationView, session::{ @@ -45,7 +36,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template(resource = "/org/gnome/Fractal/ui/session_view/content/mod.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/content.ui")] #[properties(wrapper_type = super::Content)] pub struct Content { #[template_child] diff --git a/src/session_view/content/explore/mod.blp b/src/session_view/explore/mod.blp similarity index 100% rename from src/session_view/content/explore/mod.blp rename to src/session_view/explore/mod.blp diff --git a/src/session_view/content/explore/mod.rs b/src/session_view/explore/mod.rs similarity index 99% rename from src/session_view/content/explore/mod.rs rename to src/session_view/explore/mod.rs index 8bab0168..63ee019e 100644 --- a/src/session_view/content/explore/mod.rs +++ b/src/session_view/explore/mod.rs @@ -29,7 +29,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template(resource = "/org/gnome/Fractal/ui/session_view/content/explore/mod.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/explore/mod.ui")] #[properties(wrapper_type = super::Explore)] pub struct Explore { #[template_child] diff --git a/src/session_view/content/explore/public_room_row.blp b/src/session_view/explore/public_room_row.blp similarity index 100% rename from src/session_view/content/explore/public_room_row.blp rename to src/session_view/explore/public_room_row.blp diff --git a/src/session_view/content/explore/public_room_row.rs b/src/session_view/explore/public_room_row.rs similarity index 98% rename from src/session_view/content/explore/public_room_row.rs rename to src/session_view/explore/public_room_row.rs index faf2656c..fee5c50e 100644 --- a/src/session_view/content/explore/public_room_row.rs +++ b/src/session_view/explore/public_room_row.rs @@ -20,7 +20,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template(resource = "/org/gnome/Fractal/ui/session_view/content/explore/public_room_row.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/explore/public_room_row.ui")] #[properties(wrapper_type = super::PublicRoomRow)] pub struct PublicRoomRow { #[template_child] diff --git a/src/session_view/content/explore/search.rs b/src/session_view/explore/search.rs similarity index 100% rename from src/session_view/content/explore/search.rs rename to src/session_view/explore/search.rs diff --git a/src/session_view/content/explore/server.rs b/src/session_view/explore/server.rs similarity index 100% rename from src/session_view/content/explore/server.rs rename to src/session_view/explore/server.rs diff --git a/src/session_view/content/explore/server_list.rs b/src/session_view/explore/server_list.rs similarity index 100% rename from src/session_view/content/explore/server_list.rs rename to src/session_view/explore/server_list.rs diff --git a/src/session_view/content/explore/server_row.blp b/src/session_view/explore/server_row.blp similarity index 100% rename from src/session_view/content/explore/server_row.blp rename to src/session_view/explore/server_row.blp diff --git a/src/session_view/content/explore/server_row.rs b/src/session_view/explore/server_row.rs similarity index 95% rename from src/session_view/content/explore/server_row.rs rename to src/session_view/explore/server_row.rs index 15685085..69d6e6bd 100644 --- a/src/session_view/content/explore/server_row.rs +++ b/src/session_view/explore/server_row.rs @@ -11,7 +11,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template(resource = "/org/gnome/Fractal/ui/session_view/content/explore/server_row.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/explore/server_row.ui")] #[properties(wrapper_type = super::ExploreServerRow)] pub struct ExploreServerRow { #[template_child] diff --git a/src/session_view/content/explore/servers_popover.blp b/src/session_view/explore/servers_popover.blp similarity index 100% rename from src/session_view/content/explore/servers_popover.blp rename to src/session_view/explore/servers_popover.blp diff --git a/src/session_view/content/explore/servers_popover.rs b/src/session_view/explore/servers_popover.rs similarity index 98% rename from src/session_view/content/explore/servers_popover.rs rename to src/session_view/explore/servers_popover.rs index 513185a3..efbc0426 100644 --- a/src/session_view/content/explore/servers_popover.rs +++ b/src/session_view/explore/servers_popover.rs @@ -14,7 +14,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template(resource = "/org/gnome/Fractal/ui/session_view/content/explore/servers_popover.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/explore/servers_popover.ui")] #[properties(wrapper_type = super::ExploreServersPopover)] pub struct ExploreServersPopover { #[template_child] diff --git a/src/session_view/content/invite.blp b/src/session_view/invite.blp similarity index 100% rename from src/session_view/content/invite.blp rename to src/session_view/invite.blp diff --git a/src/session_view/content/invite.rs b/src/session_view/invite.rs similarity index 99% rename from src/session_view/content/invite.rs rename to src/session_view/invite.rs index ee335bda..69992bef 100644 --- a/src/session_view/content/invite.rs +++ b/src/session_view/invite.rs @@ -22,7 +22,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template(resource = "/org/gnome/Fractal/ui/session_view/content/invite.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/invite.ui")] #[properties(wrapper_type = super::Invite)] pub struct Invite { #[template_child] diff --git a/src/session_view/content/invite_request.blp b/src/session_view/invite_request.blp similarity index 100% rename from src/session_view/content/invite_request.blp rename to src/session_view/invite_request.blp diff --git a/src/session_view/content/invite_request.rs b/src/session_view/invite_request.rs similarity index 98% rename from src/session_view/content/invite_request.rs rename to src/session_view/invite_request.rs index b779f03b..0ffb4911 100644 --- a/src/session_view/content/invite_request.rs +++ b/src/session_view/invite_request.rs @@ -17,7 +17,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template(resource = "/org/gnome/Fractal/ui/session_view/content/invite_request.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/invite_request.ui")] #[properties(wrapper_type = super::InviteRequest)] pub struct InviteRequest { #[template_child] diff --git a/src/session_view/mod.rs b/src/session_view/mod.rs index 4b649c26..8e7df1e2 100644 --- a/src/session_view/mod.rs +++ b/src/session_view/mod.rs @@ -6,12 +6,19 @@ use tracing::{error, warn}; mod content; mod create_direct_chat_dialog; mod create_room_dialog; +mod explore; +mod invite; +mod invite_request; mod media_viewer; +mod room_details; +mod room_history; mod sidebar; use self::{ content::Content, create_direct_chat_dialog::CreateDirectChatDialog, - create_room_dialog::CreateRoomDialog, media_viewer::MediaViewer, sidebar::Sidebar, + create_room_dialog::CreateRoomDialog, explore::Explore, invite::Invite, + invite_request::InviteRequest, media_viewer::MediaViewer, room_details::RoomDetails, + room_history::RoomHistory, sidebar::Sidebar, }; use crate::{ Window, diff --git a/src/session_view/content/room_details/addresses_subpage/completion_popover.blp b/src/session_view/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/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/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/room_details/addresses_subpage/completion_popover.rs index aa6442d3..dafa9ca1 100644 --- a/src/session_view/content/room_details/addresses_subpage/completion_popover.rs +++ b/src/session_view/room_details/addresses_subpage/completion_popover.rs @@ -13,7 +13,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/addresses_subpage/completion_popover.ui" + resource = "/org/gnome/Fractal/ui/session_view/room_details/addresses_subpage/completion_popover.ui" )] #[properties(wrapper_type = super::CompletionPopover)] pub struct CompletionPopover { diff --git a/src/session_view/content/room_details/addresses_subpage/mod.blp b/src/session_view/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/room_details/addresses_subpage/mod.blp diff --git a/src/session_view/content/room_details/addresses_subpage/mod.rs b/src/session_view/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/room_details/addresses_subpage/mod.rs index b620208c..1b85978b 100644 --- a/src/session_view/content/room_details/addresses_subpage/mod.rs +++ b/src/session_view/room_details/addresses_subpage/mod.rs @@ -29,7 +29,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/addresses_subpage/mod.ui" + resource = "/org/gnome/Fractal/ui/session_view/room_details/addresses_subpage/mod.ui" )] #[properties(wrapper_type = super::AddressesSubpage)] pub struct AddressesSubpage { diff --git a/src/session_view/content/room_details/addresses_subpage/public_address.rs b/src/session_view/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/room_details/addresses_subpage/public_address.rs diff --git a/src/session_view/content/room_details/edit_details_subpage.blp b/src/session_view/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/room_details/edit_details_subpage.blp diff --git a/src/session_view/content/room_details/edit_details_subpage.rs b/src/session_view/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/room_details/edit_details_subpage.rs index 3b0a54e8..02f9ebcc 100644 --- a/src/session_view/content/room_details/edit_details_subpage.rs +++ b/src/session_view/room_details/edit_details_subpage.rs @@ -28,7 +28,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/edit_details_subpage.ui" + resource = "/org/gnome/Fractal/ui/session_view/room_details/edit_details_subpage.ui" )] #[properties(wrapper_type = super::EditDetailsSubpage)] pub struct EditDetailsSubpage { diff --git a/src/session_view/content/room_details/general_page.blp b/src/session_view/room_details/general_page.blp similarity index 100% rename from src/session_view/content/room_details/general_page.blp rename to src/session_view/room_details/general_page.blp diff --git a/src/session_view/content/room_details/general_page.rs b/src/session_view/room_details/general_page.rs similarity index 99% rename from src/session_view/content/room_details/general_page.rs rename to src/session_view/room_details/general_page.rs index 6595317c..f8b4880c 100644 --- a/src/session_view/content/room_details/general_page.rs +++ b/src/session_view/room_details/general_page.rs @@ -48,9 +48,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/general_page.ui" - )] + #[template(resource = "/org/gnome/Fractal/ui/session_view/room_details/general_page.ui")] #[properties(wrapper_type = super::GeneralPage)] pub struct GeneralPage { #[template_child] diff --git a/src/session_view/content/room_details/history_viewer/audio.blp b/src/session_view/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/room_details/history_viewer/audio.blp diff --git a/src/session_view/content/room_details/history_viewer/audio.rs b/src/session_view/room_details/history_viewer/audio.rs similarity index 98% rename from src/session_view/content/room_details/history_viewer/audio.rs rename to src/session_view/room_details/history_viewer/audio.rs index 95a6c312..9f578377 100644 --- a/src/session_view/content/room_details/history_viewer/audio.rs +++ b/src/session_view/room_details/history_viewer/audio.rs @@ -22,7 +22,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/history_viewer/audio.ui" + resource = "/org/gnome/Fractal/ui/session_view/room_details/history_viewer/audio.ui" )] #[properties(wrapper_type = super::AudioHistoryViewer)] pub struct AudioHistoryViewer { diff --git a/src/session_view/content/room_details/history_viewer/audio_row.blp b/src/session_view/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/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/room_details/history_viewer/audio_row.rs similarity index 95% rename from src/session_view/content/room_details/history_viewer/audio_row.rs rename to src/session_view/room_details/history_viewer/audio_row.rs index 85585508..88a66ed7 100644 --- a/src/session_view/content/room_details/history_viewer/audio_row.rs +++ b/src/session_view/room_details/history_viewer/audio_row.rs @@ -13,7 +13,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/history_viewer/audio_row.ui" + resource = "/org/gnome/Fractal/ui/session_view/room_details/history_viewer/audio_row.ui" )] #[properties(wrapper_type = super::AudioRow)] pub struct AudioRow { diff --git a/src/session_view/content/room_details/history_viewer/event.rs b/src/session_view/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/room_details/history_viewer/event.rs diff --git a/src/session_view/content/room_details/history_viewer/file.blp b/src/session_view/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/room_details/history_viewer/file.blp diff --git a/src/session_view/content/room_details/history_viewer/file.rs b/src/session_view/room_details/history_viewer/file.rs similarity index 98% rename from src/session_view/content/room_details/history_viewer/file.rs rename to src/session_view/room_details/history_viewer/file.rs index 1d3a0ad7..f042f6ff 100644 --- a/src/session_view/content/room_details/history_viewer/file.rs +++ b/src/session_view/room_details/history_viewer/file.rs @@ -21,9 +21,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/history_viewer/file.ui" - )] + #[template(resource = "/org/gnome/Fractal/ui/session_view/room_details/history_viewer/file.ui")] #[properties(wrapper_type = super::FileHistoryViewer)] pub struct FileHistoryViewer { #[template_child] diff --git a/src/session_view/content/room_details/history_viewer/file_row.blp b/src/session_view/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/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/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/room_details/history_viewer/file_row.rs index e6d8face..7bd27d77 100644 --- a/src/session_view/content/room_details/history_viewer/file_row.rs +++ b/src/session_view/room_details/history_viewer/file_row.rs @@ -15,7 +15,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/history_viewer/file_row.ui" + resource = "/org/gnome/Fractal/ui/session_view/room_details/history_viewer/file_row.ui" )] #[properties(wrapper_type = super::FileRow)] pub struct FileRow { diff --git a/src/session_view/content/room_details/history_viewer/mod.rs b/src/session_view/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/room_details/history_viewer/mod.rs diff --git a/src/session_view/content/room_details/history_viewer/timeline.rs b/src/session_view/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/room_details/history_viewer/timeline.rs diff --git a/src/session_view/content/room_details/history_viewer/visual_media.blp b/src/session_view/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/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/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/room_details/history_viewer/visual_media.rs index 8d41ad28..332947da 100644 --- a/src/session_view/content/room_details/history_viewer/visual_media.rs +++ b/src/session_view/room_details/history_viewer/visual_media.rs @@ -25,7 +25,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/history_viewer/visual_media.ui" + resource = "/org/gnome/Fractal/ui/session_view/room_details/history_viewer/visual_media.ui" )] #[properties(wrapper_type = super::VisualMediaHistoryViewer)] pub struct VisualMediaHistoryViewer { diff --git a/src/session_view/content/room_details/history_viewer/visual_media_item.blp b/src/session_view/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/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/room_details/history_viewer/visual_media_item.rs similarity index 98% rename from src/session_view/content/room_details/history_viewer/visual_media_item.rs rename to src/session_view/room_details/history_viewer/visual_media_item.rs index 15e27b9c..fd3b0fb6 100644 --- a/src/session_view/content/room_details/history_viewer/visual_media_item.rs +++ b/src/session_view/room_details/history_viewer/visual_media_item.rs @@ -44,7 +44,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/history_viewer/visual_media_item.ui" + resource = "/org/gnome/Fractal/ui/session_view/room_details/history_viewer/visual_media_item.ui" )] #[properties(wrapper_type = super::VisualMediaItem)] pub struct VisualMediaItem { diff --git a/src/session_view/content/room_details/history_visibility_subpage.blp b/src/session_view/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/room_details/history_visibility_subpage.blp diff --git a/src/session_view/content/room_details/history_visibility_subpage.rs b/src/session_view/room_details/history_visibility_subpage.rs similarity index 98% rename from src/session_view/content/room_details/history_visibility_subpage.rs rename to src/session_view/room_details/history_visibility_subpage.rs index 9a03555e..9128e2e0 100644 --- a/src/session_view/content/room_details/history_visibility_subpage.rs +++ b/src/session_view/room_details/history_visibility_subpage.rs @@ -23,7 +23,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/history_visibility_subpage.ui" + resource = "/org/gnome/Fractal/ui/session_view/room_details/history_visibility_subpage.ui" )] #[properties(wrapper_type = super::HistoryVisibilitySubpage)] pub struct HistoryVisibilitySubpage { diff --git a/src/session_view/content/room_details/invite_subpage/item.rs b/src/session_view/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/room_details/invite_subpage/item.rs diff --git a/src/session_view/content/room_details/invite_subpage/list.rs b/src/session_view/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/room_details/invite_subpage/list.rs diff --git a/src/session_view/content/room_details/invite_subpage/mod.blp b/src/session_view/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/room_details/invite_subpage/mod.blp diff --git a/src/session_view/content/room_details/invite_subpage/mod.rs b/src/session_view/room_details/invite_subpage/mod.rs similarity index 98% rename from src/session_view/content/room_details/invite_subpage/mod.rs rename to src/session_view/room_details/invite_subpage/mod.rs index 0ad5a077..4dea1dfb 100644 --- a/src/session_view/content/room_details/invite_subpage/mod.rs +++ b/src/session_view/room_details/invite_subpage/mod.rs @@ -27,9 +27,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/invite_subpage/mod.ui" - )] + #[template(resource = "/org/gnome/Fractal/ui/session_view/room_details/invite_subpage/mod.ui")] #[properties(wrapper_type = super::InviteSubpage)] pub struct InviteSubpage { #[template_child] diff --git a/src/session_view/content/room_details/invite_subpage/row.blp b/src/session_view/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/room_details/invite_subpage/row.blp diff --git a/src/session_view/content/room_details/invite_subpage/row.rs b/src/session_view/room_details/invite_subpage/row.rs similarity index 95% rename from src/session_view/content/room_details/invite_subpage/row.rs rename to src/session_view/room_details/invite_subpage/row.rs index 633c12fd..8039c4a6 100644 --- a/src/session_view/content/room_details/invite_subpage/row.rs +++ b/src/session_view/room_details/invite_subpage/row.rs @@ -12,9 +12,7 @@ mod imp { use crate::utils::TemplateCallbacks; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/invite_subpage/row.ui" - )] + #[template(resource = "/org/gnome/Fractal/ui/session_view/room_details/invite_subpage/row.ui")] #[properties(wrapper_type = super::InviteRow)] pub struct InviteRow { #[template_child] diff --git a/src/session_view/content/room_details/join_rule_subpage.blp b/src/session_view/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/room_details/join_rule_subpage.blp diff --git a/src/session_view/content/room_details/join_rule_subpage.rs b/src/session_view/room_details/join_rule_subpage.rs similarity index 98% rename from src/session_view/content/room_details/join_rule_subpage.rs rename to src/session_view/room_details/join_rule_subpage.rs index e1253909..947ded42 100644 --- a/src/session_view/content/room_details/join_rule_subpage.rs +++ b/src/session_view/room_details/join_rule_subpage.rs @@ -20,9 +20,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/join_rule_subpage.ui" - )] + #[template(resource = "/org/gnome/Fractal/ui/session_view/room_details/join_rule_subpage.ui")] #[properties(wrapper_type = super::JoinRuleSubpage)] pub struct JoinRuleSubpage { #[template_child] diff --git a/src/session_view/content/room_details/member_row.blp b/src/session_view/room_details/member_row.blp similarity index 100% rename from src/session_view/content/room_details/member_row.blp rename to src/session_view/room_details/member_row.blp diff --git a/src/session_view/content/room_details/member_row.rs b/src/session_view/room_details/member_row.rs similarity index 96% rename from src/session_view/content/room_details/member_row.rs rename to src/session_view/room_details/member_row.rs index 82b63fa5..897078a4 100644 --- a/src/session_view/content/room_details/member_row.rs +++ b/src/session_view/room_details/member_row.rs @@ -14,7 +14,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template(resource = "/org/gnome/Fractal/ui/session_view/content/room_details/member_row.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/room_details/member_row.ui")] #[properties(wrapper_type = super::MemberRow)] pub struct MemberRow { #[template_child] diff --git a/src/session_view/content/room_details/members_page/members_list_view/item_row.rs b/src/session_view/room_details/members_page/members_list_view/item_row.rs similarity index 97% rename from src/session_view/content/room_details/members_page/members_list_view/item_row.rs rename to src/session_view/room_details/members_page/members_list_view/item_row.rs index efbf8ffd..6befd740 100644 --- a/src/session_view/content/room_details/members_page/members_list_view/item_row.rs +++ b/src/session_view/room_details/members_page/members_list_view/item_row.rs @@ -5,7 +5,7 @@ use super::MembershipSubpageRow; use crate::{ prelude::*, session::Member, - session_view::content::room_details::{MemberRow, MembershipSubpageItem}, + session_view::room_details::{MemberRow, MembershipSubpageItem}, }; mod imp { diff --git a/src/session_view/content/room_details/members_page/members_list_view/membership_subpage_row.blp b/src/session_view/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/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/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/room_details/members_page/members_list_view/membership_subpage_row.rs index d82d3b73..cf0636c5 100644 --- a/src/session_view/content/room_details/members_page/members_list_view/membership_subpage_row.rs +++ b/src/session_view/room_details/members_page/members_list_view/membership_subpage_row.rs @@ -3,7 +3,7 @@ use gtk::{glib, glib::clone, prelude::*, subclass::prelude::*}; use crate::{ session::MembershipListKind, - session_view::content::room_details::membership_subpage_item::MembershipSubpageItem, + session_view::room_details::membership_subpage_item::MembershipSubpageItem, }; mod imp { @@ -15,7 +15,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/members_page/members_list_view/membership_subpage_row.ui" + resource = "/org/gnome/Fractal/ui/session_view/room_details/members_page/members_list_view/membership_subpage_row.ui" )] #[properties(wrapper_type = super::MembershipSubpageRow)] pub struct MembershipSubpageRow { diff --git a/src/session_view/content/room_details/members_page/members_list_view/mod.blp b/src/session_view/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/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/room_details/members_page/members_list_view/mod.rs similarity index 99% rename from src/session_view/content/room_details/members_page/members_list_view/mod.rs rename to src/session_view/room_details/members_page/members_list_view/mod.rs index 6a419ad8..a1bc5142 100644 --- a/src/session_view/content/room_details/members_page/members_list_view/mod.rs +++ b/src/session_view/room_details/members_page/members_list_view/mod.rs @@ -13,7 +13,7 @@ use crate::{ components::LoadingRow, prelude::*, session::{Member, MemberList, MembershipListKind, Room}, - session_view::content::room_details::MembershipSubpageItem, + session_view::room_details::MembershipSubpageItem, utils::{BoundObjectWeakRef, ExpressionListModel, LoadingState, expression}, }; @@ -29,7 +29,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/members_page/members_list_view/mod.ui" + resource = "/org/gnome/Fractal/ui/session_view/room_details/members_page/members_list_view/mod.ui" )] #[properties(wrapper_type = super::MembersListView)] pub struct MembersListView { diff --git a/src/session_view/content/room_details/members_page/mod.blp b/src/session_view/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/room_details/members_page/mod.blp diff --git a/src/session_view/content/room_details/members_page/mod.rs b/src/session_view/room_details/members_page/mod.rs similarity index 96% rename from src/session_view/content/room_details/members_page/mod.rs rename to src/session_view/room_details/members_page/mod.rs index e7d1990d..ae61fe8c 100644 --- a/src/session_view/content/room_details/members_page/mod.rs +++ b/src/session_view/room_details/members_page/mod.rs @@ -12,9 +12,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/members_page/mod.ui" - )] + #[template(resource = "/org/gnome/Fractal/ui/session_view/room_details/members_page/mod.ui")] #[properties(wrapper_type = super::MembersPage)] pub struct MembersPage { #[template_child] diff --git a/src/session_view/content/room_details/membership_subpage_item.rs b/src/session_view/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/room_details/membership_subpage_item.rs diff --git a/src/session_view/content/room_details/mod.blp b/src/session_view/room_details/mod.blp similarity index 100% rename from src/session_view/content/room_details/mod.blp rename to src/session_view/room_details/mod.blp diff --git a/src/session_view/content/room_details/mod.rs b/src/session_view/room_details/mod.rs similarity index 99% rename from src/session_view/content/room_details/mod.rs rename to src/session_view/room_details/mod.rs index dd60826a..bf19f69b 100644 --- a/src/session_view/content/room_details/mod.rs +++ b/src/session_view/room_details/mod.rs @@ -89,7 +89,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template(resource = "/org/gnome/Fractal/ui/session_view/content/room_details/mod.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/room_details/mod.ui")] #[properties(wrapper_type = super::RoomDetails)] pub struct RoomDetails { /// The room to show the details for. diff --git a/src/session_view/content/room_details/permissions/add_members_subpage.blp b/src/session_view/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/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/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/room_details/permissions/add_members_subpage.rs index 0ce06fa5..501243b5 100644 --- a/src/session_view/content/room_details/permissions/add_members_subpage.rs +++ b/src/session_view/room_details/permissions/add_members_subpage.rs @@ -26,7 +26,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/permissions/add_members_subpage.ui" + resource = "/org/gnome/Fractal/ui/session_view/room_details/permissions/add_members_subpage.ui" )] #[properties(wrapper_type = super::PermissionsAddMembersSubpage)] pub struct PermissionsAddMembersSubpage { diff --git a/src/session_view/content/room_details/permissions/member_power_level.rs b/src/session_view/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/room_details/permissions/member_power_level.rs diff --git a/src/session_view/content/room_details/permissions/member_row.blp b/src/session_view/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/room_details/permissions/member_row.blp diff --git a/src/session_view/content/room_details/permissions/member_row.rs b/src/session_view/room_details/permissions/member_row.rs similarity index 98% rename from src/session_view/content/room_details/permissions/member_row.rs rename to src/session_view/room_details/permissions/member_row.rs index 1c2683f3..32c0841e 100644 --- a/src/session_view/content/room_details/permissions/member_row.rs +++ b/src/session_view/room_details/permissions/member_row.rs @@ -23,7 +23,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/permissions/member_row.ui" + resource = "/org/gnome/Fractal/ui/session_view/room_details/permissions/member_row.ui" )] #[properties(wrapper_type = super::PermissionsMemberRow)] pub struct PermissionsMemberRow { diff --git a/src/session_view/content/room_details/permissions/members_subpage.blp b/src/session_view/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/room_details/permissions/members_subpage.blp diff --git a/src/session_view/content/room_details/permissions/members_subpage.rs b/src/session_view/room_details/permissions/members_subpage.rs similarity index 98% rename from src/session_view/content/room_details/permissions/members_subpage.rs rename to src/session_view/room_details/permissions/members_subpage.rs index 2458e683..2e518d4a 100644 --- a/src/session_view/content/room_details/permissions/members_subpage.rs +++ b/src/session_view/room_details/permissions/members_subpage.rs @@ -18,7 +18,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/permissions/members_subpage.ui" + resource = "/org/gnome/Fractal/ui/session_view/room_details/permissions/members_subpage.ui" )] #[properties(wrapper_type = super::PermissionsMembersSubpage)] pub struct PermissionsMembersSubpage { diff --git a/src/session_view/content/room_details/permissions/mod.rs b/src/session_view/room_details/permissions/mod.rs similarity index 100% rename from src/session_view/content/room_details/permissions/mod.rs rename to src/session_view/room_details/permissions/mod.rs diff --git a/src/session_view/content/room_details/permissions/permissions_subpage.blp b/src/session_view/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/room_details/permissions/permissions_subpage.blp diff --git a/src/session_view/content/room_details/permissions/permissions_subpage.rs b/src/session_view/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/room_details/permissions/permissions_subpage.rs index ca668caf..163fafd5 100644 --- a/src/session_view/content/room_details/permissions/permissions_subpage.rs +++ b/src/session_view/room_details/permissions/permissions_subpage.rs @@ -30,7 +30,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/permissions/permissions_subpage.ui" + resource = "/org/gnome/Fractal/ui/session_view/room_details/permissions/permissions_subpage.ui" )] #[properties(wrapper_type = super::PermissionsSubpage)] pub struct PermissionsSubpage { diff --git a/src/session_view/content/room_details/permissions/privileged_members.rs b/src/session_view/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/room_details/permissions/privileged_members.rs diff --git a/src/session_view/content/room_details/permissions/select_member_row.blp b/src/session_view/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/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/room_details/permissions/select_member_row.rs similarity index 95% rename from src/session_view/content/room_details/permissions/select_member_row.rs rename to src/session_view/room_details/permissions/select_member_row.rs index 2b6679b2..8ac0ca30 100644 --- a/src/session_view/content/room_details/permissions/select_member_row.rs +++ b/src/session_view/room_details/permissions/select_member_row.rs @@ -12,7 +12,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/permissions/select_member_row.ui" + resource = "/org/gnome/Fractal/ui/session_view/room_details/permissions/select_member_row.ui" )] #[properties(wrapper_type = super::PermissionsSelectMemberRow)] pub struct PermissionsSelectMemberRow { diff --git a/src/session_view/content/room_details/upgrade_dialog/mod.blp b/src/session_view/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/room_details/upgrade_dialog/mod.blp diff --git a/src/session_view/content/room_details/upgrade_dialog/mod.rs b/src/session_view/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/room_details/upgrade_dialog/mod.rs index 12621025..ee6f1eb4 100644 --- a/src/session_view/content/room_details/upgrade_dialog/mod.rs +++ b/src/session_view/room_details/upgrade_dialog/mod.rs @@ -22,9 +22,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate)] - #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_details/upgrade_dialog/mod.ui" - )] + #[template(resource = "/org/gnome/Fractal/ui/session_view/room_details/upgrade_dialog/mod.ui")] pub struct UpgradeDialog { #[template_child] version_combo: TemplateChild, diff --git a/src/session_view/content/room_details/upgrade_dialog/room_version.rs b/src/session_view/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/room_details/upgrade_dialog/room_version.rs diff --git a/src/session_view/content/room_history/divider_row.blp b/src/session_view/room_history/divider_row.blp similarity index 100% rename from src/session_view/content/room_history/divider_row.blp rename to src/session_view/room_history/divider_row.blp diff --git a/src/session_view/content/room_history/divider_row.rs b/src/session_view/room_history/divider_row.rs similarity index 98% rename from src/session_view/content/room_history/divider_row.rs rename to src/session_view/room_history/divider_row.rs index afed1dbf..429e7116 100644 --- a/src/session_view/content/room_history/divider_row.rs +++ b/src/session_view/room_history/divider_row.rs @@ -13,7 +13,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template(resource = "/org/gnome/Fractal/ui/session_view/content/room_history/divider_row.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session_view/room_history/divider_row.ui")] #[properties(wrapper_type = super::DividerRow)] pub struct DividerRow { #[template_child] diff --git a/src/session_view/content/room_history/event_actions/context_menu.blp b/src/session_view/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/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/room_history/event_actions/context_menu.rs similarity index 96% rename from src/session_view/content/room_history/event_actions/context_menu.rs rename to src/session_view/room_history/event_actions/context_menu.rs index ea6697dc..04aa4b75 100644 --- a/src/session_view/content/room_history/event_actions/context_menu.rs +++ b/src/session_view/room_history/event_actions/context_menu.rs @@ -70,7 +70,7 @@ impl EventActionsContextMenu { impl Default for EventActionsContextMenu { fn default() -> Self { let menu_model = gtk::Builder::from_resource( - "/org/gnome/Fractal/ui/session_view/content/room_history/event_actions/context_menu.ui", + "/org/gnome/Fractal/ui/session_view/room_history/event_actions/context_menu.ui", ) .object::("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/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/room_history/event_actions/group.rs diff --git a/src/session_view/content/room_history/event_actions/mod.rs b/src/session_view/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/room_history/event_actions/mod.rs diff --git a/src/session_view/content/room_history/event_actions/properties_dialog.blp b/src/session_view/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/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/room_history/event_actions/properties_dialog.rs similarity index 97% rename from src/session_view/content/room_history/event_actions/properties_dialog.rs rename to src/session_view/room_history/event_actions/properties_dialog.rs index d16975dd..77b3f7b3 100644 --- a/src/session_view/content/room_history/event_actions/properties_dialog.rs +++ b/src/session_view/room_history/event_actions/properties_dialog.rs @@ -20,7 +20,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_history/event_actions/properties_dialog.ui" + resource = "/org/gnome/Fractal/ui/session_view/room_history/event_actions/properties_dialog.ui" )] #[properties(wrapper_type = super::EventPropertiesDialog)] pub struct EventPropertiesDialog { diff --git a/src/session_view/content/room_history/event_actions/quick_reaction_chooser.blp b/src/session_view/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/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/room_history/event_actions/quick_reaction_chooser.rs similarity index 98% rename from src/session_view/content/room_history/event_actions/quick_reaction_chooser.rs rename to src/session_view/room_history/event_actions/quick_reaction_chooser.rs index a8ec249e..a4649415 100644 --- a/src/session_view/content/room_history/event_actions/quick_reaction_chooser.rs +++ b/src/session_view/room_history/event_actions/quick_reaction_chooser.rs @@ -70,7 +70,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_history/event_actions/quick_reaction_chooser.ui" + resource = "/org/gnome/Fractal/ui/session_view/room_history/event_actions/quick_reaction_chooser.ui" )] #[properties(wrapper_type = super::QuickReactionChooser)] pub struct QuickReactionChooser { diff --git a/src/session_view/content/room_history/event_row.rs b/src/session_view/room_history/event_row.rs similarity index 99% rename from src/session_view/content/room_history/event_row.rs rename to src/session_view/room_history/event_row.rs index f4ea7d0a..6e73fd14 100644 --- a/src/session_view/content/room_history/event_row.rs +++ b/src/session_view/room_history/event_row.rs @@ -7,7 +7,7 @@ use crate::{ components::ContextMenuBin, prelude::*, session::Event, - session_view::content::room_history::message_toolbar::ComposerState, + session_view::room_history::message_toolbar::ComposerState, utils::{BoundObject, BoundObjectWeakRef}, }; diff --git a/src/session_view/content/room_history/member_timestamp/mod.rs b/src/session_view/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/room_history/member_timestamp/mod.rs diff --git a/src/session_view/content/room_history/member_timestamp/row.blp b/src/session_view/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/room_history/member_timestamp/row.blp diff --git a/src/session_view/content/room_history/member_timestamp/row.rs b/src/session_view/room_history/member_timestamp/row.rs similarity index 97% rename from src/session_view/content/room_history/member_timestamp/row.rs rename to src/session_view/room_history/member_timestamp/row.rs index 03832418..a863b04c 100644 --- a/src/session_view/content/room_history/member_timestamp/row.rs +++ b/src/session_view/room_history/member_timestamp/row.rs @@ -16,7 +16,7 @@ mod imp { #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_history/member_timestamp/row.ui" + resource = "/org/gnome/Fractal/ui/session_view/room_history/member_timestamp/row.ui" )] #[properties(wrapper_type = super::MemberTimestampRow)] pub struct MemberTimestampRow { diff --git a/src/session_view/content/room_history/message_row/audio.blp b/src/session_view/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/room_history/message_row/audio.blp diff --git a/src/session_view/content/room_history/message_row/audio.rs b/src/session_view/room_history/message_row/audio.rs similarity index 96% rename from src/session_view/content/room_history/message_row/audio.rs rename to src/session_view/room_history/message_row/audio.rs index 362ac795..653ccfca 100644 --- a/src/session_view/content/room_history/message_row/audio.rs +++ b/src/session_view/room_history/message_row/audio.rs @@ -15,9 +15,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_history/message_row/audio.ui" - )] + #[template(resource = "/org/gnome/Fractal/ui/session_view/room_history/message_row/audio.ui")] #[properties(wrapper_type = super::MessageAudio)] pub struct MessageAudio { #[template_child] diff --git a/src/session_view/content/room_history/message_row/caption.rs b/src/session_view/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/room_history/message_row/caption.rs diff --git a/src/session_view/content/room_history/message_row/content.rs b/src/session_view/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/room_history/message_row/content.rs index aba54dc6..2d61bcfc 100644 --- a/src/session_view/content/room_history/message_row/content.rs +++ b/src/session_view/room_history/message_row/content.rs @@ -13,7 +13,7 @@ use crate::{ components::AudioPlayerMessage, prelude::*, session::{Event, Member, Room}, - session_view::content::room_history::message_toolbar::MessageEventSource, + session_view::room_history::message_toolbar::MessageEventSource, spawn, utils::matrix::{MediaMessage, MessageCacheKey}, }; diff --git a/src/session_view/content/room_history/message_row/file.blp b/src/session_view/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/room_history/message_row/file.blp diff --git a/src/session_view/content/room_history/message_row/file.rs b/src/session_view/room_history/message_row/file.rs similarity index 96% rename from src/session_view/content/room_history/message_row/file.rs rename to src/session_view/room_history/message_row/file.rs index 3eb7b12a..9569d2d1 100644 --- a/src/session_view/content/room_history/message_row/file.rs +++ b/src/session_view/room_history/message_row/file.rs @@ -13,9 +13,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_history/message_row/file.ui" - )] + #[template(resource = "/org/gnome/Fractal/ui/session_view/room_history/message_row/file.ui")] #[properties(wrapper_type = super::MessageFile)] pub struct MessageFile { /// The filename of the file. diff --git a/src/session_view/content/room_history/message_row/location.blp b/src/session_view/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/room_history/message_row/location.blp diff --git a/src/session_view/content/room_history/message_row/location.rs b/src/session_view/room_history/message_row/location.rs similarity index 97% rename from src/session_view/content/room_history/message_row/location.rs rename to src/session_view/room_history/message_row/location.rs index b723f565..3121d601 100644 --- a/src/session_view/content/room_history/message_row/location.rs +++ b/src/session_view/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/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/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/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/room_history/message_row/message_state_stack.rs similarity index 97% rename from src/session_view/content/room_history/message_row/message_state_stack.rs rename to src/session_view/room_history/message_row/message_state_stack.rs index de86fbe9..7d57a2d7 100644 --- a/src/session_view/content/room_history/message_row/message_state_stack.rs +++ b/src/session_view/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/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/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/room_history/message_row/mod.blp diff --git a/src/session_view/content/room_history/message_row/mod.rs b/src/session_view/room_history/message_row/mod.rs similarity index 98% rename from src/session_view/content/room_history/message_row/mod.rs rename to src/session_view/room_history/message_row/mod.rs index 1d910944..07a9f756 100644 --- a/src/session_view/content/room_history/message_row/mod.rs +++ b/src/session_view/room_history/message_row/mod.rs @@ -39,9 +39,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_history/message_row/mod.ui" - )] + #[template(resource = "/org/gnome/Fractal/ui/session_view/room_history/message_row/mod.ui")] #[properties(wrapper_type = super::MessageRow)] pub struct MessageRow { #[template_child] diff --git a/src/session_view/content/room_history/message_row/reaction/mod.blp b/src/session_view/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/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/room_history/message_row/reaction/mod.rs similarity index 98% rename from src/session_view/content/room_history/message_row/reaction/mod.rs rename to src/session_view/room_history/message_row/reaction/mod.rs index 3084f2fc..1ef88959 100644 --- a/src/session_view/content/room_history/message_row/reaction/mod.rs +++ b/src/session_view/room_history/message_row/reaction/mod.rs @@ -7,7 +7,7 @@ use crate::{ gettext_f, ngettext_f, prelude::*, session::{Member, MemberList, ReactionData, ReactionGroup}, - session_view::content::room_history::member_timestamp::MemberTimestamp, + session_view::room_history::member_timestamp::MemberTimestamp, utils::{BoundObjectWeakRef, EMOJI_REGEX, key_bindings}, }; @@ -20,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/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/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/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/room_history/message_row/reaction/reaction_popover.rs similarity index 92% rename from src/session_view/content/room_history/message_row/reaction/reaction_popover.rs rename to src/session_view/room_history/message_row/reaction/reaction_popover.rs index d95349d6..fc066bf4 100644 --- a/src/session_view/content/room_history/message_row/reaction/reaction_popover.rs +++ b/src/session_view/room_history/message_row/reaction/reaction_popover.rs @@ -3,9 +3,7 @@ use gtk::{gio, glib, glib::clone}; use crate::{ components::UserProfileDialog, - session_view::content::room_history::member_timestamp::{ - MemberTimestamp, row::MemberTimestampRow, - }, + session_view::room_history::member_timestamp::{MemberTimestamp, row::MemberTimestampRow}, }; mod imp { @@ -15,7 +13,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/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/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/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/room_history/message_row/reaction_list.rs similarity index 95% rename from src/session_view/content/room_history/message_row/reaction_list.rs rename to src/session_view/room_history/message_row/reaction_list.rs index 9e9abe88..07b43ba0 100644 --- a/src/session_view/content/room_history/message_row/reaction_list.rs +++ b/src/session_view/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/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/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/room_history/message_row/reply.blp diff --git a/src/session_view/content/room_history/message_row/reply.rs b/src/session_view/room_history/message_row/reply.rs similarity index 96% rename from src/session_view/content/room_history/message_row/reply.rs rename to src/session_view/room_history/message_row/reply.rs index 30e48a07..e2981a94 100644 --- a/src/session_view/content/room_history/message_row/reply.rs +++ b/src/session_view/room_history/message_row/reply.rs @@ -11,9 +11,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_history/message_row/reply.ui" - )] + #[template(resource = "/org/gnome/Fractal/ui/session_view/room_history/message_row/reply.ui")] #[properties(wrapper_type = super::MessageReply)] pub struct MessageReply { #[template_child] diff --git a/src/session_view/content/room_history/message_row/sender_name.blp b/src/session_view/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/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/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/room_history/message_row/sender_name.rs index 4d669785..e58494f5 100644 --- a/src/session_view/content/room_history/message_row/sender_name.rs +++ b/src/session_view/room_history/message_row/sender_name.rs @@ -5,7 +5,7 @@ use gtk::{glib, glib::clone}; use crate::{ prelude::*, session::{Member, Membership}, - session_view::content::RoomHistory, + session_view::RoomHistory, utils::{BoundObject, key_bindings}, }; @@ -18,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/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/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/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/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/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/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/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/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/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/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/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/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/room_history/message_row/visual_media.rs index 65942ae3..3943616e 100644 --- a/src/session_view/content/room_history/message_row/visual_media.rs +++ b/src/session_view/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/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/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/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/room_history/message_toolbar/attachment_dialog.rs similarity index 97% rename from src/session_view/content/room_history/message_toolbar/attachment_dialog.rs rename to src/session_view/room_history/message_toolbar/attachment_dialog.rs index c1ae5961..098dae74 100644 --- a/src/session_view/content/room_history/message_toolbar/attachment_dialog.rs +++ b/src/session_view/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/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/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/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/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/room_history/message_toolbar/completion/completion_popover.rs index 98910e92..4b485746 100644 --- a/src/session_view/content/room_history/message_toolbar/completion/completion_popover.rs +++ b/src/session_view/room_history/message_toolbar/completion/completion_popover.rs @@ -7,7 +7,7 @@ use super::{CompletionMemberList, CompletionRoomList}; use crate::{ components::{AvatarImageSafetySetting, Pill, PillSource, PillSourceRow}, session::Room, - session_view::content::room_history::message_toolbar::MessageToolbar, + session_view::room_history::message_toolbar::MessageToolbar, utils::BoundObject, }; @@ -30,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/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/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/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/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/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/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/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/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/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/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/room_history/message_toolbar/composer_state.rs diff --git a/src/session_view/content/room_history/message_toolbar/mod.blp b/src/session_view/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/room_history/message_toolbar/mod.blp diff --git a/src/session_view/content/room_history/message_toolbar/mod.rs b/src/session_view/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/room_history/message_toolbar/mod.rs index 89097c34..60434a36 100644 --- a/src/session_view/content/room_history/message_toolbar/mod.rs +++ b/src/session_view/room_history/message_toolbar/mod.rs @@ -76,9 +76,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_history/message_toolbar/mod.ui" - )] + #[template(resource = "/org/gnome/Fractal/ui/session_view/room_history/message_toolbar/mod.ui")] #[properties(wrapper_type = super::MessageToolbar)] pub struct MessageToolbar { #[template_child] diff --git a/src/session_view/content/room_history/mod.blp b/src/session_view/room_history/mod.blp similarity index 100% rename from src/session_view/content/room_history/mod.blp rename to src/session_view/room_history/mod.blp diff --git a/src/session_view/content/room_history/mod.rs b/src/session_view/room_history/mod.rs similarity index 99% rename from src/session_view/content/room_history/mod.rs rename to src/session_view/room_history/mod.rs index 593962ec..81f5a6e1 100644 --- a/src/session_view/content/room_history/mod.rs +++ b/src/session_view/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/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/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/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/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/room_history/read_receipts_list/mod.rs index 1ff20bf7..4aa0eb59 100644 --- a/src/session_view/content/room_history/read_receipts_list/mod.rs +++ b/src/session_view/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/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/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/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/room_history/read_receipts_list/read_receipts_popover.rs similarity index 92% rename from src/session_view/content/room_history/read_receipts_list/read_receipts_popover.rs rename to src/session_view/room_history/read_receipts_list/read_receipts_popover.rs index 339de05b..46032953 100644 --- a/src/session_view/content/room_history/read_receipts_list/read_receipts_popover.rs +++ b/src/session_view/room_history/read_receipts_list/read_receipts_popover.rs @@ -3,9 +3,7 @@ use gtk::{gio, glib, glib::clone, subclass::prelude::*}; use crate::{ components::UserProfileDialog, - session_view::content::room_history::member_timestamp::{ - MemberTimestamp, row::MemberTimestampRow, - }, + session_view::room_history::member_timestamp::{MemberTimestamp, row::MemberTimestampRow}, }; mod imp { @@ -15,7 +13,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/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/room_history/state/content.rs similarity index 100% rename from src/session_view/content/room_history/state/content.rs rename to src/session_view/room_history/state/content.rs diff --git a/src/session_view/content/room_history/state/creation.blp b/src/session_view/room_history/state/creation.blp similarity index 100% rename from src/session_view/content/room_history/state/creation.blp rename to src/session_view/room_history/state/creation.blp diff --git a/src/session_view/content/room_history/state/creation.rs b/src/session_view/room_history/state/creation.rs similarity index 95% rename from src/session_view/content/room_history/state/creation.rs rename to src/session_view/room_history/state/creation.rs index 89605e42..1d910537 100644 --- a/src/session_view/content/room_history/state/creation.rs +++ b/src/session_view/room_history/state/creation.rs @@ -10,9 +10,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate)] - #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_history/state/creation.ui" - )] + #[template(resource = "/org/gnome/Fractal/ui/session_view/room_history/state/creation.ui")] pub struct StateCreation { #[template_child] previous_room_btn: TemplateChild, diff --git a/src/session_view/content/room_history/state/group_item_row.rs b/src/session_view/room_history/state/group_item_row.rs similarity index 99% rename from src/session_view/content/room_history/state/group_item_row.rs rename to src/session_view/room_history/state/group_item_row.rs index b2d922fd..3dec9613 100644 --- a/src/session_view/content/room_history/state/group_item_row.rs +++ b/src/session_view/room_history/state/group_item_row.rs @@ -5,7 +5,7 @@ use super::StateContent; use crate::{ prelude::*, session::Event, - session_view::content::room_history::{EventActionsGroup, RoomHistory}, + session_view::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/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/room_history/state/group_row.blp diff --git a/src/session_view/content/room_history/state/group_row.rs b/src/session_view/room_history/state/group_row.rs similarity index 97% rename from src/session_view/content/room_history/state/group_row.rs rename to src/session_view/room_history/state/group_row.rs index 8ef7f57e..f02e8a78 100644 --- a/src/session_view/content/room_history/state/group_row.rs +++ b/src/session_view/room_history/state/group_row.rs @@ -6,7 +6,7 @@ use crate::{ ngettext_f, prelude::*, session::{Event, Room}, - session_view::content::room_history::ReadReceiptsList, + session_view::room_history::ReadReceiptsList, utils::{BoundObject, GroupingListGroup, key_bindings}, }; @@ -21,9 +21,7 @@ mod imp { use super::*; #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)] - #[template( - resource = "/org/gnome/Fractal/ui/session_view/content/room_history/state/group_row.ui" - )] + #[template(resource = "/org/gnome/Fractal/ui/session_view/room_history/state/group_row.ui")] #[properties(wrapper_type = super::StateGroupRow)] pub struct StateGroupRow { #[template_child] diff --git a/src/session_view/content/room_history/state/mod.rs b/src/session_view/room_history/state/mod.rs similarity index 100% rename from src/session_view/content/room_history/state/mod.rs rename to src/session_view/room_history/state/mod.rs diff --git a/src/session_view/content/room_history/state/row.blp b/src/session_view/room_history/state/row.blp similarity index 100% rename from src/session_view/content/room_history/state/row.blp rename to src/session_view/room_history/state/row.blp diff --git a/src/session_view/content/room_history/state/row.rs b/src/session_view/room_history/state/row.rs similarity index 89% rename from src/session_view/content/room_history/state/row.rs rename to src/session_view/room_history/state/row.rs index 01169c41..162654ff 100644 --- a/src/session_view/content/room_history/state/row.rs +++ b/src/session_view/room_history/state/row.rs @@ -2,7 +2,7 @@ use adw::{prelude::*, subclass::prelude::*}; use gtk::glib; use super::StateContent; -use crate::{session::Event, session_view::content::room_history::ReadReceiptsList}; +use crate::{session::Event, session_view::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/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/room_history/title.blp similarity index 100% rename from src/session_view/content/room_history/title.blp rename to src/session_view/room_history/title.blp diff --git a/src/session_view/content/room_history/title.rs b/src/session_view/room_history/title.rs similarity index 98% rename from src/session_view/content/room_history/title.rs rename to src/session_view/room_history/title.rs index 23df49b2..8bb00ca6 100644 --- a/src/session_view/content/room_history/title.rs +++ b/src/session_view/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/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/room_history/typing_row.blp similarity index 100% rename from src/session_view/content/room_history/typing_row.blp rename to src/session_view/room_history/typing_row.blp diff --git a/src/session_view/content/room_history/typing_row.rs b/src/session_view/room_history/typing_row.rs similarity index 98% rename from src/session_view/content/room_history/typing_row.rs rename to src/session_view/room_history/typing_row.rs index 2d57aa8a..88b1e62e 100644 --- a/src/session_view/content/room_history/typing_row.rs +++ b/src/session_view/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/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/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/room_history/verification_info_bar.blp diff --git a/src/session_view/content/room_history/verification_info_bar.rs b/src/session_view/room_history/verification_info_bar.rs similarity index 98% rename from src/session_view/content/room_history/verification_info_bar.rs rename to src/session_view/room_history/verification_info_bar.rs index d92b26ba..6cbd986c 100644 --- a/src/session_view/content/room_history/verification_info_bar.rs +++ b/src/session_view/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/room_history/verification_info_bar.ui" )] #[properties(wrapper_type = super::VerificationInfoBar)] pub struct VerificationInfoBar { diff --git a/src/ui-blueprint-resources.in b/src/ui-blueprint-resources.in index 6822c5c9..0370d141 100644 --- a/src/ui-blueprint-resources.in +++ b/src/ui-blueprint-resources.in @@ -75,70 +75,70 @@ 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/content.blp session_view/create_direct_chat_dialog/mod.blp session_view/create_room_dialog.blp +session_view/explore/mod.blp +session_view/explore/public_room_row.blp +session_view/explore/server_row.blp +session_view/explore/servers_popover.blp +session_view/invite.blp +session_view/invite_request.blp session_view/media_viewer.blp session_view/mod.blp +session_view/room_details/addresses_subpage/completion_popover.blp +session_view/room_details/addresses_subpage/mod.blp +session_view/room_details/edit_details_subpage.blp +session_view/room_details/general_page.blp +session_view/room_details/history_viewer/audio.blp +session_view/room_details/history_viewer/audio_row.blp +session_view/room_details/history_viewer/file.blp +session_view/room_details/history_viewer/file_row.blp +session_view/room_details/history_viewer/visual_media.blp +session_view/room_details/history_viewer/visual_media_item.blp +session_view/room_details/history_visibility_subpage.blp +session_view/room_details/invite_subpage/mod.blp +session_view/room_details/invite_subpage/row.blp +session_view/room_details/join_rule_subpage.blp +session_view/room_details/member_row.blp +session_view/room_details/members_page/members_list_view/membership_subpage_row.blp +session_view/room_details/members_page/members_list_view/mod.blp +session_view/room_details/members_page/mod.blp +session_view/room_details/mod.blp +session_view/room_details/permissions/add_members_subpage.blp +session_view/room_details/permissions/member_row.blp +session_view/room_details/permissions/members_subpage.blp +session_view/room_details/permissions/permissions_subpage.blp +session_view/room_details/permissions/select_member_row.blp +session_view/room_details/upgrade_dialog/mod.blp +session_view/room_history/divider_row.blp +session_view/room_history/event_actions/context_menu.blp +session_view/room_history/event_actions/properties_dialog.blp +session_view/room_history/event_actions/quick_reaction_chooser.blp +session_view/room_history/member_timestamp/row.blp +session_view/room_history/message_row/audio.blp +session_view/room_history/message_row/file.blp +session_view/room_history/message_row/location.blp +session_view/room_history/message_row/message_state_stack.blp +session_view/room_history/message_row/mod.blp +session_view/room_history/message_row/reaction/mod.blp +session_view/room_history/message_row/reaction/reaction_popover.blp +session_view/room_history/message_row/reaction_list.blp +session_view/room_history/message_row/reply.blp +session_view/room_history/message_row/sender_name.blp +session_view/room_history/message_row/visual_media.blp +session_view/room_history/message_toolbar/attachment_dialog.blp +session_view/room_history/message_toolbar/completion/completion_popover.blp +session_view/room_history/message_toolbar/mod.blp +session_view/room_history/mod.blp +session_view/room_history/read_receipts_list/mod.blp +session_view/room_history/read_receipts_list/read_receipts_popover.blp +session_view/room_history/state/creation.blp +session_view/room_history/state/group_row.blp +session_view/room_history/state/row.blp +session_view/room_history/title.blp +session_view/room_history/typing_row.blp +session_view/room_history/verification_info_bar.blp session_view/sidebar/icon_item_row.blp session_view/sidebar/mod.blp session_view/sidebar/room_row.blp