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

components: Rename loading property of LoadingButton to is-loading

merge-requests/1716/head
Kévin Commaille 2 years ago
parent
31cb11d152
commit
ae553500c3
No known key found for this signature in database
GPG Key ID: C971D9DBC9D678D
35 changed files with 115 additions and 115 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
      src/components/crypto/identity_setup_view.rs
  2. 14
      src/components/crypto/recovery_setup_view.rs
  3. 10
      src/components/join_room_dialog.rs
  4. 8
      src/components/loading/button.rs
  5. 4
      src/components/rows/entry_add_row.rs
  6. 4
      src/components/rows/removable_row.rs
  7. 4
      src/components/rows/substring_entry_row.rs
  8. 18
      src/components/user_page.rs
  9. 2
      src/components/user_page.ui
  10. 8
      src/identity_verification_view/accept_request_page.rs
  11. 4
      src/identity_verification_view/cancelled_page.rs
  12. 12
      src/identity_verification_view/choose_method_page.rs
  13. 8
      src/identity_verification_view/confirm_qr_code_page.rs
  14. 4
      src/identity_verification_view/no_supported_methods_page.rs
  15. 4
      src/identity_verification_view/qr_code_scanned_page.rs
  16. 8
      src/identity_verification_view/sas_page.rs
  17. 8
      src/identity_verification_view/scan_qr_code_page.rs
  18. 4
      src/identity_verification_view/wait_for_other_page.rs
  19. 6
      src/login/homeserver_page.rs
  20. 6
      src/login/method_page.rs
  21. 4
      src/session/view/account_settings/general_page/change_password_subpage.rs
  22. 4
      src/session/view/account_settings/general_page/deactivate_account_subpage.rs
  23. 4
      src/session/view/account_settings/general_page/log_out_subpage.rs
  24. 6
      src/session/view/account_settings/security_page/ignored_users_subpage/ignored_user_row.rs
  25. 4
      src/session/view/account_settings/security_page/import_export_keys_subpage.rs
  26. 4
      src/session/view/account_settings/user_sessions_page/user_session_row.rs
  27. 2
      src/session/view/content/explore/public_room_row.rs
  28. 12
      src/session/view/content/invite.rs
  29. 6
      src/session/view/content/room_details/addresses_subpage/mod.rs
  30. 14
      src/session/view/content/room_details/general_page/mod.rs
  31. 4
      src/session/view/content/room_details/invite_subpage/mod.rs
  32. 2
      src/session/view/content/room_details/invite_subpage/mod.ui
  33. 6
      src/session/view/content/room_details/permissions/permissions_subpage.rs
  34. 10
      src/session/view/content/room_history/verification_info_bar.rs
  35. 4
      src/session/view/room_creation.rs

8
src/components/crypto/identity_setup_view.rs
Unescape View File

@ -412,7 +412,7 @@ impl CryptoIdentitySetupView {
};
let imp = self.imp();
imp.send_request_btn.set_loading(true);
imp.send_request_btn.set_is_loading(true);
match session.verification_list().create(None).await {
Ok(_) => {
@ -423,7 +423,7 @@ impl CryptoIdentitySetupView {
}
}
imp.send_request_btn.set_loading(false);
imp.send_request_btn.set_is_loading(false);
}
/// Reset cross-signing and optionally recovery.
@ -453,7 +453,7 @@ impl CryptoIdentitySetupView {
};
let imp = self.imp();
imp.bootstrap_btn.set_loading(true);
imp.bootstrap_btn.set_is_loading(true);
let dialog = AuthDialog::new(&session);
@ -474,7 +474,7 @@ impl CryptoIdentitySetupView {
}
}
imp.bootstrap_btn.set_loading(false);
imp.bootstrap_btn.set_is_loading(false);
}
/// Recover the data.

14
src/components/crypto/recovery_setup_view.rs
Unescape View File

@ -259,7 +259,7 @@ impl CryptoRecoverySetupView {
return;
}
imp.recover_btn.set_loading(true);
imp.recover_btn.set_is_loading(true);
let encryption = session.client().encryption();
let recovery = encryption.recovery();
@ -291,7 +291,7 @@ impl CryptoRecoverySetupView {
}
}
imp.recover_btn.set_loading(false);
imp.recover_btn.set_is_loading(false);
}
/// Reset recovery and optionally cross-signing.
@ -299,17 +299,17 @@ impl CryptoRecoverySetupView {
async fn reset(&self) {
let imp = self.imp();
imp.reset_btn.set_loading(true);
imp.reset_btn.set_is_loading(true);
if self.reset_identity() && self.bootstrap_cross_signing().await.is_err() {
imp.reset_btn.set_loading(false);
imp.reset_btn.set_is_loading(false);
return;
}
let passphrase = imp.reset_entry.text();
self.reset_recovery(passphrase).await;
imp.reset_btn.set_loading(false);
imp.reset_btn.set_is_loading(false);
}
async fn bootstrap_cross_signing(&self) -> Result<(), ()> {
@ -381,7 +381,7 @@ impl CryptoRecoverySetupView {
};
let imp = self.imp();
imp.enable_btn.set_loading(true);
imp.enable_btn.set_is_loading(true);
let passphrase = Some(imp.enable_entry.text()).filter(|s| !s.is_empty());
let has_passphrase = passphrase.is_some();
@ -410,7 +410,7 @@ impl CryptoRecoverySetupView {
}
}
imp.enable_btn.set_loading(false);
imp.enable_btn.set_is_loading(false);
}
/// Copy the recovery key to the clipboard.

10
src/components/join_room_dialog.rs
Unescape View File

@ -209,7 +209,7 @@ impl JoinRoomDialog {
return;
};
imp.look_up_btn.set_loading(true);
imp.look_up_btn.set_is_loading(true);
imp.entry_page.set_sensitive(false);
// Join or view the room with the given identifier.
@ -228,7 +228,7 @@ impl JoinRoomDialog {
// Reset state before switching to possible pages.
imp.go_back_btn.set_sensitive(true);
imp.join_btn.set_loading(false);
imp.join_btn.set_is_loading(false);
let room = RemoteRoom::new(&session, uri);
imp.set_room(Some(room));
@ -301,7 +301,7 @@ impl JoinRoomDialog {
let imp = self.imp();
imp.go_back_btn.set_sensitive(false);
imp.join_btn.set_loading(true);
imp.join_btn.set_is_loading(true);
// Join the room with the given identifier.
let room_list = session.room_list();
@ -320,7 +320,7 @@ impl JoinRoomDialog {
Err(error) => {
toast!(self, error);
imp.join_btn.set_loading(false);
imp.join_btn.set_is_loading(false);
imp.go_back_btn.set_sensitive(true);
}
}
@ -335,7 +335,7 @@ impl JoinRoomDialog {
if imp.can_go_back() {
// There is only one screen to go back to.
imp.look_up_btn.set_loading(false);
imp.look_up_btn.set_is_loading(false);
imp.entry_page.set_sensitive(true);
imp.set_visible_page("entry");
} else {

8
src/components/loading/button.rs
Unescape View File

@ -25,8 +25,8 @@ mod imp {
/// Whether to display the loading spinner.
///
/// If this is `false`, the text or icon will be displayed.
#[property(get = Self::is_loading, set = Self::set_loading, explicit_notify)]
pub loading: PhantomData<bool>,
#[property(get = Self::is_loading, set = Self::set_is_loading, explicit_notify)]
pub is_loading: PhantomData<bool>,
}
#[glib::object_subclass]
@ -133,7 +133,7 @@ mod imp {
}
/// Set whether to display the loading spinner.
fn set_loading(&self, is_loading: bool) {
fn set_is_loading(&self, is_loading: bool) {
if self.is_loading() == is_loading {
return;
}
@ -147,7 +147,7 @@ mod imp {
self.loading_bin.set_is_loading(is_loading);
obj.notify_loading();
obj.notify_is_loading();
}
}
}

4
src/components/rows/entry_add_row.rs
Unescape View File

@ -89,7 +89,7 @@ mod imp {
/// Whether this row is loading.
fn is_loading(&self) -> bool {
self.add_button.loading()
self.add_button.is_loading()
}
/// Set whether this row is loading.
@ -98,7 +98,7 @@ mod imp {
return;
}
self.add_button.set_loading(is_loading);
self.add_button.set_is_loading(is_loading);
let obj = self.obj();
obj.set_sensitive(!is_loading);

4
src/components/rows/removable_row.rs
Unescape View File

@ -101,7 +101,7 @@ mod imp {
/// Whether this row is loading.
fn is_loading(&self) -> bool {
self.remove_button.loading()
self.remove_button.is_loading()
}
/// Set whether this row is loading.
@ -110,7 +110,7 @@ mod imp {
return;
}
self.remove_button.set_loading(is_loading);
self.remove_button.set_is_loading(is_loading);
let obj = self.obj();
obj.set_sensitive(!is_loading);

4
src/components/rows/substring_entry_row.rs
Unescape View File

@ -334,7 +334,7 @@ mod imp {
/// Whether this row is loading.
fn is_loading(&self) -> bool {
self.add_button.loading()
self.add_button.is_loading()
}
/// Set whether this row is loading.
@ -343,7 +343,7 @@ mod imp {
return;
}
self.add_button.set_loading(is_loading);
self.add_button.set_is_loading(is_loading);
let obj = self.obj();
obj.set_sensitive(!is_loading);

18
src/components/user_page.rs
Unescape View File

@ -295,7 +295,7 @@ impl UserPage {
/// Set whether the direct chat button is loading.
fn set_direct_chat_loading(&self, loading: bool) {
self.action_set_enabled("user-page.open-direct-chat", !loading);
self.imp().direct_chat_button.set_loading(loading);
self.imp().direct_chat_button.set_is_loading(loading);
}
/// Open a direct chat with the current user.
@ -433,13 +433,13 @@ impl UserPage {
imp.kick_button.set_is_loading(false);
imp.kick_button.set_sensitive(true);
imp.invite_button.set_loading(false);
imp.invite_button.set_is_loading(false);
imp.invite_button.set_sensitive(true);
imp.ban_button.set_is_loading(false);
imp.ban_button.set_sensitive(true);
imp.unban_button.set_loading(false);
imp.unban_button.set_is_loading(false);
imp.unban_button.set_sensitive(true);
imp.remove_messages_button.set_is_loading(false);
@ -504,7 +504,7 @@ impl UserPage {
};
let imp = self.imp();
imp.invite_button.set_loading(true);
imp.invite_button.set_is_loading(true);
imp.kick_button.set_sensitive(false);
imp.ban_button.set_sensitive(false);
imp.unban_button.set_sensitive(false);
@ -614,7 +614,7 @@ impl UserPage {
};
let imp = self.imp();
imp.unban_button.set_loading(true);
imp.unban_button.set_is_loading(true);
imp.invite_button.set_sensitive(false);
imp.kick_button.set_sensitive(false);
imp.ban_button.set_sensitive(false);
@ -707,13 +707,13 @@ impl UserPage {
let imp = self.imp();
self.action_set_enabled("user-page.verify-user", false);
imp.verify_button.set_loading(true);
imp.verify_button.set_is_loading(true);
let verification = match user.verify_identity().await {
Ok(verification) => verification,
Err(()) => {
toast!(self, gettext("Could not start user verification"));
self.action_set_enabled("user-page.verify-user", true);
imp.verify_button.set_loading(false);
imp.verify_button.set_is_loading(false);
return;
}
};
@ -756,7 +756,7 @@ impl UserPage {
};
let imp = self.imp();
self.imp().ignored_button.set_loading(true);
self.imp().ignored_button.set_is_loading(true);
if user.is_ignored() {
if user.stop_ignoring().await.is_err() {
@ -766,7 +766,7 @@ impl UserPage {
toast!(self, gettext("Could not ignore user"));
}
imp.ignored_button.set_loading(false);
imp.ignored_button.set_is_loading(false);
}
/// Connect to the signal emitted when the page should be closed.

2
src/components/user_page.ui
Unescape View File

@ -85,7 +85,7 @@
<class name="row"/>
</style>
<property name="visible">false</property>
<property name="loading">true</property>
<property name="is-loading">true</property>
<property name="action-name">user-page.open-direct-chat</property>
</object>
</child>

8
src/identity_verification_view/accept_request_page.rs
Unescape View File

@ -141,8 +141,8 @@ impl AcceptRequestPage {
/// Reset the UI to its initial state.
pub fn reset(&self) {
let imp = self.imp();
imp.accept_btn.set_loading(false);
imp.decline_btn.set_loading(false);
imp.accept_btn.set_is_loading(false);
imp.decline_btn.set_is_loading(false);
self.set_sensitive(true);
}
@ -153,7 +153,7 @@ impl AcceptRequestPage {
return;
};
self.imp().decline_btn.set_loading(true);
self.imp().decline_btn.set_is_loading(true);
self.set_sensitive(false);
if verification.cancel().await.is_err() {
@ -169,7 +169,7 @@ impl AcceptRequestPage {
return;
};
self.imp().accept_btn.set_loading(true);
self.imp().accept_btn.set_is_loading(true);
self.set_sensitive(false);
if verification.accept().await.is_err() {

4
src/identity_verification_view/cancelled_page.rs
Unescape View File

@ -167,7 +167,7 @@ impl CancelledPage {
/// Reset the UI to its initial state.
pub fn reset(&self) {
self.imp().try_again_btn.set_loading(false);
self.imp().try_again_btn.set_is_loading(false);
self.set_sensitive(true);
}
@ -178,7 +178,7 @@ impl CancelledPage {
return;
};
self.imp().try_again_btn.set_loading(true);
self.imp().try_again_btn.set_is_loading(true);
self.set_sensitive(false);
if verification.restart().await.is_err() {

12
src/identity_verification_view/choose_method_page.rs
Unescape View File

@ -206,9 +206,9 @@ impl ChooseMethodPage {
pub fn reset(&self) {
let imp = self.imp();
imp.scan_qr_code_btn.set_loading(false);
imp.start_sas_btn.set_loading(false);
imp.cancel_btn.set_loading(false);
imp.scan_qr_code_btn.set_is_loading(false);
imp.start_sas_btn.set_is_loading(false);
imp.cancel_btn.set_is_loading(false);
self.set_sensitive(true);
}
@ -221,7 +221,7 @@ impl ChooseMethodPage {
};
let imp = self.imp();
imp.scan_qr_code_btn.set_loading(true);
imp.scan_qr_code_btn.set_is_loading(true);
self.set_sensitive(false);
if verification.start_qr_code_scan().await.is_err() {
@ -238,7 +238,7 @@ impl ChooseMethodPage {
};
let imp = self.imp();
imp.start_sas_btn.set_loading(true);
imp.start_sas_btn.set_is_loading(true);
self.set_sensitive(false);
if verification.start_sas().await.is_err() {
@ -254,7 +254,7 @@ impl ChooseMethodPage {
return;
};
self.imp().cancel_btn.set_loading(true);
self.imp().cancel_btn.set_is_loading(true);
self.set_sensitive(false);
if verification.cancel().await.is_err() {

8
src/identity_verification_view/confirm_qr_code_page.rs
Unescape View File

@ -140,8 +140,8 @@ impl ConfirmQrCodePage {
pub fn reset(&self) {
let imp = self.imp();
imp.confirm_btn.set_loading(false);
imp.cancel_btn.set_loading(false);
imp.confirm_btn.set_is_loading(false);
imp.cancel_btn.set_is_loading(false);
self.set_sensitive(true);
}
@ -152,7 +152,7 @@ impl ConfirmQrCodePage {
return;
};
self.imp().confirm_btn.set_loading(true);
self.imp().confirm_btn.set_is_loading(true);
self.set_sensitive(false);
if verification.confirm_qr_code_scanned().await.is_err() {
@ -168,7 +168,7 @@ impl ConfirmQrCodePage {
return;
};
self.imp().cancel_btn.set_loading(true);
self.imp().cancel_btn.set_is_loading(true);
self.set_sensitive(false);
if verification.cancel().await.is_err() {

4
src/identity_verification_view/no_supported_methods_page.rs
Unescape View File

@ -169,7 +169,7 @@ impl NoSupportedMethodsPage {
/// Reset the UI to its initial state.
pub fn reset(&self) {
self.imp().cancel_btn.set_loading(false);
self.imp().cancel_btn.set_is_loading(false);
self.set_sensitive(true);
}
@ -180,7 +180,7 @@ impl NoSupportedMethodsPage {
return;
};
self.imp().cancel_btn.set_loading(true);
self.imp().cancel_btn.set_is_loading(true);
self.set_sensitive(false);
if verification.cancel().await.is_err() {

4
src/identity_verification_view/qr_code_scanned_page.rs
Unescape View File

@ -125,7 +125,7 @@ impl QrCodeScannedPage {
/// Reset the UI to its initial state.
pub fn reset(&self) {
self.imp().cancel_btn.set_loading(false);
self.imp().cancel_btn.set_is_loading(false);
self.set_sensitive(true);
}
@ -136,7 +136,7 @@ impl QrCodeScannedPage {
return;
};
self.imp().cancel_btn.set_loading(true);
self.imp().cancel_btn.set_is_loading(true);
self.set_sensitive(false);
if verification.cancel().await.is_err() {

8
src/identity_verification_view/sas_page.rs
Unescape View File

@ -181,8 +181,8 @@ impl SasPage {
fn reset_buttons(&self) {
let imp = self.imp();
imp.mismatch_btn.set_loading(false);
imp.match_btn.set_loading(false);
imp.mismatch_btn.set_is_loading(false);
imp.match_btn.set_is_loading(false);
self.set_sensitive(true);
}
@ -242,7 +242,7 @@ impl SasPage {
return;
};
self.imp().mismatch_btn.set_loading(true);
self.imp().mismatch_btn.set_is_loading(true);
self.set_sensitive(false);
if verification.sas_mismatch().await.is_err() {
@ -257,7 +257,7 @@ impl SasPage {
return;
};
self.imp().match_btn.set_loading(true);
self.imp().match_btn.set_is_loading(true);
self.set_sensitive(false);
if verification.sas_match().await.is_err() {

8
src/identity_verification_view/scan_qr_code_page.rs
Unescape View File

@ -195,8 +195,8 @@ impl ScanQrCodePage {
pub fn reset(&self) {
let imp = self.imp();
imp.start_sas_btn.set_loading(false);
imp.cancel_btn.set_loading(false);
imp.start_sas_btn.set_is_loading(false);
imp.cancel_btn.set_is_loading(false);
self.set_sensitive(true);
}
@ -232,7 +232,7 @@ impl ScanQrCodePage {
};
let imp = self.imp();
imp.start_sas_btn.set_loading(true);
imp.start_sas_btn.set_is_loading(true);
self.set_sensitive(false);
if verification.start_sas().await.is_err() {
@ -248,7 +248,7 @@ impl ScanQrCodePage {
return;
};
self.imp().cancel_btn.set_loading(true);
self.imp().cancel_btn.set_is_loading(true);
self.set_sensitive(false);
if verification.cancel().await.is_err() {

4
src/identity_verification_view/wait_for_other_page.rs
Unescape View File

@ -144,7 +144,7 @@ impl WaitForOtherPage {
/// Reset the UI to its initial state.
pub fn reset(&self) {
self.imp().cancel_btn.set_loading(false);
self.imp().cancel_btn.set_is_loading(false);
self.set_sensitive(true);
}
@ -155,7 +155,7 @@ impl WaitForOtherPage {
return;
};
self.imp().cancel_btn.set_loading(true);
self.imp().cancel_btn.set_is_loading(true);
self.set_sensitive(false);
if verification.cancel().await.is_err() {

6
src/login/homeserver_page.rs
Unescape View File

@ -134,7 +134,7 @@ impl LoginHomeserverPage {
pub fn clean(&self) {
let imp = self.imp();
imp.homeserver_entry.set_text("");
imp.next_button.set_loading(false);
imp.next_button.set_is_loading(false);
self.update_next_state();
}
@ -175,7 +175,7 @@ impl LoginHomeserverPage {
};
let imp = self.imp();
imp.next_button.set_loading(true);
imp.next_button.set_is_loading(true);
login.freeze();
let autodiscovery = login.autodiscovery();
@ -202,7 +202,7 @@ impl LoginHomeserverPage {
}
};
imp.next_button.set_loading(false);
imp.next_button.set_is_loading(false);
login.unfreeze();
}

6
src/login/method_page.rs
Unescape View File

@ -211,7 +211,7 @@ impl LoginMethodPage {
};
let imp = self.imp();
imp.next_button.set_loading(true);
imp.next_button.set_is_loading(true);
login.freeze();
let username = self.username();
@ -237,7 +237,7 @@ impl LoginMethodPage {
}
}
imp.next_button.set_loading(false);
imp.next_button.set_is_loading(false);
login.unfreeze();
}
@ -246,7 +246,7 @@ impl LoginMethodPage {
let imp = self.imp();
imp.username_entry.set_text("");
imp.password_entry.set_text("");
imp.next_button.set_loading(false);
imp.next_button.set_is_loading(false);
self.update_next_state();
self.clean_idp_box();
}

4
src/session/view/account_settings/general_page/change_password_subpage.rs
Unescape View File

@ -217,7 +217,7 @@ impl ChangePasswordSubpage {
let imp = self.imp();
let password = imp.password.text();
imp.button.set_loading(true);
imp.button.set_is_loading(true);
imp.password.set_sensitive(false);
imp.confirm_password.set_sensitive(false);
@ -256,7 +256,7 @@ impl ChangePasswordSubpage {
}
},
}
imp.button.set_loading(false);
imp.button.set_is_loading(false);
imp.password.set_sensitive(true);
imp.confirm_password.set_sensitive(true);
}

4
src/session/view/account_settings/general_page/deactivate_account_subpage.rs
Unescape View File

@ -120,7 +120,7 @@ impl DeactivateAccountSubpage {
}
let imp = self.imp();
imp.button.set_loading(true);
imp.button.set_is_loading(true);
imp.confirmation.set_sensitive(false);
let dialog = AuthDialog::new(&session);
@ -148,7 +148,7 @@ impl DeactivateAccountSubpage {
toast!(self, gettext("Could not deactivate account"));
}
}
imp.button.set_loading(false);
imp.button.set_is_loading(false);
imp.confirmation.set_sensitive(true);
}
}

4
src/session/view/account_settings/general_page/log_out_subpage.rs
Unescape View File

@ -129,14 +129,14 @@ impl LogOutSubpage {
};
let imp = self.imp();
imp.logout_button.set_loading(true);
imp.logout_button.set_is_loading(true);
imp.warning_button.set_sensitive(false);
if let Err(error) = session.logout().await {
toast!(self, error);
}
imp.logout_button.set_loading(false);
imp.logout_button.set_is_loading(false);
imp.warning_button.set_sensitive(true);
}
}

6
src/session/view/account_settings/security_page/ignored_users_subpage/ignored_user_row.rs
Unescape View File

@ -60,7 +60,7 @@ mod imp {
self.obj().notify_item();
// Reset the state of the button.
self.stop_ignoring_button.set_loading(false);
self.stop_ignoring_button.set_is_loading(false);
}
}
}
@ -94,11 +94,11 @@ impl IgnoredUserRow {
};
let imp = self.imp();
imp.stop_ignoring_button.set_loading(true);
imp.stop_ignoring_button.set_is_loading(true);
if ignored_users.remove(&user_id).await.is_err() {
toast!(self, gettext("Could not stop ignoring user"));
imp.stop_ignoring_button.set_loading(false);
imp.stop_ignoring_button.set_is_loading(false);
}
}
}

4
src/session/view/account_settings/security_page/import_export_keys_subpage.rs
Unescape View File

@ -304,7 +304,7 @@ impl ImportExportKeysSubpage {
let passphrase = imp.passphrase.text();
let is_export = self.is_export();
imp.proceed_button.set_loading(true);
imp.proceed_button.set_is_loading(true);
imp.file_button.set_sensitive(false);
imp.passphrase.set_sensitive(false);
imp.confirm_passphrase.set_sensitive(false);
@ -367,7 +367,7 @@ impl ImportExportKeysSubpage {
}
}
}
imp.proceed_button.set_loading(false);
imp.proceed_button.set_is_loading(false);
imp.file_button.set_sensitive(true);
imp.passphrase.set_sensitive(true);
imp.confirm_passphrase.set_sensitive(true);

4
src/session/view/account_settings/user_sessions_page/user_session_row.rs
Unescape View File

@ -150,7 +150,7 @@ impl UserSessionRow {
}
let imp = self.imp();
imp.disconnect_button.set_loading(true);
imp.disconnect_button.set_is_loading(true);
match user_session.delete(self).await {
Ok(_) => self.set_visible(false),
@ -167,7 +167,7 @@ impl UserSessionRow {
}
}
imp.disconnect_button.set_loading(false);
imp.disconnect_button.set_is_loading(false);
}
/// Update the last seen timestamp according to the current user session and

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

@ -180,7 +180,7 @@ mod imp {
self.button
.update_property(&[gtk::accessible::Property::Description(&accessible_desc)]);
self.button.set_loading(public_room.pending());
self.button.set_is_loading(public_room.pending());
}
}
}

12
src/session/view/content/invite.rs
Unescape View File

@ -109,12 +109,12 @@ mod imp {
Some(room) if self.accept_requests.borrow().contains(room) => {
obj.action_set_enabled("invite.accept", false);
obj.action_set_enabled("invite.decline", false);
self.accept_button.set_loading(true);
self.accept_button.set_is_loading(true);
}
Some(room) if self.decline_requests.borrow().contains(room) => {
obj.action_set_enabled("invite.accept", false);
obj.action_set_enabled("invite.decline", false);
self.decline_button.set_loading(true);
self.decline_button.set_is_loading(true);
}
_ => obj.reset(),
}
@ -181,8 +181,8 @@ impl Invite {
fn reset(&self) {
let imp = self.imp();
imp.accept_button.set_loading(false);
imp.decline_button.set_loading(false);
imp.accept_button.set_is_loading(false);
imp.decline_button.set_is_loading(false);
self.action_set_enabled("invite.accept", true);
self.action_set_enabled("invite.decline", true);
}
@ -196,7 +196,7 @@ impl Invite {
self.action_set_enabled("invite.accept", false);
self.action_set_enabled("invite.decline", false);
imp.accept_button.set_loading(true);
imp.accept_button.set_is_loading(true);
imp.accept_requests.borrow_mut().insert(room.clone());
let result = room.accept_invite().await;
@ -229,7 +229,7 @@ impl Invite {
self.action_set_enabled("invite.accept", false);
self.action_set_enabled("invite.decline", false);
imp.decline_button.set_loading(true);
imp.decline_button.set_is_loading(true);
imp.decline_requests.borrow_mut().insert(room.clone());
let result = room.decline_invite().await;

6
src/session/view/content/room_details/addresses_subpage/mod.rs
Unescape View File

@ -282,7 +282,7 @@ mod imp {
row.set_is_loading(false);
if let Some(button) = row.extra_suffix().and_downcast::<LoadingButton>() {
button.set_loading(false);
button.set_is_loading(false);
}
}
@ -496,12 +496,12 @@ impl AddressesSubpage {
let aliases = room.aliases();
imp.public_addresses_list.set_sensitive(false);
button.set_loading(true);
button.set_is_loading(true);
if aliases.set_canonical_alias(alias).await.is_err() {
toast!(self, gettext("Could not set main public address"));
imp.public_addresses_list.set_sensitive(true);
button.set_loading(false);
button.set_is_loading(false);
}
}

14
src/session/view/content/room_details/general_page/mod.rs
Unescape View File

@ -610,7 +610,7 @@ impl GeneralPage {
}
self.set_edit_mode_enabled(false);
imp.save_details_btn.set_loading(false);
imp.save_details_btn.set_is_loading(false);
}
fn name_changed(&self, name: Option<String>) {
@ -672,7 +672,7 @@ impl GeneralPage {
};
let imp = self.imp();
imp.save_details_btn.set_loading(true);
imp.save_details_btn.set_is_loading(true);
self.enable_details(false);
self.set_edit_mode_enabled(false);
@ -726,7 +726,7 @@ impl GeneralPage {
error!("Could not change room name: {error}");
toast!(self, gettext("Could not change room name"));
self.enable_details(true);
imp.save_details_btn.set_loading(false);
imp.save_details_btn.set_is_loading(false);
return;
}
}
@ -750,7 +750,7 @@ impl GeneralPage {
error!("Could not change room topic: {error}");
toast!(self, gettext("Could not change room topic"));
self.enable_details(true);
imp.save_details_btn.set_loading(false);
imp.save_details_btn.set_is_loading(false);
}
}
}
@ -1351,11 +1351,11 @@ impl GeneralPage {
let imp = self.imp();
// TODO: Hide upgrade button if room already upgraded?
imp.upgrade_button.set_loading(true);
imp.upgrade_button.set_is_loading(true);
let room_versions_capability = imp.capabilities.borrow().room_versions.clone();
let Some(new_version) = confirm_room_upgrade(room_versions_capability, self).await else {
imp.upgrade_button.set_loading(false);
imp.upgrade_button.set_is_loading(false);
return;
};
@ -1371,7 +1371,7 @@ impl GeneralPage {
Err(error) => {
error!("Could not upgrade room: {error}");
toast!(self, gettext("Could not upgrade room"));
imp.upgrade_button.set_loading(false);
imp.upgrade_button.set_is_loading(false);
}
}
}

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

@ -197,7 +197,7 @@ impl InviteSubpage {
return;
};
self.imp().invite_button.set_loading(true);
self.imp().invite_button.set_is_loading(true);
let invite_list = self.invite_list();
let invitees = invite_list.invitees_ids();
@ -238,6 +238,6 @@ impl InviteSubpage {
}
}
self.imp().invite_button.set_loading(false);
self.imp().invite_button.set_is_loading(false);
}
}

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

@ -40,7 +40,7 @@
<property name="hexpand">True</property>
<child>
<object class="PillSearchEntry" id="search_entry">
<property name="editable" bind-source="invite_button" bind-property="loading" bind-flags="sync-create | invert-boolean"/>
<property name="editable" bind-source="invite_button" bind-property="is-loading" bind-flags="sync-create | invert-boolean"/>
<signal name="pill-removed" handler="remove_pill_invitee" swapped="yes" />
</object>
</child>

6
src/session/view/content/room_details/permissions/permissions_subpage.rs
Unescape View File

@ -168,7 +168,7 @@ mod imp {
self.update_member_actions();
self.update_members_power_levels();
self.save_button.set_loading(false);
self.save_button.set_is_loading(false);
self.update_in_progress.set(false);
self.update_changed();
@ -624,7 +624,7 @@ impl PermissionsSubpage {
};
let imp = self.imp();
imp.save_button.set_loading(true);
imp.save_button.set_is_loading(true);
let Some(power_levels) = self.collect_power_levels() else {
return;
@ -632,7 +632,7 @@ impl PermissionsSubpage {
if permissions.set_power_levels(power_levels).await.is_err() {
toast!(self, gettext("Could not save permissions"));
imp.save_button.set_loading(false);
imp.save_button.set_is_loading(false);
}
}

10
src/session/view/content/room_history/verification_info_bar.rs
Unescape View File

@ -61,17 +61,17 @@ mod imp {
let imp = obj.imp();
if verification.state() == VerificationState::Requested {
imp.accept_btn.set_loading(true);
imp.accept_btn.set_is_loading(true);
if verification.accept().await.is_err() {
toast!(obj, gettext("Could not accept verification"));
imp.accept_btn.set_loading(false);
imp.accept_btn.set_is_loading(false);
return;
}
}
window.session_view().select_verification(verification);
imp.accept_btn.set_loading(false);
imp.accept_btn.set_is_loading(false);
});
klass.install_action_async("verification.decline", None, |obj, _, _| async move {
@ -80,13 +80,13 @@ mod imp {
};
let imp = obj.imp();
imp.cancel_btn.set_loading(true);
imp.cancel_btn.set_is_loading(true);
if verification.cancel().await.is_err() {
toast!(obj, gettext("Could not decline verification"));
}
imp.cancel_btn.set_loading(false);
imp.cancel_btn.set_is_loading(false);
});
}

4
src/session/view/room_creation.rs
Unescape View File

@ -121,7 +121,7 @@ impl RoomCreation {
};
let imp = self.imp();
imp.create_button.set_loading(true);
imp.create_button.set_is_loading(true);
imp.content.set_sensitive(false);
let name = Some(imp.room_name.text().to_string());
@ -174,7 +174,7 @@ impl RoomCreation {
fn handle_error(&self, error: Error) {
let imp = self.imp();
imp.create_button.set_loading(false);
imp.create_button.set_is_loading(false);
imp.content.set_sensitive(true);
// Handle the room address already taken error.

Write Preview
Loading…
Cancel
Save