Browse Source

Apply blueprint-compiler formatting changes

Due to changes upstream.
merge-requests/2136/head
Kévin Commaille 3 months ago
parent
commit
dba0712763
No known key found for this signature in database
GPG Key ID: F26F4BE20A08255B
  1. 4
      src/account_settings/encryption_page/mod.blp
  2. 4
      src/account_settings/general_page/deactivate_account_subpage.blp
  3. 8
      src/account_settings/general_page/log_out_subpage.blp
  4. 4
      src/account_settings/notifications_page.blp
  5. 8
      src/account_settings/safety_page/mod.blp
  6. 4
      src/account_settings/user_session/user_session_row.blp
  7. 4
      src/account_settings/user_session/user_session_subpage.blp
  8. 12
      src/account_switcher/account_switcher_button.blp
  9. 16
      src/components/crypto/identity_setup_view.blp
  10. 28
      src/components/crypto/recovery_setup_view.blp
  11. 4
      src/components/power_level_selection/row.blp
  12. 8
      src/error_page.blp
  13. 4
      src/login/advanced_dialog.blp
  14. 8
      src/session_view/room_details/addresses_subpage/mod.blp
  15. 8
      src/session_view/room_details/upgrade_dialog/mod.blp
  16. 6
      src/session_view/room_history/event_actions/properties_dialog.blp
  17. 5
      src/session_view/sidebar/room_row.blp
  18. 13
      src/session_view/sidebar/section_row.blp

4
src/account_settings/encryption_page/mod.blp

@ -73,7 +73,9 @@ template $EncryptionPage: Adw.PreferencesPage {
Adw.PreferencesGroup {
title: _("Account Recovery");
description: _("Allows to fully recover your account with a recovery key or passphrase, if you ever lose access to all your sessions");
description: _(
"Allows to fully recover your account with a recovery key or passphrase, if you ever lose access to all your sessions"
);
Adw.PreferencesRow recovery_row {
activatable: false;

4
src/account_settings/general_page/deactivate_account_subpage.blp

@ -42,7 +42,9 @@ template $DeactivateAccountSubpage: Adw.NavigationPage {
Gtk.Label {
// Translators: Deactivation is a permanent action that occurs on the server.
label: _("Deactivating your account means you will lose access to all your messages, contacts, files, and more, forever.");
label: _(
"Deactivating your account means you will lose access to all your messages, contacts, files, and more, forever."
);
wrap: true;
wrap-mode: word_char;
xalign: 0.0;

8
src/account_settings/general_page/log_out_subpage.blp

@ -117,7 +117,9 @@ template $LogOutSubpage: Adw.NavigationPage {
orientation: vertical;
Gtk.Label {
label: _("Logging out of this session failed. You can try again, or, if this is a permanent error, you can remove the session.");
label: _(
"Logging out of this session failed. You can try again, or, if this is a permanent error, you can remove the session."
);
wrap: true;
wrap-mode: word_char;
xalign: 0.0;
@ -141,7 +143,9 @@ template $LogOutSubpage: Adw.NavigationPage {
}
Gtk.Label {
label: _("Removing the session deletes the associated data from the system, but your homeserver and other sessions will not be aware that this session was logged out.");
label: _(
"Removing the session deletes the associated data from the system, but your homeserver and other sessions will not be aware that this session was logged out."
);
wrap: true;
wrap-mode: word_char;
xalign: 0.0;

4
src/account_settings/notifications_page.blp

@ -45,7 +45,9 @@ template $NotificationsPage: Adw.PreferencesPage {
Adw.PreferencesGroup {
title: _("Keywords");
description: _("Messages that contain one of these keywords trigger notifications. Matching on these keywords is case-insensitive.");
description: _(
"Messages that contain one of these keywords trigger notifications. Matching on these keywords is case-insensitive."
);
ListBox keywords {
styles [

8
src/account_settings/safety_page/mod.blp

@ -9,7 +9,9 @@ template $SafetyPage: Adw.PreferencesPage {
Adw.PreferencesGroup {
$ButtonCountRow ignored_users_row {
title: _("Ignored Users");
subtitle: _("All messages or invitations sent by these users will be ignored. You will still see some of their activity, like when they join or leave a room.");
subtitle: _(
"All messages or invitations sent by these users will be ignored. You will still see some of their activity, like when they join or leave a room."
);
action-name: "account-settings.show-subpage";
action-target: "'ignored-users'";
}
@ -33,7 +35,9 @@ template $SafetyPage: Adw.PreferencesPage {
Adw.PreferencesGroup media_previews {
title: _("Media Previews");
description: _("Which rooms automatically show previews for images and videos. Hidden previews can always be shown by clicking on the media.");
description: _(
"Which rooms automatically show previews for images and videos. Hidden previews can always be shown by clicking on the media."
);
$CheckLoadingRow media_previews_on_row {
title: _("Show in all rooms");

4
src/account_settings/user_session/user_session_row.blp

@ -60,7 +60,9 @@ template $UserSessionRow: Gtk.ListBoxRow {
Gtk.Label {
xalign: 0.0;
ellipsize: end;
label: bind $unwrap_string_or_empty(template.user-session as <$UserSession>.last-seen-datetime-string) as <string>;
label: bind $unwrap_string_or_empty(
template.user-session as <$UserSession>.last-seen-datetime-string
) as <string>;
visible: bind $string_not_empty(template.user-session as <$UserSession>.last-seen-datetime-string) as <bool>;
styles [

4
src/account_settings/user_session/user_session_subpage.blp

@ -36,7 +36,9 @@ template $UserSessionSubpage: Adw.NavigationPage {
Adw.ActionRow {
title: _("Last Seen");
subtitle: bind $unwrap_string_or_empty(template.user-session as <$UserSession>.last-seen-datetime-string) as <string>;
subtitle: bind $unwrap_string_or_empty(
template.user-session as <$UserSession>.last-seen-datetime-string
) as <string>;
visible: bind $string_not_empty(template.user-session as <$UserSession>.last-seen-datetime-string) as <bool>;
styles [

12
src/account_switcher/account_switcher_button.blp

@ -2,7 +2,11 @@ using Gtk 4.0;
template $AccountSwitcherButton: Gtk.ToggleButton {
visible: bind $invert_boolean(template.root as <$Window>.session-selection as <$FixedSelection>.is-empty) as <bool>;
tooltip-text: bind template.root as <$Window>.session-selection as <$FixedSelection>.selected-item as <$SessionInfo>.user-id-string;
tooltip-text: bind template
.root as <$Window>
.session-selection as <$FixedSelection>
.selected-item as <$SessionInfo>
.user-id-string;
toggled => $toggle_popover() swapped;
styles [
@ -17,7 +21,11 @@ template $AccountSwitcherButton: Gtk.ToggleButton {
child: $Avatar {
size: 24;
data: bind template.root as <$Window>.session-selection as <$FixedSelection>.selected-item as <$SessionInfo>.avatar-data;
data: bind template
.root as <$Window>
.session-selection as <$FixedSelection>
.selected-item as <$SessionInfo>
.avatar-data;
accessible-role: presentation;
};
}

16
src/components/crypto/identity_setup_view.blp

@ -41,7 +41,9 @@ template $CryptoIdentitySetupView: Adw.Bin {
}
Gtk.Label {
label: _("Verifying your session allows you and the people you chat with to be sure that no one is trying to impersonate you or intercept your conversations.");
label: _(
"Verifying your session allows you and the people you chat with to be sure that no one is trying to impersonate you or intercept your conversations."
);
wrap: true;
wrap-mode: word_char;
justify: center;
@ -149,7 +151,9 @@ template $CryptoIdentitySetupView: Adw.Bin {
}
Gtk.Label {
label: _("Your crypto identity allows you to verify other Matrix accounts and automatically trust their verified sessions.");
label: _(
"Your crypto identity allows you to verify other Matrix accounts and automatically trust their verified sessions."
);
wrap: true;
wrap-mode: word_char;
justify: center;
@ -224,7 +228,9 @@ template $CryptoIdentitySetupView: Adw.Bin {
}
Gtk.Label {
label: _("Your crypto identity allows you to verify other Matrix accounts and automatically trust their verified sessions.");
label: _(
"Your crypto identity allows you to verify other Matrix accounts and automatically trust their verified sessions."
);
wrap: true;
wrap-mode: word_char;
justify: center;
@ -235,7 +241,9 @@ template $CryptoIdentitySetupView: Adw.Bin {
}
Gtk.Label {
label: _("You should reset your crypto identity if a device that does not belong to you managed to be verified.");
label: _(
"You should reset your crypto identity if a device that does not belong to you managed to be verified."
);
wrap: true;
wrap-mode: word_char;
justify: center;

28
src/components/crypto/recovery_setup_view.blp

@ -48,7 +48,9 @@ template $CryptoRecoverySetupView: Adw.Bin {
}
Gtk.Label {
label: _("To access the recovery data, we need the recovery passphrase or the recovery key that is usually set up when you create your account.");
label: _(
"To access the recovery data, we need the recovery passphrase or the recovery key that is usually set up when you create your account."
);
wrap: true;
wrap-mode: word_char;
justify: center;
@ -144,7 +146,9 @@ template $CryptoRecoverySetupView: Adw.Bin {
}
Gtk.Label {
label: _("Resetting account recovery can allow you to fix or reset part or all of your recovery setup.");
label: _(
"Resetting account recovery can allow you to fix or reset part or all of your recovery setup."
);
wrap: true;
wrap-mode: word_char;
justify: center;
@ -180,7 +184,9 @@ template $CryptoRecoverySetupView: Adw.Bin {
}
Gtk.Label {
label: _("You should not reuse the password of your Matrix account as a passphrase. Otherwise, if someone manages to get your account password, they will also be able to access all your encrypted conversations and to impersonate you.");
label: _(
"You should not reuse the password of your Matrix account as a passphrase. Otherwise, if someone manages to get your account password, they will also be able to access all your encrypted conversations and to impersonate you."
);
wrap: true;
wrap-mode: word_char;
justify: center;
@ -254,7 +260,9 @@ template $CryptoRecoverySetupView: Adw.Bin {
}
Gtk.Label {
label: _("Account recovery allows you to recover your crypto identity and to read your encrypted messages even if you lose access to all your sessions.");
label: _(
"Account recovery allows you to recover your crypto identity and to read your encrypted messages even if you lose access to all your sessions."
);
wrap: true;
wrap-mode: word_char;
justify: center;
@ -276,7 +284,9 @@ template $CryptoRecoverySetupView: Adw.Bin {
}
Gtk.Label {
label: _("You should not reuse the password of your Matrix account as a passphrase. Otherwise, if someone manages to get your account password, they will also be able to access all your encrypted conversations and to impersonate you.");
label: _(
"You should not reuse the password of your Matrix account as a passphrase. Otherwise, if someone manages to get your account password, they will also be able to access all your encrypted conversations and to impersonate you."
);
wrap: true;
wrap-mode: word_char;
justify: center;
@ -455,14 +465,18 @@ template $CryptoRecoverySetupView: Adw.Bin {
}
Gtk.Label {
label: _("To fix this, you should reset the recovery from a session that has all the data, and attempt to recover this session again.");
label: _(
"To fix this, you should reset the recovery from a session that has all the data, and attempt to recover this session again."
);
wrap: true;
wrap-mode: word_char;
justify: center;
}
Gtk.Label {
label: _("Note that account recovery can have a different name in other Matrix clients, like “key backup” or “secure backup”.");
label: _(
"Note that account recovery can have a different name in other Matrix clients, like “key backup” or “secure backup”."
);
wrap: true;
wrap-mode: word_char;
justify: center;

4
src/components/power_level_selection/row.blp

@ -114,7 +114,9 @@ Gtk.Box selected_box {
valign: center;
wrap: true;
wrap-mode: word_char;
label: _("Creator is an immutable role that can be attributed to several users when creating a room. Creators always have a higher power level than any other room members, except other creators, and have the permission to do anything in the room. The only way to demote a creator is to replace the current room with another one with a different creator, by upgrading the room for example.");
label: _(
"Creator is an immutable role that can be attributed to several users when creating a room. Creators always have a higher power level than any other room members, except other creators, and have the permission to do anything in the room. The only way to demote a creator is to replace the current room with another one with a different creator, by upgrading the room for example."
);
};
};
}

8
src/error_page.blp

@ -55,7 +55,9 @@ template $ErrorPage: Adw.Bin {
wrap: true;
wrap-mode: word_char;
xalign: 0.0;
label: _("Fractal relies on a Secret Portal to manage your sensitive session information and an error occurred while we were trying to restore your sessions.");
label: _(
"Fractal relies on a Secret Portal to manage your sensitive session information and an error occurred while we were trying to restore your sessions."
);
styles [
"body",
@ -113,7 +115,9 @@ template $ErrorPage: Adw.Bin {
wrap: true;
wrap-mode: word_char;
xalign: 0.0;
label: _("If you prefer to use a Secret Service Provider instead, you need to allow Fractal to interact with it, like this:");
label: _(
"If you prefer to use a Secret Service Provider instead, you need to allow Fractal to interact with it, like this:"
);
styles [
"body",

4
src/login/advanced_dialog.blp

@ -8,7 +8,9 @@ template $LoginAdvancedDialog: Adw.PreferencesDialog {
Adw.PreferencesPage {
Adw.PreferencesGroup {
description: _("Auto-discovery, also known as “well-known lookup”, allows to discover the URL of a Matrix homeserver from a domain name. This should only be disabled if your homeserver doesn’t support auto-discovery or if you want to provide the URL yourself.");
description: _(
"Auto-discovery, also known as “well-known lookup”, allows to discover the URL of a Matrix homeserver from a domain name. This should only be disabled if your homeserver doesn’t support auto-discovery or if you want to provide the URL yourself."
);
Adw.SwitchRow {
title: _("_Auto-Discovery");

8
src/session_view/room_details/addresses_subpage/mod.blp

@ -11,7 +11,9 @@ template $RoomDetailsAddressesSubpage: Adw.NavigationPage {
content: Adw.PreferencesPage {
Adw.PreferencesGroup public_addresses_group {
title: _("Public Addresses");
description: _("Public addresses are advertised for all users in the room and the main address is used to identify a room publicly. Before adding an address to this list, it must be registered as a local address.");
description: _(
"Public addresses are advertised for all users in the room and the main address is used to identify a room publicly. Before adding an address to this list, it must be registered as a local address."
);
Gtk.ListBox public_addresses_list {
styles [
@ -39,7 +41,9 @@ template $RoomDetailsAddressesSubpage: Adw.NavigationPage {
}
Adw.PreferencesGroup local_addresses_group {
description: _("Local addresses can only be registered with your own homeserver. If they are not made public, only people on your homeserver can discover them.");
description: _(
"Local addresses can only be registered with your own homeserver. If they are not made public, only people on your homeserver can discover them."
);
Gtk.ListBox local_addresses_list {
styles [

8
src/session_view/room_details/upgrade_dialog/mod.blp

@ -61,7 +61,9 @@ template $RoomDetailsUpgradeDialog: Adw.Dialog {
justify: center;
xalign: 0.5;
max-width-chars: 60;
label: _("Upgrading a room to a more recent version allows to benefit from new features from the Matrix specification. It can also be used to reset the room state, which should make the room faster to join. However it should be used sparingly because it can be disruptive, as room members need to join the new room manually.");
label: _(
"Upgrading a room to a more recent version allows to benefit from new features from the Matrix specification. It can also be used to reset the room state, which should make the room faster to join. However it should be used sparingly because it can be disruptive, as room members need to join the new room manually."
);
styles [
"body",
@ -91,7 +93,9 @@ template $RoomDetailsUpgradeDialog: Adw.Dialog {
justify: center;
xalign: 0.5;
max-width-chars: 60;
label: _("After the upgrade, you will be the only member of the room and other members will need to be re-invited manually. This could be avoided by using third-party upgrade tooling that handles this for you.");
label: _(
"After the upgrade, you will be the only member of the room and other members will need to be re-invited manually. This could be avoided by using third-party upgrade tooling that handles this for you."
);
styles [
"warning",

6
src/session_view/room_history/event_actions/properties_dialog.blp

@ -62,7 +62,11 @@ template $EventPropertiesDialog: $ToastableDialog {
$CopyableRow room_id_row {
main-title: "subtitle";
title: _("Room ID");
subtitle: bind template.event as <$RoomEvent>.timeline as <$Timeline>.room as <$Room>.room-id-string;
subtitle: bind template
.event as <$RoomEvent>
.timeline as <$Timeline>
.room as <$Room>
.room-id-string;
copy-button-tooltip-text: _("Copy Room ID");
toast-text: _("Room ID copied to clipboard");
}

5
src/session_view/sidebar/room_row.blp

@ -25,7 +25,10 @@ template $SidebarRoomRow: Adw.Bin {
[end]
Gtk.Stack {
visible: bind $logical_or(template.room as <$Room>.has-notifications, $invert_boolean(template.room as <$Room>.is-read) as <bool>) as <bool>;
visible: bind $logical_or(
template.room as <$Room>.has-notifications,
$invert_boolean(template.room as <$Room>.is-read) as <bool>
) as <bool>;
visible-child-name: bind $ternary_string(template.room as <$Room>.has-notifications, "count", "dot") as <string>;
Gtk.StackPage {

13
src/session_view/sidebar/section_row.blp

@ -20,8 +20,17 @@ template $SidebarSectionRow: Adw.Bin {
[end]
Gtk.Stack {
visible: bind $invert_boolean($logical_or(template.section as <$SidebarSection>.is-expanded, template.section as <$SidebarSection>.is-read) as <bool>) as <bool>;
visible-child-name: bind $ternary_string(template.section as <$SidebarSection>.has-notifications, "count", "dot") as <string>;
visible: bind $invert_boolean(
$logical_or(
template.section as <$SidebarSection>.is-expanded,
template.section as <$SidebarSection>.is-read
) as <bool>
) as <bool>;
visible-child-name: bind $ternary_string(
template.section as <$SidebarSection>.has-notifications,
"count",
"dot"
) as <string>;
Gtk.StackPage {
name: "dot";

Loading…
Cancel
Save