fix last channel button, update addon.xml

b-jesch · Apr 7, 2023 · 9058028 · 9058028
1 parent b7bf8c4
commit 9058028
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/addon.xml b/addon.xml
@@ -18,6 +18,7 @@
 		<res width="2560" height="1080" aspect="21:9" default="false" folder="xml" />
 	</extension>
 	<extension point="xbmc.service" library="scripts/services.py" visible="!String.IsEmpty(Window(home).Property(CurrentSkin))" />
+	<extension point="xbmc.python.script" library="scripts/helpers.py" />
 	<extension point="kodi.context.item">
       	<menu id="kodi.core.main">
       		<item library="scripts/context_menu_jumptoletter.py">

diff --git a/xml/Custom_1105_MusicOSDSettings.xml b/xml/Custom_1105_MusicOSDSettings.xml
@@ -72,8 +72,8 @@
 						<label>$LOCALIZE[31637]</label>
 						<onclick condition="System.HasAddon(script.cu.lrclyrics)">Skin.ToggleSetting(enable_lyrics)</onclick>
 						<onclick>Dialog.Close(all)</onclick>
-						<onclick condition="System.HasAddon(script.cu.lrclyrics) + Skin.HasSetting(enable_lyrics)">RunScript(special://skin/scripts/helpers.py,toggleAddonStatus,script.cu.lrclyrics,true)</onclick>
-						<onclick condition="System.HasAddon(script.cu.lrclyrics) + !Skin.HasSetting(enable_lyrics) + !Window.IsActive(script-cu-lrclyrics-main.xml)">RunScript(special://skin/scripts/helpers.py,toggleAddonStatus,script.cu.lrclyrics,false)</onclick>
+						<onclick condition="System.HasAddon(script.cu.lrclyrics) + Skin.HasSetting(enable_lyrics)">RunScript(skin.estuary.modv2,toggleAddonStatus,script.cu.lrclyrics,true)</onclick>
+						<onclick condition="System.HasAddon(script.cu.lrclyrics) + !Skin.HasSetting(enable_lyrics) + !Window.IsActive(script-cu-lrclyrics-main.xml)">RunScript(skin.estuary.modv2,toggleAddonStatus,script.cu.lrclyrics,false)</onclick>
 						<enable>!Window.IsActive(script-cu-lrclyrics-main.xml)</enable>
 						<selected>!Skin.HasSetting(enable_lyrics)</selected>
 					</control>

diff --git a/xml/DialogVideoInfo.xml b/xml/DialogVideoInfo.xml
@@ -7,7 +7,7 @@
 	<onload condition="Skin.HasSetting(tomatometerallaudience) + !String.IsEmpty(ListItem.Rating(tomatometerallaudience))">RunScript(script.embuary.helper,action=calc,do='"int($INFO[ListItem.Rating(tomatometerallaudience)] * 10)"',prop=rotten)</onload>
 	<onload condition="Skin.HasSetting(tomatometeravgaudience) + !String.IsEmpty(ListItem.Rating(tomatometeravgaudience))">RunScript(script.embuary.helper,action=calc,do='"int($INFO[ListItem.Rating(tomatometeravgaudience)] * 10)"',prop=rotten)</onload>
 	<onload condition="!String.IsEmpty(ListItem.Rating(metacritic))">RunScript(script.embuary.helper,action=calc,do='"int($INFO[ListItem.Rating(metacritic)] * 10)"',prop=metacritic)</onload>
-	<onload condition="!String.StartsWith(ListItem.FileNameAndPath,'plugin://') + [String.IsEmpty(ListItem.Size) | String.StartsWith(ListItem.Size,0.00)]">RunScript(special://skin/scripts/helpers.py,getFileSize,$ESCINFO[ListItem.FileNameAndPath])</onload>
+	<onload condition="!String.StartsWith(ListItem.FileNameAndPath,'plugin://') + [String.IsEmpty(ListItem.Size) | String.StartsWith(ListItem.Size,0.00)]">RunScript(skin.estuary.modv2,getFileSize,$ESCINFO[ListItem.FileNameAndPath])</onload>
 	<onunload>ClearProperty(infobackground,home)</onunload>
 	<onunload>ClearProperty(rotten,home)</onunload>
 	<onunload>ClearProperty(metacritic,home)</onunload>

diff --git a/xml/SkinSettings.xml b/xml/SkinSettings.xml
@@ -255,8 +255,8 @@
 					<label>$LOCALIZE[31637]</label>
 					<include>DefaultSettingButton</include>
 					<onclick condition="System.HasAddon(script.cu.lrclyrics)">Skin.ToggleSetting(enable_lyrics)</onclick>
-					<onclick condition="System.HasAddon(script.cu.lrclyrics) + Skin.HasSetting(enable_lyrics)">RunScript(special://skin/scripts/helpers.py,toggleAddonStatus,script.cu.lrclyrics,true)</onclick>
-					<onclick condition="System.HasAddon(script.cu.lrclyrics) + !Skin.HasSetting(enable_lyrics)">RunScript(special://skin/scripts/helpers.py,toggleAddonStatus,script.cu.lrclyrics,false)</onclick>
+					<onclick condition="System.HasAddon(script.cu.lrclyrics) + Skin.HasSetting(enable_lyrics)">RunScript(skin.estuary.modv2,toggleAddonStatus,script.cu.lrclyrics,true)</onclick>
+					<onclick condition="System.HasAddon(script.cu.lrclyrics) + !Skin.HasSetting(enable_lyrics)">RunScript(skin.estuary.modv2,toggleAddonStatus,script.cu.lrclyrics,false)</onclick>
 					<onclick condition="!System.HasAddon(script.cu.lrclyrics)">InstallAddon(script.cu.lrclyrics)</onclick>
 					<selected>!Skin.HasSetting(enable_lyrics)</selected>
 				</control>

diff --git a/xml/VideoOSD.xml b/xml/VideoOSD.xml
@@ -113,8 +113,8 @@
 					<include content="OSDButton">
 						<param name="texture" value="osd/fullscreen/buttons/channelswitch.png"/>
 					</include>
-					<onclick>Dialog.Close(VideoOSD)</onclick>
 					<onclick condition="!String.IsEqual(Skin.String(channelswitch_action),31633)">action(number0)</onclick>
+					<onclick>Dialog.Close(VideoOSD)</onclick>
 					<onclick condition="String.IsEqual(Skin.String(channelswitch_action),31633)">ActivateWindow(1133)</onclick>
 					<visible>VideoPlayer.Content(livetv) + !Skin.HasSetting(SimplyfiedOSDVideo)</visible>
 				</control>