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

user-page: Use ButtonRow for destructive actions

merge-requests/1461/merge
Kévin Commaille 2 years ago committed by Kévin Commaille
parent
33a8a08e5d
commit
142d1e4595
2 changed files with 57 additions and 30 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. 36
      src/components/user_page.rs
  2. 51
      src/components/user_page.ui

36
src/components/user_page.rs
Unescape View File

@ -7,7 +7,7 @@ use gtk::{
};
use ruma::{events::room::power_levels::PowerLevelUserAction, OwnedEventId};
use super::{Avatar, PowerLevelSelectionRow, SpinnerButton};
use super::{Avatar, ButtonRow, PowerLevelSelectionRow, SpinnerButton};
use crate::{
i18n::gettext_f,
ngettext_f,
@ -59,13 +59,19 @@ mod imp {
#[template_child]
pub invite_button: TemplateChild<SpinnerButton>,
#[template_child]
pub kick_button: TemplateChild<SpinnerButton>,
pub kick_box: TemplateChild<gtk::ListBox>,
#[template_child]
pub ban_button: TemplateChild<SpinnerButton>,
pub kick_button: TemplateChild<ButtonRow>,
#[template_child]
pub ban_box: TemplateChild<gtk::ListBox>,
#[template_child]
pub ban_button: TemplateChild<ButtonRow>,
#[template_child]
pub unban_button: TemplateChild<SpinnerButton>,
#[template_child]
pub remove_messages_button: TemplateChild<SpinnerButton>,
pub remove_messages_box: TemplateChild<gtk::ListBox>,
#[template_child]
pub remove_messages_button: TemplateChild<ButtonRow>,
#[template_child]
pub ignored_row: TemplateChild<adw::ActionRow>,
#[template_child]
@ -400,22 +406,22 @@ impl UserPage {
// Translators: As in, 'Kick room member'.
_ => gettext("Kick"),
};
imp.kick_button.set_content_label(label);
imp.kick_button.set_visible(true);
imp.kick_button.set_title(&label);
imp.kick_box.set_visible(true);
} else {
imp.kick_button.set_visible(false);
imp.kick_box.set_visible(false);
}
let can_ban = membership != Membership::Ban
&& permissions.can_do_to_user(user_id, PowerLevelUserAction::Ban);
imp.ban_button.set_visible(can_ban);
imp.ban_box.set_visible(can_ban);
let can_unban = matches!(membership, Membership::Ban)
&& permissions.can_do_to_user(user_id, PowerLevelUserAction::Unban);
imp.unban_button.set_visible(can_unban);
let can_redact = !member.is_own_user() && permissions.can_redact_other();
imp.remove_messages_button.set_visible(can_redact);
imp.remove_messages_box.set_visible(can_redact);
imp.room_box.set_visible(true);
}
@ -424,19 +430,19 @@ impl UserPage {
fn reset_room(&self) {
let imp = self.imp();
imp.kick_button.set_loading(false);
imp.kick_button.set_is_loading(false);
imp.kick_button.set_sensitive(true);
imp.invite_button.set_loading(false);
imp.invite_button.set_sensitive(true);
imp.ban_button.set_loading(false);
imp.ban_button.set_is_loading(false);
imp.ban_button.set_sensitive(true);
imp.unban_button.set_loading(false);
imp.unban_button.set_sensitive(true);
imp.remove_messages_button.set_loading(false);
imp.remove_messages_button.set_is_loading(false);
imp.remove_messages_button.set_sensitive(true);
}
@ -521,7 +527,7 @@ impl UserPage {
};
let imp = self.imp();
imp.kick_button.set_loading(true);
imp.kick_button.set_is_loading(true);
imp.invite_button.set_sensitive(false);
imp.ban_button.set_sensitive(false);
imp.unban_button.set_sensitive(false);
@ -559,7 +565,7 @@ impl UserPage {
};
let imp = self.imp();
imp.ban_button.set_loading(true);
imp.ban_button.set_is_loading(true);
imp.invite_button.set_sensitive(false);
imp.kick_button.set_sensitive(false);
imp.unban_button.set_sensitive(false);
@ -631,7 +637,7 @@ impl UserPage {
};
let imp = self.imp();
imp.remove_messages_button.set_loading(true);
imp.remove_messages_button.set_is_loading(true);
let redactable_events = member.redactable_events();

51
src/components/user_page.ui
Unescape View File

@ -138,23 +138,37 @@
</object>
</child>
<child>
<object class="SpinnerButton" id="kick_button">
<object class="GtkListBox" id="kick_box">
<style>
<class name="row"/>
<class name="destructive-action"/>
<class name="boxed-list" />
</style>
<signal name="clicked" handler="kick_user" swapped="yes"/>
<property name="accessible-role">group</property>
<child>
<object class="ButtonRow" id="kick_button">
<style>
<class name="error"/>
</style>
<signal name="activated" handler="kick_user" swapped="yes"/>
</object>
</child>
</object>
</child>
<child>
<object class="SpinnerButton" id="ban_button">
<object class="GtkListBox" id="ban_box">
<style>
<class name="row"/>
<class name="destructive-action"/>
<class name="boxed-list" />
</style>
<!-- Translators: As in, 'Ban room member'. -->
<property name="content-label" translatable="yes">Ban</property>
<signal name="clicked" handler="ban_user" swapped="yes"/>
<property name="accessible-role">group</property>
<child>
<object class="ButtonRow" id="ban_button">
<style>
<class name="error"/>
</style>
<!-- Translators: As in, 'Ban room member'. -->
<property name="title" translatable="yes">Ban</property>
<signal name="activated" handler="ban_user" swapped="yes"/>
</object>
</child>
</object>
</child>
<child>
@ -168,13 +182,20 @@
</object>
</child>
<child>
<object class="SpinnerButton" id="remove_messages_button">
<object class="GtkListBox" id="remove_messages_box">
<style>
<class name="row"/>
<class name="destructive-action"/>
<class name="boxed-list" />
</style>
<property name="content-label" translatable="yes">Remove Messages</property>
<signal name="clicked" handler="remove_messages" swapped="yes"/>
<property name="accessible-role">group</property>
<child>
<object class="ButtonRow" id="remove_messages_button">
<style>
<class name="error"/>
</style>
<property name="title" translatable="yes">Remove Messages</property>
<signal name="activated" handler="remove_messages" swapped="yes"/>
</object>
</child>
</object>
</child>
</object>

Write Preview
Loading…
Cancel
Save