From 4c48c5c16d5f5b010c2e5dfb1affcb59f937510c Mon Sep 17 00:00:00 2001 From: fiaxh Date: Fri, 10 Mar 2017 18:07:28 +0100 Subject: Reformat [GtkChild] --- .../conversation_summary/merged_message_item.vala | 23 ++++++---------------- .../conversation_summary/merged_status_item.vala | 1 + .../src/ui/conversation_summary/status_item.vala | 1 + client/src/ui/conversation_summary/view.vala | 8 +++----- 4 files changed, 11 insertions(+), 22 deletions(-) (limited to 'client/src/ui/conversation_summary') diff --git a/client/src/ui/conversation_summary/merged_message_item.vala b/client/src/ui/conversation_summary/merged_message_item.vala index 3647d082..4957b1a6 100644 --- a/client/src/ui/conversation_summary/merged_message_item.vala +++ b/client/src/ui/conversation_summary/merged_message_item.vala @@ -15,23 +15,12 @@ public class MergedMessageItem : Grid { public DateTime initial_time { get; private set; } public ArrayList messages = new ArrayList(Message.equals_func); - [GtkChild] - private Image image; - - [GtkChild] - private Label time_label; - - [GtkChild] - private Label name_label; - - [GtkChild] - private Image encryption_image; - - [GtkChild] - private Image received_image; - - [GtkChild] - private TextView message_text_view; + [GtkChild] private Image image; + [GtkChild] private Label time_label; + [GtkChild] private Label name_label; + [GtkChild] private Image encryption_image; + [GtkChild] private Image received_image; + [GtkChild] private TextView message_text_view; public MergedMessageItem(StreamInteractor stream_interactor, Conversation conversation, Message message) { this.conversation = conversation; diff --git a/client/src/ui/conversation_summary/merged_status_item.vala b/client/src/ui/conversation_summary/merged_status_item.vala index 78b156e9..1fe8ecf3 100644 --- a/client/src/ui/conversation_summary/merged_status_item.vala +++ b/client/src/ui/conversation_summary/merged_status_item.vala @@ -27,4 +27,5 @@ private class MergedStatusItem : Expander { } } } + } \ No newline at end of file diff --git a/client/src/ui/conversation_summary/status_item.vala b/client/src/ui/conversation_summary/status_item.vala index 5918d008..0775d8f3 100644 --- a/client/src/ui/conversation_summary/status_item.vala +++ b/client/src/ui/conversation_summary/status_item.vala @@ -26,4 +26,5 @@ private class StatusItem : Grid { show_all(); } } + } \ No newline at end of file diff --git a/client/src/ui/conversation_summary/view.vala b/client/src/ui/conversation_summary/view.vala index 59cf88aa..d2599041 100644 --- a/client/src/ui/conversation_summary/view.vala +++ b/client/src/ui/conversation_summary/view.vala @@ -13,11 +13,8 @@ public class View : Box { public Conversation? conversation { get; private set; } public HashMap message_items = new HashMap(Entities.Message.hash_func, Entities.Message.equals_func); - [GtkChild] - private ScrolledWindow scrolled; - - [GtkChild] - private Box main; + [GtkChild] private ScrolledWindow scrolled; + [GtkChild] private Box main; private StreamInteractor stream_interactor; private MergedMessageItem? last_message_item; @@ -219,4 +216,5 @@ public class View : Box { main.@foreach((widget) => { main.remove(widget); }); } } + } -- cgit v1.2.3-70-g09d2