From 4c48c5c16d5f5b010c2e5dfb1affcb59f937510c Mon Sep 17 00:00:00 2001 From: fiaxh Date: Fri, 10 Mar 2017 18:07:28 +0100 Subject: Reformat [GtkChild] --- client/src/ui/conversation_selector/chat_row.vala | 2 ++ .../ui/conversation_selector/conversation_row.vala | 33 ++++++---------------- .../ui/conversation_selector/groupchat_row.vala | 2 ++ client/src/ui/conversation_selector/list.vala | 2 ++ client/src/ui/conversation_selector/view.vala | 12 +++----- 5 files changed, 19 insertions(+), 32 deletions(-) (limited to 'client/src/ui/conversation_selector') diff --git a/client/src/ui/conversation_selector/chat_row.vala b/client/src/ui/conversation_selector/chat_row.vala index 1613b404..8b36b333 100644 --- a/client/src/ui/conversation_selector/chat_row.vala +++ b/client/src/ui/conversation_selector/chat_row.vala @@ -6,6 +6,7 @@ using Xmpp; using Dino.Entities; namespace Dino.Ui.ConversationSelector { + public class ChatRow : ConversationRow { public ChatRow(StreamInteractor stream_interactor, Conversation conversation) { @@ -85,4 +86,5 @@ public class ChatRow : ConversationRow { return main_box; } } + } \ No newline at end of file diff --git a/client/src/ui/conversation_selector/conversation_row.vala b/client/src/ui/conversation_selector/conversation_row.vala index e641cab2..0a6b7e70 100644 --- a/client/src/ui/conversation_selector/conversation_row.vala +++ b/client/src/ui/conversation_selector/conversation_row.vala @@ -11,29 +11,14 @@ namespace Dino.Ui.ConversationSelector { [GtkTemplate (ui = "/org/dino-im/conversation_selector/conversation_row.ui")] public abstract class ConversationRow : ListBoxRow { - [GtkChild] - protected Image image; - - [GtkChild] - private Label name_label; - - [GtkChild] - private Label time_label; - - [GtkChild] - private Label message_label; - - [GtkChild] - protected Button x_button; - - [GtkChild] - private Revealer time_revealer; - - [GtkChild] - private Revealer xbutton_revealer; - - [GtkChild] - public Revealer main_revealer; + [GtkChild] protected Image image; + [GtkChild] private Label name_label; + [GtkChild] private Label time_label; + [GtkChild] private Label message_label; + [GtkChild] protected Button x_button; + [GtkChild] private Revealer time_revealer; + [GtkChild] private Revealer xbutton_revealer; + [GtkChild] public Revealer main_revealer; public Conversation conversation { get; private set; } @@ -170,6 +155,6 @@ public abstract class ConversationRow : ListBoxRow { return "Just now"; } } - } + } diff --git a/client/src/ui/conversation_selector/groupchat_row.vala b/client/src/ui/conversation_selector/groupchat_row.vala index bec2181e..7fe52d89 100644 --- a/client/src/ui/conversation_selector/groupchat_row.vala +++ b/client/src/ui/conversation_selector/groupchat_row.vala @@ -1,6 +1,7 @@ using Dino.Entities; namespace Dino.Ui.ConversationSelector { + public class GroupchatRow : ConversationRow { public GroupchatRow(StreamInteractor stream_interactor, Conversation conversation) { @@ -30,4 +31,5 @@ public class GroupchatRow : ConversationRow { MucManager.get_instance(stream_interactor).part(conversation.account, conversation.counterpart); } } + } \ No newline at end of file diff --git a/client/src/ui/conversation_selector/list.vala b/client/src/ui/conversation_selector/list.vala index e6a5231c..ea2f9622 100644 --- a/client/src/ui/conversation_selector/list.vala +++ b/client/src/ui/conversation_selector/list.vala @@ -5,6 +5,7 @@ using Xmpp; using Dino.Entities; namespace Dino.Ui.ConversationSelector { + public class List : ListBox { public signal void conversation_selected(Conversation conversation); @@ -170,4 +171,5 @@ public class List : ListBox { return 0; } } + } \ No newline at end of file diff --git a/client/src/ui/conversation_selector/view.vala b/client/src/ui/conversation_selector/view.vala index c551d258..ae641664 100644 --- a/client/src/ui/conversation_selector/view.vala +++ b/client/src/ui/conversation_selector/view.vala @@ -10,14 +10,9 @@ namespace Dino.Ui.ConversationSelector { public class View : Grid { public List conversation_list; - [GtkChild] - public SearchEntry search_entry; - - [GtkChild] - public SearchBar search_bar; - - [GtkChild] - private ScrolledWindow scrolled; + [GtkChild] public SearchEntry search_entry; + [GtkChild] public SearchBar search_bar; + [GtkChild] private ScrolledWindow scrolled; public View(StreamInteractor stream_interactor) { conversation_list = new List(stream_interactor); @@ -53,4 +48,5 @@ public class View : Grid { return false; } } + } \ No newline at end of file -- cgit v1.2.3-70-g09d2