From 14344e8bd23fde6bdd5c6ff00f83070f52b2980f Mon Sep 17 00:00:00 2001
From: Alastair Poole <netstar@gmail.com>
Date: Sat, 4 Jan 2020 12:59:03 +0000
Subject: [PATCH] Icons: Add default icons (Use Apostolos E icons).

Minor formatting and use our own icons by Apostolos.
He already created the application icon. These look fine
with flat and dark theme.
---
 AUTHORS                 |   2 +-
 data/images/go-down.png | Bin 0 -> 1470 bytes
 data/images/go-up.png   | Bin 0 -> 1580 bytes
 data/images/meson.build |   2 ++
 data/meson.build        |   1 +
 meson.build             |   1 +
 src/bin/ui.c            |  56 +++++++++++++++++++++++++++++++++-------
 7 files changed, 52 insertions(+), 10 deletions(-)
 create mode 100644 data/images/go-down.png
 create mode 100644 data/images/go-up.png
 create mode 100644 data/images/meson.build

diff --git a/AUTHORS b/AUTHORS
index 2f10215..5233598 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
 Alastair Poole <netstar@gmail.com>
 
-Icon:
+Icons:
 Apostolos Bartziokas <barz621@gmail.com>
diff --git a/data/images/go-down.png b/data/images/go-down.png
new file mode 100644
index 0000000000000000000000000000000000000000..93c36448bd999744ba92e2e5e9c22704976c87a5
GIT binary patch
literal 1470
zcmcgs`#aQm6#jh81w*DuQ$sc5md#*Ls+E$<xK<J~nv6?GnWbE2ddB0jeVKJ_OSRHs
z8e&7pHAWkn8EJFbG8CyMLd~|rq%Ee%w&NezXMfuBoO9mioadb9yyurU*U#5;6~+()
z09fViMfF!Byb@Yyb?$Zw?^gqo?dna_Qd_Flu^e@+9q)C7t)3rU3CMLzNs_v0z;S1A
z0^*KyxZ#OWfXn4lSf^sxk>T-Cl(@tbCCc4~0H7SbsV=l6{;X{LES<hq^uA#;bx*+=
zXKBE@Ls$OJDpL_9Bv#u1bxjl6VvCi2-fA(S-9^hk+=%K&@W8nc>ZxS1c5dH(@;5g*
z1JcUumL3-lKkP(9rz)s)wCHw<csWs7l(MjgE1jM;6E|$A)6{A+0rLOo>zG*EFrKj-
zF46UDKa$DLQaswX5#pZ(|F<(A%T;K-tXRz*AKPH;9U5b7l&4BVKGjVf{$Oamgi9)a
zgi2mzBy(XK*h=NQ&MjgY*Cb(Sl%XXD7?TZKr!@?h&5~1xR3^85HH47n)|*c<8q%xS
zR*x0l6EvPN7s^g&Hd`?ov?rYKdUA%<^SkNfRBUWtYiN()_xWkJH!6rmKrOruZrNH2
z*}M)OoIF?N3ES~b@8hBw^^zX`+2dH}%qh{c7mC266&O#pP4TSRoDa`94q%I{LIo;%
zk|-j)KL%33ky(l>lV-C1a_tsC`xaHF5v%9&no%LquI)L{fUapIJ!LuYnq=ge){SL9
z^ovbJIEAt97u`A`QL-E0@4uxGLK+2|E4(Md@xDxK1QEa(&Ghwk@(0n`7}60el!?3$
zi_#0iUK9&COJ;d~`vEz)EX9H#6kPYz7d2n%V%_=~s4u&6{h!vz>7OLYIXCh!Mq}DD
zLSngQDZ(ZQo3Ob>m{GNjkmxvvZ@iaWh)P`7?ijMh#wXWPz38C|Ot2JKz3<I-%?DR>
zvt}UTEkUHf$?w(o3gi0g4@^aCW74Na+y=S{vib87_)Rb-k`QXa1o>6V*dFpO0PqV?
z#Rz*q%p}h=5hs)LutsCZC;>I3+lH37hUpH-d{m*^%jHD2y>=b#)j@^J@$$SC%FZh2
zr=iZ`1qa%-VsOb?WUMf*Oh6{}CFhJ)lL6iwzV7$1r@(?T81l!BKO+L^5U4IV?QlBp
zCM(R1UZZ0)21UhId)3GW{Xa6r!v?yydCCmw$@>*QB2?9LSKn`B`zvtZ^41-64bxVq
z&wdF2kY~`tC!dh~KesK^AiPH4UQJ71Y3Hi|c}%o_nwlpvaD!DRWtLeTG_O83N3<Pi
zpMFm6C`#yjX^(Sm#x<vQEFLyoOiI}XRdaSS%D(D&)DAgin%nCG*yo*)VQ^qczgS8G
zz3jpM1BJyMy>vEI9WPModwiu#bcg<O=ggxqRO*0<{dxfRWsFBBFrVcQ^34%mZQU6!
zzH5EUlm({PMVq7Dl*lgRsjE|Ne1wwDQk|DulOVq$)$GVl;g@N*DK)o7oum_bXBO>b
zUA)TeBxe&*T+65BVU94KrJA=(z`>Zii2R3>2S;k>0>VBN+;dm|-l5as#0!&^EEu#;
zn8U{qbKUlP_d>f1S%oI;80XBp>3GigZ|v>0^iQT!UT=a?piELFvON4*8p8@pw^V9)
z39daql-hgf*JY%#UDqhYHVDI)|25jO9O-!ZT;({XOCY|0JDTfrvDCgVqG=x74@IB4
nMU-4pm^#NN>#e5zyUr|;mb7d(?L#nDbQyTN`%>#&k7oP>ZVi8a

literal 0
HcmV?d00001

diff --git a/data/images/go-up.png b/data/images/go-up.png
new file mode 100644
index 0000000000000000000000000000000000000000..899e596c669c8b5434c9b03916b930ef8b381977
GIT binary patch
literal 1580
zcmbtUX;9K>82<w*pewC`S4rt=>Z+NfrUI+!B3>P))L@FosG)7938}QEP`cjcMP;H^
zXr(S5yIF3B{qw*|lcY(p)~gH2BMK`Ia`)eto&B=Yhka+B_j#Y|o%zl0nO|PuE+1X(
zb=m*`==%9mf*{ZRVkj->?skvrhnxn>%a4YFPC6<k7mCqIz9B5Af8>k7ysWFzprkR|
zo6ZhSJitzkN{$6mQ&a8Z5C6o9j!KHPPfTW3&6C#wfM$aq#gmpMn5$;w8pPuIGDEMm
zH(f~3x?~WQd;IMFAD;iVr!+1kD9~4mWN7G89_=)xaE4rhXt;gkkm18@Jq-qqvf#M~
z=bUhQ40=>hvgvtwzdY-8G)!!tz1iZZ5-?v2ChF%&@-326ESa0C_&64eH9F?zMdX?l
zpwF9Nx4T(#lXn2G&H@hzu!?B7b)QCH@jnHc&Lo*hl-MXt$`<0sw1|>DU>~?6(z~W@
zw`&>d90_EA+K~ihNs<A9mIBC)VdIG6*~J$Ds=|@%@A59}0_2tGbc|rR_RdpH0iQWr
zT<ec1GM|iE&0GXjJS%gip3h!nQcXX1<c3;ylp`)6yszV~g9+qmlL3+8XEu%@>>fI1
zG<xvK=cr&X+asOp2BydrO>Vo_UilW}G$XeyC`;SH&Cb1k`NO9Gxf@!B9+-b8%!D!J
z#u0mKZSecYVENltO>S>=2LXrIWJeoazLCfP=+LJ#o~vwmB%23i79u=skVSOBm;}EM
z%0!rR#8$6@>wRoV+uNp%h3YB9fN9|go^~_eM1%um-v~mdKAZ+ZZEl5cy?R&!xAJ+-
z;-`z3wJo^?szMjr&Sq=TT9Bi~!)NIy;?=%%qqzpf@=*LUR9eY0W@DsTYrA;H=dv>%
z<k<7#R@6ltaX{(8C;qk?Ni}9&W1UN-{_~cFCm5w~o=`)nAhw5;&NZ8?%>8gs_zvzW
zaR#Y8>5M>rfOms0oz|Nq>!3t`xn4l6pmyUjH`DGo70m&?7n!8woHY)pLSn?y4>@s8
z`+%;_3=ta@Y1F|W_Do6dL306IiD~7E3dx%yM~4x8Tb!B^xRoV>)GgiAu2#?zvxMV|
z(c5K`mI@33%>>r?=1lXcMS%PWm{T$vOvHlc$S)EUrjP3haNNq`kx3_o9b*wjKh0Fz
z<70?U@fwHBK6fKsjnl%2J?wZ2M6xru{?QfY2bY(|TLN;XsqY~)CJ^9kX~?mcE?r&I
zOoeIiP?laR|25tn42!H{=N`7$%vFWyhS^pNHD;=<$}t4}`^6B+rOMbrGlkuz(Ez&9
zadUjk)}VPnB2{-I&w6+12rV?NKhDn7v1s>Dt$xIw7z-D;fJvCTKklip(`Ny6Xbnp+
zQokVl`M7f7)wfF6GFnF{tUt*vs{pcYFSoLD*M(^RX@$R79z*4-1c-DBU39JTNAL~#
z1w&z4k_+^1_#E8jzZWrq=vNhb)Sax`3ZM6pOd$ktvJD=-b{ZID=_w5!?q8tw@;PGL
zG8jcOsb&;3%+hb9W^B4uHgDJfNX;h+3me=)H2Am-)&p_h#9d$a#;QkukR_xYDTN49
zp-8KL3>93yUz;_d-C4k(HzE#oWA2nk^W@d1GB*tA5G6aoW!cg7;1Zb7RzQVz`1f38
z^J>UY{<Z=Hx8E^EY-1!s;N}u=Bz40yGCZkfm980G%-soc^k$s-vEW!+zPB+nB~W^>
zy&Z2(nZWG_9LHO32F^j0z7@1;J71Dq&x+9fG#p|fMs*mH)ZI~fO5ZW>gL4o>m=g2;
zx}a*{6-V53lyPf5an%0&>WFCK<m~lq7wouoxMBOa12zJArkC^a<TNV<!4YTNU9N8(
z{`G63^Pg(;KMLkc8Mhldu%nrMo_C+t$E$ya7bVM3|5CcI{Jn&v%f1h_yb<#bQg*=4
Ldl#kIEAqtOtf05^

literal 0
HcmV?d00001

diff --git a/data/images/meson.build b/data/images/meson.build
new file mode 100644
index 0000000..25530a8
--- /dev/null
+++ b/data/images/meson.build
@@ -0,0 +1,2 @@
+install_data('go-up.png', 'go-down.png',
+             install_dir: join_paths(dir_data, 'evisum/images'))
diff --git a/data/meson.build b/data/meson.build
index 8a19d38..db5bf15 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,2 +1,3 @@
 subdir('desktop')
 subdir('icons')
+subdir('images')
diff --git a/meson.build b/meson.build
index 5f6143b..05b1862 100644
--- a/meson.build
+++ b/meson.build
@@ -26,6 +26,7 @@ dir_locale = join_paths(dir_prefix, get_option('localedir'))
 ##### config.h
 
 cfg.set_quoted('PACKAGE_VERSION', meson.project_version())
+cfg.set_quoted('PACKAGE_DATA_DIR', join_paths(dir_data, 'evisum'))
 configure_file(output: 'config.h', configuration: cfg)
 
 subdir('src')
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 24bfa7d..800d0fc 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -1,3 +1,4 @@
+#include "config.h"
 #include "system.h"
 #include "process.h"
 #include "disks.h"
@@ -12,6 +13,7 @@
 
 static Eina_Lock _lock;
 
+
 void
 ui_shutdown(Ui *ui)
 {
@@ -55,7 +57,7 @@ _system_stats(void *data, Ecore_Thread *thread)
         system_stats_all_get(results);
         ecore_thread_feedback(thread, results);
 
-	// Let's wait 3/4 of a second before updating.
+        // Let's wait 3/4 of a second before updating.
         for (int i = 0; i < 3; i++)
           {
              if (ecore_thread_check(thread))
@@ -110,6 +112,42 @@ _network_transfer_format(double rate)
    return strdup(eina_slstr_printf("%.2f %s", rate, unit));
 }
 
+char *
+_path_append(const char *path, const char *file)
+{
+   char *concat;
+   int len;
+   char separator = '/';
+#ifdef WIN32
+   separator = '\\';
+#endif
+
+   len = strlen(path) + strlen(file) + 2;
+   concat = malloc(len * sizeof(char));
+   snprintf(concat, len, "%s%c%s", path, separator, file);
+
+   return concat;
+}
+
+const char *
+_icon_path_get(const char *name)
+{
+   char *path;
+   const char *icon_path, *directory = PACKAGE_DATA_DIR "/images";
+   icon_path = name;
+
+   path = _path_append(directory, eina_slstr_printf("%s.png", name));
+   if (path)
+     {
+        if (ecore_file_exists(path))
+          icon_path = eina_slstr_printf("%s", path);
+
+        free(path);
+     }
+
+   return icon_path;
+}
+
 static void
 _tab_misc_update(Ui *ui, results_t *results)
 {
@@ -132,14 +170,14 @@ _tab_misc_update(Ui *ui, results_t *results)
         evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, 0);
         evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
  
-	Eina_Strbuf *buf = eina_strbuf_new();
-	eina_strbuf_append_printf(buf, "Battery %s ", results->power.battery_names[i]);
+        Eina_Strbuf *buf = eina_strbuf_new();
+        eina_strbuf_append_printf(buf, "Battery %s ", results->power.battery_names[i]);
         if (results->power.have_ac && i == 0)
-	  eina_strbuf_append(buf, "(plugged in)");
+          eina_strbuf_append(buf, "(plugged in)");
 
         elm_object_text_set(frame, eina_strbuf_string_get(buf));
 
-	eina_strbuf_free(buf);
+        eina_strbuf_free(buf);
         evas_object_show(frame);
 
         progress = elm_progressbar_add(frame);
@@ -152,8 +190,8 @@ _tab_misc_update(Ui *ui, results_t *results)
         elm_object_content_set(frame, progress);
         elm_box_pack_end(box, frame);
 
-	free(results->power.battery_names[i]);
-	free(results->power.batteries[i]);
+        free(results->power.battery_names[i]);
+        free(results->power.batteries[i]);
      }
 
    if (results->power.batteries)
@@ -848,9 +886,9 @@ _btn_icon_state_set(Evas_Object *button, Eina_Bool reverse)
 {
    Evas_Object *icon = elm_icon_add(button);
    if (reverse)
-     elm_icon_standard_set(icon, "go-down");
+     elm_icon_standard_set(icon, _icon_path_get("go-down"));
    else
-     elm_icon_standard_set(icon, "go-up");
+     elm_icon_standard_set(icon, _icon_path_get("go-up"));
 
    elm_object_part_content_set(button, "icon", icon);
    evas_object_show(icon);