From 146af3152475f12c9b19a92c4779a53f6fc517ce Mon Sep 17 00:00:00 2001 From: fiaxh Date: Sun, 18 Sep 2022 19:44:26 +0200 Subject: Move icons out of scalable/ui/ since it's not allowed by icon naming spec --- main/CMakeLists.txt | 11 ++++---- .../dino-conversation-list-placeholder-arrow.svg | 11 ++++++++ .../scalable/actions/dino-emoticon-symbolic.svg | 4 +++ .../scalable/actions/dino-qr-code-symbolic.svg | 15 +++++++++++ .../scalable/emotes/dino-emoticon-symbolic.svg | 4 --- .../scalable/status/dino-party-popper-symbolic.svg | 29 ++++++++++++++++++++++ .../dino-conversation-list-placeholder-arrow.svg | 11 -------- .../scalable/ui/dino-party-popper-symbolic.svg | 29 ---------------------- .../icons/scalable/ui/dino-qr-code-symbolic.svg | 15 ----------- main/src/ui/main_window.vala | 2 +- 10 files changed, 65 insertions(+), 66 deletions(-) create mode 100644 main/data/dino-conversation-list-placeholder-arrow.svg create mode 100644 main/data/icons/scalable/actions/dino-emoticon-symbolic.svg create mode 100644 main/data/icons/scalable/actions/dino-qr-code-symbolic.svg delete mode 100644 main/data/icons/scalable/emotes/dino-emoticon-symbolic.svg create mode 100644 main/data/icons/scalable/status/dino-party-popper-symbolic.svg delete mode 100644 main/data/icons/scalable/ui/dino-conversation-list-placeholder-arrow.svg delete mode 100644 main/data/icons/scalable/ui/dino-party-popper-symbolic.svg delete mode 100644 main/data/icons/scalable/ui/dino-qr-code-symbolic.svg (limited to 'main') diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 6b97444d..f5796651 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -14,7 +14,11 @@ find_packages(MAIN_PACKAGES REQUIRED ) set(RESOURCE_LIST + dino-conversation-list-placeholder-arrow.svg + icons/scalable/actions/dino-account-plus-symbolic.svg + icons/scalable/actions/dino-emoticon-symbolic.svg + icons/scalable/actions/dino-qr-code-symbolic.svg icons/scalable/apps/im.dino.Dino.svg icons/scalable/apps/im.dino.Dino-symbolic.svg @@ -27,8 +31,6 @@ set(RESOURCE_LIST icons/scalable/devices/dino-phone-ring-symbolic.svg icons/scalable/devices/dino-phone-symbolic.svg - icons/scalable/emotes/dino-emoticon-symbolic.svg - icons/scalable/mimetypes/dino-file-document-symbolic.svg icons/scalable/mimetypes/dino-file-download-symbolic.svg icons/scalable/mimetypes/dino-file-image-symbolic.svg @@ -40,6 +42,7 @@ set(RESOURCE_LIST icons/scalable/status/dino-double-tick-symbolic.svg icons/scalable/status/dino-microphone-off-symbolic.svg icons/scalable/status/dino-microphone-symbolic.svg + icons/scalable/status/dino-party-popper-symbolic.svg icons/scalable/status/dino-security-high-symbolic.svg icons/scalable/status/dino-status-away.svg icons/scalable/status/dino-status-chat.svg @@ -49,10 +52,6 @@ set(RESOURCE_LIST icons/scalable/status/dino-video-off-symbolic.svg icons/scalable/status/dino-video-symbolic.svg - icons/scalable/ui/dino-conversation-list-placeholder-arrow.svg - icons/scalable/ui/dino-qr-code-symbolic.svg - icons/scalable/ui/dino-party-popper-symbolic.svg - add_conversation/add_contact_dialog.ui add_conversation/add_groupchat_dialog.ui add_conversation/conference_details_fragment.ui diff --git a/main/data/dino-conversation-list-placeholder-arrow.svg b/main/data/dino-conversation-list-placeholder-arrow.svg new file mode 100644 index 00000000..1de38347 --- /dev/null +++ b/main/data/dino-conversation-list-placeholder-arrow.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/main/data/icons/scalable/actions/dino-emoticon-symbolic.svg b/main/data/icons/scalable/actions/dino-emoticon-symbolic.svg new file mode 100644 index 00000000..5656303d --- /dev/null +++ b/main/data/icons/scalable/actions/dino-emoticon-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/main/data/icons/scalable/actions/dino-qr-code-symbolic.svg b/main/data/icons/scalable/actions/dino-qr-code-symbolic.svg new file mode 100644 index 00000000..92394eca --- /dev/null +++ b/main/data/icons/scalable/actions/dino-qr-code-symbolic.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/main/data/icons/scalable/emotes/dino-emoticon-symbolic.svg b/main/data/icons/scalable/emotes/dino-emoticon-symbolic.svg deleted file mode 100644 index 5656303d..00000000 --- a/main/data/icons/scalable/emotes/dino-emoticon-symbolic.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/main/data/icons/scalable/status/dino-party-popper-symbolic.svg b/main/data/icons/scalable/status/dino-party-popper-symbolic.svg new file mode 100644 index 00000000..084d6f1b --- /dev/null +++ b/main/data/icons/scalable/status/dino-party-popper-symbolic.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/main/data/icons/scalable/ui/dino-conversation-list-placeholder-arrow.svg b/main/data/icons/scalable/ui/dino-conversation-list-placeholder-arrow.svg deleted file mode 100644 index 1de38347..00000000 --- a/main/data/icons/scalable/ui/dino-conversation-list-placeholder-arrow.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/main/data/icons/scalable/ui/dino-party-popper-symbolic.svg b/main/data/icons/scalable/ui/dino-party-popper-symbolic.svg deleted file mode 100644 index 084d6f1b..00000000 --- a/main/data/icons/scalable/ui/dino-party-popper-symbolic.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/main/data/icons/scalable/ui/dino-qr-code-symbolic.svg b/main/data/icons/scalable/ui/dino-qr-code-symbolic.svg deleted file mode 100644 index 92394eca..00000000 --- a/main/data/icons/scalable/ui/dino-qr-code-symbolic.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/main/src/ui/main_window.vala b/main/src/ui/main_window.vala index 1f1a7688..14058a29 100644 --- a/main/src/ui/main_window.vala +++ b/main/src/ui/main_window.vala @@ -77,7 +77,7 @@ public class MainWindow : Gtk.Window { search_frame.set_child(global_search.get_widget()); Image conversation_list_placeholder_image = (Image) builder.get_object("conversation_list_placeholder_image"); - conversation_list_placeholder_image.set_from_pixbuf(new Pixbuf.from_resource("/im/dino/Dino/icons/scalable/ui/dino-conversation-list-placeholder-arrow.svg")); + conversation_list_placeholder_image.set_from_pixbuf(new Pixbuf.from_resource("/im/dino/Dino/dino-conversation-list-placeholder-arrow.svg")); } private void setup_headerbar() { -- cgit v1.2.3-54-g00ecf