From bdd7fcc5f6b187cd733020122d209a7de9d5d7a7 Mon Sep 17 00:00:00 2001
From: cvh <namerp@googlemail.com>
Date: Mon, 19 Sep 2016 13:07:52 +0200
Subject: [PATCH] kodi-theme-Estuary: change config position

---
 .../mediacenter/kodi-theme-Estuary/package.mk   |   2 +-
 ...-0001-add_le_settings_to_settingscreen.patch |  15 +++++++++++++++
 ...ary-0001-add_oe_settings_to_homescreen.patch |  16 ----------------
 .../sources/media/icons/home/libreelec.png      | Bin 724 -> 0 bytes
 .../sources/media/icons/settings/libreelec.png  | Bin 0 -> 2313 bytes
 5 files changed, 16 insertions(+), 17 deletions(-)
 create mode 100644 packages/mediacenter/kodi-theme-Estuary/patches/kodi-theme-Estuary-0001-add_le_settings_to_settingscreen.patch
 delete mode 100644 packages/mediacenter/kodi-theme-Estuary/patches/kodi-theme-Estuary-0001-add_oe_settings_to_homescreen.patch
 delete mode 100644 packages/mediacenter/kodi-theme-Estuary/sources/media/icons/home/libreelec.png
 create mode 100644 packages/mediacenter/kodi-theme-Estuary/sources/media/icons/settings/libreelec.png

diff --git a/packages/mediacenter/kodi-theme-Estuary/package.mk b/packages/mediacenter/kodi-theme-Estuary/package.mk
index c47f90e3b6..c218bbd885 100644
--- a/packages/mediacenter/kodi-theme-Estuary/package.mk
+++ b/packages/mediacenter/kodi-theme-Estuary/package.mk
@@ -59,5 +59,5 @@ makeinstall_target() {
     done
 
 # Rebrand
-  sed -e "s,@DISTRONAME@,$DISTRONAME,g" -i $INSTALL/usr/share/kodi/addons/skin.estuary/1080i/Home.xml
+  sed -e "s,@DISTRONAME@,$DISTRONAME,g" -i $INSTALL/usr/share/kodi/addons/skin.estuary/1080i/Settings.xml
 }
diff --git a/packages/mediacenter/kodi-theme-Estuary/patches/kodi-theme-Estuary-0001-add_le_settings_to_settingscreen.patch b/packages/mediacenter/kodi-theme-Estuary/patches/kodi-theme-Estuary-0001-add_le_settings_to_settingscreen.patch
new file mode 100644
index 0000000000..7d094a5436
--- /dev/null
+++ b/packages/mediacenter/kodi-theme-Estuary/patches/kodi-theme-Estuary-0001-add_le_settings_to_settingscreen.patch
@@ -0,0 +1,15 @@
+diff --git a/1080i/Settings.xml b/1080i/Settings.xml
+--- a/1080i/Settings.xml
++++ b/1080i/Settings.xml
+@@ -134,6 +134,11 @@
+ 					<icon>icons/settings/system.png</icon>
+ 				</item>
+ 				<item>
++					<label>@DISTRONAME@</label>
++					<onclick>RunAddon(service.libreelec.settings)</onclick>
++					<icon>icons/settings/libreelec.png</icon>
++				</item>
++				<item>
+ 					<label>$LOCALIZE[138]</label>
+ 					<onclick>ActivateWindow(systeminfo)</onclick>
+ 					<icon>icons/settings/sysinfo.png</icon>
diff --git a/packages/mediacenter/kodi-theme-Estuary/patches/kodi-theme-Estuary-0001-add_oe_settings_to_homescreen.patch b/packages/mediacenter/kodi-theme-Estuary/patches/kodi-theme-Estuary-0001-add_oe_settings_to_homescreen.patch
deleted file mode 100644
index c2806c96d5..0000000000
--- a/packages/mediacenter/kodi-theme-Estuary/patches/kodi-theme-Estuary-0001-add_oe_settings_to_homescreen.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur a/1080i/Home.xml b/1080i/Home.xml
---- a/1080i/Home.xml	2016-03-29 23:29:42.616607010 +0100
-+++ b/1080i/Home.xml	2016-03-29 23:30:49.205150336 +0100
-@@ -1090,6 +1090,12 @@
- 								<property name="id">weather</property>
- 								<visible>!Skin.HasSetting(HomeMenuNoWeatherButton)</visible>
- 							</item>
-+							<item>
-+								<label>@DISTRONAME@</label>
-+								<onclick>RunAddon(service.libreelec.settings)</onclick>
-+								<thumb>icons/home/libreelec.png</thumb>
-+								<property name="id">libreelec</property>
-+							</item>
- 						</content>
- 					</control>
- 				</control>
diff --git a/packages/mediacenter/kodi-theme-Estuary/sources/media/icons/home/libreelec.png b/packages/mediacenter/kodi-theme-Estuary/sources/media/icons/home/libreelec.png
deleted file mode 100644
index 458b87fefd89d629a5daf32e5732b7ead0ed4fba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 724
zcmeAS@N?(olHy`uVBq!ia0y~yU~mIr4i*LmhTG~|{0s~XOiAAEE)4(M`_JrWU|`@Z
z@Q5sCVBi)8VMc~ob0ioT7}!fZeO=ifut<t=soZh9lgGfol<Mi?7?N@C?To#7j~qnY
z-aE8!(GGNr+LgLAf%BfihDE$h$0kk+@80TmN-5|ASDU#5Q=s)xvFN;wQxyxg8Q7cM
z2ohs!_xL>3c-ynjb06<4Uf(eh0xlk(X7x<9t4Ou}>iU+M`kx}}R@=|~xxA_Q`~<O`
zH!Av~ZE9rJtXWfYRFxs&)Zue{mhWaV2wYe?r**29{Y>GklT-M-Tv%LZbDsWsW{%v|
z;%Lpw(e9~>4b3V)-RMbv%xJrB?&Yr5-My#Ww9{_fI1};q?3tJIdS!LyeP1M$bx^rq
zM<|VH-ua|<qq`#7{t*#2OK)84Hwvv{muC5Jih;ZJP||_yL&CcP{SK6E4wyfSgOy9^
z$_sTVz89I@eoEUCLw?09{?XU%?c9?6OY>sk$`>1gj(8@fI{3C&Ig9Ch*de&^m_n;;
z`=Y+Z_x%rtwWu9_JHtI#Mf9mS@5Y59k$LjB*%qHT#O-z^I8ZL=(#F8GCk*9}Zfg{m
zZdaB2$}(lTPv%R;is=m7Z**Nq*^;grQ|9uS;c0}E?OngwhO0TYnOAhC6f}J5GL+2?
zyJmSaZQIdp6AuK2JWOlVIKLrq*ZBuF<rWbdTst%aZ@NBbXB83SD}Qo-->KWo9UuPR
zFF0Z?pE3KyMN7^H+s@U$Y<%gt|65D7Z&`++?avFdGc3PsS<3A1Y_;G}_cWK6uRW$r
zFKHE6xaeWg()E593f^9cbUga%#P_`u;v-fTCA!{eox0s!<lpnW?ju>JRVRCRFA?^X
zj@;t%Euc^JfQJ)rfpMnT+M9(RKJKv1SiDu@(PNqFFR$|qracK>#_OgG0gJmY*-vGW
Wi0s}U#>&9Jz~JfX=d#Wzp$P!o-9X;}

diff --git a/packages/mediacenter/kodi-theme-Estuary/sources/media/icons/settings/libreelec.png b/packages/mediacenter/kodi-theme-Estuary/sources/media/icons/settings/libreelec.png
new file mode 100644
index 0000000000000000000000000000000000000000..7dfd90398bd76a8f977f40f58cd4f9b90c2de7c6
GIT binary patch
literal 2313
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
Ib4q9e0Aq(5ng9R*

literal 0
HcmV?d00001