From 4c48c5c16d5f5b010c2e5dfb1affcb59f937510c Mon Sep 17 00:00:00 2001 From: fiaxh Date: Fri, 10 Mar 2017 18:07:28 +0100 Subject: Reformat [GtkChild] --- .../add_conversation/chat/add_contact_dialog.vala | 23 ++------ client/src/ui/add_conversation/chat/dialog.vala | 1 + .../src/ui/add_conversation/chat/roster_list.vala | 2 + .../conference/add_groupchat_dialog.vala | 36 ++++-------- .../conference/conference_details_fragment.vala | 66 +++++++--------------- .../conference/conference_list.vala | 2 + client/src/ui/add_conversation/list_row.vala | 12 ++-- .../ui/add_conversation/select_jid_fragment.vala | 19 ++----- 8 files changed, 49 insertions(+), 112 deletions(-) (limited to 'client/src/ui/add_conversation') diff --git a/client/src/ui/add_conversation/chat/add_contact_dialog.vala b/client/src/ui/add_conversation/chat/add_contact_dialog.vala index 1be0225b..df8fbeb9 100644 --- a/client/src/ui/add_conversation/chat/add_contact_dialog.vala +++ b/client/src/ui/add_conversation/chat/add_contact_dialog.vala @@ -8,23 +8,12 @@ namespace Dino.Ui.AddConversation.Chat { [GtkTemplate (ui = "/org/dino-im/add_conversation/add_contact_dialog.ui")] protected class AddContactDialog : Gtk.Dialog { - [GtkChild] - private ComboBoxText accounts_comboboxtext; - - [GtkChild] - private Button ok_button; - - [GtkChild] - private Button cancel_button; - - [GtkChild] - private Entry jid_entry; - - [GtkChild] - private Entry alias_entry; - - [GtkChild] - private CheckButton subscribe_checkbutton; + [GtkChild] private ComboBoxText accounts_comboboxtext; + [GtkChild] private Button ok_button; + [GtkChild] private Button cancel_button; + [GtkChild] private Entry jid_entry; + [GtkChild] private Entry alias_entry; + [GtkChild] private CheckButton subscribe_checkbutton; private StreamInteractor stream_interactor; diff --git a/client/src/ui/add_conversation/chat/dialog.vala b/client/src/ui/add_conversation/chat/dialog.vala index 80dac68e..cad2b367 100644 --- a/client/src/ui/add_conversation/chat/dialog.vala +++ b/client/src/ui/add_conversation/chat/dialog.vala @@ -79,4 +79,5 @@ public class Dialog : Gtk.Dialog { close(); } } + } \ No newline at end of file diff --git a/client/src/ui/add_conversation/chat/roster_list.vala b/client/src/ui/add_conversation/chat/roster_list.vala index 9e970d8c..92388597 100644 --- a/client/src/ui/add_conversation/chat/roster_list.vala +++ b/client/src/ui/add_conversation/chat/roster_list.vala @@ -5,6 +5,7 @@ using Dino.Entities; using Xmpp; namespace Dino.Ui.AddConversation.Chat { + protected class RosterList : FilterableList { public signal void conversation_selected(Conversation? conversation); @@ -74,4 +75,5 @@ protected class RosterList : FilterableList { return c1.name_label.label.collate(c2.name_label.label); } } + } \ No newline at end of file diff --git a/client/src/ui/add_conversation/conference/add_groupchat_dialog.vala b/client/src/ui/add_conversation/conference/add_groupchat_dialog.vala index 05589fe1..8cc5ac72 100644 --- a/client/src/ui/add_conversation/conference/add_groupchat_dialog.vala +++ b/client/src/ui/add_conversation/conference/add_groupchat_dialog.vala @@ -8,32 +8,15 @@ namespace Dino.Ui.AddConversation.Conference { [GtkTemplate (ui = "/org/dino-im/add_conversation/add_groupchat_dialog.ui")] protected class AddGroupchatDialog : Gtk.Dialog { - [GtkChild] - private Stack accounts_stack; - - [GtkChild] - private ComboBoxText accounts_comboboxtext; - - [GtkChild] - private Label account_label; - - [GtkChild] - private Button ok_button; - - [GtkChild] - private Button cancel_button; - - [GtkChild] - private Entry jid_entry; - - [GtkChild] - private Entry alias_entry; - - [GtkChild] - private Entry nick_entry; - - [GtkChild] - private CheckButton autojoin_checkbutton; + [GtkChild] private Stack accounts_stack; + [GtkChild] private ComboBoxText accounts_comboboxtext; + [GtkChild] private Label account_label; + [GtkChild] private Button ok_button; + [GtkChild] private Button cancel_button; + [GtkChild] private Entry jid_entry; + [GtkChild] private Entry alias_entry; + [GtkChild] private Entry nick_entry; + [GtkChild] private CheckButton autojoin_checkbutton; private StreamInteractor stream_interactor; private Xmpp.Xep.Bookmarks.Conference? edit_confrence = null; @@ -104,4 +87,5 @@ protected class AddGroupchatDialog : Gtk.Dialog { close(); } } + } \ No newline at end of file diff --git a/client/src/ui/add_conversation/conference/conference_details_fragment.vala b/client/src/ui/add_conversation/conference/conference_details_fragment.vala index 324c133d..d42c79bd 100644 --- a/client/src/ui/add_conversation/conference/conference_details_fragment.vala +++ b/client/src/ui/add_conversation/conference/conference_details_fragment.vala @@ -53,53 +53,25 @@ protected class ConferenceDetailsFragment : Box { } } - [GtkChild] - private Stack accounts_stack; - - [GtkChild] - private Stack jid_stack; - - [GtkChild] - private Stack nick_stack; - - [GtkChild] - private Stack password_stack; - - [GtkChild] - private Button accounts_button; - - [GtkChild] - private Button jid_button; - - [GtkChild] - private Button nick_button; - - [GtkChild] - private Button password_button; - - [GtkChild] - private Label accounts_label; - - [GtkChild] - private Label jid_label; - - [GtkChild] - private Label nick_label; - - [GtkChild] - private Label password_label; - - [GtkChild] - private ComboBoxText accounts_comboboxtext; - - [GtkChild] - private Entry jid_entry; - - [GtkChild] - private Entry nick_entry; - - [GtkChild] - private Entry password_entry; + [GtkChild] private Stack accounts_stack; + [GtkChild] private Button accounts_button; + [GtkChild] private Label accounts_label; + [GtkChild] private ComboBoxText accounts_comboboxtext; + + [GtkChild] private Stack jid_stack; + [GtkChild] private Button jid_button; + [GtkChild] private Label jid_label; + [GtkChild] private Entry jid_entry; + + [GtkChild] private Stack nick_stack; + [GtkChild] private Button nick_button; + [GtkChild] private Label nick_label; + [GtkChild] private Entry nick_entry; + + [GtkChild] private Stack password_stack; + [GtkChild] private Button password_button; + [GtkChild] private Label password_label; + [GtkChild] private Entry password_entry; private StreamInteractor stream_interactor; diff --git a/client/src/ui/add_conversation/conference/conference_list.vala b/client/src/ui/add_conversation/conference/conference_list.vala index 2e461472..17f08ff3 100644 --- a/client/src/ui/add_conversation/conference/conference_list.vala +++ b/client/src/ui/add_conversation/conference/conference_list.vala @@ -5,6 +5,7 @@ using Xmpp; using Dino.Entities; namespace Dino.Ui.AddConversation.Conference { + protected class ConferenceList : FilterableList { public signal void conversation_selected(Conversation? conversation); @@ -102,4 +103,5 @@ internal class ConferenceListRow : ListRow { image.set_from_pixbuf((new AvatarGenerator(35, 35)).set_stateless(true).draw_jid(stream_interactor, jid, account)); } } + } \ No newline at end of file diff --git a/client/src/ui/add_conversation/list_row.vala b/client/src/ui/add_conversation/list_row.vala index 5c2eff97..b53432a6 100644 --- a/client/src/ui/add_conversation/list_row.vala +++ b/client/src/ui/add_conversation/list_row.vala @@ -8,14 +8,9 @@ namespace Dino.Ui.AddConversation { [GtkTemplate (ui = "/org/dino-im/add_conversation/list_row.ui")] public class ListRow : ListBoxRow { - [GtkChild] - public Image image; - - [GtkChild] - public Label name_label; - - [GtkChild] - public Label via_label; + [GtkChild] public Image image; + [GtkChild] public Label name_label; + [GtkChild] public Label via_label; public Jid? jid; public Account? account; @@ -40,4 +35,5 @@ public class ListRow : ListBoxRow { image.set_from_pixbuf((new AvatarGenerator(35, 35)).draw_jid(stream_interactor, jid, account)); } } + } \ No newline at end of file diff --git a/client/src/ui/add_conversation/select_jid_fragment.vala b/client/src/ui/add_conversation/select_jid_fragment.vala index 847a9ecb..d0b214b5 100644 --- a/client/src/ui/add_conversation/select_jid_fragment.vala +++ b/client/src/ui/add_conversation/select_jid_fragment.vala @@ -17,20 +17,11 @@ public class SelectJidFragment : Gtk.Box { } private set {} } - [GtkChild] - private Entry entry; - - [GtkChild] - private Box box; - - [GtkChild] - private Button add_button; - - [GtkChild] - private Button edit_button; - - [GtkChild] - private Button remove_button; + [GtkChild] private Entry entry; + [GtkChild] private Box box; + [GtkChild] private Button add_button; + [GtkChild] private Button edit_button; + [GtkChild] private Button remove_button; private FilterableList filterable_list; private ArrayList added_rows = new ArrayList(); -- cgit v1.2.3-70-g09d2