diff --git a/data/resources/resources.gresource.xml b/data/resources/resources.gresource.xml index 4b3bba14..9bb4e7cb 100644 --- a/data/resources/resources.gresource.xml +++ b/data/resources/resources.gresource.xml @@ -50,104 +50,5 @@ sas-emoji/vi.json sas-emoji/zh_Hans.json style.css - ui/account-settings-change-password-subpage.ui - ui/account-settings-deactivate-account-subpage.ui - ui/account-settings-device-row.ui - ui/account-settings-devices-page.ui - ui/account-settings-import-export-keys-subpage.ui - ui/account-settings-log-out-subpage.ui - ui/account-settings-notifications-page.ui - ui/account-settings-security-page.ui - ui/account-settings-user-page.ui - ui/account-settings.ui - ui/attachment-dialog.ui - ui/avatar-with-selection.ui - ui/components-action-button.ui - ui/components-audio-player.ui - ui/components-auth-dialog.ui - ui/components-avatar.ui - ui/components-button-row.ui - ui/components-editable-avatar.ui - ui/components-loading-listbox-row.ui - ui/components-location-viewer.ui - ui/components-media-content-viewer.ui - ui/components-reaction-chooser.ui - ui/components-toastable-window.ui - ui/components-video-player.ui - ui/content-audio-history-viewer-row.ui - ui/content-audio-history-viewer.ui - ui/content-completion-popover.ui - ui/content-completion-row.ui - ui/content-divider-row.ui - ui/content-explore-item.ui - ui/content-explore-server-row.ui - ui/content-explore-servers-popover.ui - ui/content-explore.ui - ui/content-file-history-viewer-row.ui - ui/content-file-history-viewer.ui - ui/content-invite-subpage.ui - ui/content-invite.ui - ui/content-invitee-item.ui - ui/content-invitee-row.ui - ui/content-media-history-viewer-item.ui - ui/content-media-history-viewer.ui - ui/content-member-item.ui - ui/content-member-page-list-view.ui - ui/content-member-page-membership-subpage-row.ui - ui/content-member-page.ui - ui/content-member-row.ui - ui/content-message-audio.ui - ui/content-message-file.ui - ui/content-message-location.ui - ui/content-message-media.ui - ui/content-message-reaction-list.ui - ui/content-message-reaction.ui - ui/content-message-reply.ui - ui/content-message-row.ui - ui/content-public-room-row.ui - ui/content-read-receipts-list.ui - ui/content-room-details-general-page.ui - ui/content-room-details.ui - ui/content-room-history.ui - ui/content-state-creation.ui - ui/content-state-row.ui - ui/content-state-tombstone.ui - ui/content-typing-row.ui - ui/content-verification-info-bar.ui - ui/content.ui - ui/context-menu-bin.ui - ui/create-dm-dialog-user-row.ui - ui/create-dm-dialog.ui - ui/error-page.ui - ui/event-menu.ui - ui/event-source-dialog.ui - ui/greeter.ui - ui/identity-verification-widget.ui - ui/join-room-dialog.ui - ui/login-advanced-dialog.ui - ui/login-homeserver-page.ui - ui/login-idp-button.ui - ui/login-method-page.ui - ui/login-sso-page.ui - ui/login.ui - ui/media-viewer.ui - ui/member-menu.ui - ui/pill.ui - ui/qr-code-scanner.ui - ui/room-creation.ui - ui/room-title.ui - ui/session-item-row.ui - ui/session-verification.ui - ui/session-view.ui - ui/shortcuts.ui - ui/sidebar-account-switcher.ui - ui/sidebar-category-row.ui - ui/sidebar-entry-row.ui - ui/sidebar-room-row.ui - ui/sidebar-verification-row.ui - ui/sidebar.ui - ui/spinner-button.ui - ui/verification-emoji.ui - ui/window.ui diff --git a/data/resources/ui/content-explore-item.ui b/data/resources/ui/content-explore-item.ui deleted file mode 100644 index bd83d29e..00000000 --- a/data/resources/ui/content-explore-item.ui +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/data/resources/ui/content-invitee-item.ui b/data/resources/ui/content-invitee-item.ui deleted file mode 100644 index 07f1ad3c..00000000 --- a/data/resources/ui/content-invitee-item.ui +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/data/resources/ui/content-member-item.ui b/data/resources/ui/content-member-item.ui deleted file mode 100644 index 3e15849d..00000000 --- a/data/resources/ui/content-member-item.ui +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/po/POTFILES.in b/po/POTFILES.in index 1054fe0a..31c4c5ea 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -4,66 +4,26 @@ data/org.gnome.Fractal.desktop.in.in data/org.gnome.Fractal.gschema.xml.in data/org.gnome.Fractal.metainfo.xml.in.in -# UI files -data/resources/ui/account-settings-change-password-subpage.ui -data/resources/ui/account-settings-deactivate-account-subpage.ui -data/resources/ui/account-settings-device-row.ui -data/resources/ui/account-settings-devices-page.ui -data/resources/ui/account-settings-log-out-subpage.ui -data/resources/ui/account-settings-import-export-keys-subpage.ui -data/resources/ui/account-settings-notifications-page.ui -data/resources/ui/account-settings-user-page.ui -data/resources/ui/account-settings-security-page.ui -data/resources/ui/account-settings.ui -data/resources/ui/attachment-dialog.ui -data/resources/ui/components-auth-dialog.ui -data/resources/ui/components-loading-listbox-row.ui -data/resources/ui/content-audio-history-viewer.ui -data/resources/ui/content-explore-servers-popover.ui -data/resources/ui/content-explore.ui -data/resources/ui/content-file-history-viewer.ui -data/resources/ui/content-invite-subpage.ui -data/resources/ui/content-invite.ui -data/resources/ui/content-media-history-viewer.ui -data/resources/ui/content-member-page.ui -data/resources/ui/content-message-file.ui -data/resources/ui/content-message-row.ui -data/resources/ui/content-room-details.ui -data/resources/ui/content-room-details-general-page.ui -data/resources/ui/content-room-history.ui -data/resources/ui/content-state-creation.ui -data/resources/ui/content-state-tombstone.ui -data/resources/ui/content.ui -data/resources/ui/create-dm-dialog.ui -data/resources/ui/error-page.ui -data/resources/ui/event-menu.ui -data/resources/ui/event-source-dialog.ui -data/resources/ui/greeter.ui -data/resources/ui/identity-verification-widget.ui -data/resources/ui/join-room-dialog.ui -data/resources/ui/login-advanced-dialog.ui -data/resources/ui/login-homeserver-page.ui -data/resources/ui/login-method-page.ui -data/resources/ui/login-sso-page.ui -data/resources/ui/login.ui -data/resources/ui/media-viewer.ui -data/resources/ui/member-menu.ui -data/resources/ui/room-creation.ui -data/resources/ui/session-verification.ui -data/resources/ui/shortcuts.ui -data/resources/ui/sidebar.ui -data/resources/ui/qr-code-scanner.ui - -# Rust files +src/account_switcher/mod.ui src/application.rs +src/components/auth_dialog.ui src/components/editable_avatar.rs +src/components/loading_listbox_row.ui src/components/location_viewer.rs src/components/media_content_viewer.rs +src/contrib/qr_code_scanner/mod.ui src/error_page.rs +src/error_page.ui src/greeter.rs +src/greeter.ui +src/login/advanced_dialog.ui src/login/homeserver_page.rs +src/login/homeserver_page.ui src/login/method_page.rs +src/login/method_page.ui src/login/mod.rs +src/login/mod.ui +src/login/sso_page.ui src/secret.rs src/session/model/session.rs src/session/model/room/member.rs @@ -74,42 +34,80 @@ src/session/model/sidebar/category/category_type.rs src/session/model/sidebar/entry/entry_type.rs src/session/view/account_settings/devices_page/device_list.rs src/session/view/account_settings/devices_page/device_row.rs +src/session/view/account_settings/devices_page/device_row.ui +src/session/view/account_settings/devices_page/mod.ui +src/session/view/account_settings/mod.ui src/session/view/account_settings/notifications_page.rs +src/session/view/account_settings/notifications_page.ui src/session/view/account_settings/security_page/import_export_keys_subpage.rs +src/session/view/account_settings/security_page/import_export_keys_subpage.ui src/session/view/account_settings/security_page/mod.rs +src/session/view/account_settings/security_page/mod.ui src/session/view/account_settings/user_page/change_password_subpage.rs +src/session/view/account_settings/user_page/change_password_subpage.ui src/session/view/account_settings/user_page/deactivate_account_subpage.rs +src/session/view/account_settings/user_page/deactivate_account_subpage.ui +src/session/view/account_settings/user_page/log_out_subpage.ui src/session/view/account_settings/user_page/mod.rs +src/session/view/account_settings/user_page/mod.ui +src/session/view/content/explore/mod.ui src/session/view/content/explore/public_room_row.rs +src/session/view/content/explore/servers_popover.ui src/session/view/content/invite.rs +src/session/view/content/invite.ui +src/session/view/content/mod.ui src/session/view/content/room_details/general_page/mod.rs +src/session/view/content/room_details/general_page/mod.ui src/session/view/content/room_details/history_viewer/audio_row.rs +src/session/view/content/room_details/history_viewer/audio.ui src/session/view/content/room_details/history_viewer/file_row.rs +src/session/view/content/room_details/history_viewer/file.ui +src/session/view/content/room_details/history_viewer/media.ui src/session/view/content/room_details/invite_subpage/invitee_list.rs src/session/view/content/room_details/invite_subpage/mod.rs +src/session/view/content/room_details/invite_subpage/mod.ui +src/session/view/content/room_details/member_page/member_menu.ui src/session/view/content/room_details/member_page/mod.rs +src/session/view/content/room_details/member_page/mod.ui src/session/view/content/room_details/mod.rs +src/session/view/content/room_details/mod.ui +src/session/view/content/room_history/attachment_dialog.ui src/session/view/content/room_history/event_actions.rs +src/session/view/content/room_history/event_actions.ui src/session/view/content/room_history/item_row.rs 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.ui src/session/view/content/room_history/message_row/location.rs src/session/view/content/room_history/message_row/media.rs +src/session/view/content/room_history/message_row/mod.ui src/session/view/content/room_history/mod.rs +src/session/view/content/room_history/mod.ui src/session/view/content/room_history/state_row/creation.rs +src/session/view/content/room_history/state_row/creation.ui src/session/view/content/room_history/state_row/mod.rs src/session/view/content/room_history/state_row/tombstone.rs +src/session/view/content/room_history/state_row/tombstone.ui src/session/view/content/room_history/typing_row.rs src/session/view/content/room_history/verification_info_bar.rs src/session/view/content/verification/identity_verification_widget.rs +src/session/view/content/verification/identity_verification_widget.ui src/session/view/content/verification/session_verification.rs +src/session/view/content/verification/session_verification.ui src/session/view/create_dm_dialog/mod.rs +src/session/view/create_dm_dialog/mod.ui +src/session/view/event_source_dialog.ui src/session/view/join_room_dialog.rs +src/session/view/join_room_dialog.ui src/session/view/media_viewer.rs +src/session/view/media_viewer.ui src/session/view/room_creation.rs +src/session/view/room_creation.ui src/session/view/sidebar/category_row.rs +src/session/view/sidebar/mod.ui src/session/view/sidebar/room_row.rs src/session/view/sidebar/row.rs +src/shortcuts.ui src/user_facing_error.rs src/utils/media.rs src/utils/matrix.rs diff --git a/scripts/checks.sh b/scripts/checks.sh index d5550e79..fb6591bf 100755 --- a/scripts/checks.sh +++ b/scripts/checks.sh @@ -304,7 +304,7 @@ run_typos() { # # This assumes the following: # - POTFILES is located at 'po/POTFILES.in' -# - UI (Glade) files are located in 'data/resources/ui' and use 'translatable="yes"' +# - UI (Glade) files are located in 'src' and use 'translatable="yes"' # - Rust files are located in 'src' and use '*gettext' methods or macros check_potfiles() { echo -e "$Checking po/POTFILES.in…" @@ -354,7 +354,7 @@ check_potfiles() { fi # Get UI files with 'translatable="yes"'. - ui_files=(`grep -lIr 'translatable="yes"' data/resources/ui/*`) + ui_files=(`grep -lIr 'translatable="yes"' src/*`) # Get Rust files with regex 'gettext(_f)?\('. rs_files=(`grep -lIrE 'gettext(_f)?\(' src/*`) @@ -463,11 +463,12 @@ check_potfiles() { fi } -# Check if files in data/resources/resources.gresource.xml are sorted alphabetically. +# Check if files in resource files are sorted alphabetically. check_resources() { - echo -e "$Checking data/resources/resources.gresource.xml…" + echo -e "$Checking $1…" local ret=0 + local files=() # Get files. regex="(.*)" @@ -475,14 +476,14 @@ check_resources() { if [[ $line =~ $regex ]]; then files+=("${BASH_REMATCH[1]}") fi - done < data/resources/resources.gresource.xml + done < $1 # Check sorted alphabetically - to_sort=("${files[@]}") + local to_sort=("${files[@]}") sort for i in ${!files[@]}; do if [[ "${files[$i]}" != "${to_sort[$i]}" ]]; then - echo -e "$error Found file '${files[$i]#src/}' before '${to_sort[$i]#src/}' in resources.gresource.xml" + echo -e "$error Found file '${files[$i]#src/}' before '${to_sort[$i]#src/}' in $1" ret=1 break fi @@ -490,11 +491,11 @@ check_resources() { if [[ ret -eq 1 ]]; then echo "" - echo -e " Checking data/resources/resources.gresource.xml result: $fail" + echo -e " Checking $1 result: $fail" echo "Please fix the above issues" exit 1 else - echo -e " Checking data/resources/resources.gresource.xml result: $ok" + echo -e " Checking $1 result: $ok" fi } @@ -600,10 +601,19 @@ echo "" if [[ $git_staged -eq 1 ]]; then staged_files=`git diff --name-only --cached | xargs ls -d 2>/dev/null | grep data/resources/resources.gresource.xml` if [[ -z $staged_files ]]; then - check_resources + check_resources "data/resources/resources.gresource.xml" fi else - check_resources + check_resources "data/resources/resources.gresource.xml" +fi +echo "" +if [[ $git_staged -eq 1 ]]; then + staged_files=`git diff --name-only --cached | xargs ls -d 2>/dev/null | grep src/ui-resources.gresource.xml` + if [[ -z $staged_files ]]; then + check_resources "src/ui-resources.gresource.xml" + fi +else + check_resources "src/ui-resources.gresource.xml" fi echo "" run_cargo_sort diff --git a/src/account_switcher/avatar_with_selection.rs b/src/account_switcher/avatar_with_selection.rs index 9446bb13..54f3cbd4 100644 --- a/src/account_switcher/avatar_with_selection.rs +++ b/src/account_switcher/avatar_with_selection.rs @@ -10,7 +10,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/avatar-with-selection.ui")] + #[template(resource = "/org/gnome/Fractal/ui/account_switcher/avatar_with_selection.ui")] pub struct AvatarWithSelection { #[template_child] pub child_avatar: TemplateChild, diff --git a/data/resources/ui/avatar-with-selection.ui b/src/account_switcher/avatar_with_selection.ui similarity index 100% rename from data/resources/ui/avatar-with-selection.ui rename to src/account_switcher/avatar_with_selection.ui diff --git a/src/account_switcher/mod.rs b/src/account_switcher/mod.rs index 2fbcb573..3b9af1f8 100644 --- a/src/account_switcher/mod.rs +++ b/src/account_switcher/mod.rs @@ -18,7 +18,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/sidebar-account-switcher.ui")] + #[template(resource = "/org/gnome/Fractal/ui/account_switcher/mod.ui")] pub struct AccountSwitcher { #[template_child] pub sessions: TemplateChild, diff --git a/data/resources/ui/sidebar-account-switcher.ui b/src/account_switcher/mod.ui similarity index 94% rename from data/resources/ui/sidebar-account-switcher.ui rename to src/account_switcher/mod.ui index c1e29d2a..c7b7f1a8 100644 --- a/data/resources/ui/sidebar-account-switcher.ui +++ b/src/account_switcher/mod.ui @@ -30,7 +30,7 @@ true - _Add Account + _Add Account diff --git a/src/account_switcher/session_item.rs b/src/account_switcher/session_item.rs index 30dd51ee..f1f5b435 100644 --- a/src/account_switcher/session_item.rs +++ b/src/account_switcher/session_item.rs @@ -10,7 +10,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/session-item-row.ui")] + #[template(resource = "/org/gnome/Fractal/ui/account_switcher/session_item.ui")] pub struct SessionItemRow { #[template_child] pub avatar: TemplateChild, diff --git a/data/resources/ui/session-item-row.ui b/src/account_switcher/session_item.ui similarity index 100% rename from data/resources/ui/session-item-row.ui rename to src/account_switcher/session_item.ui diff --git a/src/components/action_button.rs b/src/components/action_button.rs index dc38078d..87fb875c 100644 --- a/src/components/action_button.rs +++ b/src/components/action_button.rs @@ -40,7 +40,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/components-action-button.ui")] + #[template(resource = "/org/gnome/Fractal/ui/components/action_button.ui")] pub struct ActionButton { /// The icon used in the default state. pub icon_name: RefCell, diff --git a/data/resources/ui/components-action-button.ui b/src/components/action_button.ui similarity index 100% rename from data/resources/ui/components-action-button.ui rename to src/components/action_button.ui diff --git a/src/components/audio_player.rs b/src/components/audio_player.rs index 24c3bd88..e48cf3bf 100644 --- a/src/components/audio_player.rs +++ b/src/components/audio_player.rs @@ -10,7 +10,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/components-audio-player.ui")] + #[template(resource = "/org/gnome/Fractal/ui/components/audio-player.ui")] pub struct AudioPlayer { /// The media file to play. pub media_file: RefCell>, diff --git a/data/resources/ui/components-audio-player.ui b/src/components/audio_player.ui similarity index 100% rename from data/resources/ui/components-audio-player.ui rename to src/components/audio_player.ui diff --git a/src/components/auth_dialog.rs b/src/components/auth_dialog.rs index 27457685..3a33c404 100644 --- a/src/components/auth_dialog.rs +++ b/src/components/auth_dialog.rs @@ -42,7 +42,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/components-auth-dialog.ui")] + #[template(resource = "/org/gnome/Fractal/ui/components/auth_dialog.ui")] pub struct AuthDialog { pub session: WeakRef, #[template_child] diff --git a/data/resources/ui/components-auth-dialog.ui b/src/components/auth_dialog.ui similarity index 100% rename from data/resources/ui/components-auth-dialog.ui rename to src/components/auth_dialog.ui diff --git a/src/components/avatar.rs b/src/components/avatar.rs index 3e8d7053..998b74a3 100644 --- a/src/components/avatar.rs +++ b/src/components/avatar.rs @@ -12,7 +12,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/components-avatar.ui")] + #[template(resource = "/org/gnome/Fractal/ui/components/avatar.ui")] pub struct Avatar { /// A `Room` or `User` pub data: RefCell>, diff --git a/data/resources/ui/components-avatar.ui b/src/components/avatar.ui similarity index 100% rename from data/resources/ui/components-avatar.ui rename to src/components/avatar.ui diff --git a/src/components/button_row.rs b/src/components/button_row.rs index 303917b9..e64be53f 100644 --- a/src/components/button_row.rs +++ b/src/components/button_row.rs @@ -15,7 +15,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/components-button-row.ui")] + #[template(resource = "/org/gnome/Fractal/ui/components/button_row.ui")] pub struct ButtonRow { /// Whether activating this button opens a subpage. pub to_subpage: Cell, diff --git a/data/resources/ui/components-button-row.ui b/src/components/button_row.ui similarity index 100% rename from data/resources/ui/components-button-row.ui rename to src/components/button_row.ui diff --git a/src/components/context_menu_bin.rs b/src/components/context_menu_bin.rs index ee5a47ee..cff7438e 100644 --- a/src/components/context_menu_bin.rs +++ b/src/components/context_menu_bin.rs @@ -25,7 +25,7 @@ mod imp { } #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/context-menu-bin.ui")] + #[template(resource = "/org/gnome/Fractal/ui/components/context_menu_bin.ui")] pub struct ContextMenuBin { #[template_child] pub click_gesture: TemplateChild, diff --git a/data/resources/ui/context-menu-bin.ui b/src/components/context_menu_bin.ui similarity index 100% rename from data/resources/ui/context-menu-bin.ui rename to src/components/context_menu_bin.ui diff --git a/src/components/editable_avatar.rs b/src/components/editable_avatar.rs index 04754119..448ec051 100644 --- a/src/components/editable_avatar.rs +++ b/src/components/editable_avatar.rs @@ -42,7 +42,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/components-editable-avatar.ui")] + #[template(resource = "/org/gnome/Fractal/ui/components/editable_avatar.ui")] pub struct EditableAvatar { /// The [`AvatarData`] to display. pub data: RefCell>, diff --git a/data/resources/ui/components-editable-avatar.ui b/src/components/editable_avatar.ui similarity index 100% rename from data/resources/ui/components-editable-avatar.ui rename to src/components/editable_avatar.ui diff --git a/src/components/loading_listbox_row.rs b/src/components/loading_listbox_row.rs index 2c3a0f4f..573c0611 100644 --- a/src/components/loading_listbox_row.rs +++ b/src/components/loading_listbox_row.rs @@ -12,7 +12,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/components-loading-listbox-row.ui")] + #[template(resource = "/org/gnome/Fractal/ui/components/loading_listbox_row.ui")] pub struct LoadingListBoxRow { #[template_child] pub spinner: TemplateChild, diff --git a/data/resources/ui/components-loading-listbox-row.ui b/src/components/loading_listbox_row.ui similarity index 100% rename from data/resources/ui/components-loading-listbox-row.ui rename to src/components/loading_listbox_row.ui diff --git a/src/components/location_viewer.rs b/src/components/location_viewer.rs index 1f354c07..5dc47a95 100644 --- a/src/components/location_viewer.rs +++ b/src/components/location_viewer.rs @@ -14,7 +14,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/components-location-viewer.ui")] + #[template(resource = "/org/gnome/Fractal/ui/components/location_viewer.ui")] pub struct LocationViewer { #[template_child] pub map: TemplateChild, diff --git a/data/resources/ui/components-location-viewer.ui b/src/components/location_viewer.ui similarity index 100% rename from data/resources/ui/components-location-viewer.ui rename to src/components/location_viewer.ui diff --git a/src/components/media_content_viewer.rs b/src/components/media_content_viewer.rs index 492bd33e..b02eb77b 100644 --- a/src/components/media_content_viewer.rs +++ b/src/components/media_content_viewer.rs @@ -47,7 +47,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/components-media-content-viewer.ui")] + #[template(resource = "/org/gnome/Fractal/ui/components/media_content_viewer.ui")] pub struct MediaContentViewer { /// Whether to play the media content automatically. pub autoplay: Cell, diff --git a/data/resources/ui/components-media-content-viewer.ui b/src/components/media_content_viewer.ui similarity index 100% rename from data/resources/ui/components-media-content-viewer.ui rename to src/components/media_content_viewer.ui diff --git a/src/components/pill.rs b/src/components/pill.rs index 4ad592a3..789495d1 100644 --- a/src/components/pill.rs +++ b/src/components/pill.rs @@ -15,7 +15,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/pill.ui")] + #[template(resource = "/org/gnome/Fractal/ui/components/pill.ui")] pub struct Pill { /// The user displayed by this widget pub user: RefCell>, diff --git a/data/resources/ui/pill.ui b/src/components/pill.ui similarity index 100% rename from data/resources/ui/pill.ui rename to src/components/pill.ui diff --git a/src/components/reaction_chooser.rs b/src/components/reaction_chooser.rs index 154b4106..340f7c72 100644 --- a/src/components/reaction_chooser.rs +++ b/src/components/reaction_chooser.rs @@ -56,7 +56,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/components-reaction-chooser.ui")] + #[template(resource = "/org/gnome/Fractal/ui/components/reaction_chooser.ui")] pub struct ReactionChooser { /// The `ReactionList` associated to this chooser pub reactions: RefCell>, diff --git a/data/resources/ui/components-reaction-chooser.ui b/src/components/reaction_chooser.ui similarity index 100% rename from data/resources/ui/components-reaction-chooser.ui rename to src/components/reaction_chooser.ui diff --git a/src/components/room_title.rs b/src/components/room_title.rs index a4b0fb2a..8053d2ee 100644 --- a/src/components/room_title.rs +++ b/src/components/room_title.rs @@ -10,7 +10,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/room-title.ui")] + #[template(resource = "/org/gnome/Fractal/ui/components/room_title.ui")] pub struct RoomTitle { // The markup for the title pub title: RefCell>, diff --git a/data/resources/ui/room-title.ui b/src/components/room_title.ui similarity index 100% rename from data/resources/ui/room-title.ui rename to src/components/room_title.ui diff --git a/src/components/spinner_button.rs b/src/components/spinner_button.rs index d7530a64..f39ad77f 100644 --- a/src/components/spinner_button.rs +++ b/src/components/spinner_button.rs @@ -9,7 +9,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/spinner-button.ui")] + #[template(resource = "/org/gnome/Fractal/ui/components/spinner_button.ui")] pub struct SpinnerButton { #[template_child] pub stack: TemplateChild, diff --git a/data/resources/ui/spinner-button.ui b/src/components/spinner_button.ui similarity index 100% rename from data/resources/ui/spinner-button.ui rename to src/components/spinner_button.ui diff --git a/src/components/toastable_window.rs b/src/components/toastable_window.rs index a73a5d61..fd17c5ae 100644 --- a/src/components/toastable_window.rs +++ b/src/components/toastable_window.rs @@ -8,7 +8,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/components-toastable-window.ui")] + #[template(resource = "/org/gnome/Fractal/ui/components/toastable_window.ui")] pub struct ToastableWindow { #[template_child] pub toast_overlay: TemplateChild, diff --git a/data/resources/ui/components-toastable-window.ui b/src/components/toastable_window.ui similarity index 100% rename from data/resources/ui/components-toastable-window.ui rename to src/components/toastable_window.ui diff --git a/src/components/video_player.rs b/src/components/video_player.rs index a83b2c01..792765d1 100644 --- a/src/components/video_player.rs +++ b/src/components/video_player.rs @@ -15,7 +15,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/components-video-player.ui")] + #[template(resource = "/org/gnome/Fractal/ui/components/video_player.ui")] pub struct VideoPlayer { /// Whether this player should be displayed in a compact format. pub compact: Cell, diff --git a/data/resources/ui/components-video-player.ui b/src/components/video_player.ui similarity index 100% rename from data/resources/ui/components-video-player.ui rename to src/components/video_player.ui diff --git a/src/config.rs.in b/src/config.rs.in index deea1ea4..47615f1a 100644 --- a/src/config.rs.in +++ b/src/config.rs.in @@ -6,4 +6,5 @@ pub const LOCALEDIR: &str = @LOCALEDIR@; pub const PKGDATADIR: &str = @PKGDATADIR@; pub const PROFILE: AppProfile = AppProfile::@PROFILE@; pub const RESOURCES_FILE: &str = concat!(@PKGDATADIR@, "/resources.gresource"); +pub const UI_RESOURCES_FILE: &str = concat!(@PKGDATADIR@, "/ui-resources.gresource"); pub const VERSION: &str = @VERSION@; diff --git a/src/contrib/qr_code_scanner/mod.rs b/src/contrib/qr_code_scanner/mod.rs index 5837eef9..ea91a8e4 100644 --- a/src/contrib/qr_code_scanner/mod.rs +++ b/src/contrib/qr_code_scanner/mod.rs @@ -18,7 +18,7 @@ mod imp { use super::*; #[derive(Debug, CompositeTemplate, Default)] - #[template(resource = "/org/gnome/Fractal/qr-code-scanner.ui")] + #[template(resource = "/org/gnome/Fractal/ui/contrib/qr_code_scanner/mod.ui")] pub struct QrCodeScanner { #[template_child] pub stack: TemplateChild, diff --git a/data/resources/ui/qr-code-scanner.ui b/src/contrib/qr_code_scanner/mod.ui similarity index 100% rename from data/resources/ui/qr-code-scanner.ui rename to src/contrib/qr_code_scanner/mod.ui diff --git a/src/error_page.rs b/src/error_page.rs index 8900b9f4..64e55376 100644 --- a/src/error_page.rs +++ b/src/error_page.rs @@ -27,7 +27,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/error-page.ui")] + #[template(resource = "/org/gnome/Fractal/ui/error_page.ui")] pub struct ErrorPage { #[template_child] pub page: TemplateChild, diff --git a/data/resources/ui/error-page.ui b/src/error_page.ui similarity index 100% rename from data/resources/ui/error-page.ui rename to src/error_page.ui diff --git a/src/greeter.rs b/src/greeter.rs index 2bb52934..495ff94c 100644 --- a/src/greeter.rs +++ b/src/greeter.rs @@ -9,7 +9,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/greeter.ui")] + #[template(resource = "/org/gnome/Fractal/ui/greeter.ui")] pub struct Greeter { #[template_child] pub back_button: TemplateChild, diff --git a/data/resources/ui/greeter.ui b/src/greeter.ui similarity index 100% rename from data/resources/ui/greeter.ui rename to src/greeter.ui diff --git a/src/login/advanced_dialog.rs b/src/login/advanced_dialog.rs index 233a39fe..e39f405f 100644 --- a/src/login/advanced_dialog.rs +++ b/src/login/advanced_dialog.rs @@ -10,7 +10,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/login-advanced-dialog.ui")] + #[template(resource = "/org/gnome/Fractal/ui/login/advanced_dialog.ui")] pub struct LoginAdvancedDialog { pub autodiscovery: Cell, } diff --git a/data/resources/ui/login-advanced-dialog.ui b/src/login/advanced_dialog.ui similarity index 100% rename from data/resources/ui/login-advanced-dialog.ui rename to src/login/advanced_dialog.ui diff --git a/src/login/homeserver_page.rs b/src/login/homeserver_page.rs index 6b658a04..79de21b7 100644 --- a/src/login/homeserver_page.rs +++ b/src/login/homeserver_page.rs @@ -19,7 +19,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/login-homeserver-page.ui")] + #[template(resource = "/org/gnome/Fractal/ui/login/homeserver_page.ui")] pub struct LoginHomeserverPage { #[template_child] pub homeserver_entry: TemplateChild, diff --git a/data/resources/ui/login-homeserver-page.ui b/src/login/homeserver_page.ui similarity index 100% rename from data/resources/ui/login-homeserver-page.ui rename to src/login/homeserver_page.ui diff --git a/src/login/idp_button.rs b/src/login/idp_button.rs index b7927540..e20d8aff 100644 --- a/src/login/idp_button.rs +++ b/src/login/idp_button.rs @@ -94,7 +94,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/login-idp-button.ui")] + #[template(resource = "/org/gnome/Fractal/ui/login/idp_button.ui")] pub struct IdpButton { pub brand: Cell, pub id: RefCell>, diff --git a/data/resources/ui/login-idp-button.ui b/src/login/idp_button.ui similarity index 100% rename from data/resources/ui/login-idp-button.ui rename to src/login/idp_button.ui diff --git a/src/login/method_page.rs b/src/login/method_page.rs index 4079c130..f371c6d0 100644 --- a/src/login/method_page.rs +++ b/src/login/method_page.rs @@ -16,7 +16,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/login-method-page.ui")] + #[template(resource = "/org/gnome/Fractal/ui/login/method_page.ui")] pub struct LoginMethodPage { #[template_child] pub title: TemplateChild, diff --git a/data/resources/ui/login-method-page.ui b/src/login/method_page.ui similarity index 100% rename from data/resources/ui/login-method-page.ui rename to src/login/method_page.ui diff --git a/src/login/mod.rs b/src/login/mod.rs index 4be605da..c4fcfb07 100644 --- a/src/login/mod.rs +++ b/src/login/mod.rs @@ -57,7 +57,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/login.ui")] + #[template(resource = "/org/gnome/Fractal/ui/login/mod.ui")] pub struct Login { #[template_child] pub back_button: TemplateChild, diff --git a/data/resources/ui/login.ui b/src/login/mod.ui similarity index 100% rename from data/resources/ui/login.ui rename to src/login/mod.ui diff --git a/src/login/sso_page.rs b/src/login/sso_page.rs index 6b0ab552..da65dc45 100644 --- a/src/login/sso_page.rs +++ b/src/login/sso_page.rs @@ -7,7 +7,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/login-sso-page.ui")] + #[template(resource = "/org/gnome/Fractal/ui/login/sso_page.ui")] pub struct LoginSsoPage {} #[glib::object_subclass] diff --git a/data/resources/ui/login-sso-page.ui b/src/login/sso_page.ui similarity index 100% rename from data/resources/ui/login-sso-page.ui rename to src/login/sso_page.ui diff --git a/src/main.rs b/src/main.rs index 2dab4409..c886e6c2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -49,6 +49,8 @@ fn main() { let res = gio::Resource::load(RESOURCES_FILE).expect("Could not load gresource file"); gio::resources_register(&res); + let ui_res = gio::Resource::load(UI_RESOURCES_FILE).expect("Could not load UI gresource file"); + gio::resources_register(&ui_res); IconTheme::for_display(&Display::default().unwrap()) .add_resource_path("/org/gnome/Fractal/icons"); diff --git a/src/meson.build b/src/meson.build index 8e4f68f9..e123b2ae 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,3 +1,12 @@ +# UI resources +ui_resources = gnome.compile_resources( + 'ui-resources', + 'ui-resources.gresource.xml', + gresource_bundle: true, + install: true, + install_dir: pkgdatadir, +) + version = major_version if pre_release_version != '' version += '.' + pre_release_version @@ -48,7 +57,7 @@ cargo_build = custom_target( console: true, install: true, install_dir: bindir, - depends: resources, + depends: [resources, ui_resources], command: [ 'env', cargo_env, diff --git a/src/session/view/account_settings/devices_page/device_row.rs b/src/session/view/account_settings/devices_page/device_row.rs index c54fca8b..1b27f7bd 100644 --- a/src/session/view/account_settings/devices_page/device_row.rs +++ b/src/session/view/account_settings/devices_page/device_row.rs @@ -18,7 +18,9 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/account-settings-device-row.ui")] + #[template( + resource = "/org/gnome/Fractal/ui/session/view/account_settings/devices_page/device_row.ui" + )] pub struct DeviceRow { #[template_child] pub display_name: TemplateChild, diff --git a/data/resources/ui/account-settings-device-row.ui b/src/session/view/account_settings/devices_page/device_row.ui similarity index 100% rename from data/resources/ui/account-settings-device-row.ui rename to src/session/view/account_settings/devices_page/device_row.ui diff --git a/src/session/view/account_settings/devices_page/mod.rs b/src/session/view/account_settings/devices_page/mod.rs index 589876d4..215e29ad 100644 --- a/src/session/view/account_settings/devices_page/mod.rs +++ b/src/session/view/account_settings/devices_page/mod.rs @@ -19,7 +19,9 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/account-settings-devices-page.ui")] + #[template( + resource = "/org/gnome/Fractal/ui/session/view/account_settings/devices_page/mod.ui" + )] pub struct DevicesPage { pub user: RefCell>, #[template_child] diff --git a/data/resources/ui/account-settings-devices-page.ui b/src/session/view/account_settings/devices_page/mod.ui similarity index 100% rename from data/resources/ui/account-settings-devices-page.ui rename to src/session/view/account_settings/devices_page/mod.ui diff --git a/src/session/view/account_settings/mod.rs b/src/session/view/account_settings/mod.rs index 15066054..552bccea 100644 --- a/src/session/view/account_settings/mod.rs +++ b/src/session/view/account_settings/mod.rs @@ -24,7 +24,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/account-settings.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session/view/account_settings/mod.ui")] pub struct AccountSettings { pub session: WeakRef, pub session_handler: RefCell>, diff --git a/data/resources/ui/account-settings.ui b/src/session/view/account_settings/mod.ui similarity index 100% rename from data/resources/ui/account-settings.ui rename to src/session/view/account_settings/mod.ui diff --git a/src/session/view/account_settings/notifications_page.rs b/src/session/view/account_settings/notifications_page.rs index 04e2a75e..124f07d9 100644 --- a/src/session/view/account_settings/notifications_page.rs +++ b/src/session/view/account_settings/notifications_page.rs @@ -19,7 +19,9 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/account-settings-notifications-page.ui")] + #[template( + resource = "/org/gnome/Fractal/ui/session/view/account_settings/notifications_page.ui" + )] pub struct NotificationsPage { /// The current session. pub session: WeakRef, diff --git a/data/resources/ui/account-settings-notifications-page.ui b/src/session/view/account_settings/notifications_page.ui similarity index 100% rename from data/resources/ui/account-settings-notifications-page.ui rename to src/session/view/account_settings/notifications_page.ui diff --git a/src/session/view/account_settings/security_page/import_export_keys_subpage.rs b/src/session/view/account_settings/security_page/import_export_keys_subpage.rs index ca9e2960..1d874380 100644 --- a/src/session/view/account_settings/security_page/import_export_keys_subpage.rs +++ b/src/session/view/account_settings/security_page/import_export_keys_subpage.rs @@ -29,7 +29,9 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/account-settings-import-export-keys-subpage.ui")] + #[template( + resource = "/org/gnome/Fractal/ui/session/view/account_settings/security_page/import_export_keys_subpage.ui" + )] pub struct ImportExportKeysSubpage { pub session: WeakRef, #[template_child] diff --git a/data/resources/ui/account-settings-import-export-keys-subpage.ui b/src/session/view/account_settings/security_page/import_export_keys_subpage.ui similarity index 100% rename from data/resources/ui/account-settings-import-export-keys-subpage.ui rename to src/session/view/account_settings/security_page/import_export_keys_subpage.ui diff --git a/src/session/view/account_settings/security_page/mod.rs b/src/session/view/account_settings/security_page/mod.rs index 121684f7..75987356 100644 --- a/src/session/view/account_settings/security_page/mod.rs +++ b/src/session/view/account_settings/security_page/mod.rs @@ -13,7 +13,9 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/account-settings-security-page.ui")] + #[template( + resource = "/org/gnome/Fractal/ui/session/view/account_settings/security_page/mod.ui" + )] pub struct SecurityPage { pub session: WeakRef, #[template_child] diff --git a/data/resources/ui/account-settings-security-page.ui b/src/session/view/account_settings/security_page/mod.ui similarity index 100% rename from data/resources/ui/account-settings-security-page.ui rename to src/session/view/account_settings/security_page/mod.ui diff --git a/src/session/view/account_settings/user_page/change_password_subpage.rs b/src/session/view/account_settings/user_page/change_password_subpage.rs index 03a9b930..879f3ccd 100644 --- a/src/session/view/account_settings/user_page/change_password_subpage.rs +++ b/src/session/view/account_settings/user_page/change_password_subpage.rs @@ -23,7 +23,9 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/account-settings-change-password-subpage.ui")] + #[template( + resource = "/org/gnome/Fractal/ui/session/view/account_settings/user_page/change_password_subpage.ui" + )] pub struct ChangePasswordSubpage { pub session: WeakRef, #[template_child] diff --git a/data/resources/ui/account-settings-change-password-subpage.ui b/src/session/view/account_settings/user_page/change_password_subpage.ui similarity index 100% rename from data/resources/ui/account-settings-change-password-subpage.ui rename to src/session/view/account_settings/user_page/change_password_subpage.ui diff --git a/src/session/view/account_settings/user_page/deactivate_account_subpage.rs b/src/session/view/account_settings/user_page/deactivate_account_subpage.rs index b8234008..355a8e50 100644 --- a/src/session/view/account_settings/user_page/deactivate_account_subpage.rs +++ b/src/session/view/account_settings/user_page/deactivate_account_subpage.rs @@ -20,7 +20,9 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/account-settings-deactivate-account-subpage.ui")] + #[template( + resource = "/org/gnome/Fractal/ui/session/view/account_settings/user_page/deactivate_account_subpage.ui" + )] pub struct DeactivateAccountSubpage { pub session: WeakRef, #[template_child] diff --git a/data/resources/ui/account-settings-deactivate-account-subpage.ui b/src/session/view/account_settings/user_page/deactivate_account_subpage.ui similarity index 100% rename from data/resources/ui/account-settings-deactivate-account-subpage.ui rename to src/session/view/account_settings/user_page/deactivate_account_subpage.ui diff --git a/src/session/view/account_settings/user_page/log_out_subpage.rs b/src/session/view/account_settings/user_page/log_out_subpage.rs index 33123435..b50701a3 100644 --- a/src/session/view/account_settings/user_page/log_out_subpage.rs +++ b/src/session/view/account_settings/user_page/log_out_subpage.rs @@ -12,7 +12,9 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/account-settings-log-out-subpage.ui")] + #[template( + resource = "/org/gnome/Fractal/ui/session/view/account_settings/user_page/log_out_subpage.ui" + )] pub struct LogOutSubpage { pub session: WeakRef, #[template_child] diff --git a/data/resources/ui/account-settings-log-out-subpage.ui b/src/session/view/account_settings/user_page/log_out_subpage.ui similarity index 100% rename from data/resources/ui/account-settings-log-out-subpage.ui rename to src/session/view/account_settings/user_page/log_out_subpage.ui diff --git a/src/session/view/account_settings/user_page/mod.rs b/src/session/view/account_settings/user_page/mod.rs index d347889c..61927f39 100644 --- a/src/session/view/account_settings/user_page/mod.rs +++ b/src/session/view/account_settings/user_page/mod.rs @@ -32,7 +32,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/account-settings-user-page.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session/view/account_settings/user_page/mod.ui")] pub struct UserPage { pub session: WeakRef, #[template_child] diff --git a/data/resources/ui/account-settings-user-page.ui b/src/session/view/account_settings/user_page/mod.ui similarity index 100% rename from data/resources/ui/account-settings-user-page.ui rename to src/session/view/account_settings/user_page/mod.ui diff --git a/src/session/view/content/explore/mod.rs b/src/session/view/content/explore/mod.rs index b1fab313..ca2e6368 100644 --- a/src/session/view/content/explore/mod.rs +++ b/src/session/view/content/explore/mod.rs @@ -25,7 +25,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/content-explore.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session/view/content/explore/mod.ui")] pub struct Explore { pub compact: Cell, pub session: WeakRef, diff --git a/data/resources/ui/content-explore.ui b/src/session/view/content/explore/mod.ui similarity index 90% rename from data/resources/ui/content-explore.ui rename to src/session/view/content/explore/mod.ui index 4a133cc1..1307e943 100644 --- a/data/resources/ui/content-explore.ui +++ b/src/session/view/content/explore/mod.ui @@ -89,7 +89,22 @@ 24 - /org/gnome/Fractal/content-explore-item.ui + + + + + ]]> diff --git a/src/session/view/content/explore/public_room_row.rs b/src/session/view/content/explore/public_room_row.rs index a059d938..40d750db 100644 --- a/src/session/view/content/explore/public_room_row.rs +++ b/src/session/view/content/explore/public_room_row.rs @@ -17,7 +17,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/content-public-room-row.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session/view/content/explore/public_room_row.ui")] pub struct PublicRoomRow { pub public_room: RefCell>, #[template_child] diff --git a/data/resources/ui/content-public-room-row.ui b/src/session/view/content/explore/public_room_row.ui similarity index 100% rename from data/resources/ui/content-public-room-row.ui rename to src/session/view/content/explore/public_room_row.ui diff --git a/src/session/view/content/explore/server_row.rs b/src/session/view/content/explore/server_row.rs index 47f09ce0..08eb0c49 100644 --- a/src/session/view/content/explore/server_row.rs +++ b/src/session/view/content/explore/server_row.rs @@ -9,7 +9,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/content-explore-server-row.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session/view/content/explore/server_row.ui")] pub struct ExploreServerRow { /// The server displayed by this row. pub server: OnceCell, diff --git a/data/resources/ui/content-explore-server-row.ui b/src/session/view/content/explore/server_row.ui similarity index 100% rename from data/resources/ui/content-explore-server-row.ui rename to src/session/view/content/explore/server_row.ui diff --git a/src/session/view/content/explore/servers_popover.rs b/src/session/view/content/explore/servers_popover.rs index 7fc6ba01..366d38ed 100644 --- a/src/session/view/content/explore/servers_popover.rs +++ b/src/session/view/content/explore/servers_popover.rs @@ -19,7 +19,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/content-explore-servers-popover.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session/view/content/explore/servers_popover.ui")] pub struct ExploreServersPopover { pub session: WeakRef, pub server_list: RefCell>, diff --git a/data/resources/ui/content-explore-servers-popover.ui b/src/session/view/content/explore/servers_popover.ui similarity index 100% rename from data/resources/ui/content-explore-servers-popover.ui rename to src/session/view/content/explore/servers_popover.ui diff --git a/src/session/view/content/invite.rs b/src/session/view/content/invite.rs index 4cf5fbff..0bd21699 100644 --- a/src/session/view/content/invite.rs +++ b/src/session/view/content/invite.rs @@ -20,7 +20,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/content-invite.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session/view/content/invite.ui")] pub struct Invite { pub compact: Cell, pub room: RefCell>, diff --git a/data/resources/ui/content-invite.ui b/src/session/view/content/invite.ui similarity index 100% rename from data/resources/ui/content-invite.ui rename to src/session/view/content/invite.ui diff --git a/src/session/view/content/mod.rs b/src/session/view/content/mod.rs index 59814c92..6c37d167 100644 --- a/src/session/view/content/mod.rs +++ b/src/session/view/content/mod.rs @@ -24,7 +24,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/content.ui")] + #[template(resource = "/org/gnome/Fractal/ui/session/view/content/mod.ui")] pub struct Content { pub compact: Cell, pub session: WeakRef, diff --git a/data/resources/ui/content.ui b/src/session/view/content/mod.ui similarity index 100% rename from data/resources/ui/content.ui rename to src/session/view/content/mod.ui diff --git a/src/session/view/content/room_details/general_page/mod.rs b/src/session/view/content/room_details/general_page/mod.rs index d5127f91..640d807c 100644 --- a/src/session/view/content/room_details/general_page/mod.rs +++ b/src/session/view/content/room_details/general_page/mod.rs @@ -40,7 +40,9 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/content-room-details-general-page.ui")] + #[template( + resource = "/org/gnome/Fractal/ui/session/view/content/room_details/general_page/mod.ui" + )] pub struct GeneralPage { pub room: OnceCell, #[template_child] diff --git a/data/resources/ui/content-room-details-general-page.ui b/src/session/view/content/room_details/general_page/mod.ui similarity index 100% rename from data/resources/ui/content-room-details-general-page.ui rename to src/session/view/content/room_details/general_page/mod.ui diff --git a/src/session/view/content/room_details/history_viewer/audio.rs b/src/session/view/content/room_details/history_viewer/audio.rs index 95e9e357..521ee8b8 100644 --- a/src/session/view/content/room_details/history_viewer/audio.rs +++ b/src/session/view/content/room_details/history_viewer/audio.rs @@ -13,7 +13,9 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/content-audio-history-viewer.ui")] + #[template( + resource = "/org/gnome/Fractal/ui/session/view/content/room_details/history_viewer/audio.ui" + )] pub struct AudioHistoryViewer { pub room_timeline: OnceCell, #[template_child] diff --git a/data/resources/ui/content-audio-history-viewer.ui b/src/session/view/content/room_details/history_viewer/audio.ui similarity index 100% rename from data/resources/ui/content-audio-history-viewer.ui rename to src/session/view/content/room_details/history_viewer/audio.ui diff --git a/src/session/view/content/room_details/history_viewer/audio_row.rs b/src/session/view/content/room_details/history_viewer/audio_row.rs index e9b6f713..3d0f2234 100644 --- a/src/session/view/content/room_details/history_viewer/audio_row.rs +++ b/src/session/view/content/room_details/history_viewer/audio_row.rs @@ -20,7 +20,9 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/content-audio-history-viewer-row.ui")] + #[template( + resource = "/org/gnome/Fractal/ui/session/view/content/room_details/history_viewer/audio_row.ui" + )] pub struct AudioRow { pub event: RefCell>, pub media_file: RefCell>, diff --git a/data/resources/ui/content-audio-history-viewer-row.ui b/src/session/view/content/room_details/history_viewer/audio_row.ui similarity index 100% rename from data/resources/ui/content-audio-history-viewer-row.ui rename to src/session/view/content/room_details/history_viewer/audio_row.ui diff --git a/src/session/view/content/room_details/history_viewer/file.rs b/src/session/view/content/room_details/history_viewer/file.rs index 9a759482..32ea0151 100644 --- a/src/session/view/content/room_details/history_viewer/file.rs +++ b/src/session/view/content/room_details/history_viewer/file.rs @@ -13,7 +13,9 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/content-file-history-viewer.ui")] + #[template( + resource = "/org/gnome/Fractal/ui/session/view/content/room_details/history_viewer/file.ui" + )] pub struct FileHistoryViewer { pub room_timeline: OnceCell, #[template_child] diff --git a/data/resources/ui/content-file-history-viewer.ui b/src/session/view/content/room_details/history_viewer/file.ui similarity index 100% rename from data/resources/ui/content-file-history-viewer.ui rename to src/session/view/content/room_details/history_viewer/file.ui diff --git a/src/session/view/content/room_details/history_viewer/file_row.rs b/src/session/view/content/room_details/history_viewer/file_row.rs index e32aeb01..3cdc88c9 100644 --- a/src/session/view/content/room_details/history_viewer/file_row.rs +++ b/src/session/view/content/room_details/history_viewer/file_row.rs @@ -16,7 +16,9 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/content-file-history-viewer-row.ui")] + #[template( + resource = "/org/gnome/Fractal/ui/session/view/content/room_details/history_viewer/file_row.ui" + )] pub struct FileRow { pub event: RefCell>, pub file: RefCell>, diff --git a/data/resources/ui/content-file-history-viewer-row.ui b/src/session/view/content/room_details/history_viewer/file_row.ui similarity index 100% rename from data/resources/ui/content-file-history-viewer-row.ui rename to src/session/view/content/room_details/history_viewer/file_row.ui diff --git a/src/session/view/content/room_details/history_viewer/media.rs b/src/session/view/content/room_details/history_viewer/media.rs index d570fa9e..6ec3e590 100644 --- a/src/session/view/content/room_details/history_viewer/media.rs +++ b/src/session/view/content/room_details/history_viewer/media.rs @@ -18,7 +18,9 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/content-media-history-viewer.ui")] + #[template( + resource = "/org/gnome/Fractal/ui/session/view/content/room_details/history_viewer/media.ui" + )] pub struct MediaHistoryViewer { pub room_timeline: OnceCell, #[template_child] diff --git a/data/resources/ui/content-media-history-viewer.ui b/src/session/view/content/room_details/history_viewer/media.ui similarity index 100% rename from data/resources/ui/content-media-history-viewer.ui rename to src/session/view/content/room_details/history_viewer/media.ui diff --git a/src/session/view/content/room_details/history_viewer/media_item.rs b/src/session/view/content/room_details/history_viewer/media_item.rs index 0f55c921..ca5be1fe 100644 --- a/src/session/view/content/room_details/history_viewer/media_item.rs +++ b/src/session/view/content/room_details/history_viewer/media_item.rs @@ -24,7 +24,9 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/content-media-history-viewer-item.ui")] + #[template( + resource = "/org/gnome/Fractal/ui/session/view/content/room_details/history_viewer/media_item.ui" + )] pub struct MediaItem { pub event: RefCell>, pub overlay_icon: RefCell>, diff --git a/data/resources/ui/content-media-history-viewer-item.ui b/src/session/view/content/room_details/history_viewer/media_item.ui similarity index 100% rename from data/resources/ui/content-media-history-viewer-item.ui rename to src/session/view/content/room_details/history_viewer/media_item.ui diff --git a/src/session/view/content/room_details/invite_subpage/invitee_row.rs b/src/session/view/content/room_details/invite_subpage/invitee_row.rs index 3cdb7b93..7ede1df1 100644 --- a/src/session/view/content/room_details/invite_subpage/invitee_row.rs +++ b/src/session/view/content/room_details/invite_subpage/invitee_row.rs @@ -13,7 +13,9 @@ mod imp { use crate::utils::template_callbacks::TemplateCallbacks; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/content-invitee-row.ui")] + #[template( + resource = "/org/gnome/Fractal/ui/session/view/content/room_details/invite_subpage/invitee_row.ui" + )] pub struct InviteeRow { pub user: RefCell>, pub binding: RefCell>, diff --git a/data/resources/ui/content-invitee-row.ui b/src/session/view/content/room_details/invite_subpage/invitee_row.ui similarity index 100% rename from data/resources/ui/content-invitee-row.ui rename to src/session/view/content/room_details/invite_subpage/invitee_row.ui diff --git a/src/session/view/content/room_details/invite_subpage/mod.rs b/src/session/view/content/room_details/invite_subpage/mod.rs index 52880100..7b25e296 100644 --- a/src/session/view/content/room_details/invite_subpage/mod.rs +++ b/src/session/view/content/room_details/invite_subpage/mod.rs @@ -25,7 +25,9 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/content-invite-subpage.ui")] + #[template( + resource = "/org/gnome/Fractal/ui/session/view/content/room_details/invite_subpage/mod.ui" + )] pub struct InviteSubpage { pub room: RefCell>, #[template_child] diff --git a/data/resources/ui/content-invite-subpage.ui b/src/session/view/content/room_details/invite_subpage/mod.ui similarity index 92% rename from data/resources/ui/content-invite-subpage.ui rename to src/session/view/content/room_details/invite_subpage/mod.ui index 6688ed33..2014c180 100644 --- a/data/resources/ui/content-invite-subpage.ui +++ b/src/session/view/content/room_details/invite_subpage/mod.ui @@ -97,7 +97,22 @@ True - /org/gnome/Fractal/content-invitee-item.ui + + + + + ]]>