From 0bf6a4ff32a08239c5a48896bc9c281b73e8e097 Mon Sep 17 00:00:00 2001 From: Julian Sparber Date: Tue, 29 Mar 2022 11:12:08 +0200 Subject: [PATCH] Remove Next from app-id --- .gitlab-ci.yml | 8 ++++---- README.md | 4 ++-- ...talNext.Devel.json => org.gnome.Fractal.Devel.json} | 2 +- ...ext-symbolic.svg => org.gnome.Fractal-symbolic.svg} | 0 ...actalNext.Devel.svg => org.gnome.Fractal.Devel.svg} | 0 ...org.gnome.FractalNext.svg => org.gnome.Fractal.svg} | 0 ...t.desktop.in.in => org.gnome.Fractal.desktop.in.in} | 0 ...gschema.xml.in => org.gnome.Fractal.gschema.xml.in} | 2 +- ....xml.in.in => org.gnome.Fractal.metainfo.xml.in.in} | 0 data/resources/resources.gresource.xml | 2 +- data/resources/ui/content-explore.ui | 2 +- data/resources/ui/content-invite-subpage.ui | 2 +- data/resources/ui/content-member-page.ui | 4 ++-- data/resources/ui/content-room-history.ui | 2 +- data/resources/ui/greeter.ui | 2 +- data/resources/ui/identity-verification-widget.ui | 10 +++++----- data/resources/ui/login.ui | 2 +- data/resources/ui/session-verification.ui | 2 +- data/resources/ui/sidebar.ui | 2 +- meson.build | 2 +- po/POTFILES.in | 6 +++--- src/application.rs | 2 +- src/components/action_button.rs | 2 +- src/components/audio_player.rs | 2 +- src/components/auth_dialog.rs | 2 +- src/components/avatar.rs | 2 +- src/components/button_row.rs | 2 +- src/components/context_menu_bin.rs | 2 +- src/components/editable_avatar.rs | 2 +- src/components/entry_row.rs | 2 +- src/components/in_app_notification.rs | 2 +- src/components/loading_listbox_row.rs | 2 +- src/components/password_entry_row.rs | 2 +- src/components/pill.rs | 2 +- src/components/reaction_chooser.rs | 2 +- src/components/room_title.rs | 2 +- src/components/spinner_button.rs | 2 +- src/components/video_player.rs | 2 +- src/contrib/qr_code_scanner/mod.rs | 2 +- src/error_page.rs | 2 +- src/greeter.rs | 2 +- src/login/idp_button.rs | 2 +- src/login/login_advanced_dialog.rs | 2 +- src/login/mod.rs | 2 +- src/main.rs | 4 ++-- .../account_settings/devices_page/device_row.rs | 2 +- src/session/account_settings/devices_page/mod.rs | 2 +- src/session/account_settings/mod.rs | 2 +- .../user_page/change_password_subpage.rs | 2 +- .../user_page/deactivate_account_subpage.rs | 2 +- src/session/account_settings/user_page/mod.rs | 2 +- src/session/content/explore/mod.rs | 2 +- src/session/content/explore/public_room_row.rs | 2 +- src/session/content/invite.rs | 2 +- src/session/content/markdown_popover.rs | 2 +- src/session/content/mod.rs | 2 +- .../content/room_details/invite_subpage/invitee_row.rs | 2 +- src/session/content/room_details/invite_subpage/mod.rs | 2 +- .../content/room_details/member_page/member_menu.rs | 2 +- .../content/room_details/member_page/member_row.rs | 2 +- src/session/content/room_details/member_page/mod.rs | 2 +- src/session/content/room_details/mod.rs | 2 +- src/session/content/room_history/attachment_dialog.rs | 2 +- src/session/content/room_history/divider_row.rs | 2 +- src/session/content/room_history/message_row/audio.rs | 2 +- src/session/content/room_history/message_row/file.rs | 2 +- src/session/content/room_history/message_row/media.rs | 2 +- src/session/content/room_history/message_row/mod.rs | 2 +- .../content/room_history/message_row/reaction.rs | 2 +- .../content/room_history/message_row/reaction_list.rs | 2 +- src/session/content/room_history/message_row/reply.rs | 2 +- src/session/content/room_history/mod.rs | 2 +- src/session/content/room_history/state_row/creation.rs | 2 +- src/session/content/room_history/state_row/mod.rs | 2 +- .../content/room_history/state_row/tombstone.rs | 2 +- .../content/room_history/verification_info_bar.rs | 2 +- src/session/content/verification/emoji.rs | 2 +- .../verification/identity_verification_widget.rs | 2 +- .../content/verification/session_verification.rs | 2 +- src/session/event_source_dialog.rs | 2 +- src/session/media_viewer.rs | 2 +- src/session/mod.rs | 6 +++--- src/session/room/event_actions.rs | 6 +++--- src/session/room_creation/mod.rs | 2 +- src/session/sidebar/account_switcher/add_account.rs | 2 +- .../sidebar/account_switcher/avatar_with_selection.rs | 2 +- src/session/sidebar/account_switcher/mod.rs | 2 +- src/session/sidebar/account_switcher/user_entry.rs | 2 +- src/session/sidebar/category_row.rs | 2 +- src/session/sidebar/entry_row.rs | 2 +- src/session/sidebar/mod.rs | 2 +- src/session/sidebar/room_row.rs | 2 +- src/session/sidebar/verification_row.rs | 2 +- src/window.rs | 4 ++-- 94 files changed, 106 insertions(+), 106 deletions(-) rename build-aux/{org.gnome.FractalNext.Devel.json => org.gnome.Fractal.Devel.json} (96%) rename data/icons/{org.gnome.FractalNext-symbolic.svg => org.gnome.Fractal-symbolic.svg} (100%) rename data/icons/{org.gnome.FractalNext.Devel.svg => org.gnome.Fractal.Devel.svg} (100%) rename data/icons/{org.gnome.FractalNext.svg => org.gnome.Fractal.svg} (100%) rename data/{org.gnome.FractalNext.desktop.in.in => org.gnome.Fractal.desktop.in.in} (100%) rename data/{org.gnome.FractalNext.gschema.xml.in => org.gnome.Fractal.gschema.xml.in} (90%) rename data/{org.gnome.FractalNext.metainfo.xml.in.in => org.gnome.Fractal.metainfo.xml.in.in} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2a5b517..2d9907ff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,9 +10,9 @@ flatpak: - flatpak variables: BUNDLE: "fractal-nightly.flatpak" - MANIFEST_PATH: "build-aux/org.gnome.FractalNext.Devel.json" + MANIFEST_PATH: "build-aux/org.gnome.Fractal.Devel.json" FLATPAK_MODULE: "fractal" - APP_ID: "org.gnome.FractalNext.Devel" + APP_ID: "org.gnome.Fractal.Devel" RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo" script: - > @@ -46,7 +46,7 @@ cargo-clippy: tags: - flatpak variables: - MANIFEST_PATH: "build-aux/org.gnome.FractalNext.Devel.json" + MANIFEST_PATH: "build-aux/org.gnome.Fractal.Devel.json" FLATPAK_MODULE: "fractal" script: - flatpak-builder --keep-build-dirs --user --disable-rofiles-fuse --stop-at=${FLATPAK_MODULE} flatpak_app --repo=repo ${BRANCH:+--default-branch=$BRANCH} ${MANIFEST_PATH} @@ -69,7 +69,7 @@ pages: tags: - flatpak variables: - MANIFEST_PATH: "build-aux/org.gnome.FractalNext.Devel.json" + MANIFEST_PATH: "build-aux/org.gnome.Fractal.Devel.json" FLATPAK_MODULE: "fractal" script: - flatpak-builder --keep-build-dirs --user --disable-rofiles-fuse --stop-at=${FLATPAK_MODULE} flatpak_app --repo=repo ${BRANCH:+--default-branch=$BRANCH} ${MANIFEST_PATH} diff --git a/README.md b/README.md index 03f72491..dc5f8f04 100644 --- a/README.md +++ b/README.md @@ -60,13 +60,13 @@ Move inside the `build-aux` folder and then build and install the app: ``` cd build-aux -flatpak-builder --user --install app org.gnome.FractalNext.Devel.json +flatpak-builder --user --install app org.gnome.Fractal.Devel.json ``` Fractal Next can then be entirely removed from your system with: ``` -flatpak remove org.gnome.FractalNext.Devel.json` +flatpak remove org.gnome.Fractal.Devel.json` ``` ### GNU/Linux diff --git a/build-aux/org.gnome.FractalNext.Devel.json b/build-aux/org.gnome.Fractal.Devel.json similarity index 96% rename from build-aux/org.gnome.FractalNext.Devel.json rename to build-aux/org.gnome.Fractal.Devel.json index 0ec20c56..f216f210 100644 --- a/build-aux/org.gnome.FractalNext.Devel.json +++ b/build-aux/org.gnome.Fractal.Devel.json @@ -1,5 +1,5 @@ { - "app-id" : "org.gnome.FractalNext.Devel", + "app-id" : "org.gnome.Fractal.Devel", "runtime" : "org.gnome.Platform", "runtime-version" : "master", "sdk" : "org.gnome.Sdk", diff --git a/data/icons/org.gnome.FractalNext-symbolic.svg b/data/icons/org.gnome.Fractal-symbolic.svg similarity index 100% rename from data/icons/org.gnome.FractalNext-symbolic.svg rename to data/icons/org.gnome.Fractal-symbolic.svg diff --git a/data/icons/org.gnome.FractalNext.Devel.svg b/data/icons/org.gnome.Fractal.Devel.svg similarity index 100% rename from data/icons/org.gnome.FractalNext.Devel.svg rename to data/icons/org.gnome.Fractal.Devel.svg diff --git a/data/icons/org.gnome.FractalNext.svg b/data/icons/org.gnome.Fractal.svg similarity index 100% rename from data/icons/org.gnome.FractalNext.svg rename to data/icons/org.gnome.Fractal.svg diff --git a/data/org.gnome.FractalNext.desktop.in.in b/data/org.gnome.Fractal.desktop.in.in similarity index 100% rename from data/org.gnome.FractalNext.desktop.in.in rename to data/org.gnome.Fractal.desktop.in.in diff --git a/data/org.gnome.FractalNext.gschema.xml.in b/data/org.gnome.Fractal.gschema.xml.in similarity index 90% rename from data/org.gnome.FractalNext.gschema.xml.in rename to data/org.gnome.Fractal.gschema.xml.in index bee2631d..eca4aca9 100644 --- a/data/org.gnome.FractalNext.gschema.xml.in +++ b/data/org.gnome.Fractal.gschema.xml.in @@ -1,6 +1,6 @@ - + -1 Default window width diff --git a/data/org.gnome.FractalNext.metainfo.xml.in.in b/data/org.gnome.Fractal.metainfo.xml.in.in similarity index 100% rename from data/org.gnome.FractalNext.metainfo.xml.in.in rename to data/org.gnome.Fractal.metainfo.xml.in.in diff --git a/data/resources/resources.gresource.xml b/data/resources/resources.gresource.xml index f9eb156f..79008ec3 100644 --- a/data/resources/resources.gresource.xml +++ b/data/resources/resources.gresource.xml @@ -1,6 +1,6 @@ - + assets/homeserver.svg assets/other-device.svg assets/setup-complete.svg diff --git a/data/resources/ui/content-explore.ui b/data/resources/ui/content-explore.ui index a4851567..f5e5f2ca 100644 --- a/data/resources/ui/content-explore.ui +++ b/data/resources/ui/content-explore.ui @@ -90,7 +90,7 @@ - /org/gnome/FractalNext/content-explore-item.ui + /org/gnome/Fractal/content-explore-item.ui diff --git a/data/resources/ui/content-invite-subpage.ui b/data/resources/ui/content-invite-subpage.ui index f859af82..930f24f6 100644 --- a/data/resources/ui/content-invite-subpage.ui +++ b/data/resources/ui/content-invite-subpage.ui @@ -102,7 +102,7 @@ True - /org/gnome/FractalNext/content-invitee-item.ui + /org/gnome/Fractal/content-invitee-item.ui - /org/gnome/FractalNext/content-item.ui + /org/gnome/Fractal/content-item.ui True diff --git a/data/resources/ui/greeter.ui b/data/resources/ui/greeter.ui index d9df2e7a..0a7a9e46 100644 --- a/data/resources/ui/greeter.ui +++ b/data/resources/ui/greeter.ui @@ -71,7 +71,7 @@ 24 - resource:///org/gnome/FractalNext/assets/welcome.svg + resource:///org/gnome/Fractal/assets/welcome.svg 120 diff --git a/data/resources/ui/identity-verification-widget.ui b/data/resources/ui/identity-verification-widget.ui index 6e9b9bac..ca7368c5 100644 --- a/data/resources/ui/identity-verification-widget.ui +++ b/data/resources/ui/identity-verification-widget.ui @@ -38,7 +38,7 @@ - resource:///org/gnome/FractalNext/assets/other-device.svg + resource:///org/gnome/Fractal/assets/other-device.svg @@ -158,7 +158,7 @@ - resource:///org/gnome/FractalNext/assets/setup-complete.svg + resource:///org/gnome/Fractal/assets/setup-complete.svg @@ -338,7 +338,7 @@ - resource:///org/gnome/FractalNext/assets/setup-complete.svg + resource:///org/gnome/Fractal/assets/setup-complete.svg @@ -396,7 +396,7 @@ - resource:///org/gnome/FractalNext/icons/scalable/status/other-device.svg + resource:///org/gnome/Fractal/icons/scalable/status/other-device.svg @@ -430,7 +430,7 @@ - resource:///org/gnome/FractalNext/assets/setup-complete.svg + resource:///org/gnome/Fractal/assets/setup-complete.svg diff --git a/data/resources/ui/login.ui b/data/resources/ui/login.ui index f1a4256b..4d20622e 100644 --- a/data/resources/ui/login.ui +++ b/data/resources/ui/login.ui @@ -49,7 +49,7 @@ 24 - resource:///org/gnome/FractalNext/assets/homeserver.svg + resource:///org/gnome/Fractal/assets/homeserver.svg diff --git a/data/resources/ui/session-verification.ui b/data/resources/ui/session-verification.ui index 15d90902..d38594ce 100644 --- a/data/resources/ui/session-verification.ui +++ b/data/resources/ui/session-verification.ui @@ -65,7 +65,7 @@ - resource:///org/gnome/FractalNext/assets/other-device.svg + resource:///org/gnome/Fractal/assets/other-device.svg diff --git a/data/resources/ui/sidebar.ui b/data/resources/ui/sidebar.ui index 08400bd3..3943a137 100644 --- a/data/resources/ui/sidebar.ui +++ b/data/resources/ui/sidebar.ui @@ -87,7 +87,7 @@ true - /org/gnome/FractalNext/sidebar-item.ui + /org/gnome/Fractal/sidebar-item.ui diff --git a/meson.build b/meson.build index 315311b8..05584122 100644 --- a/meson.build +++ b/meson.build @@ -7,7 +7,7 @@ project('fractal', i18n = import('i18n') gnome = import('gnome') -base_id = 'org.gnome.FractalNext' +base_id = 'org.gnome.Fractal' dependency('glib-2.0', version: '>= 2.66') dependency('gio-2.0', version: '>= 2.66') diff --git a/po/POTFILES.in b/po/POTFILES.in index 7a8aaf07..7719f7fa 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,8 +1,8 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. -data/org.gnome.FractalNext.desktop.in.in -data/org.gnome.FractalNext.gschema.xml.in -data/org.gnome.FractalNext.metainfo.xml.in.in +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 diff --git a/src/application.rs b/src/application.rs index 04c72dc4..4cacfb97 100644 --- a/src/application.rs +++ b/src/application.rs @@ -79,7 +79,7 @@ impl Application { glib::Object::new(&[ ("application-id", &Some(config::APP_ID)), ("flags", &ApplicationFlags::default()), - ("resource-base-path", &Some("/org/gnome/FractalNext/")), + ("resource-base-path", &Some("/org/gnome/Fractal/")), ]) .expect("Application initialization failed") } diff --git a/src/components/action_button.rs b/src/components/action_button.rs index 256e75cd..cc627059 100644 --- a/src/components/action_button.rs +++ b/src/components/action_button.rs @@ -43,7 +43,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/components-action-button.ui")] + #[template(resource = "/org/gnome/Fractal/components-action-button.ui")] pub struct ActionButton { /// The icon used in the default state. pub icon_name: RefCell, diff --git a/src/components/audio_player.rs b/src/components/audio_player.rs index ff67d011..36297836 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/FractalNext/components-audio-player.ui")] + #[template(resource = "/org/gnome/Fractal/components-audio-player.ui")] pub struct AudioPlayer { /// The media file to play. pub media_file: RefCell>, diff --git a/src/components/auth_dialog.rs b/src/components/auth_dialog.rs index d286320f..ed35bcf1 100644 --- a/src/components/auth_dialog.rs +++ b/src/components/auth_dialog.rs @@ -91,7 +91,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/components-auth-dialog.ui")] + #[template(resource = "/org/gnome/Fractal/components-auth-dialog.ui")] pub struct AuthDialog { pub session: OnceCell>, #[template_child] diff --git a/src/components/avatar.rs b/src/components/avatar.rs index 3458e708..717a6f37 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/FractalNext/components-avatar.ui")] + #[template(resource = "/org/gnome/Fractal/components-avatar.ui")] pub struct Avatar { /// A `Room` or `User` pub item: RefCell>, diff --git a/src/components/button_row.rs b/src/components/button_row.rs index d5db9303..88c0b252 100644 --- a/src/components/button_row.rs +++ b/src/components/button_row.rs @@ -16,7 +16,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/components-button-row.ui")] + #[template(resource = "/org/gnome/Fractal/components-button-row.ui")] pub struct ButtonRow { /// Whether activating this button opens a subpage. pub to_subpage: Cell, diff --git a/src/components/context_menu_bin.rs b/src/components/context_menu_bin.rs index 4ac6a921..e20672c9 100644 --- a/src/components/context_menu_bin.rs +++ b/src/components/context_menu_bin.rs @@ -8,7 +8,7 @@ mod imp { use super::*; #[derive(Debug, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/context-menu-bin.ui")] + #[template(resource = "/org/gnome/Fractal/context-menu-bin.ui")] pub struct ContextMenuBin { #[template_child] pub click_gesture: TemplateChild, diff --git a/src/components/editable_avatar.rs b/src/components/editable_avatar.rs index 47caba01..c03a01e0 100644 --- a/src/components/editable_avatar.rs +++ b/src/components/editable_avatar.rs @@ -21,7 +21,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/components-editable-avatar.ui")] + #[template(resource = "/org/gnome/Fractal/components-editable-avatar.ui")] pub struct EditableAvatar { /// The avatar to display. pub avatar: RefCell>, diff --git a/src/components/entry_row.rs b/src/components/entry_row.rs index 5d42236b..78f792b3 100644 --- a/src/components/entry_row.rs +++ b/src/components/entry_row.rs @@ -19,7 +19,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/components-entry-row.ui")] + #[template(resource = "/org/gnome/Fractal/components-entry-row.ui")] pub struct EntryRow { #[template_child] pub entry: TemplateChild, diff --git a/src/components/in_app_notification.rs b/src/components/in_app_notification.rs index 5a8f06f3..980a8091 100644 --- a/src/components/in_app_notification.rs +++ b/src/components/in_app_notification.rs @@ -11,7 +11,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/in-app-notification.ui")] + #[template(resource = "/org/gnome/Fractal/in-app-notification.ui")] pub struct InAppNotification { pub error_list: RefCell>, pub handler: RefCell>, diff --git a/src/components/loading_listbox_row.rs b/src/components/loading_listbox_row.rs index 9c7d83c6..5a91f591 100644 --- a/src/components/loading_listbox_row.rs +++ b/src/components/loading_listbox_row.rs @@ -10,7 +10,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/components-loading-listbox-row.ui")] + #[template(resource = "/org/gnome/Fractal/components-loading-listbox-row.ui")] pub struct LoadingListBoxRow { #[template_child] pub spinner: TemplateChild, diff --git a/src/components/password_entry_row.rs b/src/components/password_entry_row.rs index ef85ae9a..1dbcc2e2 100644 --- a/src/components/password_entry_row.rs +++ b/src/components/password_entry_row.rs @@ -19,7 +19,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/components-password-entry-row.ui")] + #[template(resource = "/org/gnome/Fractal/components-password-entry-row.ui")] pub struct PasswordEntryRow { #[template_child] pub entry: TemplateChild, diff --git a/src/components/pill.rs b/src/components/pill.rs index 1822a02b..2691a787 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/FractalNext/pill.ui")] + #[template(resource = "/org/gnome/Fractal/pill.ui")] pub struct Pill { /// The user displayed by this widget pub user: RefCell>, diff --git a/src/components/reaction_chooser.rs b/src/components/reaction_chooser.rs index 8b4429fc..4a279176 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/FractalNext/components-reaction-chooser.ui")] + #[template(resource = "/org/gnome/Fractal/components-reaction-chooser.ui")] pub struct ReactionChooser { /// The `ReactionList` associated to this chooser pub reactions: RefCell>, diff --git a/src/components/room_title.rs b/src/components/room_title.rs index 937cb2de..2c8d1a83 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/FractalNext/room-title.ui")] + #[template(resource = "/org/gnome/Fractal/room-title.ui")] pub struct RoomTitle { // The markup for the title pub title: RefCell>, diff --git a/src/components/spinner_button.rs b/src/components/spinner_button.rs index e29ebab2..e21c1bfb 100644 --- a/src/components/spinner_button.rs +++ b/src/components/spinner_button.rs @@ -7,7 +7,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/spinner-button.ui")] + #[template(resource = "/org/gnome/Fractal/spinner-button.ui")] pub struct SpinnerButton { #[template_child] pub stack: TemplateChild, diff --git a/src/components/video_player.rs b/src/components/video_player.rs index 76ab33b4..5d4cb9cf 100644 --- a/src/components/video_player.rs +++ b/src/components/video_player.rs @@ -14,7 +14,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/components-video-player.ui")] + #[template(resource = "/org/gnome/Fractal/components-video-player.ui")] pub struct VideoPlayer { /// Whether this player should be displayed in a compact format. pub compact: Cell, diff --git a/src/contrib/qr_code_scanner/mod.rs b/src/contrib/qr_code_scanner/mod.rs index f961bf8d..b1aba8af 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/FractalNext/qr-code-scanner.ui")] + #[template(resource = "/org/gnome/Fractal/qr-code-scanner.ui")] pub struct QrCodeScanner { #[template_child] pub stack: TemplateChild, diff --git a/src/error_page.rs b/src/error_page.rs index 7ada187f..5ed7a188 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/FractalNext/error-page.ui")] + #[template(resource = "/org/gnome/Fractal/error-page.ui")] pub struct ErrorPage { #[template_child] pub page: TemplateChild, diff --git a/src/greeter.rs b/src/greeter.rs index 986d1fa6..0eb5745d 100644 --- a/src/greeter.rs +++ b/src/greeter.rs @@ -7,7 +7,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/greeter.ui")] + #[template(resource = "/org/gnome/Fractal/greeter.ui")] pub struct Greeter { #[template_child] pub back_button: TemplateChild, diff --git a/src/login/idp_button.rs b/src/login/idp_button.rs index e685f318..54accf0f 100644 --- a/src/login/idp_button.rs +++ b/src/login/idp_button.rs @@ -102,7 +102,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/login-idp-button.ui")] + #[template(resource = "/org/gnome/Fractal/login-idp-button.ui")] pub struct IdpButton { pub brand: Cell, pub id: RefCell>, diff --git a/src/login/login_advanced_dialog.rs b/src/login/login_advanced_dialog.rs index 8985cb67..80dd9e53 100644 --- a/src/login/login_advanced_dialog.rs +++ b/src/login/login_advanced_dialog.rs @@ -10,7 +10,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/login-advanced-dialog.ui")] + #[template(resource = "/org/gnome/Fractal/login-advanced-dialog.ui")] pub struct LoginAdvancedDialog { pub autodiscovery: Cell, } diff --git a/src/login/mod.rs b/src/login/mod.rs index 845b51b7..2a28aeb3 100644 --- a/src/login/mod.rs +++ b/src/login/mod.rs @@ -40,7 +40,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/login.ui")] + #[template(resource = "/org/gnome/Fractal/login.ui")] pub struct Login { pub current_session: RefCell>, #[template_child] diff --git a/src/main.rs b/src/main.rs index 8a58c6cf..9ff5886e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,5 @@ #![doc( - html_logo_url = "https://gitlab.gnome.org/GNOME/fractal/-/raw/fractal-next/data/icons/org.gnome.FractalNext.svg?inline=false" + html_logo_url = "https://gitlab.gnome.org/GNOME/fractal/-/raw/fractal-next/data/icons/org.gnome.Fractal.svg?inline=false" )] mod application; @@ -56,7 +56,7 @@ fn main() { gio::resources_register(&res); IconTheme::for_display(&Display::default().unwrap()) - .add_resource_path("/org/gnome/FractalNext/icons"); + .add_resource_path("/org/gnome/Fractal/icons"); let app = Application::new(); app.run(); diff --git a/src/session/account_settings/devices_page/device_row.rs b/src/session/account_settings/devices_page/device_row.rs index feac6f67..6d60400d 100644 --- a/src/session/account_settings/devices_page/device_row.rs +++ b/src/session/account_settings/devices_page/device_row.rs @@ -18,7 +18,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/account-settings-device-row.ui")] + #[template(resource = "/org/gnome/Fractal/account-settings-device-row.ui")] pub struct DeviceRow { #[template_child] pub display_name: TemplateChild, diff --git a/src/session/account_settings/devices_page/mod.rs b/src/session/account_settings/devices_page/mod.rs index 83e0bf2c..29139717 100644 --- a/src/session/account_settings/devices_page/mod.rs +++ b/src/session/account_settings/devices_page/mod.rs @@ -22,7 +22,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/account-settings-devices-page.ui")] + #[template(resource = "/org/gnome/Fractal/account-settings-devices-page.ui")] pub struct DevicesPage { pub user: RefCell>, #[template_child] diff --git a/src/session/account_settings/mod.rs b/src/session/account_settings/mod.rs index a981ca5c..e27e487c 100644 --- a/src/session/account_settings/mod.rs +++ b/src/session/account_settings/mod.rs @@ -21,7 +21,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/account-settings.ui")] + #[template(resource = "/org/gnome/Fractal/account-settings.ui")] pub struct AccountSettings { pub session: RefCell>>, pub session_handler: RefCell>, diff --git a/src/session/account_settings/user_page/change_password_subpage.rs b/src/session/account_settings/user_page/change_password_subpage.rs index e8a0a1dc..7b0d5fea 100644 --- a/src/session/account_settings/user_page/change_password_subpage.rs +++ b/src/session/account_settings/user_page/change_password_subpage.rs @@ -31,7 +31,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/account-settings-change-password-subpage.ui")] + #[template(resource = "/org/gnome/Fractal/account-settings-change-password-subpage.ui")] pub struct ChangePasswordSubpage { pub session: OnceCell>, #[template_child] diff --git a/src/session/account_settings/user_page/deactivate_account_subpage.rs b/src/session/account_settings/user_page/deactivate_account_subpage.rs index 19533296..6d8751c8 100644 --- a/src/session/account_settings/user_page/deactivate_account_subpage.rs +++ b/src/session/account_settings/user_page/deactivate_account_subpage.rs @@ -21,7 +21,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/account-settings-deactivate-account-subpage.ui")] + #[template(resource = "/org/gnome/Fractal/account-settings-deactivate-account-subpage.ui")] pub struct DeactivateAccountSubpage { pub session: OnceCell>, #[template_child] diff --git a/src/session/account_settings/user_page/mod.rs b/src/session/account_settings/user_page/mod.rs index e9faa131..13b80c09 100644 --- a/src/session/account_settings/user_page/mod.rs +++ b/src/session/account_settings/user_page/mod.rs @@ -32,7 +32,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/account-settings-user-page.ui")] + #[template(resource = "/org/gnome/Fractal/account-settings-user-page.ui")] pub struct UserPage { pub session: RefCell>>, #[template_child] diff --git a/src/session/content/explore/mod.rs b/src/session/content/explore/mod.rs index d7dbbac4..64744c33 100644 --- a/src/session/content/explore/mod.rs +++ b/src/session/content/explore/mod.rs @@ -21,7 +21,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content-explore.ui")] + #[template(resource = "/org/gnome/Fractal/content-explore.ui")] pub struct Explore { pub compact: Cell, pub session: RefCell>>, diff --git a/src/session/content/explore/public_room_row.rs b/src/session/content/explore/public_room_row.rs index 7a39c4ed..f695ae45 100644 --- a/src/session/content/explore/public_room_row.rs +++ b/src/session/content/explore/public_room_row.rs @@ -16,7 +16,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content-public-room-row.ui")] + #[template(resource = "/org/gnome/Fractal/content-public-room-row.ui")] pub struct PublicRoomRow { pub public_room: RefCell>, #[template_child] diff --git a/src/session/content/invite.rs b/src/session/content/invite.rs index 5cc3d6ce..60e1a3c3 100644 --- a/src/session/content/invite.rs +++ b/src/session/content/invite.rs @@ -18,7 +18,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content-invite.ui")] + #[template(resource = "/org/gnome/Fractal/content-invite.ui")] pub struct Invite { pub compact: Cell, pub room: RefCell>, diff --git a/src/session/content/markdown_popover.rs b/src/session/content/markdown_popover.rs index 13ccd807..326f9bb3 100644 --- a/src/session/content/markdown_popover.rs +++ b/src/session/content/markdown_popover.rs @@ -8,7 +8,7 @@ pub mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content-markdown-popover.ui")] + #[template(resource = "/org/gnome/Fractal/content-markdown-popover.ui")] pub struct MarkdownPopover { pub markdown_enabled: Cell, } diff --git a/src/session/content/mod.rs b/src/session/content/mod.rs index 03864802..940a831c 100644 --- a/src/session/content/mod.rs +++ b/src/session/content/mod.rs @@ -28,7 +28,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content.ui")] + #[template(resource = "/org/gnome/Fractal/content.ui")] pub struct Content { pub compact: Cell, pub session: RefCell>>, diff --git a/src/session/content/room_details/invite_subpage/invitee_row.rs b/src/session/content/room_details/invite_subpage/invitee_row.rs index 521cbab1..acaa4900 100644 --- a/src/session/content/room_details/invite_subpage/invitee_row.rs +++ b/src/session/content/room_details/invite_subpage/invitee_row.rs @@ -12,7 +12,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content-invitee-row.ui")] + #[template(resource = "/org/gnome/Fractal/content-invitee-row.ui")] pub struct InviteeRow { pub user: RefCell>, pub binding: RefCell>, diff --git a/src/session/content/room_details/invite_subpage/mod.rs b/src/session/content/room_details/invite_subpage/mod.rs index 9931a909..5aa19964 100644 --- a/src/session/content/room_details/invite_subpage/mod.rs +++ b/src/session/content/room_details/invite_subpage/mod.rs @@ -23,7 +23,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content-invite-subpage.ui")] + #[template(resource = "/org/gnome/Fractal/content-invite-subpage.ui")] pub struct InviteSubpage { pub room: RefCell>, #[template_child] diff --git a/src/session/content/room_details/member_page/member_menu.rs b/src/session/content/room_details/member_page/member_menu.rs index aa72a56f..843a42c4 100644 --- a/src/session/content/room_details/member_page/member_menu.rs +++ b/src/session/content/room_details/member_page/member_menu.rs @@ -131,7 +131,7 @@ impl MemberMenu { fn popover_menu(&self) -> >k::PopoverMenu { self.imp().popover.get_or_init(|| { gtk::PopoverMenu::from_model(Some( - >k::Builder::from_resource("/org/gnome/FractalNext/member-menu.ui") + >k::Builder::from_resource("/org/gnome/Fractal/member-menu.ui") .object::("menu_model") .unwrap(), )) diff --git a/src/session/content/room_details/member_page/member_row.rs b/src/session/content/room_details/member_page/member_row.rs index 063f3ef5..681be76c 100644 --- a/src/session/content/room_details/member_page/member_row.rs +++ b/src/session/content/room_details/member_page/member_row.rs @@ -12,7 +12,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content-member-row.ui")] + #[template(resource = "/org/gnome/Fractal/content-member-row.ui")] pub struct MemberRow { pub member: RefCell>, #[template_child] diff --git a/src/session/content/room_details/member_page/mod.rs b/src/session/content/room_details/member_page/mod.rs index fbd20ea0..2ed11ce1 100644 --- a/src/session/content/room_details/member_page/mod.rs +++ b/src/session/content/room_details/member_page/mod.rs @@ -31,7 +31,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content-member-page.ui")] + #[template(resource = "/org/gnome/Fractal/content-member-page.ui")] pub struct MemberPage { pub room: OnceCell, #[template_child] diff --git a/src/session/content/room_details/mod.rs b/src/session/content/room_details/mod.rs index 445dbfd0..f6c0ca2d 100644 --- a/src/session/content/room_details/mod.rs +++ b/src/session/content/room_details/mod.rs @@ -25,7 +25,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content-room-details.ui")] + #[template(resource = "/org/gnome/Fractal/content-room-details.ui")] pub struct RoomDetails { pub room: OnceCell, pub avatar_chooser: OnceCell, diff --git a/src/session/content/room_history/attachment_dialog.rs b/src/session/content/room_history/attachment_dialog.rs index 8525c104..4e39c4bd 100644 --- a/src/session/content/room_history/attachment_dialog.rs +++ b/src/session/content/room_history/attachment_dialog.rs @@ -7,7 +7,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/attachment-dialog.ui")] + #[template(resource = "/org/gnome/Fractal/attachment-dialog.ui")] pub struct AttachmentDialog { pub file: RefCell>, pub texture: RefCell>, diff --git a/src/session/content/room_history/divider_row.rs b/src/session/content/room_history/divider_row.rs index 810660b0..538b9b92 100644 --- a/src/session/content/room_history/divider_row.rs +++ b/src/session/content/room_history/divider_row.rs @@ -7,7 +7,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content-divider-row.ui")] + #[template(resource = "/org/gnome/Fractal/content-divider-row.ui")] pub struct DividerRow { #[template_child] pub label: TemplateChild, diff --git a/src/session/content/room_history/message_row/audio.rs b/src/session/content/room_history/message_row/audio.rs index f7bfa41f..acc31d4a 100644 --- a/src/session/content/room_history/message_row/audio.rs +++ b/src/session/content/room_history/message_row/audio.rs @@ -21,7 +21,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content-message-audio.ui")] + #[template(resource = "/org/gnome/Fractal/content-message-audio.ui")] pub struct MessageAudio { /// The body of the audio message. pub body: RefCell>, diff --git a/src/session/content/room_history/message_row/file.rs b/src/session/content/room_history/message_row/file.rs index 49deeecb..4211516d 100644 --- a/src/session/content/room_history/message_row/file.rs +++ b/src/session/content/room_history/message_row/file.rs @@ -10,7 +10,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content-message-file.ui")] + #[template(resource = "/org/gnome/Fractal/content-message-file.ui")] pub struct MessageFile { /// The filename of the file pub filename: RefCell>, diff --git a/src/session/content/room_history/message_row/media.rs b/src/session/content/room_history/message_row/media.rs index 9a122e6a..3a032dfc 100644 --- a/src/session/content/room_history/message_row/media.rs +++ b/src/session/content/room_history/message_row/media.rs @@ -67,7 +67,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content-message-media.ui")] + #[template(resource = "/org/gnome/Fractal/content-message-media.ui")] pub struct MessageMedia { /// The intended display width of the media. pub width: Cell, diff --git a/src/session/content/room_history/message_row/mod.rs b/src/session/content/room_history/message_row/mod.rs index 7152822a..dfd32372 100644 --- a/src/session/content/room_history/message_row/mod.rs +++ b/src/session/content/room_history/message_row/mod.rs @@ -37,7 +37,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content-message-row.ui")] + #[template(resource = "/org/gnome/Fractal/content-message-row.ui")] pub struct MessageRow { #[template_child] pub avatar: TemplateChild, diff --git a/src/session/content/room_history/message_row/reaction.rs b/src/session/content/room_history/message_row/reaction.rs index 7d435f8a..f01969f0 100644 --- a/src/session/content/room_history/message_row/reaction.rs +++ b/src/session/content/room_history/message_row/reaction.rs @@ -10,7 +10,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content-message-reaction.ui")] + #[template(resource = "/org/gnome/Fractal/content-message-reaction.ui")] pub struct MessageReaction { /// The reaction group to display. pub group: OnceCell, diff --git a/src/session/content/room_history/message_row/reaction_list.rs b/src/session/content/room_history/message_row/reaction_list.rs index 0a4fda0b..a9d4e35e 100644 --- a/src/session/content/room_history/message_row/reaction_list.rs +++ b/src/session/content/room_history/message_row/reaction_list.rs @@ -10,7 +10,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content-message-reaction-list.ui")] + #[template(resource = "/org/gnome/Fractal/content-message-reaction-list.ui")] pub struct MessageReactionList { #[template_child] pub flow_box: TemplateChild, diff --git a/src/session/content/room_history/message_row/reply.rs b/src/session/content/room_history/message_row/reply.rs index ad5fbb70..0ae21603 100644 --- a/src/session/content/room_history/message_row/reply.rs +++ b/src/session/content/room_history/message_row/reply.rs @@ -9,7 +9,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content-message-reply.ui")] + #[template(resource = "/org/gnome/Fractal/content-message-reply.ui")] pub struct MessageReply { #[template_child] pub pill: TemplateChild, diff --git a/src/session/content/room_history/mod.rs b/src/session/content/room_history/mod.rs index 9408b7cf..5b98654e 100644 --- a/src/session/content/room_history/mod.rs +++ b/src/session/content/room_history/mod.rs @@ -53,7 +53,7 @@ mod imp { use crate::Application; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content-room-history.ui")] + #[template(resource = "/org/gnome/Fractal/content-room-history.ui")] pub struct RoomHistory { pub compact: Cell, pub room: RefCell>, diff --git a/src/session/content/room_history/state_row/creation.rs b/src/session/content/room_history/state_row/creation.rs index 9629dd50..1a68ea03 100644 --- a/src/session/content/room_history/state_row/creation.rs +++ b/src/session/content/room_history/state_row/creation.rs @@ -9,7 +9,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content-state-creation.ui")] + #[template(resource = "/org/gnome/Fractal/content-state-creation.ui")] pub struct StateCreation { #[template_child] pub previous_room_btn: TemplateChild, diff --git a/src/session/content/room_history/state_row/mod.rs b/src/session/content/room_history/state_row/mod.rs index e2b3dfcc..34d5d0f6 100644 --- a/src/session/content/room_history/state_row/mod.rs +++ b/src/session/content/room_history/state_row/mod.rs @@ -17,7 +17,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content-state-row.ui")] + #[template(resource = "/org/gnome/Fractal/content-state-row.ui")] pub struct StateRow { #[template_child] pub timestamp: TemplateChild, diff --git a/src/session/content/room_history/state_row/tombstone.rs b/src/session/content/room_history/state_row/tombstone.rs index 9ff1f790..f38ef0da 100644 --- a/src/session/content/room_history/state_row/tombstone.rs +++ b/src/session/content/room_history/state_row/tombstone.rs @@ -8,7 +8,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content-state-tombstone.ui")] + #[template(resource = "/org/gnome/Fractal/content-state-tombstone.ui")] pub struct StateTombstone { #[template_child] pub new_room_btn: TemplateChild, diff --git a/src/session/content/room_history/verification_info_bar.rs b/src/session/content/room_history/verification_info_bar.rs index 97900bd9..ac9d47b6 100644 --- a/src/session/content/room_history/verification_info_bar.rs +++ b/src/session/content/room_history/verification_info_bar.rs @@ -14,7 +14,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/content-verification-info-bar.ui")] + #[template(resource = "/org/gnome/Fractal/content-verification-info-bar.ui")] pub struct VerificationInfoBar { #[template_child] pub revealer: TemplateChild, diff --git a/src/session/content/verification/emoji.rs b/src/session/content/verification/emoji.rs index fe872425..f4504e4e 100644 --- a/src/session/content/verification/emoji.rs +++ b/src/session/content/verification/emoji.rs @@ -7,7 +7,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/verification-emoji.ui")] + #[template(resource = "/org/gnome/Fractal/verification-emoji.ui")] pub struct Emoji { #[template_child] pub emoji: TemplateChild, diff --git a/src/session/content/verification/identity_verification_widget.rs b/src/session/content/verification/identity_verification_widget.rs index cd6e3933..c6b7368d 100644 --- a/src/session/content/verification/identity_verification_widget.rs +++ b/src/session/content/verification/identity_verification_widget.rs @@ -26,7 +26,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/identity-verification-widget.ui")] + #[template(resource = "/org/gnome/Fractal/identity-verification-widget.ui")] pub struct IdentityVerificationWidget { pub request: RefCell>, #[template_child] diff --git a/src/session/content/verification/session_verification.rs b/src/session/content/verification/session_verification.rs index 9799ae66..718e66fb 100644 --- a/src/session/content/verification/session_verification.rs +++ b/src/session/content/verification/session_verification.rs @@ -19,7 +19,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/session-verification.ui")] + #[template(resource = "/org/gnome/Fractal/session-verification.ui")] pub struct SessionVerification { pub request: RefCell>, pub session: OnceCell>, diff --git a/src/session/event_source_dialog.rs b/src/session/event_source_dialog.rs index 1949287c..2901d9b9 100644 --- a/src/session/event_source_dialog.rs +++ b/src/session/event_source_dialog.rs @@ -11,7 +11,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/event-source-dialog.ui")] + #[template(resource = "/org/gnome/Fractal/event-source-dialog.ui")] pub struct EventSourceDialog { pub event: OnceCell, #[template_child] diff --git a/src/session/media_viewer.rs b/src/session/media_viewer.rs index 65df94b3..75ed9bdc 100644 --- a/src/session/media_viewer.rs +++ b/src/session/media_viewer.rs @@ -16,7 +16,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/media-viewer.ui")] + #[template(resource = "/org/gnome/Fractal/media-viewer.ui")] pub struct MediaViewer { pub fullscreened: Cell, pub event: RefCell>>, diff --git a/src/session/mod.rs b/src/session/mod.rs index 9bbee2f7..e8a2a70c 100644 --- a/src/session/mod.rs +++ b/src/session/mod.rs @@ -96,7 +96,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/session.ui")] + #[template(resource = "/org/gnome/Fractal/session.ui")] pub struct Session { #[template_child] pub stack: TemplateChild, @@ -333,7 +333,7 @@ impl Session { let client = create_client(&homeserver, &path, &passphrase, use_discovery).await?; let response = client - .login(&username, &password, None, Some("Fractal Next")) + .login(&username, &password, None, Some("Fractal")) .await; match response { Ok(response) => Ok(( @@ -387,7 +387,7 @@ impl Session { None, None, None, - Some("Fractal Next"), + Some("Fractal"), idp_id.as_deref(), ) .await; diff --git a/src/session/room/event_actions.rs b/src/session/room/event_actions.rs index 002d5671..fba9f61d 100644 --- a/src/session/room/event_actions.rs +++ b/src/session/room/event_actions.rs @@ -33,7 +33,7 @@ where fn event_message_menu_model() -> &'static gio::MenuModel { static MODEL: Lazy = Lazy::new(|| { MenuModelSendSync( - gtk::Builder::from_resource("/org/gnome/FractalNext/event-menu.ui") + gtk::Builder::from_resource("/org/gnome/Fractal/event-menu.ui") .object::("message_menu_model") .unwrap(), ) @@ -45,7 +45,7 @@ where fn event_media_menu_model() -> &'static gio::MenuModel { static MODEL: Lazy = Lazy::new(|| { MenuModelSendSync( - gtk::Builder::from_resource("/org/gnome/FractalNext/event-menu.ui") + gtk::Builder::from_resource("/org/gnome/Fractal/event-menu.ui") .object::("media_menu_model") .unwrap(), ) @@ -57,7 +57,7 @@ where fn event_state_menu_model() -> &'static gio::MenuModel { static MODEL: Lazy = Lazy::new(|| { MenuModelSendSync( - gtk::Builder::from_resource("/org/gnome/FractalNext/event-menu.ui") + gtk::Builder::from_resource("/org/gnome/Fractal/event-menu.ui") .object::("state_menu_model") .unwrap(), ) diff --git a/src/session/room_creation/mod.rs b/src/session/room_creation/mod.rs index 973c23c9..c1c58712 100644 --- a/src/session/room_creation/mod.rs +++ b/src/session/room_creation/mod.rs @@ -37,7 +37,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/room-creation.ui")] + #[template(resource = "/org/gnome/Fractal/room-creation.ui")] pub struct RoomCreation { pub session: RefCell>>, #[template_child] diff --git a/src/session/sidebar/account_switcher/add_account.rs b/src/session/sidebar/account_switcher/add_account.rs index 3fcf3986..7a61eee4 100644 --- a/src/session/sidebar/account_switcher/add_account.rs +++ b/src/session/sidebar/account_switcher/add_account.rs @@ -7,7 +7,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/add-account-row.ui")] + #[template(resource = "/org/gnome/Fractal/add-account-row.ui")] pub struct AddAccountRow; #[glib::object_subclass] diff --git a/src/session/sidebar/account_switcher/avatar_with_selection.rs b/src/session/sidebar/account_switcher/avatar_with_selection.rs index 53917240..45f55fce 100644 --- a/src/session/sidebar/account_switcher/avatar_with_selection.rs +++ b/src/session/sidebar/account_switcher/avatar_with_selection.rs @@ -10,7 +10,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/avatar-with-selection.ui")] + #[template(resource = "/org/gnome/Fractal/avatar-with-selection.ui")] pub struct AvatarWithSelection { #[template_child] pub child_avatar: TemplateChild, diff --git a/src/session/sidebar/account_switcher/mod.rs b/src/session/sidebar/account_switcher/mod.rs index 0badb320..015984bd 100644 --- a/src/session/sidebar/account_switcher/mod.rs +++ b/src/session/sidebar/account_switcher/mod.rs @@ -22,7 +22,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/sidebar-account-switcher.ui")] + #[template(resource = "/org/gnome/Fractal/sidebar-account-switcher.ui")] pub struct AccountSwitcher { #[template_child] pub entries: TemplateChild, diff --git a/src/session/sidebar/account_switcher/user_entry.rs b/src/session/sidebar/account_switcher/user_entry.rs index 6074c544..096ce783 100644 --- a/src/session/sidebar/account_switcher/user_entry.rs +++ b/src/session/sidebar/account_switcher/user_entry.rs @@ -13,7 +13,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/user-entry-row.ui")] + #[template(resource = "/org/gnome/Fractal/user-entry-row.ui")] pub struct UserEntryRow { #[template_child] pub account_avatar: TemplateChild, diff --git a/src/session/sidebar/category_row.rs b/src/session/sidebar/category_row.rs index be7d33a1..fa076643 100644 --- a/src/session/sidebar/category_row.rs +++ b/src/session/sidebar/category_row.rs @@ -12,7 +12,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/sidebar-category-row.ui")] + #[template(resource = "/org/gnome/Fractal/sidebar-category-row.ui")] pub struct CategoryRow { /// The category of this row. pub category: RefCell>, diff --git a/src/session/sidebar/entry_row.rs b/src/session/sidebar/entry_row.rs index b957a1f4..d6f2906c 100644 --- a/src/session/sidebar/entry_row.rs +++ b/src/session/sidebar/entry_row.rs @@ -11,7 +11,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/sidebar-entry-row.ui")] + #[template(resource = "/org/gnome/Fractal/sidebar-entry-row.ui")] pub struct EntryRow { pub entry: RefCell>, } diff --git a/src/session/sidebar/mod.rs b/src/session/sidebar/mod.rs index 212593d0..c43aa817 100644 --- a/src/session/sidebar/mod.rs +++ b/src/session/sidebar/mod.rs @@ -44,7 +44,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/sidebar.ui")] + #[template(resource = "/org/gnome/Fractal/sidebar.ui")] pub struct Sidebar { pub compact: Cell, pub selected_item: RefCell>, diff --git a/src/session/sidebar/room_row.rs b/src/session/sidebar/room_row.rs index c8c960e7..f7a93f8e 100644 --- a/src/session/sidebar/room_row.rs +++ b/src/session/sidebar/room_row.rs @@ -15,7 +15,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/sidebar-room-row.ui")] + #[template(resource = "/org/gnome/Fractal/sidebar-room-row.ui")] pub struct RoomRow { pub room: RefCell>, pub binding: RefCell>, diff --git a/src/session/sidebar/verification_row.rs b/src/session/sidebar/verification_row.rs index f271bc5b..f6083a84 100644 --- a/src/session/sidebar/verification_row.rs +++ b/src/session/sidebar/verification_row.rs @@ -12,7 +12,7 @@ mod imp { use super::*; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/FractalNext/sidebar-verification-row.ui")] + #[template(resource = "/org/gnome/Fractal/sidebar-verification-row.ui")] pub struct VerificationRow { pub verification: RefCell>, } diff --git a/src/window.rs b/src/window.rs index 81a278ef..94f0e04e 100644 --- a/src/window.rs +++ b/src/window.rs @@ -18,7 +18,7 @@ mod imp { use super::*; #[derive(Debug, CompositeTemplate, Default)] - #[template(resource = "/org/gnome/FractalNext/window.ui")] + #[template(resource = "/org/gnome/Fractal/window.ui")] pub struct Window { #[template_child] pub main_stack: TemplateChild, @@ -78,7 +78,7 @@ mod imp { fn constructed(&self, obj: &Self::Type) { self.parent_constructed(obj); - let builder = gtk::Builder::from_resource("/org/gnome/FractalNext/shortcuts.ui"); + let builder = gtk::Builder::from_resource("/org/gnome/Fractal/shortcuts.ui"); let shortcuts = builder.object("shortcuts").unwrap(); obj.set_help_overlay(Some(&shortcuts));