anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Prefill nick with local alias when joining a non-bookmarked MUC

Browse source 
fixes #223
This commit is contained in:
bobufa 2018-03-26 20:23:04 +00:00 committed by fiaxh
parent 7ecb0e614b
commit fefa28c4ef
3 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
main/src/ui/add_conversation/add_conference_dialog.vala
View file

@ -130,7 +130,6 @@ public class AddConferenceDialog : Gtk.Dialog {
} else if (row != null) { } else if (row != null) {
details_fragment.account = row.account; details_fragment.account = row.account;
details_fragment.jid = row.jid.to_string(); details_fragment.jid = row.jid.to_string();
details_fragment.set_editable();
} }
show_conference_details_view(); show_conference_details_view();
} }

31
main/src/ui/add_conversation/conference_details_fragment.vala
View file

@ -23,6 +23,10 @@ protected class ConferenceDetailsFragment : Box {
set { set {
accounts_label.label = value.bare_jid.to_string(); accounts_label.label = value.bare_jid.to_string();
account_combobox.selected = value; account_combobox.selected = value;
if (nick == null && value.alias != null) {
nick = value.alias;
}
accounts_stack.set_visible_child_name("label");
} }
} }
public string jid { public string jid {
@ -30,6 +34,7 @@ protected class ConferenceDetailsFragment : Box {
set { set {
jid_label.label = value; jid_label.label = value;
jid_entry.text = value; jid_entry.text = value;
jid_stack.set_visible_child_name("label");
} }
} }
public string? nick { public string? nick {
@ -37,6 +42,7 @@ protected class ConferenceDetailsFragment : Box {
set { set {
nick_label.label = value ?? ""; nick_label.label = value ?? "";
nick_entry.text = value ?? ""; nick_entry.text = value ?? "";
nick_stack.set_visible_child_name("label");
} }
} }
public string? password { public string? password {
@ -44,6 +50,7 @@ protected class ConferenceDetailsFragment : Box {
set { set {
password_label.label = value; password_label.label = value;
password_entry.text = value; password_entry.text = value;
nick_stack.set_visible_child_name("label");
} }
} }
@ -81,11 +88,6 @@ protected class ConferenceDetailsFragment : Box {
account_combobox.initialize(stream_interactor); account_combobox.initialize(stream_interactor);
accounts_stack.set_visible_child_name("label");
jid_stack.set_visible_child_name("label");
nick_stack.set_visible_child_name("label");
password_stack.set_visible_child_name("label");
accounts_button.clicked.connect(() => { set_active_stack(accounts_stack); }); accounts_button.clicked.connect(() => { set_active_stack(accounts_stack); });
jid_button.clicked.connect(() => { set_active_stack(jid_stack); }); jid_button.clicked.connect(() => { set_active_stack(jid_stack); });
nick_button.clicked.connect(() => { set_active_stack(nick_stack); }); nick_button.clicked.connect(() => { set_active_stack(nick_stack); });
@ -106,18 +108,8 @@ protected class ConferenceDetailsFragment : Box {
ok_button.label = _("Joining…"); ok_button.label = _("Joining…");
ok_button.sensitive = false; ok_button.sensitive = false;
}); });
}
public void set_editable() { clear();
nick_stack.set_visible_child_name("entry");
password_stack.set_visible_child_name("entry");
}
public void reset_editable() {
jid_stack.set_visible_child_name("label");
accounts_stack.set_visible_child_name("label");
nick_stack.set_visible_child_name("label");
password_stack.set_visible_child_name("label");
} }
public void clear() { public void clear() {
@ -130,6 +122,13 @@ protected class ConferenceDetailsFragment : Box {
reset_editable(); reset_editable();
} }
public void reset_editable() {
jid_stack.set_visible_child_name("entry");
accounts_stack.set_visible_child_name("entry");
nick_stack.set_visible_child_name("entry");
password_stack.set_visible_child_name("entry");
}
private void on_enter_error(Account account, Jid jid, Xmpp.Xep.Muc.MucEnterError error) { private void on_enter_error(Account account, Jid jid, Xmpp.Xep.Muc.MucEnterError error) {
ok_button.label = _("Join"); ok_button.label = _("Join");
ok_button.sensitive = true; ok_button.sensitive = true;

1
main/src/ui/application.vala
View file

@ -47,7 +47,6 @@ public class Dino.Ui.Application : Gtk.Application, Dino.Application {
ok_button.get_style_context().add_class("suggested-action"); ok_button.get_style_context().add_class("suggested-action");
ConferenceDetailsFragment conference_fragment = new ConferenceDetailsFragment(stream_interactor, ok_button); ConferenceDetailsFragment conference_fragment = new ConferenceDetailsFragment(stream_interactor, ok_button);
conference_fragment.jid = jid; conference_fragment.jid = jid;
conference_fragment.set_editable();
Box content_area = dialog.get_content_area(); Box content_area = dialog.get_content_area();
content_area.add(conference_fragment); content_area.add(conference_fragment);
dialog.response.connect((response_id) => { dialog.response.connect((response_id) => {