From 4faee9f08dca187b04a6f5719fe766a3b4375460 Mon Sep 17 00:00:00 2001
From: fiaxh <git@mx.ax.lt>
Date: Wed, 15 Mar 2017 00:36:56 +0100
Subject: Set dino-specific icons as part of icon theme

---
 main/src/ui/application.vala                              |  1 +
 main/src/ui/conversation_selector/chat_row.vala           | 11 ++++-------
 main/src/ui/conversation_summary/merged_message_item.vala |  4 ++--
 main/src/ui/util.vala                                     |  1 +
 4 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'main/src/ui')

diff --git a/main/src/ui/application.vala b/main/src/ui/application.vala
index 8dbe176b..66fc0fd0 100644
--- a/main/src/ui/application.vala
+++ b/main/src/ui/application.vala
@@ -16,6 +16,7 @@ public class Dino.Ui.Application : Dino.Application {
         notifications = new Notifications(stream_interaction);
         notifications.start();
         Environment.set_application_name("Dino");
+        IconTheme.get_default().add_resource_path("/org/dino-im/icons");
     }
 
     public override void activate() {
diff --git a/main/src/ui/conversation_selector/chat_row.vala b/main/src/ui/conversation_selector/chat_row.vala
index 8b36b333..96f6921d 100644
--- a/main/src/ui/conversation_selector/chat_row.vala
+++ b/main/src/ui/conversation_selector/chat_row.vala
@@ -61,18 +61,15 @@ public class ChatRow : ConversationRow {
 
                 Show show = PresenceManager.get_instance(stream_interactor).get_last_show(full_jids[i], conversation.account);
                 Image image = new Image();
-                Pixbuf pixbuf;
-                int icon_size = 13 * image.scale_factor;
                 if (show.as == Show.AWAY) {
-                    pixbuf = new Pixbuf.from_resource_at_scale("/org/dino-im/img/status_away.svg", icon_size, icon_size, true);
+                    image.set_from_icon_name("dino-status-away", IconSize.SMALL_TOOLBAR);
                 } else if (show.as == Show.XA || show.as == Show.DND) {
-                    pixbuf = new Pixbuf.from_resource_at_scale("/org/dino-im/img/status_dnd.svg", icon_size, icon_size, true);
+                    image.set_from_icon_name("dino-status-dnd", IconSize.SMALL_TOOLBAR);
                 } else if (show.as == Show.CHAT) {
-                    pixbuf = new Pixbuf.from_resource_at_scale("/org/dino-im/img/status_chat.svg", icon_size, icon_size, true);
+                    image.set_from_icon_name("dino-status-chat", IconSize.SMALL_TOOLBAR);
                 } else {
-                    pixbuf = new Pixbuf.from_resource_at_scale("/org/dino-im/img/status_online.svg", icon_size, icon_size, true);
+                    image.set_from_icon_name("dino-status-online", IconSize.SMALL_TOOLBAR);
                 }
-                Util.image_set_from_scaled_pixbuf(image, pixbuf);
                 box.add(image);
 
                 Label resource = new Label(full_jids[i].resourcepart);
diff --git a/main/src/ui/conversation_summary/merged_message_item.vala b/main/src/ui/conversation_summary/merged_message_item.vala
index 695bf589..190be50a 100644
--- a/main/src/ui/conversation_summary/merged_message_item.vala
+++ b/main/src/ui/conversation_summary/merged_message_item.vala
@@ -94,10 +94,10 @@ public class MergedMessageItem : Grid {
         }
         if (all_read) {
             received_image.visible = true;
-            received_image.set_from_resource("/org/dino-im/img/double_tick.svg");
+            received_image.set_from_icon_name("dino-double-tick-symbolic", IconSize.SMALL_TOOLBAR);
         } else if (all_received) {
             received_image.visible = true;
-            received_image.set_from_resource("/org/dino-im/img/tick.svg");
+            received_image.set_from_icon_name("dino-tick-symbolic", IconSize.SMALL_TOOLBAR);
         } else if (received_image.visible) {
             received_image.set_from_icon_name("image-loading-symbolic", IconSize.SMALL_TOOLBAR);
         }
diff --git a/main/src/ui/util.vala b/main/src/ui/util.vala
index ec09609a..34df82d8 100644
--- a/main/src/ui/util.vala
+++ b/main/src/ui/util.vala
@@ -9,6 +9,7 @@ public class Util : Object {
 
     private const string[] tango_colors_light = {"FCE94F", "FCAF3E", "E9B96E", "8AE234", "729FCF", "AD7FA8", "EF2929"};
     private const string[] tango_colors_medium = {"EDD400", "F57900", "C17D11", "73D216", "3465A4", "75507B", "CC0000"};
+    private const string[] material_colors_800 = {"D32F2F", "C2185B", "7B1FA2", "512DA8", "303F9F", "1976D2", "0288D1", "0097A7", "00796B", "388E3C", "689F38", "AFB42B", "FFA000", "F57C00", "E64A19", "5D4037"};
     private const string[] material_colors_500 = {"F44336", "E91E63", "9C27B0", "673AB7", "3f51B5", "2196F3", "03A9f4", "00BCD4", "009688", "4CAF50", "8BC34a", "CDDC39", "FFC107", "FF9800", "FF5722", "795548"};
     private const string[] material_colors_300 = {"E57373", "F06292", "BA68C8", "9575CD", "7986CB", "64B5F6", "4FC3F7", "4DD0E1", "4DB6AC", "81C784", "AED581", "DCE775", "FFD54F", "FFB74D", "FF8A65", "A1887F"};
     private const string[] material_colors_200 = {"EF9A9A", "F48FB1", "CE93D8", "B39DDB", "9FA8DA", "90CAF9", "81D4FA", "80DEEA", "80CBC4", "A5D6A7", "C5E1A5", "E6EE9C", "FFE082", "FFCC80", "FFAB91", "BCAAA4"};
-- 
cgit v1.2.3-70-g09d2