Merge pull request #81 from gade01/V19

Changes for v19

720p/Home.xml

@@ -525,7 +525,7 @@
 				<height>35</height>
 				<colordiffuse>CCFFFFFF</colordiffuse>
 				<texture flipy="true" border="0,5,0,0" flipx="true">HomeSubEnd.png</texture>
-				<animation effect="slide" start="0,0" end="145,0" time="0" condition="!System.HasAddon(script.globalsearch)">Conditional</animation>
+				<animation effect="slide" start="0,0" end="145,0" time="0" condition="!System.AddonIsEnabled(script.globalsearch)">Conditional</animation>
 			</control>
 			<control type="radiobutton" id="608">
 				<colordiffuse>CCFFFFFF</colordiffuse>
@@ -545,7 +545,9 @@
 				<texturenofocus flipy="true" border="5">HomeSubNF.png</texturenofocus>
 				<pulseonselect>false</pulseonselect>
 				<label>137</label>
-				<onclick>RunScript(script.globalsearch)</onclick>
+				<onclick condition="System.AddonIsEnabled(script.globalsearch)">RunScript(script.globalsearch)</onclick>
+				<onclick condition="!System.AddonIsEnabled(script.globalsearch) + System.HasAddon(script.globalsearch)">EnableAddon(script.globalsearch)</onclick>
+				<onclick condition="!System.HasAddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
 				<textureradioonfocus>icon_search_home.png</textureradioonfocus>
 				<textureradioonnofocus>icon_search_home.png</textureradioonnofocus>
 				<textureradioofffocus>icon_search_home.png</textureradioofffocus>
@@ -554,7 +556,6 @@
 				<onright>601</onright>
 				<onup>9003</onup>
 				<ondown>9000</ondown>
-				<visible>System.HasAddon(script.globalsearch)</visible>
 			</control>
 			<control type="group" id="600">
 				<left>180</left>
@@ -907,8 +908,7 @@
 				<height>60</height>
 				<onleft>9000</onleft>
 				<onright>9000</onright>
-				<onup condition="System.HasAddon(script.globalsearch)">608</onup>
+				<onup>608</onup>
-				<onup condition="!System.HasAddon(script.globalsearch)">603</onup>
 				<ondown>9001</ondown>
 				<pagecontrol/>
 				<scrolltime>300</scrolltime>

720p/IncludesHomeMenuItems.xml

@@ -202,13 +202,13 @@
 			<include>ButtonHomeSubCommonValues</include>
 			<label>LibreELEC</label>
 			<onclick>RunAddon(service.libreelec.settings)</onclick>
-			<visible>System.HasAddon(service.libreelec.settings)</visible>
+			<visible>System.AddonIsEnabled(service.libreelec.settings)</visible>
 		</control>
 		<control type="button" id="90400">
 			<include>ButtonHomeSubCommonValues</include>
 			<label>CoreELEC</label>
 			<onclick>RunAddon(service.coreelec.settings)</onclick>
-			<visible>System.HasAddon(service.coreelec.settings)</visible>
+			<visible>System.AddonIsEnabled(service.coreelec.settings)</visible>
 		</control>
 		<control type="button" id="90123">
 			<include>ButtonHomeSubCommonValues</include>

720p/IncludesHomeRecentlyAdded.xml

@@ -4,8 +4,7 @@
 		<control type="group" id="9003">
 			<depth>DepthMenu</depth>
 			<onup>20</onup>
-			<ondown condition="System.HasAddon(script.globalsearch)">608</ondown>
+			<ondown>608</ondown>
-			<ondown condition="!System.HasAddon(script.globalsearch)">603</ondown>
 			<visible>!Window.IsVisible(Favourites)</visible>
 			<include>VisibleFadeEffect</include>
 			<animation effect="fade" time="225" delay="750">WindowOpen</animation>
@@ -41,8 +40,7 @@
 					<onleft>8000</onleft>
 					<onright>8000</onright>
 					<onup>20</onup>
-					<ondown condition="System.HasAddon(script.globalsearch)">608</ondown>
+					<ondown>608</ondown>
-					<ondown condition="!System.HasAddon(script.globalsearch)">603</ondown>
 					<viewtype label="535">list</viewtype>
 					<pagecontrol/>
 					<scrolltime>200</scrolltime>
@@ -277,8 +275,7 @@
 					<onleft>8001</onleft>
 					<onright>8001</onright>
 					<onup>20</onup>
-					<ondown condition="System.HasAddon(script.globalsearch)">608</ondown>
+					<ondown>608</ondown>
-					<ondown condition="!System.HasAddon(script.globalsearch)">603</ondown>
 					<viewtype label="535">list</viewtype>
 					<pagecontrol/>
 					<scrolltime>200</scrolltime>
@@ -539,8 +536,7 @@
 					<onleft>8002</onleft>
 					<onright>8002</onright>
 					<onup>20</onup>
-					<ondown condition="System.HasAddon(script.globalsearch)">608</ondown>
+					<ondown>608</ondown>
-					<ondown condition="!System.HasAddon(script.globalsearch)">603</ondown>
 					<viewtype label="535">list</viewtype>
 					<pagecontrol/>
 					<scrolltime>200</scrolltime>

720p/MyWeather.xml

@@ -14,7 +14,7 @@
 			<randomize>true</randomize>
 			<fadetime>1000</fadetime>
 			<include>VisibleFadeEffect</include>
-			<visible>System.HasAddon(resource.images.weatherfanart.multi)</visible>
+			<visible>System.AddonIsEnabled(resource.images.weatherfanart.multi)</visible>
 			<animation effect="fade" time="150">WindowClose</animation>
 		</control>
 		<include content="CommonWindowHeader">

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.confluence" version="4.7.4" name="Confluence" provider-name="Jezz_X, Team Kodi">
+<addon id="skin.confluence" version="4.7.5" name="Confluence" provider-name="Jezz_X, Team Kodi">
 	<requires>
-		<import addon="xbmc.gui" version="5.14.0"/>
+		<import addon="xbmc.gui" version="5.15.0"/>
 	</requires>
 	<extension point="xbmc.gui.skin" debugging="false" effectslowdown="1.0">
 		<res width="1280" height="720" aspect="16:9" default="true" folder="720p" />
@@ -143,6 +143,6 @@
 			<screenshot>resources/screenshot-08.jpg</screenshot>
 			<screenshot>resources/screenshot-09.jpg</screenshot>
 		</assets>
-		<news>- Add support for PVR reminders.[CR]- Fix / add new buttons in PVR information window.[CR]- Update PVR group manager dialog with latest changes.</news>
+		<news>- Bump xbmc.gui.[CR]- Add support for enabled add-ons.</news>
 	</extension>
 </addon>

changelog.txt

@@ -1,3 +1,8 @@
+[B]4.7.5[/B]
+
+- Bump xbmc.gui
+- Add support for enabled add-ons
+
 [B]4.7.1[/B]
 
 - Add support for PVR reminders