From 9c4b8025282487a94aaae2210d96b8e7ced5377d Mon Sep 17 00:00:00 2001
From: Horst3180 <horst3180@users.noreply.github.com>
Date: Tue, 30 Aug 2016 23:58:13 +0200
Subject: [PATCH] underp gtk2 render-assets script

---
 common/gtk-2.0/assets/menubar_button.png      | Bin 164 -> 156 bytes
 .../gtk-2.0/menubar-toolbar/button-active.png | Bin 309 -> 271 bytes
 .../gtk-2.0/menubar-toolbar/button-hover.png  | Bin 317 -> 262 bytes
 .../menubar-toolbar/button-insensitive.png    | Bin 304 -> 260 bytes
 common/gtk-2.0/menubar-toolbar/button.png     | Bin 313 -> 260 bytes
 .../gtk-2.0/menubar-toolbar/menubar-dark.png  | Bin 183 -> 165 bytes
 common/gtk-2.0/menubar-toolbar/menubar.png    | Bin 183 -> 165 bytes
 .../menubar-toolbar/menubar_button-dark.png   | Bin 164 -> 156 bytes
 .../menubar-toolbar/menubar_button.png        | Bin 164 -> 156 bytes
 common/gtk-2.0/render-assets.sh               |  39 +++++++++++++++++-
 common/gtk-2.0/render-dark-assets.sh          |  23 -----------
 11 files changed, 38 insertions(+), 24 deletions(-)
 delete mode 100755 common/gtk-2.0/render-dark-assets.sh

diff --git a/common/gtk-2.0/assets/menubar_button.png b/common/gtk-2.0/assets/menubar_button.png
index f6d3b895c472889d3622feb24ea89e9771caaad8..70c8f86992ed0b4aa84de859ce16206ed6d5b764 100644
GIT binary patch
delta 54
zcmZ3&IEQgUu0C^sPl#*Klt+`Zx&0Uz7`Q!M978x{lNZPVIo=G6-wmv$0a*;5u6{1-
HoD!M<p8^hU

delta 62
zcmbQkxP);+t~pzPPl)S{TMz#K|L@nQ9?!tQAmHiZ7{Vc&oWRid>;HdEb%t{$O4nD{
Sdh`S37(8A5T-G@yGywnx4i|C&

diff --git a/common/gtk-2.0/menubar-toolbar/button-active.png b/common/gtk-2.0/menubar-toolbar/button-active.png
index 29cd827afb84cda1135fd0dc88dd4964a77b2368..ad0dd367b966577d233ea39385908642eb80fa8a 100644
GIT binary patch
delta 198
zcmdnW)Xy|QLV|^vfq_A6&4+J5in-XyGlYYK<Mu=U2NMl#>kR^YLR^93nwnM`8WtMb
zrW!it>e^-++Gd)%mfE`3+CWmzO3&CHC;}rL4yxW&2kPM~3GxeOkXP8Xd(Yne`wtxW
z@$;u3->Ed9jJc<aV~9j}aza-nJF`2B#EobF+8d?$cx=8u+;g8@;>SPb1I>cRoOwBw
ouWc>3SIW%hCSSoJC&s{V_p#`P+Z~UZfo3pxy85}Sb4q9e02baqM*si-

delta 236
zcmV<I02BX@0<{8=7#Ro#0002wg6+is000DYLP=Bz2nYy#2xN$nFg<^=Nkl<ZNQv#$
zu?@mN429v}v2(0J$p}P(l1YHA!ZIMi2&vg3+~smK2?&YukSOj|mJ5G!^#owGS}&81
zt-uy=<cUY*EKv_#cfA_`I-aajRp$W7<RqdWEb7n#JDawf3CZ;hAWoe%u@3?;LoVMZ
zAJ}4^svlhcngSK5Km|xDP=Wpdnj6+bB5#!gqz6-V8$g0f48gRnn|xUE!TTGe@Pew*
m_EBOR`yr3<#)6FX5#R}z{V`%>8D1~|0000<MNUMnLSTZ`IASvZ

diff --git a/common/gtk-2.0/menubar-toolbar/button-hover.png b/common/gtk-2.0/menubar-toolbar/button-hover.png
index b8a6e0e85d12f5a6470587ae6185fda78627360e..ec020de75a2d0af56e69cdbe856c07fafac2662b 100644
GIT binary patch
delta 189
zcmdnX)W$SHLV|^vfq_A6&4+J5in-XyGlYYK<Mu=U2NMl#>$L)WLR^93nub;y1{T`-
zRyul?+F)ek;A7+9Yvbq-;rfTB285;gKDO!us^%^U@(X5=SJ<_C&)x?Q9{fCTRU#WG
zZ0_me7$Om#oX~ZPm)V;|;>NQ(t&PHbJTd7H_gHgF?0BzqpiS_YGcV^gIg9r@7?~G~
fOWCl9b2BigetBnl|7(#V&<qAoS3j3^P6<r_$!9zZ

delta 244
zcmV<Q01N+y0=)u|7#Ro#0002wg6+is000DYLP=Bz2nYy#2xN$nFg<^|Nkl<ZNQv#%
zs}90I5QX7?x=lSPG@u|MBuFFzBu@goRe2a7!6Hd;RW#{^>LzqBE2>Z{5PRfgGM^Z8
z1Yo&Z&rByNumvLAq!qY)j2s^KTNVPCPELb3na9H<5)mhgszz0jFPgecfn8|l8<z-x
zh!Bs)(|27?00KLAiu6!1>??xbtM1|<4|&K#9`evXL9MDfKW=Zfedt;hdFB#RRjT5Z
uA#w%?0Xif5rY=)kB%IYPM4ny15#S58ayo!nvLh7$0000<MNUMnLSTY-`dsG#

diff --git a/common/gtk-2.0/menubar-toolbar/button-insensitive.png b/common/gtk-2.0/menubar-toolbar/button-insensitive.png
index fc776f1fb6a08fcc1101f687eb6c7c12da3bb4a0..a96be6ede0f809357f6b43fc9f38b600766dc21f 100644
GIT binary patch
delta 187
zcmdnM)WS4DLV|^vfq_A6&4+J5in-XyGlYYK<Mu=U2NMl#>$L)WLR^93hK5cC77hj`
zAf#{NU}$P@X60dS?O|YI4-~O=3bX?v=fHx^2lfF~bCm@71vAJi?ApC&?}G<FSxV&+
zfTCueE{-7*;mHYIF|5qNED|@W-W@u?$<B6ebHTm0oIEk*f(ZvX9xrTT(N>z$Cv9L*
gb;wzwU=ssF<h$3^&67flfJQKQy85}Sb4q9e03wV#od5s;

delta 231
zcmV<D02u#-0<Z#*7#Ro#0002wg6+is000DYLP=Bz2nYy#2xN$nFg<^*Nkl<ZNQv#%
zF$%&!6oldbEn$}&!Ae2wEiDvmJc)X%cojiCKzh5JV)KH_voOI6tYEQIPBC9Q0<hlf
z7xtnNYzN}W5*tA7lH93nuU!Qo$u1$(%Mfah<Y6$pYFw%I4RELc%-Ci{00exf=c;iA
z;KnvDGFdWif1%%}Km|i8P=N|mpg)3a!19lqjoTAs$U`-DSuq3cV+V2rr~q7YN7cUh
h9Eq%V>nX{d0p43lJJ_-IS%3fl002ovPDHLkV1jGxU%3DP

diff --git a/common/gtk-2.0/menubar-toolbar/button.png b/common/gtk-2.0/menubar-toolbar/button.png
index 5105fda82bc8fc64504bf45e0edb5796789a0610..102c97fa53b8f1ca60f8f0883a3abcb556696290 100644
GIT binary patch
delta 187
zcmdnV)WS4DLV|^vfq_A6&4+J5in-XyGlYYK<Mu=U2NMl#>$L)WLR^93nub;y1{T`-
zRyul?+F)dE?QU-E0bx6PhC6#kxOhddm;O2nRLxZq<QL2!udr+Pp1ltq{A4MWO8|<R
zdAc};NQ5URbj7eT2eU}r*!BL<fiiZsb9)Q!&E@2YDHlvQ$nkh#8%wt7ob7iT8ZQdV
dNi<DnWzc1Lt(Eiom><vx22WQ%mvv4FO#lZ)JLLcX

delta 240
zcmV<M01y9!0=WW^7#Ro#0002wg6+is000DYLP=Bz2nYy#2xN$nFg<^^Nkl<ZNQv#%
zF$%&!6oldbnUE?bSXwEFU}<Tgr6*Bu6%V6=t)*a>6Bss|CSab03+4bTSnQNj%-4<p
zES9Tj)JXwsfCN8j1<tQX_V?Shi~*ufj_EL;rCFYch!;gw6Kkq@Q=0<V#;#xcL;ysD
zG#gE9ZN>lt*Ly|2*k??;5B)p=3Q&Lo6rce86V$4z_i;Db_MwY4Rp}E`RjhfIh@1do
qfG(0<Q=7sa32%1`kw-V+0PqG4BssH@o0?Vt0000<MNUMnLSTaTd|)&H

diff --git a/common/gtk-2.0/menubar-toolbar/menubar-dark.png b/common/gtk-2.0/menubar-toolbar/menubar-dark.png
index 4a4222a29ea77dee1c3d8949ec841b0dae3cdf97..e69ee018414730c282643eb744020e442b97917e 100644
GIT binary patch
delta 91
zcmdnaxRh~%gajiq0|SH61g&Zy#a!&<8N$KAar>eFgNcT=7Hk1NA+BngM*1f9cWnNy
t0jd!6ba4#fh)(`<{=k7F1_lx=41GTtZEgR>ECfn2c)I$ztaD0e0sxAg8>;{S

delta 109
zcmZ3=xSer=gd_(W0|Ns`+ztyM#Zv6#8NvYsH5@4&6Af%VO*~y3Lp(Z@ub6NAf8N3Q
zfQ$EGcU_6C30Il|x!q70E|CX5{e7K2D~f?3_8`llib5}Lpn(jYu6{1-oD!M<7N{ge

diff --git a/common/gtk-2.0/menubar-toolbar/menubar.png b/common/gtk-2.0/menubar-toolbar/menubar.png
index ff499522d754f1fab68fd2d96ebf4c04171e7858..1a65249426a8ea0dcded10498e1cf75f2c17b74c 100644
GIT binary patch
delta 91
zcmdnaxRh~%gajiq0|SH61g&Zy#a!&<8N$KAar>eFgNcT=7Hk1NA+FbN+<pGy^(j-A
ttw0rmo-U3d9MQ>t&L22%#K1s;g`w{!qpj_~n1w(|22WQ%mvv4FO#m@f9|Zsa

delta 109
zcmZ3=xSer=gd_(W0|Ns`+ztyM#Zv6#8NvYsH5@4&6Af%VO*~y3Lp(Z@YyLg@TF)lM
zq!uM*mvwLj>teB<C<7FR@+qci{PK1euP`y}v}QY7xaM0E&_D)HS3j3^P6<r_$d)4!

diff --git a/common/gtk-2.0/menubar-toolbar/menubar_button-dark.png b/common/gtk-2.0/menubar-toolbar/menubar_button-dark.png
index 717575ad8f2f23ef51b11c7df620dfebeee451ab..70c8f86992ed0b4aa84de859ce16206ed6d5b764 100644
GIT binary patch
delta 82
zcmZ3&IEQh9gajiq0|SHhif_w+6mzkYX9x!e$L)vy4<;Jg>N5xUgt!Jxc{Dkj+Yczs
i?djqe!XcZyKn}?9W?=koU^NZMV(@hJb6Mw<&;$UNO%?k9

delta 90
zcmbQkxP)<ngd_(W0|SF#TFO%(#Zv6#8NvYsH5@4&6Af(56g^!WLo9led1ifjVb9#l
rD7;ozVr$BkNrB#Ox{_O2_!$_E8!|m*;5s4+)Xm`O>gTe~DWM4fCYKn~

diff --git a/common/gtk-2.0/menubar-toolbar/menubar_button.png b/common/gtk-2.0/menubar-toolbar/menubar_button.png
index 717575ad8f2f23ef51b11c7df620dfebeee451ab..70c8f86992ed0b4aa84de859ce16206ed6d5b764 100644
GIT binary patch
delta 82
zcmZ3&IEQh9gajiq0|SHhif_w+6mzkYX9x!e$L)vy4<;Jg>N5xUgt!Jxc{Dkj+Yczs
i?djqe!XcZyKn}?9W?=koU^NZMV(@hJb6Mw<&;$UNO%?k9

delta 90
zcmbQkxP)<ngd_(W0|SF#TFO%(#Zv6#8NvYsH5@4&6Af(56g^!WLo9led1ifjVb9#l
rD7;ozVr$BkNrB#Ox{_O2_!$_E8!|m*;5s4+)Xm`O>gTe~DWM4fCYKn~

diff --git a/common/gtk-2.0/render-assets.sh b/common/gtk-2.0/render-assets.sh
index 43861c7..71114bf 100755
--- a/common/gtk-2.0/render-assets.sh
+++ b/common/gtk-2.0/render-assets.sh
@@ -5,10 +5,15 @@ OPTIPNG="/usr/bin/optipng"
 
 SRC_FILE="assets.svg"
 ASSETS_DIR="assets"
+
+DARK_SRC_FILE="assets-dark.svg"
+DARK_ASSETS_DIR="assets-dark"
+
 INDEX="assets.txt"
 
 for i in `cat $INDEX`
-do 
+do
+
 if [ -f $ASSETS_DIR/$i.png ]; then
     echo $ASSETS_DIR/$i.png exists.
 else
@@ -19,5 +24,37 @@ else
               --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null \
     && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png 
 fi
+
+if [ -f $DARK_ASSETS_DIR/$i.png ]; then
+    echo $DARK_ASSETS_DIR/$i.png exists.
+else
+    echo
+    echo Rendering $DARK_ASSETS_DIR/$i.png
+    $INKSCAPE --export-id=$i \
+              --export-id-only \
+              --export-png=$DARK_ASSETS_DIR/$i.png $DARK_SRC_FILE >/dev/null \
+    && $OPTIPNG -o7 --quiet $DARK_ASSETS_DIR/$i.png 
+fi
 done
+
+cp $ASSETS_DIR/entry-toolbar.png menubar-toolbar/entry-toolbar.png
+cp $ASSETS_DIR/entry-active-toolbar.png menubar-toolbar/entry-active-toolbar.png
+cp $ASSETS_DIR/entry-disabled-toolbar.png menubar-toolbar/entry-disabled-toolbar.png
+
+cp $ASSETS_DIR/menubar.png menubar-toolbar/menubar.png
+cp $ASSETS_DIR/menubar_button.png menubar-toolbar/menubar_button.png
+
+
+cp $DARK_ASSETS_DIR/button.png menubar-toolbar/button.png
+cp $DARK_ASSETS_DIR/button-hover.png menubar-toolbar/button-hover.png
+cp $DARK_ASSETS_DIR/button-active.png menubar-toolbar/button-active.png
+cp $DARK_ASSETS_DIR/button-insensitive.png menubar-toolbar/button-insensitive.png
+
+cp $DARK_ASSETS_DIR/entry-toolbar.png menubar-toolbar/entry-toolbar-dark.png
+cp $DARK_ASSETS_DIR/entry-active-toolbar.png menubar-toolbar/entry-active-toolbar-dark.png
+cp $DARK_ASSETS_DIR/entry-disabled-toolbar.png menubar-toolbar/entry-disabled-toolbar-dark.png
+
+cp $DARK_ASSETS_DIR/menubar.png menubar-toolbar/menubar-dark.png
+cp $DARK_ASSETS_DIR/menubar_button.png menubar-toolbar/menubar_button-dark.png
+
 exit 0
diff --git a/common/gtk-2.0/render-dark-assets.sh b/common/gtk-2.0/render-dark-assets.sh
deleted file mode 100755
index fd2c80b..0000000
--- a/common/gtk-2.0/render-dark-assets.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="/usr/bin/inkscape"
-OPTIPNG="/usr/bin/optipng"
-
-SRC_FILE="assets-dark.svg"
-ASSETS_DIR="assets-dark"
-INDEX="assets.txt"
-
-for i in `cat $INDEX`
-do 
-if [ -f $ASSETS_DIR/$i.png ]; then
-    echo $ASSETS_DIR/$i.png exists.
-else
-    echo
-    echo Rendering $ASSETS_DIR/$i.png
-    $INKSCAPE --export-id=$i \
-              --export-id-only \
-              --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null \
-    && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png 
-fi
-done
-exit 0