From 4ed6204fc2879c52fe88caa5711dea37cd4ae201 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Fri, 21 Feb 2020 02:49:53 +0100 Subject: [PATCH] Rename folders/files conversation_summary -> conversation_content_view --- main/CMakeLists.txt | 24 +++++++++---------- .../image_toolbar.ui | 0 .../item_metadata_header.ui | 0 .../view.ui | 0 .../chat_input_controller.vala | 0 .../chat_state_populator.vala | 0 .../content_item_widget_factory.vala | 0 .../content_populator.vala | 0 .../conversation_item_skeleton.vala | 2 +- .../conversation_view.vala | 2 +- .../date_separator_populator.vala | 0 .../file_widget.vala | 2 +- .../message_item.vala | 0 .../subscription_notification.vala | 0 14 files changed, 15 insertions(+), 15 deletions(-) rename main/data/{conversation_summary => conversation_content_view}/image_toolbar.ui (100%) rename main/data/{conversation_summary => conversation_content_view}/item_metadata_header.ui (100%) rename main/data/{conversation_summary => conversation_content_view}/view.ui (100%) rename main/src/ui/{ => chat_input}/chat_input_controller.vala (100%) rename main/src/ui/{conversation_summary => conversation_content_view}/chat_state_populator.vala (100%) rename main/src/ui/{conversation_summary => conversation_content_view}/content_item_widget_factory.vala (100%) rename main/src/ui/{conversation_summary => conversation_content_view}/content_populator.vala (100%) rename main/src/ui/{conversation_summary => conversation_content_view}/conversation_item_skeleton.vala (99%) rename main/src/ui/{conversation_summary => conversation_content_view}/conversation_view.vala (99%) rename main/src/ui/{conversation_summary => conversation_content_view}/date_separator_populator.vala (100%) rename main/src/ui/{conversation_summary => conversation_content_view}/file_widget.vala (99%) rename main/src/ui/{conversation_summary => conversation_content_view}/message_item.vala (100%) rename main/src/ui/{conversation_summary => conversation_content_view}/subscription_notification.vala (100%) diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 61fbc374..c6d92fa4 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -48,9 +48,9 @@ set(RESOURCE_LIST global_search.ui conversation_selector/chat_row_tooltip.ui conversation_selector/conversation_row.ui - conversation_summary/image_toolbar.ui - conversation_summary/item_metadata_header.ui - conversation_summary/view.ui + conversation_content_view/image_toolbar.ui + conversation_content_view/item_metadata_header.ui + conversation_content_view/view.ui manage_accounts/account_row.ui manage_accounts/add_account_dialog.ui manage_accounts/dialog.ui @@ -95,7 +95,6 @@ SOURCES src/ui/application.vala src/ui/avatar_drawer.vala src/ui/avatar_image.vala - src/ui/chat_input_controller.vala src/ui/conversation_list_titlebar.vala src/ui/conversation_view.vala src/ui/conversation_view_controller.vala @@ -115,6 +114,7 @@ SOURCES src/ui/add_conversation/select_contact_dialog.vala src/ui/add_conversation/select_jid_fragment.vala + src/ui/chat_input/chat_input_controller.vala src/ui/chat_input/edit_history.vala src/ui/chat_input/encryption_button.vala src/ui/chat_input/occupants_tab_completer.vala @@ -129,14 +129,14 @@ SOURCES src/ui/conversation_selector/conversation_selector_row.vala src/ui/conversation_selector/conversation_selector.vala - src/ui/conversation_summary/chat_state_populator.vala - src/ui/conversation_summary/content_item_widget_factory.vala - src/ui/conversation_summary/content_populator.vala - src/ui/conversation_summary/conversation_item_skeleton.vala - src/ui/conversation_summary/conversation_view.vala - src/ui/conversation_summary/date_separator_populator.vala - src/ui/conversation_summary/file_widget.vala - src/ui/conversation_summary/subscription_notification.vala + src/ui/conversation_content_view/chat_state_populator.vala + src/ui/conversation_content_view/content_item_widget_factory.vala + src/ui/conversation_content_view/content_populator.vala + src/ui/conversation_content_view/conversation_item_skeleton.vala + src/ui/conversation_content_view/conversation_view.vala + src/ui/conversation_content_view/date_separator_populator.vala + src/ui/conversation_content_view/file_widget.vala + src/ui/conversation_content_view/subscription_notification.vala src/ui/conversation_titlebar/menu_entry.vala src/ui/conversation_titlebar/occupants_entry.vala diff --git a/main/data/conversation_summary/image_toolbar.ui b/main/data/conversation_content_view/image_toolbar.ui similarity index 100% rename from main/data/conversation_summary/image_toolbar.ui rename to main/data/conversation_content_view/image_toolbar.ui diff --git a/main/data/conversation_summary/item_metadata_header.ui b/main/data/conversation_content_view/item_metadata_header.ui similarity index 100% rename from main/data/conversation_summary/item_metadata_header.ui rename to main/data/conversation_content_view/item_metadata_header.ui diff --git a/main/data/conversation_summary/view.ui b/main/data/conversation_content_view/view.ui similarity index 100% rename from main/data/conversation_summary/view.ui rename to main/data/conversation_content_view/view.ui diff --git a/main/src/ui/chat_input_controller.vala b/main/src/ui/chat_input/chat_input_controller.vala similarity index 100% rename from main/src/ui/chat_input_controller.vala rename to main/src/ui/chat_input/chat_input_controller.vala diff --git a/main/src/ui/conversation_summary/chat_state_populator.vala b/main/src/ui/conversation_content_view/chat_state_populator.vala similarity index 100% rename from main/src/ui/conversation_summary/chat_state_populator.vala rename to main/src/ui/conversation_content_view/chat_state_populator.vala diff --git a/main/src/ui/conversation_summary/content_item_widget_factory.vala b/main/src/ui/conversation_content_view/content_item_widget_factory.vala similarity index 100% rename from main/src/ui/conversation_summary/content_item_widget_factory.vala rename to main/src/ui/conversation_content_view/content_item_widget_factory.vala diff --git a/main/src/ui/conversation_summary/content_populator.vala b/main/src/ui/conversation_content_view/content_populator.vala similarity index 100% rename from main/src/ui/conversation_summary/content_populator.vala rename to main/src/ui/conversation_content_view/content_populator.vala diff --git a/main/src/ui/conversation_summary/conversation_item_skeleton.vala b/main/src/ui/conversation_content_view/conversation_item_skeleton.vala similarity index 99% rename from main/src/ui/conversation_summary/conversation_item_skeleton.vala rename to main/src/ui/conversation_content_view/conversation_item_skeleton.vala index 40816493..dbba2276 100644 --- a/main/src/ui/conversation_summary/conversation_item_skeleton.vala +++ b/main/src/ui/conversation_content_view/conversation_item_skeleton.vala @@ -94,7 +94,7 @@ public class ConversationItemSkeleton : EventBox { } } -[GtkTemplate (ui = "/im/dino/Dino/conversation_summary/item_metadata_header.ui")] +[GtkTemplate (ui = "/im/dino/Dino/conversation_content_view/item_metadata_header.ui")] public class ItemMetaDataHeader : Box { [GtkChild] public Label name_label; [GtkChild] public Label dot_label; diff --git a/main/src/ui/conversation_summary/conversation_view.vala b/main/src/ui/conversation_content_view/conversation_view.vala similarity index 99% rename from main/src/ui/conversation_summary/conversation_view.vala rename to main/src/ui/conversation_content_view/conversation_view.vala index 6b3f0f8a..6c286fc0 100644 --- a/main/src/ui/conversation_summary/conversation_view.vala +++ b/main/src/ui/conversation_content_view/conversation_view.vala @@ -6,7 +6,7 @@ using Dino.Entities; namespace Dino.Ui.ConversationSummary { -[GtkTemplate (ui = "/im/dino/Dino/conversation_summary/view.ui")] +[GtkTemplate (ui = "/im/dino/Dino/conversation_content_view/view.ui")] public class ConversationView : Box, Plugins.ConversationItemCollection, Plugins.NotificationCollection { public Conversation? conversation { get; private set; } diff --git a/main/src/ui/conversation_summary/date_separator_populator.vala b/main/src/ui/conversation_content_view/date_separator_populator.vala similarity index 100% rename from main/src/ui/conversation_summary/date_separator_populator.vala rename to main/src/ui/conversation_content_view/date_separator_populator.vala diff --git a/main/src/ui/conversation_summary/file_widget.vala b/main/src/ui/conversation_content_view/file_widget.vala similarity index 99% rename from main/src/ui/conversation_summary/file_widget.vala rename to main/src/ui/conversation_content_view/file_widget.vala index 91b8912b..dd28b385 100644 --- a/main/src/ui/conversation_summary/file_widget.vala +++ b/main/src/ui/conversation_content_view/file_widget.vala @@ -90,7 +90,7 @@ public class FileWidget : Box { Util.force_css(image, "* { box-shadow: 0px 0px 2px 0px rgba(0,0,0,0.1); margin: 2px; border-radius: 3px; }"); - Builder builder = new Builder.from_resource("/im/dino/Dino/conversation_summary/image_toolbar.ui"); + Builder builder = new Builder.from_resource("/im/dino/Dino/conversation_content_view/image_toolbar.ui"); Widget toolbar = builder.get_object("main") as Widget; Util.force_background(toolbar, "rgba(0, 0, 0, 0.5)"); Util.force_css(toolbar, "* { padding: 3px; border-radius: 3px; }"); diff --git a/main/src/ui/conversation_summary/message_item.vala b/main/src/ui/conversation_content_view/message_item.vala similarity index 100% rename from main/src/ui/conversation_summary/message_item.vala rename to main/src/ui/conversation_content_view/message_item.vala diff --git a/main/src/ui/conversation_summary/subscription_notification.vala b/main/src/ui/conversation_content_view/subscription_notification.vala similarity index 100% rename from main/src/ui/conversation_summary/subscription_notification.vala rename to main/src/ui/conversation_content_view/subscription_notification.vala