Skip to content
This repository has been archived by the owner on Mar 8, 2022. It is now read-only.

Kodi 19 Matrix port #256

Closed
wants to merge 2 commits into from
Closed

Kodi 19 Matrix port #256

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1800aea
Fix to try and make skin compatible with Kodi 19. Power menu not work…
mechevarria Feb 25, 2021
dc91591
port video nav fixes by pkscout
mechevarria Jun 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion 1080i/DialogExtendedProgressBar.xml
View file
Open in desktop
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<window type="dialog">
<onload condition="Library.IsScanningVideo + Skin.HasSetting(UpdateArt.Enabled)">SetProperty(UpdateArt,1)</onload>
<onunload condition="!String.IsEmpty(Window.Property(UpdateArt)) + Skin.HasSetting(UpdateArt.Enabled)">XBMC.RunScript(script.artwork.downloader,mode=custom,silent=true,landscape,clearlogo,clearart)</onunload>
<onunload condition="!String.IsEmpty(Window.Property(UpdateArt)) + Skin.HasSetting(UpdateArt.Enabled)">RunScript(script.artwork.downloader,mode=custom,silent=true,landscape,clearlogo,clearart)</onunload>
<onunload condition="!String.IsEmpty(Window.Property(UpdateArt)) + Skin.HasSetting(UpdateArt.Enabled)">ClearProperty(UpdateArt)</onunload>
<controls>

Expand Down
4 changes: 2 additions & 2 deletions 1080i/Home.xml
View file
Open in desktop
Expand Up @@ -2,8 +2,8 @@
<!-- Foundation -->
<window id="0">
<defaultcontrol always="false">301</defaultcontrol>
<onload condition="Skin.HasSetting(ThemeSwitcher) + System.Time(06:00,18:00) + !String.IsEqual(Skin.CurrentColourTheme,SKINDEFAULT)">XBMC.RunScript(script.skin.helper.service,action=setkodisetting,setting=lookandfeel.skincolors,value=SKINDEFAULT)</onload>
<onload condition="Skin.HasSetting(ThemeSwitcher) + !System.Time(06:00,18:00) + !String.IsEqual(Skin.CurrentColourTheme,Dark)">XBMC.RunScript(script.skin.helper.service,action=setkodisetting,setting=lookandfeel.skincolors,value=Dark)</onload>
<onload condition="Skin.HasSetting(ThemeSwitcher) + System.Time(06:00,18:00) + !String.IsEqual(Skin.CurrentColourTheme,SKINDEFAULT)">RunScript(script.skin.helper.service,action=setkodisetting,setting=lookandfeel.skincolors,value=SKINDEFAULT)</onload>
<onload condition="Skin.HasSetting(ThemeSwitcher) + !System.Time(06:00,18:00) + !String.IsEqual(Skin.CurrentColourTheme,Dark)">RunScript(script.skin.helper.service,action=setkodisetting,setting=lookandfeel.skincolors,value=Dark)</onload>

<onload>SetProperty(ListItemHelper.WidgetContainerWindowName,home,home)</onload>

Expand Down
12 changes: 6 additions & 6 deletions 1080i/Includes_DialogMusicInfo.xml
View file
Open in desktop
Expand Up @@ -111,19 +111,19 @@
<param name="label" value="Artwork" />
<param name="visible" value="[String.IsEqual(ListItem.DBType,artist) | String.IsEqual(ListItem.DBType,album) | String.IsEqual(ListItem.DBType,song)] + system.hasaddon(script.artwork.beef)" />
<param name="icon" value="special://skin/extras/icons/paintbrush2.png" />
<onclick condition="String.IsEqual(ListItem.DBType,artist) + System.HasAddon(script.artwork.beef)">XBMC.RunScript(script.artwork.beef, mode=gui, mediatype=artist, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,album) + System.HasAddon(script.artwork.beef)">XBMC.RunScript(script.artwork.beef, mode=gui, mediatype=album, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,song) + System.HasAddon(script.artwork.beef)">XBMC.RunScript(script.artwork.beef, mode=gui, mediatype=song, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,artist) + System.HasAddon(script.artwork.beef)">RunScript(script.artwork.beef, mode=gui, mediatype=artist, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,album) + System.HasAddon(script.artwork.beef)">RunScript(script.artwork.beef, mode=gui, mediatype=album, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,song) + System.HasAddon(script.artwork.beef)">RunScript(script.artwork.beef, mode=gui, mediatype=song, dbid=$INFO[ListItem.DBID])</onclick>
</include>
<include content="Object_Info_Button">
<param name="id" value="8102" />
<param name="groupid" value="8002" />
<param name="label" value="All Art" />
<param name="visible" value="[String.IsEqual(ListItem.DBType,artist) | String.IsEqual(ListItem.DBType,album) | String.IsEqual(ListItem.DBType,song)] + system.hasaddon(script.artwork.beef)" />
<param name="icon" value="special://skin/extras/icons/paintbucket3.png" />
<onclick condition="String.IsEqual(ListItem.DBType,artist) + System.HasAddon(script.artwork.beef)">XBMC.RunScript(script.artwork.beef, mode=auto, mediatype=artist, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,album) + System.HasAddon(script.artwork.beef)">XBMC.RunScript(script.artwork.beef, mode=auto, mediatype=album, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,song) + System.HasAddon(script.artwork.beef)">XBMC.RunScript(script.artwork.beef, mode=auto, mediatype=song, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,artist) + System.HasAddon(script.artwork.beef)">RunScript(script.artwork.beef, mode=auto, mediatype=artist, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,album) + System.HasAddon(script.artwork.beef)">RunScript(script.artwork.beef, mode=auto, mediatype=album, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,song) + System.HasAddon(script.artwork.beef)">RunScript(script.artwork.beef, mode=auto, mediatype=song, dbid=$INFO[ListItem.DBID])</onclick>
</include>
<include content="Object_Info_Button">
<param name="id" value="6" />
Expand Down
12 changes: 6 additions & 6 deletions 1080i/Includes_Items.xml
View file
Open in desktop
Expand Up @@ -12,17 +12,17 @@
<item>
<label>$LOCALIZE[31195]</label>
<visible>[String.IsEqual(ListItem.DBType,tvshow) | String.IsEqual(ListItem.DBType,movie) | String.IsEqual(ListItem.DBType,musicvideo) | String.IsEqual(ListItem.DBType,episode)] + system.hasaddon(script.artwork.beef)</visible>
<onclick condition="String.IsEqual(ListItem.DBType,episode)">XBMC.RunScript(script.artwork.beef, mode=gui, mediatype=episode, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,tvshow)">XBMC.RunScript(script.artwork.beef, mode=gui, mediatype=tvshow, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,movie)">XBMC.RunScript(script.artwork.beef, mode=gui, mediatype=movie, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,episode)">RunScript(script.artwork.beef, mode=gui, mediatype=episode, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,tvshow)">RunScript(script.artwork.beef, mode=gui, mediatype=tvshow, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,movie)">RunScript(script.artwork.beef, mode=gui, mediatype=movie, dbid=$INFO[ListItem.DBID])</onclick>
</item>
<item>
<label>$LOCALIZE[31197]</label>
<visible>[String.IsEqual(ListItem.DBType,tvshow) | String.IsEqual(ListItem.DBType,movie) | String.IsEqual(ListItem.DBType,musicvideo) | String.IsEqual(ListItem.DBType,episode)] + system.hasaddon(script.artwork.beef)</visible>
<onclick>Back</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,episode)">XBMC.RunScript(script.artwork.beef, mode=auto, mediatype=tvshow, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,tvshow)">XBMC.RunScript(script.artwork.beef, mode=auto, mediatype=tvshow, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,movie)">XBMC.RunScript(script.artwork.beef, mode=auto, mediatype=movie, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,episode)">RunScript(script.artwork.beef, mode=auto, mediatype=tvshow, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,tvshow)">RunScript(script.artwork.beef, mode=auto, mediatype=tvshow, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,movie)">RunScript(script.artwork.beef, mode=auto, mediatype=movie, dbid=$INFO[ListItem.DBID])</onclick>
</item>
<item>
<label>$LOCALIZE[31204]</label>
Expand Down
8 changes: 4 additions & 4 deletions 1080i/Includes_OSD.xml
View file
Open in desktop
Expand Up @@ -1107,7 +1107,7 @@
<onfocus condition="!String.IsEmpty(Window(Home).Property(OSDExtendedInfo)) + Player.Paused + !Skin.HasSetting(DontPauseOSD)">Play</onfocus>
<onfocus condition="!String.IsEmpty(Window(Home).Property(OSDExtendedInfo))">ClearProperty(OSDExtendedInfo,Home)</onfocus>
<onfocus>ClearProperty(OSD_Menu,Home)</onfocus>
<onclick>XBMC.PlayerControl(Repeat)</onclick>
<onclick>PlayerControl(Repeat)</onclick>
<visible>Window.IsVisible(musicosd)</visible>
<visible>!Playlist.IsRepeatOne + !Playlist.IsRepeat</visible>
</control>
Expand All @@ -1126,7 +1126,7 @@
<onfocus condition="!String.IsEmpty(Window(Home).Property(OSDExtendedInfo)) + Player.Paused + !Skin.HasSetting(DontPauseOSD)">Play</onfocus>
<onfocus condition="!String.IsEmpty(Window(Home).Property(OSDExtendedInfo))">ClearProperty(OSDExtendedInfo,Home)</onfocus>
<onfocus>ClearProperty(OSD_Menu,Home)</onfocus>
<onclick>XBMC.PlayerControl(Repeat)</onclick>
<onclick>PlayerControl(Repeat)</onclick>
<visible>Window.IsVisible(musicosd)</visible>
<visible>Playlist.IsRepeatOne</visible>
</control>
Expand All @@ -1145,7 +1145,7 @@
<onfocus condition="!String.IsEmpty(Window(Home).Property(OSDExtendedInfo)) + Player.Paused + !Skin.HasSetting(DontPauseOSD)">Play</onfocus>
<onfocus condition="!String.IsEmpty(Window(Home).Property(OSDExtendedInfo))">ClearProperty(OSDExtendedInfo,Home)</onfocus>
<onfocus>ClearProperty(OSD_Menu,Home)</onfocus>
<onclick>XBMC.PlayerControl(Repeat)</onclick>
<onclick>PlayerControl(Repeat)</onclick>
<visible>Window.IsVisible(musicosd)</visible>
<visible>Playlist.IsRepeat</visible>
</control>
Expand All @@ -1164,7 +1164,7 @@
<onfocus condition="!String.IsEmpty(Window(Home).Property(OSDExtendedInfo)) + Player.Paused + !Skin.HasSetting(DontPauseOSD)">Play</onfocus>
<onfocus condition="!String.IsEmpty(Window(Home).Property(OSDExtendedInfo))">ClearProperty(OSDExtendedInfo,Home)</onfocus>
<onfocus>ClearProperty(OSD_Menu,Home)</onfocus>
<onclick>XBMC.PlayerControl(Random)</onclick>
<onclick>PlayerControl(Random)</onclick>
<visible>Window.IsVisible(musicosd)</visible>
</control>
<control type="button" id="24">
Expand Down
6 changes: 3 additions & 3 deletions 1080i/Includes_Object.xml
View file
Open in desktop
Expand Up @@ -631,9 +631,9 @@
<onback>SetFocus(5000)</onback>
<onback>8000</onback>
<onclick condition="!System.HasAddon(script.artwork.beef) | ![String.IsEqual(ListItem.DBType,episode) | String.IsEqual(ListItem.DBType,tvshow) | String.IsEqual(ListItem.DBType,movie)]">SendClick(10)</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,episode) + System.HasAddon(script.artwork.beef)">XBMC.RunScript(script.artwork.beef, mode=gui, mediatype=episode, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,tvshow) + System.HasAddon(script.artwork.beef)">XBMC.RunScript(script.artwork.beef, mode=gui, mediatype=tvshow, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,movie) + System.HasAddon(script.artwork.beef)">XBMC.RunScript(script.artwork.beef, mode=gui, mediatype=movie, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,episode) + System.HasAddon(script.artwork.beef)">RunScript(script.artwork.beef, mode=gui, mediatype=episode, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,tvshow) + System.HasAddon(script.artwork.beef)">RunScript(script.artwork.beef, mode=gui, mediatype=tvshow, dbid=$INFO[ListItem.DBID])</onclick>
<onclick condition="String.IsEqual(ListItem.DBType,movie) + System.HasAddon(script.artwork.beef)">RunScript(script.artwork.beef, mode=gui, mediatype=movie, dbid=$INFO[ListItem.DBID])</onclick>
<nested />
</control>
<control type="group">
Expand Down
4 changes: 2 additions & 2 deletions addon.xml
View file
Open in desktop
@@ -1,6 +1,6 @@
<addon id="skin.arctic.zephyr.2" name="Arctic Zephyr 2" provider-name="jurialmunkey" version="0.9.62.1">
<addon id="skin.arctic.zephyr.2" name="Arctic Zephyr 2" provider-name="jurialmunkey" version="0.9.63.2">
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<addon id="skin.arctic.zephyr.2" name="Arctic Zephyr 2" provider-name="jurialmunkey" version="0.9.63.2">
<addon id="skin.arctic.zephyr.2" name="Arctic Zephyr 2" provider-name="jurialmunkey" version="0.9.63.1">

<requires>
<import addon="xbmc.gui" version="5.14.0" />
<import addon="xbmc.gui" version="5.15.0" />
<import addon="script.skinshortcuts" version="0.4.0" />
<import addon="script.image.resource.select" version="0.0.5" />
<import addon="plugin.program.autocompletion" version="1.0.1" />
Expand Down
4 changes: 4 additions & 0 deletions changelog.txt
View file
Open in desktop
@@ -1,3 +1,7 @@
0.9.63.1
- Fix for Kodi 19 Matrix by removing XMBC. prefixes from function calls
0.9.63.0
- Fix for Kodi 19 Matrix compatibility
0.9.62.1
- Fix for AEL to remove Box3D rendering since the plugin does not support managing that asset anymore

Expand Down
2 changes: 1 addition & 1 deletion shortcuts/mainmenu.DATA.xml
View file
Open in desktop
Expand Up @@ -56,7 +56,7 @@
<label2>32034</label2>
<icon>DefaultDVDFull.png</icon>
<thumb />
<action>XBMC.PlayDVD()</action>
<action>PlayDVD()</action>
</shortcut>
<shortcut>
<label>5</label>
Expand Down
18 changes: 9 additions & 9 deletions shortcuts/powermenu.DATA.xml
View file
Open in desktop
Expand Up @@ -9,28 +9,28 @@
<shortcut>
<label2>Power Menu Shortcut</label2>
<label>13012</label>
<action>XBMC.Quit()</action>
<action>Quit()</action>
<visible>System.ShowExitButton</visible>
<icon>special://skin/extras/icons/power.png</icon>
</shortcut>
<shortcut>
<label2>Power Menu Shortcut</label2>
<label>13016</label>
<action>XBMC.Powerdown()</action>
<action>Powerdown()</action>
<visible>System.CanPowerDown</visible>
<icon>special://skin/extras/icons/power.png</icon>
</shortcut>
<shortcut>
<label2>Power Menu Shortcut</label2>
<label>13011</label>
<action>XBMC.Suspend()</action>
<action>Suspend()</action>
<visible>System.CanSuspend</visible>
<icon>special://skin/extras/icons/power.png</icon>
</shortcut>
<shortcut>
<label2>Power Menu Shortcut</label2>
<label>13010</label>
<action>XBMC.Hibernate()</action>
<action>Hibernate()</action>
<visible>System.CanHibernate</visible>
<icon>special://skin/extras/icons/power.png</icon>
</shortcut>
Expand All @@ -45,7 +45,7 @@
<shortcut>
<label2>Power Menu Shortcut</label2>
<label>13013</label>
<action>XBMC.Reset()</action>
<action>Reset()</action>
<visible>System.CanReboot</visible>
<icon>special://skin/extras/icons/power.png</icon>
</shortcut>
Expand All @@ -70,29 +70,29 @@
<shortcut>
<label2>Power Menu Shortcut</label2>
<label>13017</label>
<action>XBMC.InhibitIdleShutdown(true)</action>
<action>InhibitIdleShutdown(true)</action>
<visible>System.HasShutdown +!System.IsInhibit</visible>
<icon>special://skin/extras/icons/power.png</icon>
</shortcut>
<shortcut>
<label2>Power Menu Shortcut</label2>
<label>13018</label>
<action>XBMC.InhibitIdleShutdown(false)</action>
<action>InhibitIdleShutdown(false)</action>
<visible>System.HasShutdown + System.IsInhibit</visible>
<icon>special://skin/extras/icons/power.png</icon>
</shortcut>
<shortcut>
<label2>Power Menu Shortcut</label2>
<label>20150</label>
<action>XBMC.AlarmClock(shutdowntimer,XBMC.Shutdown())</action>
<action>AlarmClock(shutdowntimer,Shutdown())</action>
<visible>!System.HasAlarm(shutdowntimer)</visible>
<visible>System.CanPowerDown | System.CanSuspend | System.CanHibernate</visible>
<icon>special://skin/extras/icons/power.png</icon>
</shortcut>
<shortcut>
<label2>Power Menu Shortcut</label2>
<label>20151</label>
<action>XBMC.CancelAlarm(shutdowntimer)</action>
<action>CancelAlarm(shutdowntimer)</action>
<visible>System.HasAlarm(shutdowntimer)</visible>
<icon>special://skin/extras/icons/power.png</icon>
</shortcut>
Expand Down