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

Make sure that groups order is consistent accross Blueprint files

fractal-13
Kévin Commaille 7 months ago
parent
89e00f0d83
commit
b746afb030
No known key found for this signature in database
GPG Key ID: F26F4BE20A08255B
28 changed files with 183 additions and 185 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. 10
      src/account_switcher/account_switcher_button.blp
  2. 10
      src/account_switcher/account_switcher_popover.blp
  3. 66
      src/components/action_button.blp
  4. 24
      src/components/avatar/editable.blp
  5. 10
      src/components/media/video_player.blp
  6. 8
      src/components/power_level_selection/row.blp
  7. 16
      src/components/rows/loading_button_row.blp
  8. 9
      src/components/rows/substring_entry_row.blp
  9. 21
      src/components/user_page.blp
  10. 12
      src/error_page.blp
  11. 8
      src/identity_verification_view/accept_request_page.blp
  12. 8
      src/identity_verification_view/cancelled_page.blp
  13. 8
      src/identity_verification_view/choose_method_page.blp
  14. 8
      src/identity_verification_view/completed_page.blp
  15. 28
      src/identity_verification_view/confirm_qr_code_page.blp
  16. 8
      src/identity_verification_view/no_supported_methods_page.blp
  17. 8
      src/identity_verification_view/qr_code_scanned_page.blp
  18. 8
      src/identity_verification_view/room_left_page.blp
  19. 4
      src/identity_verification_view/sas_emoji.blp
  20. 8
      src/identity_verification_view/sas_page.blp
  21. 8
      src/identity_verification_view/scan_qr_code_page.blp
  22. 8
      src/identity_verification_view/wait_for_other_page.blp
  23. 14
      src/login/greeter.blp
  24. 18
      src/login/homeserver_page.blp
  25. 14
      src/login/in_browser_page.blp
  26. 12
      src/login/method_page.blp
  27. 8
      src/login/mod.blp
  28. 4
      src/login/sso_idp_button.blp

10
src/account_switcher/account_switcher_button.blp
Unescape View File

@ -5,16 +5,16 @@ template $AccountSwitcherButton: Gtk.ToggleButton {
tooltip-text: bind template.root as <$Window>.session-selection as <$FixedSelection>.selected-item as <$SessionInfo>.user-id-string;
toggled => $toggle_popover() swapped;
accessibility {
description: _("Switch Accounts");
has-popup: true;
}
styles [
"image-button",
"circular",
]
accessibility {
description: _("Switch Accounts");
has-popup: true;
}
child: $Avatar {
size: 24;
data: bind template.root as <$Window>.session-selection as <$FixedSelection>.selected-item as <$SessionInfo>.avatar-data;

10
src/account_switcher/account_switcher_popover.blp
Unescape View File

@ -19,6 +19,11 @@ template $AccountSwitcherPopover: Gtk.Popover {
Gtk.Button {
action-name: "win.new-session";
styles [
"account-switcher-row",
"flat",
]
child: Gtk.Box {
spacing: 10;
@ -35,11 +40,6 @@ template $AccountSwitcherPopover: Gtk.Popover {
label: _("_Add Account");
}
};
styles [
"account-switcher-row",
"flat",
]
}
}
}

66
src/components/action_button.blp
Unescape View File

@ -9,15 +9,15 @@ template $ActionButton: Adw.Bin {
name: "default";
child: Gtk.Button button_default {
styles [
"circular",
]
valign: center;
icon-name: bind template.icon-name;
action-name: bind template.action-name;
action-target: bind template.action-target;
clicked => $button_clicked() swapped;
styles [
"circular",
]
};
}
@ -25,17 +25,17 @@ template $ActionButton: Adw.Bin {
name: "confirm";
child: Gtk.Button {
styles [
"circular",
"suggested-action",
]
tooltip-text: _("Confirm Change");
valign: center;
icon-name: "checkmark-symbolic";
action-name: bind template.action-name;
action-target: bind template.action-target;
clicked => $button_clicked() swapped;
styles [
"circular",
"suggested-action",
]
};
}
@ -43,17 +43,17 @@ template $ActionButton: Adw.Bin {
name: "retry";
child: Gtk.Button {
styles [
"circular",
"suggested-action",
]
tooltip-text: _("Try Again");
valign: center;
icon-name: "refresh-symbolic";
action-name: bind template.action-name;
action-target: bind template.action-target;
clicked => $button_clicked() swapped;
styles [
"circular",
"suggested-action",
]
};
}
@ -62,14 +62,14 @@ template $ActionButton: Adw.Bin {
title: _("Loading");
child: Gtk.Button {
styles [
"circular",
]
focusable: false;
can-target: false;
valign: center;
styles [
"circular",
]
Adw.Spinner {
valign: center;
halign: center;
@ -84,16 +84,16 @@ template $ActionButton: Adw.Bin {
title: _("Success");
child: Gtk.Button {
focusable: false;
can-target: false;
valign: center;
icon-name: "checkmark-symbolic";
styles [
"suggested-action",
"circular",
"success",
]
focusable: false;
can-target: false;
valign: center;
icon-name: "checkmark-symbolic";
};
}
@ -102,15 +102,15 @@ template $ActionButton: Adw.Bin {
title: _("Warning");
child: Gtk.Button button_warning {
styles [
"circular",
"warning",
]
focusable: false;
can-target: false;
valign: center;
icon-name: "warning-symbolic";
styles [
"circular",
"warning",
]
};
}
@ -119,15 +119,15 @@ template $ActionButton: Adw.Bin {
title: _("Error");
child: Gtk.Button {
styles [
"circular",
"error",
]
focusable: false;
can-target: false;
valign: center;
icon-name: "error-symbolic";
styles [
"circular",
"error",
]
};
}
}

24
src/components/avatar/editable.blp
Unescape View File

@ -33,17 +33,17 @@ template $EditableAvatar: Adw.Bin {
[overlay]
Gtk.Image error_img {
styles [
"osd",
"circular",
]
visible: false;
halign: center;
valign: center;
icon-name: "error-symbolic";
icon-size: large;
styles [
"osd",
"circular",
]
layout {
measure: true;
}
@ -51,13 +51,13 @@ template $EditableAvatar: Adw.Bin {
[overlay]
Adw.Bin button_remove_bin {
halign: end;
valign: start;
styles [
"cutout",
]
halign: end;
valign: start;
$ActionButton button_remove {
icon-name: "remove-symbolic";
action-name: "editable-avatar.remove-avatar";
@ -67,14 +67,14 @@ template $EditableAvatar: Adw.Bin {
[overlay]
Adw.Bin {
styles [
"cutout",
]
visible: bind template.editable;
halign: end;
valign: end;
styles [
"cutout",
]
$ActionButton button_edit {
icon-name: "edit-symbolic";
action-name: "editable-avatar.edit-avatar";

10
src/components/media/video_player.blp
Unescape View File

@ -13,17 +13,17 @@ template $VideoPlayer: Adw.Bin {
[overlay]
Gtk.Label timestamp {
styles [
"osd",
"timestamp",
]
visible: false;
halign: start;
valign: start;
margin-start: 5;
margin-top: 5;
styles [
"osd",
"timestamp",
]
layout {
measure: true;
}

8
src/components/power_level_selection/row.blp
Unescape View File

@ -7,16 +7,16 @@ template $PowerLevelSelectionRow: Adw.PreferencesRow {
accessible-role: combo_box;
action-name: "power-level-selection-row.popup";
styles [
"combo",
]
accessibility {
labelled-by: [
title,
];
}
styles [
"combo",
]
child: Gtk.Box header {
valign: center;
hexpand: false;

16
src/components/rows/loading_button_row.blp
Unescape View File

@ -6,27 +6,27 @@ template $LoadingButtonRow: Adw.PreferencesRow {
selectable: false;
accessible-role: button;
styles [
"button",
]
accessibility {
labelled-by: [
title,
];
}
styles [
"button",
]
$LoadingBin loading_bin {
child: Gtk.Label title {
styles [
"title",
]
label: bind template.title;
ellipsize: end;
mnemonic-widget: template;
xalign: 0.5;
justify: center;
styles [
"title",
]
};
}
}

9
src/components/rows/substring_entry_row.blp
Unescape View File

@ -54,17 +54,16 @@ template $SubstringEntryRow: Adw.PreferencesRow {
max-length: 0;
valign: baseline_fill;
accessible-role: text_box;
activate => $add() swapped;
state-flags-changed => $text_state_flags_changed() swapped;
keynav-failed => $text_keynav_failed() swapped;
changed => $update_add_button() swapped;
accessibility {
labelled-by: [
title,
];
}
activate => $add() swapped;
state-flags-changed => $text_state_flags_changed() swapped;
keynav-failed => $text_keynav_failed() swapped;
changed => $update_add_button() swapped;
}
Gtk.Image edit_icon {

21
src/components/user_page.blp
Unescape View File

@ -70,13 +70,12 @@ template $UserPage: Adw.NavigationPage {
Gtk.ListBox direct_chat_box {
visible: false;
accessible-role: group;
styles [
"boxed-list",
]
accessible-role: group;
$LoadingButtonRow direct_chat_button {
is-loading: true;
activated => $open_direct_chat() swapped;
@ -131,21 +130,21 @@ template $UserPage: Adw.NavigationPage {
}
$LoadingButtonRow kick_button {
styles [
"destructive-action",
]
activated => $kick_user() swapped;
}
$LoadingButtonRow ban_button {
styles [
"destructive-action",
]
}
$LoadingButtonRow ban_button {
// Translators: As in, 'Ban room member'.
title: _("Ban");
activated => $ban_user() swapped;
styles [
"destructive-action",
]
}
$LoadingButtonRow unban_button {
@ -155,12 +154,12 @@ template $UserPage: Adw.NavigationPage {
}
$LoadingButtonRow remove_messages_button {
title: _("Remove Messages");
activated => $remove_messages() swapped;
styles [
"destructive-action",
]
title: _("Remove Messages");
activated => $remove_messages() swapped;
}
}
}

12
src/error_page.blp
Unescape View File

@ -121,6 +121,12 @@ template $ErrorPage: Adw.Bin {
}
Gtk.Box {
styles [
"card",
"linked",
"command",
]
Gtk.ScrolledWindow {
vscrollbar-policy: never;
@ -145,12 +151,6 @@ template $ErrorPage: Adw.Bin {
"flat",
]
}
styles [
"card",
"linked",
"command",
]
}
}
}

8
src/identity_verification_view/accept_request_page.blp
Unescape View File

@ -22,13 +22,13 @@ template $IdentityVerificationAcceptRequestPage: Adw.Bin {
justify: center;
accessible-role: heading;
accessibility {
level: 1;
}
styles [
"title-1",
]
accessibility {
level: 1;
}
}
Gtk.Label instructions {

8
src/identity_verification_view/cancelled_page.blp
Unescape View File

@ -21,13 +21,13 @@ template $IdentityVerificationCancelledPage: Adw.Bin {
justify: center;
accessible-role: heading;
accessibility {
level: 1;
}
styles [
"title-1",
]
accessibility {
level: 1;
}
}
Gtk.Label message {

8
src/identity_verification_view/choose_method_page.blp
Unescape View File

@ -21,13 +21,13 @@ template $IdentityVerificationChooseMethodPage: Adw.Bin {
justify: center;
accessible-role: heading;
accessibility {
level: 1;
}
styles [
"title-1",
]
accessibility {
level: 1;
}
}
Gtk.Label instructions {

8
src/identity_verification_view/completed_page.blp
Unescape View File

@ -21,13 +21,13 @@ template $IdentityVerificationCompletedPage: Adw.Bin {
justify: center;
accessible-role: heading;
accessibility {
level: 1;
}
styles [
"title-1",
]
accessibility {
level: 1;
}
}
Gtk.Picture {

28
src/identity_verification_view/confirm_qr_code_page.blp
Unescape View File

@ -22,13 +22,13 @@ template $IdentityVerificationConfirmQrCodePage: Adw.Bin {
justify: center;
accessible-role: heading;
accessibility {
level: 1;
}
styles [
"title-1",
]
accessibility {
level: 1;
}
}
Gtk.Picture {
@ -56,16 +56,16 @@ template $IdentityVerificationConfirmQrCodePage: Adw.Bin {
halign: center;
clicked => $cancel() swapped;
styles [
"destructive-action",
"pill",
]
accessibility {
described-by: [
question,
];
}
styles [
"destructive-action",
"pill",
]
}
$LoadingButton confirm_btn {
@ -73,16 +73,16 @@ template $IdentityVerificationConfirmQrCodePage: Adw.Bin {
halign: center;
clicked => $confirm_scanned() swapped;
styles [
"suggested-action",
"pill",
]
accessibility {
described-by: [
question,
];
}
styles [
"suggested-action",
"pill",
]
}
}
};

8
src/identity_verification_view/no_supported_methods_page.blp
Unescape View File

@ -22,13 +22,13 @@ template $IdentityVerificationNoSupportedMethodsPage: Adw.Bin {
label: _("No Supported Verification Methods");
accessible-role: heading;
accessibility {
level: 1;
}
styles [
"title-1",
]
accessibility {
level: 1;
}
}
Gtk.Label message {

8
src/identity_verification_view/qr_code_scanned_page.blp
Unescape View File

@ -22,13 +22,13 @@ template $IdentityVerificationQrCodeScannedPage: Adw.Bin {
justify: center;
accessible-role: heading;
accessibility {
level: 1;
}
styles [
"title-1",
]
accessibility {
level: 1;
}
}
Gtk.Picture {

8
src/identity_verification_view/room_left_page.blp
Unescape View File

@ -22,13 +22,13 @@ template $IdentityVerificationRoomLeftPage: Adw.Bin {
label: _("Verification Cancelled");
accessible-role: heading;
accessibility {
level: 1;
}
styles [
"title-1",
]
accessibility {
level: 1;
}
}
Gtk.Label {

4
src/identity_verification_view/sas_emoji.blp
Unescape View File

@ -2,6 +2,8 @@ using Gtk 4.0;
using Adw 1;
template $IdentityVerificationSasEmoji: Adw.Bin {
valign: center;
accessibility {
labelled-by: [
emoji,
@ -12,8 +14,6 @@ template $IdentityVerificationSasEmoji: Adw.Bin {
];
}
valign: center;
Gtk.Box {
spacing: 6;
orientation: vertical;

8
src/identity_verification_view/sas_page.blp
Unescape View File

@ -21,13 +21,13 @@ template $IdentityVerificationSasPage: Adw.Bin {
justify: center;
accessible-role: heading;
accessibility {
level: 1;
}
styles [
"title-1",
]
accessibility {
level: 1;
}
}
Gtk.Label instructions {

8
src/identity_verification_view/scan_qr_code_page.blp
Unescape View File

@ -21,13 +21,13 @@ template $IdentityVerificationScanQrCodePage: Adw.Bin {
justify: center;
accessible-role: heading;
accessibility {
level: 1;
}
styles [
"title-1",
]
accessibility {
level: 1;
}
}
Gtk.Label instructions {

8
src/identity_verification_view/wait_for_other_page.blp
Unescape View File

@ -22,13 +22,13 @@ template $IdentityVerificationWaitForOtherPage: Adw.Bin {
justify: center;
accessible-role: heading;
accessibility {
level: 1;
}
styles [
"title-1",
]
accessibility {
level: 1;
}
}
Gtk.Label instructions {

14
src/login/greeter.blp
Unescape View File

@ -107,28 +107,28 @@ template $Greeter: Adw.NavigationPage {
spacing: 16;
Gtk.Button login_button {
styles [
"pill",
"suggested-action",
]
can-shrink: true;
label: _("_Log In");
use-underline: true;
action-name: "navigation.push";
action-target: "'homeserver'";
}
Gtk.Button {
styles [
"pill",
"suggested-action",
]
}
Gtk.Button {
visible: false;
can-shrink: true;
label: _("_Create Account");
use-underline: true;
action-name: "app.create-account";
styles [
"pill",
]
}
};
}

18
src/login/homeserver_page.blp
Unescape View File

@ -46,13 +46,13 @@ template $LoginHomeserverPage: Adw.NavigationPage {
justify: center;
accessible-role: heading;
accessibility {
level: 1;
}
styles [
"title-1",
]
accessibility {
level: 1;
}
}
Gtk.Picture {
@ -85,17 +85,17 @@ template $LoginHomeserverPage: Adw.NavigationPage {
}
Gtk.Label homeserver_help {
styles [
"caption",
"dimmed",
]
justify: left;
xalign: 0.0;
margin-start: 6;
margin-end: 6;
wrap: true;
use-markup: true;
styles [
"caption",
"dimmed",
]
}
}

14
src/login/in_browser_page.blp
Unescape View File

@ -39,13 +39,13 @@ template $LoginInBrowserPage: Adw.NavigationPage {
label: _("Authentication");
accessible-role: heading;
accessibility {
level: 1;
}
styles [
"title-1",
]
accessibility {
level: 1;
}
}
Gtk.Label instructions {
@ -60,6 +60,9 @@ template $LoginInBrowserPage: Adw.NavigationPage {
}
Gtk.Button continue_btn {
halign: center;
clicked => $launch_url() swapped;
styles [
"suggested-action",
"standalone-button",
@ -83,9 +86,6 @@ template $LoginInBrowserPage: Adw.NavigationPage {
valign: center;
}
};
halign: center;
clicked => $launch_url() swapped;
}
};
};

12
src/login/method_page.blp
Unescape View File

@ -50,14 +50,14 @@ template $LoginMethodPage: Adw.NavigationPage {
halign: center;
Gtk.Label title {
styles [
"title-1",
]
wrap: true;
justify: center;
accessible-role: heading;
styles [
"title-1",
]
accessibility {
level: 1;
}
@ -74,11 +74,11 @@ template $LoginMethodPage: Adw.NavigationPage {
}
Gtk.Label homeserver_url {
ellipsize: end;
styles [
"body",
]
ellipsize: end;
}
}
}

8
src/login/mod.blp
Unescape View File

@ -54,13 +54,13 @@ template $Login: Adw.Bin {
label: _("Login Complete");
accessible-role: heading;
accessibility {
level: 1;
}
styles [
"title-1",
]
accessibility {
level: 1;
}
}
Gtk.Picture {

4
src/login/sso_idp_button.blp
Unescape View File

@ -1,10 +1,10 @@
using Gtk 4.0;
template $SsoIdpButton: Gtk.Button {
action-name: "login.sso";
styles [
"card",
"sso-button",
]
action-name: "login.sso";
}

Write Preview
Loading…
Cancel
Save