mirror
/
fractal
mirror of https://gitlab.gnome.org/World/fractal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Remove Next from app-id

merge-requests/1327/merge
Julian Sparber 4 years ago
parent
38ee2cdd04
commit
0bf6a4ff32
94 changed files with 106 additions and 106 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      .gitlab-ci.yml
  2. 4
      README.md
  3. 2
      build-aux/org.gnome.Fractal.Devel.json
  4. 0
      data/icons/org.gnome.Fractal-symbolic.svg
  5. 0
      data/icons/org.gnome.Fractal.Devel.svg
  6. 0
      data/icons/org.gnome.Fractal.svg
  7. 0
      data/org.gnome.Fractal.desktop.in.in
  8. 2
      data/org.gnome.Fractal.gschema.xml.in
  9. 0
      data/org.gnome.Fractal.metainfo.xml.in.in
  10. 2
      data/resources/resources.gresource.xml
  11. 2
      data/resources/ui/content-explore.ui
  12. 2
      data/resources/ui/content-invite-subpage.ui
  13. 4
      data/resources/ui/content-member-page.ui
  14. 2
      data/resources/ui/content-room-history.ui
  15. 2
      data/resources/ui/greeter.ui
  16. 10
      data/resources/ui/identity-verification-widget.ui
  17. 2
      data/resources/ui/login.ui
  18. 2
      data/resources/ui/session-verification.ui
  19. 2
      data/resources/ui/sidebar.ui
  20. 2
      meson.build
  21. 6
      po/POTFILES.in
  22. 2
      src/application.rs
  23. 2
      src/components/action_button.rs
  24. 2
      src/components/audio_player.rs
  25. 2
      src/components/auth_dialog.rs
  26. 2
      src/components/avatar.rs
  27. 2
      src/components/button_row.rs
  28. 2
      src/components/context_menu_bin.rs
  29. 2
      src/components/editable_avatar.rs
  30. 2
      src/components/entry_row.rs
  31. 2
      src/components/in_app_notification.rs
  32. 2
      src/components/loading_listbox_row.rs
  33. 2
      src/components/password_entry_row.rs
  34. 2
      src/components/pill.rs
  35. 2
      src/components/reaction_chooser.rs
  36. 2
      src/components/room_title.rs
  37. 2
      src/components/spinner_button.rs
  38. 2
      src/components/video_player.rs
  39. 2
      src/contrib/qr_code_scanner/mod.rs
  40. 2
      src/error_page.rs
  41. 2
      src/greeter.rs
  42. 2
      src/login/idp_button.rs
  43. 2
      src/login/login_advanced_dialog.rs
  44. 2
      src/login/mod.rs
  45. 4
      src/main.rs
  46. 2
      src/session/account_settings/devices_page/device_row.rs
  47. 2
      src/session/account_settings/devices_page/mod.rs
  48. 2
      src/session/account_settings/mod.rs
  49. 2
      src/session/account_settings/user_page/change_password_subpage.rs
  50. 2
      src/session/account_settings/user_page/deactivate_account_subpage.rs
  51. 2
      src/session/account_settings/user_page/mod.rs
  52. 2
      src/session/content/explore/mod.rs
  53. 2
      src/session/content/explore/public_room_row.rs
  54. 2
      src/session/content/invite.rs
  55. 2
      src/session/content/markdown_popover.rs
  56. 2
      src/session/content/mod.rs
  57. 2
      src/session/content/room_details/invite_subpage/invitee_row.rs
  58. 2
      src/session/content/room_details/invite_subpage/mod.rs
  59. 2
      src/session/content/room_details/member_page/member_menu.rs
  60. 2
      src/session/content/room_details/member_page/member_row.rs
  61. 2
      src/session/content/room_details/member_page/mod.rs
  62. 2
      src/session/content/room_details/mod.rs
  63. 2
      src/session/content/room_history/attachment_dialog.rs
  64. 2
      src/session/content/room_history/divider_row.rs
  65. 2
      src/session/content/room_history/message_row/audio.rs
  66. 2
      src/session/content/room_history/message_row/file.rs
  67. 2
      src/session/content/room_history/message_row/media.rs
  68. 2
      src/session/content/room_history/message_row/mod.rs
  69. 2
      src/session/content/room_history/message_row/reaction.rs
  70. 2
      src/session/content/room_history/message_row/reaction_list.rs
  71. 2
      src/session/content/room_history/message_row/reply.rs
  72. 2
      src/session/content/room_history/mod.rs
  73. 2
      src/session/content/room_history/state_row/creation.rs
  74. 2
      src/session/content/room_history/state_row/mod.rs
  75. 2
      src/session/content/room_history/state_row/tombstone.rs
  76. 2
      src/session/content/room_history/verification_info_bar.rs
  77. 2
      src/session/content/verification/emoji.rs
  78. 2
      src/session/content/verification/identity_verification_widget.rs
  79. 2
      src/session/content/verification/session_verification.rs
  80. 2
      src/session/event_source_dialog.rs
  81. 2
      src/session/media_viewer.rs
  82. 6
      src/session/mod.rs
  83. 6
      src/session/room/event_actions.rs
  84. 2
      src/session/room_creation/mod.rs
  85. 2
      src/session/sidebar/account_switcher/add_account.rs
  86. 2
      src/session/sidebar/account_switcher/avatar_with_selection.rs
  87. 2
      src/session/sidebar/account_switcher/mod.rs
  88. 2
      src/session/sidebar/account_switcher/user_entry.rs
  89. 2
      src/session/sidebar/category_row.rs
  90. 2
      src/session/sidebar/entry_row.rs
  91. 2
      src/session/sidebar/mod.rs
  92. 2
      src/session/sidebar/room_row.rs
  93. 2
      src/session/sidebar/verification_row.rs
  94. 4
      src/window.rs

8
.gitlab-ci.yml
Unescape View File

@ -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}

4
README.md
Unescape View File

@ -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

2
build-aux/org.gnome.FractalNext.Devel.json → build-aux/org.gnome.Fractal.Devel.json
Unescape View File

@ -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",

0
data/icons/org.gnome.FractalNext-symbolic.svg → data/icons/org.gnome.Fractal-symbolic.svg
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 986 B

After

Width:  |  Height:  |  Size: 986 B

0
data/icons/org.gnome.FractalNext.Devel.svg → data/icons/org.gnome.Fractal.Devel.svg
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

0
data/icons/org.gnome.FractalNext.svg → data/icons/org.gnome.Fractal.svg
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

0
data/org.gnome.FractalNext.desktop.in.in → data/org.gnome.Fractal.desktop.in.in
Unescape View File

2
data/org.gnome.FractalNext.gschema.xml.in → data/org.gnome.Fractal.gschema.xml.in
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<schemalist>
<schema path="/org/gnome/FractalNext/" id="@app-id@" gettext-domain="@gettext-package@">
<schema path="/org/gnome/Fractal/" id="@app-id@" gettext-domain="@gettext-package@">
<key name="window-width" type="i">
<default>-1</default>
<summary>Default window width</summary>

0
data/org.gnome.FractalNext.metainfo.xml.in.in → data/org.gnome.Fractal.metainfo.xml.in.in
Unescape View File

2
data/resources/resources.gresource.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/FractalNext/">
<gresource prefix="/org/gnome/Fractal/">
<file preprocess="xml-stripblanks">assets/homeserver.svg</file>
<file preprocess="xml-stripblanks">assets/other-device.svg</file>
<file preprocess="xml-stripblanks">assets/setup-complete.svg</file>

2
data/resources/ui/content-explore.ui
Unescape View File

@ -90,7 +90,7 @@
</style>
<property name="factory">
<object class="GtkBuilderListItemFactory">
<property name="resource">/org/gnome/FractalNext/content-explore-item.ui</property>
<property name="resource">/org/gnome/Fractal/content-explore-item.ui</property>
</object>
</property>
<accessibility>

2
data/resources/ui/content-invite-subpage.ui
Unescape View File

@ -102,7 +102,7 @@
<property name="single-click-activate">True</property>
<property name="factory">
<object class="GtkBuilderListItemFactory">
<property name="resource">/org/gnome/FractalNext/content-invitee-item.ui</property>
<property name="resource">/org/gnome/Fractal/content-invitee-item.ui</property>
</object>
</property>
<style>

4
data/resources/ui/content-member-page.ui
Unescape View File

@ -42,7 +42,7 @@
<property name="show-separators">True</property>
<property name="factory">
<object class="GtkBuilderListItemFactory">
<property name="resource">/org/gnome/FractalNext/content-member-item.ui</property>
<property name="resource">/org/gnome/Fractal/content-member-item.ui</property>
</object>
</property>
<style>
@ -65,7 +65,7 @@
<property name="show-separators">True</property>
<property name="factory">
<object class="GtkBuilderListItemFactory">
<property name="resource">/org/gnome/FractalNext/content-member-item.ui</property>
<property name="resource">/org/gnome/Fractal/content-member-item.ui</property>
</object>
</property>
<style>

2
data/resources/ui/content-room-history.ui
Unescape View File

@ -173,7 +173,7 @@
</style>
<property name="factory">
<object class="GtkBuilderListItemFactory">
<property name="resource">/org/gnome/FractalNext/content-item.ui</property>
<property name="resource">/org/gnome/Fractal/content-item.ui</property>
</object>
</property>
<property name="single-click-activate">True</property>

2
data/resources/ui/greeter.ui
Unescape View File

@ -71,7 +71,7 @@
<property name="spacing">24</property>
<child>
<object class="GtkPicture">
<property name="file">resource:///org/gnome/FractalNext/assets/welcome.svg</property>
<property name="file">resource:///org/gnome/Fractal/assets/welcome.svg</property>
<property name="height-request">120</property>
</object>
</child>

10
data/resources/ui/identity-verification-widget.ui
Unescape View File

@ -38,7 +38,7 @@
</child>
<child>
<object class="GtkPicture">
<property name="file">resource:///org/gnome/FractalNext/assets/other-device.svg</property>
<property name="file">resource:///org/gnome/Fractal/assets/other-device.svg</property>
</object>
</child>
<child>
@ -158,7 +158,7 @@
</child>
<child>
<object class="GtkPicture">
<property name="file">resource:///org/gnome/FractalNext/assets/setup-complete.svg</property>
<property name="file">resource:///org/gnome/Fractal/assets/setup-complete.svg</property>
</object>
</child>
<child>
@ -338,7 +338,7 @@
</child>
<child>
<object class="GtkPicture">
<property name="file">resource:///org/gnome/FractalNext/assets/setup-complete.svg</property>
<property name="file">resource:///org/gnome/Fractal/assets/setup-complete.svg</property>
</object>
</child>
<child>
@ -396,7 +396,7 @@
</child>
<child>
<object class="GtkPicture">
<property name="file">resource:///org/gnome/FractalNext/icons/scalable/status/other-device.svg</property>
<property name="file">resource:///org/gnome/Fractal/icons/scalable/status/other-device.svg</property>
</object>
</child>
</object>
@ -430,7 +430,7 @@
</child>
<child>
<object class="GtkPicture">
<property name="file">resource:///org/gnome/FractalNext/assets/setup-complete.svg</property>
<property name="file">resource:///org/gnome/Fractal/assets/setup-complete.svg</property>
</object>
</child>
<child>

2
data/resources/ui/login.ui
Unescape View File

@ -49,7 +49,7 @@
<property name="spacing">24</property>
<child>
<object class="GtkPicture">
<property name="file">resource:///org/gnome/FractalNext/assets/homeserver.svg</property>
<property name="file">resource:///org/gnome/Fractal/assets/homeserver.svg</property>
</object>
</child>
<child>

2
data/resources/ui/session-verification.ui
Unescape View File

@ -65,7 +65,7 @@
</child>
<child>
<object class="GtkPicture">
<property name="file">resource:///org/gnome/FractalNext/assets/other-device.svg</property>
<property name="file">resource:///org/gnome/Fractal/assets/other-device.svg</property>
</object>
</child>
<child>

2
data/resources/ui/sidebar.ui
Unescape View File

@ -87,7 +87,7 @@
<property name="single-click-activate">true</property>
<property name="factory">
<object class="GtkBuilderListItemFactory">
<property name="resource">/org/gnome/FractalNext/sidebar-item.ui</property>
<property name="resource">/org/gnome/Fractal/sidebar-item.ui</property>
</object>
</property>
<accessibility>

2
meson.build
Unescape View File

@ -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')

6
po/POTFILES.in
Unescape View File

@ -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

2
src/application.rs
Unescape View File

@ -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")
}

2
src/components/action_button.rs
Unescape View File

@ -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<String>,

2
src/components/audio_player.rs
Unescape View File

@ -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<Option<gtk::MediaFile>>,

2
src/components/auth_dialog.rs
Unescape View File

@ -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<WeakRef<Session>>,
#[template_child]

2
src/components/avatar.rs
Unescape View File

@ -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<Option<AvatarItem>>,

2
src/components/button_row.rs
Unescape View File

@ -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<bool>,

2
src/components/context_menu_bin.rs
Unescape View File

@ -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<gtk::GestureClick>,

2
src/components/editable_avatar.rs
Unescape View File

@ -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<Option<Avatar>>,

2
src/components/entry_row.rs
Unescape View File

@ -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<gtk::Text>,

2
src/components/in_app_notification.rs
Unescape View File

@ -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<Option<gio::ListStore>>,
pub handler: RefCell<Option<SignalHandlerId>>,

2
src/components/loading_listbox_row.rs
Unescape View File

@ -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<gtk::Spinner>,

2
src/components/password_entry_row.rs
Unescape View File

@ -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<gtk::Text>,

2
src/components/pill.rs
Unescape View File

@ -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<Option<User>>,

2
src/components/reaction_chooser.rs
Unescape View File

@ -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<Option<ReactionList>>,

2
src/components/room_title.rs
Unescape View File

@ -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<Option<String>>,

2
src/components/spinner_button.rs
Unescape View File

@ -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<gtk::Stack>,

2
src/components/video_player.rs
Unescape View File

@ -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<bool>,

2
src/contrib/qr_code_scanner/mod.rs
Unescape View File

@ -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<gtk::Stack>,

2
src/error_page.rs
Unescape View File

@ -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<adw::StatusPage>,

2
src/greeter.rs
Unescape View File

@ -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<gtk::Button>,

2
src/login/idp_button.rs
Unescape View File

@ -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<IdpBrand>,
pub id: RefCell<Option<String>>,

2
src/login/login_advanced_dialog.rs
Unescape View File

@ -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<bool>,
}

2
src/login/mod.rs
Unescape View File

@ -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<Option<Session>>,
#[template_child]

4
src/main.rs
Unescape View File

@ -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();

2
src/session/account_settings/devices_page/device_row.rs
Unescape View File

@ -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<gtk::Label>,

2
src/session/account_settings/devices_page/mod.rs
Unescape View File

@ -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<Option<User>>,
#[template_child]

2
src/session/account_settings/mod.rs
Unescape View File

@ -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<Option<WeakRef<Session>>>,
pub session_handler: RefCell<Option<glib::SignalHandlerId>>,

2
src/session/account_settings/user_page/change_password_subpage.rs
Unescape View File

@ -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<WeakRef<Session>>,
#[template_child]

2
src/session/account_settings/user_page/deactivate_account_subpage.rs
Unescape View File

@ -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<WeakRef<Session>>,
#[template_child]

2
src/session/account_settings/user_page/mod.rs
Unescape View File

@ -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<Option<WeakRef<Session>>>,
#[template_child]

2
src/session/content/explore/mod.rs
Unescape View File

@ -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<bool>,
pub session: RefCell<Option<WeakRef<Session>>>,

2
src/session/content/explore/public_room_row.rs
Unescape View File

@ -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<Option<PublicRoom>>,
#[template_child]

2
src/session/content/invite.rs
Unescape View File

@ -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<bool>,
pub room: RefCell<Option<Room>>,

2
src/session/content/markdown_popover.rs
Unescape View File

@ -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<bool>,
}

2
src/session/content/mod.rs
Unescape View File

@ -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<bool>,
pub session: RefCell<Option<WeakRef<Session>>>,

2
src/session/content/room_details/invite_subpage/invitee_row.rs
Unescape View File

@ -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<Option<Invitee>>,
pub binding: RefCell<Option<glib::Binding>>,

2
src/session/content/room_details/invite_subpage/mod.rs
Unescape View File

@ -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<Option<Room>>,
#[template_child]

2
src/session/content/room_details/member_page/member_menu.rs
Unescape View File

@ -131,7 +131,7 @@ impl MemberMenu {
fn popover_menu(&self) -> &gtk::PopoverMenu {
self.imp().popover.get_or_init(|| {
gtk::PopoverMenu::from_model(Some(
&gtk::Builder::from_resource("/org/gnome/FractalNext/member-menu.ui")
&gtk::Builder::from_resource("/org/gnome/Fractal/member-menu.ui")
.object::<gio::MenuModel>("menu_model")
.unwrap(),
))

2
src/session/content/room_details/member_page/member_row.rs
Unescape View File

@ -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<Option<Member>>,
#[template_child]

2
src/session/content/room_details/member_page/mod.rs
Unescape View File

@ -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<Room>,
#[template_child]

2
src/session/content/room_details/mod.rs
Unescape View File

@ -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<Room>,
pub avatar_chooser: OnceCell<gtk::FileChooserNative>,

2
src/session/content/room_history/attachment_dialog.rs
Unescape View File

@ -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<Option<gio::File>>,
pub texture: RefCell<Option<gdk::Texture>>,

2
src/session/content/room_history/divider_row.rs
Unescape View File

@ -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<gtk::Label>,

2
src/session/content/room_history/message_row/audio.rs
Unescape View File

@ -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<Option<String>>,

2
src/session/content/room_history/message_row/file.rs
Unescape View File

@ -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<Option<String>>,

2
src/session/content/room_history/message_row/media.rs
Unescape View File

@ -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<i32>,

2
src/session/content/room_history/message_row/mod.rs
Unescape View File

@ -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<Avatar>,

2
src/session/content/room_history/message_row/reaction.rs
Unescape View File

@ -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<ReactionGroup>,

2
src/session/content/room_history/message_row/reaction_list.rs
Unescape View File

@ -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<gtk::FlowBox>,

2
src/session/content/room_history/message_row/reply.rs
Unescape View File

@ -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<Pill>,

2
src/session/content/room_history/mod.rs
Unescape View File

@ -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<bool>,
pub room: RefCell<Option<Room>>,

2
src/session/content/room_history/state_row/creation.rs
Unescape View File

@ -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<gtk::Button>,

2
src/session/content/room_history/state_row/mod.rs
Unescape View File

@ -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<gtk::Label>,

2
src/session/content/room_history/state_row/tombstone.rs
Unescape View File

@ -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<gtk::Button>,

2
src/session/content/room_history/verification_info_bar.rs
Unescape View File

@ -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<gtk::Revealer>,

2
src/session/content/verification/emoji.rs
Unescape View File

@ -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<gtk::Label>,

2
src/session/content/verification/identity_verification_widget.rs
Unescape View File

@ -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<Option<IdentityVerification>>,
#[template_child]

2
src/session/content/verification/session_verification.rs
Unescape View File

@ -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<Option<IdentityVerification>>,
pub session: OnceCell<WeakRef<Session>>,

2
src/session/event_source_dialog.rs
Unescape View File

@ -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<Event>,
#[template_child]

2
src/session/media_viewer.rs
Unescape View File

@ -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<bool>,
pub event: RefCell<Option<WeakRef<Event>>>,

6
src/session/mod.rs
Unescape View File

@ -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<gtk::Stack>,
@ -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;

6
src/session/room/event_actions.rs
Unescape View File

@ -33,7 +33,7 @@ where
fn event_message_menu_model() -> &'static gio::MenuModel {
static MODEL: Lazy<MenuModelSendSync> = Lazy::new(|| {
MenuModelSendSync(
gtk::Builder::from_resource("/org/gnome/FractalNext/event-menu.ui")
gtk::Builder::from_resource("/org/gnome/Fractal/event-menu.ui")
.object::<gio::MenuModel>("message_menu_model")
.unwrap(),
)
@ -45,7 +45,7 @@ where
fn event_media_menu_model() -> &'static gio::MenuModel {
static MODEL: Lazy<MenuModelSendSync> = Lazy::new(|| {
MenuModelSendSync(
gtk::Builder::from_resource("/org/gnome/FractalNext/event-menu.ui")
gtk::Builder::from_resource("/org/gnome/Fractal/event-menu.ui")
.object::<gio::MenuModel>("media_menu_model")
.unwrap(),
)
@ -57,7 +57,7 @@ where
fn event_state_menu_model() -> &'static gio::MenuModel {
static MODEL: Lazy<MenuModelSendSync> = Lazy::new(|| {
MenuModelSendSync(
gtk::Builder::from_resource("/org/gnome/FractalNext/event-menu.ui")
gtk::Builder::from_resource("/org/gnome/Fractal/event-menu.ui")
.object::<gio::MenuModel>("state_menu_model")
.unwrap(),
)

2
src/session/room_creation/mod.rs
Unescape View File

@ -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<Option<WeakRef<Session>>>,
#[template_child]

2
src/session/sidebar/account_switcher/add_account.rs
Unescape View File

@ -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]

2
src/session/sidebar/account_switcher/avatar_with_selection.rs
Unescape View File

@ -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<Avatar>,

2
src/session/sidebar/account_switcher/mod.rs
Unescape View File

@ -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<gtk::ListView>,

2
src/session/sidebar/account_switcher/user_entry.rs
Unescape View File

@ -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<AvatarWithSelection>,

2
src/session/sidebar/category_row.rs
Unescape View File

@ -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<Option<Category>>,

2
src/session/sidebar/entry_row.rs
Unescape View File

@ -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<Option<Entry>>,
}

2
src/session/sidebar/mod.rs
Unescape View File

@ -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<bool>,
pub selected_item: RefCell<Option<glib::Object>>,

2
src/session/sidebar/room_row.rs
Unescape View File

@ -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<Option<Room>>,
pub binding: RefCell<Option<glib::Binding>>,

2
src/session/sidebar/verification_row.rs
Unescape View File

@ -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<Option<IdentityVerification>>,
}

4
src/window.rs
Unescape View File

@ -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<gtk::Stack>,
@ -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));

Write Preview
Loading…
Cancel
Save