Merge remote-tracking branch 'jurialmunkey/master' into Leia

titovskiy · Dec 1, 2019 · 98b4ba0 · 98b4ba0
2 parents 5272701 + ee55210
commit 98b4ba0
Show file tree

Hide file tree

Showing 16 changed files with 2,463 additions and 461 deletions.
diff --git a/1080i/DialogSeekBar.xml b/1080i/DialogSeekBar.xml
@@ -3,7 +3,7 @@
 <window id="115">
     <defaultcontrol always="true">901</defaultcontrol>
     <zorder>0</zorder>
-    <visible>!Player.HasGame + [VideoPlayer.IsFullscreen | Window.IsVisible(MusicVisualisation.xml)] + [Window.IsVisible(videoosd) | Window.IsVisible(musicosd) | Player.Caching | Player.ShowInfo | Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding | Window.IsActive(DialogFullScreenInfo.xml) | Window.IsVisible(DialogPlayerProcessInfo.xml) | !String.IsEmpty(Window(Home).Property(OSDInfo)) | [!Skin.HasSetting(DisableMusicVideoAutoInfo) + Window.IsVisible(VideoFullScreen.xml) + VideoPlayer.Content(musicvideos)]]</visible>
+    <visible>!Player.HasGame + [VideoPlayer.IsFullscreen | Window.IsVisible(MusicVisualisation.xml)] + [Window.IsVisible(videoosd) | Window.IsVisible(musicosd) | Player.Caching | Player.ShowInfo | Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding | !String.IsEmpty(Player.SeekNumeric) | Window.IsActive(DialogFullScreenInfo.xml) | Window.IsVisible(DialogPlayerProcessInfo.xml) | !String.IsEmpty(Window(Home).Property(OSDInfo)) | [!Skin.HasSetting(DisableMusicVideoAutoInfo) + Window.IsVisible(VideoFullScreen.xml) + VideoPlayer.Content(musicvideos)]]</visible>
     <animation effect="fade" start="0" end="100" time="300">WindowOpen</animation>
     <animation effect="fade" end="0" start="100" time="300">WindowClose</animation>
     <animation effect="fade" start="0" end="100" time="300">VisibleChange</animation>

diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml
@@ -5,8 +5,10 @@
     <onload condition="Skin.HasSetting(ForceExtendedInfo) + System.HasAddon(script.extendedinfo) + [Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes)]">Action(close)</onload>
     <onload condition="Skin.HasSetting(ForceExtendedInfo) + System.HasAddon(script.extendedinfo) + Container.Content(movies) + Skin.String(ListItem.IMDBNumber)">RunScript(script.extendedinfo,info=extendedinfo,dbid=$INFO[ListItem.DBID],imdb_id=$INFO[ListItem.IMDBNumber],name=$INFO[ListItem.Title])</onload>
     <onload condition="Skin.HasSetting(ForceExtendedInfo) + System.HasAddon(script.extendedinfo) + Container.Content(movies) + !Skin.String(ListItem.IMDBNumber)">RunScript(script.extendedinfo,info=extendedinfo,dbid=$INFO[ListItem.DBID],name=$INFO[ListItem.Title])</onload>
-    <onload condition="Skin.HasSetting(ForceExtendedInfo) + System.HasAddon(script.extendedinfo) + Container.Content(tvshows) + Skin.String(ListItem.IMDBNumber)">RunScript(script.extendedinfo,info=extendedtvinfo,dbid=$INFO[ListItem.DBID],tvdb_id=$INFO[ListItem.IMDBNumber],name=$INFO[ListItem.TVShowTitle])</onload>
-    <onload condition="Skin.HasSetting(ForceExtendedInfo) + System.HasAddon(script.extendedinfo) + Container.Content(tvshows) + !Skin.String(ListItem.IMDBNumber)">RunScript(script.extendedinfo,info=extendedtvinfo,dbid=$INFO[ListItem.DBID],name=$INFO[ListItem.TVShowTitle])</onload>
+    <onload condition="Skin.HasSetting(ForceExtendedInfo) + System.HasAddon(script.extendedinfo) + Container.Content(tvshows) + Skin.String(ListItem.IMDBNumber) + Skin.String(ListItem.TVShowTitle)">RunScript(script.extendedinfo,info=extendedtvinfo,dbid=$INFO[ListItem.DBID],tvdb_id=$INFO[ListItem.IMDBNumber],name=$INFO[ListItem.TVShowTitle])</onload>
+    <onload condition="Skin.HasSetting(ForceExtendedInfo) + System.HasAddon(script.extendedinfo) + Container.Content(tvshows) + !Skin.String(ListItem.IMDBNumber) + Skin.String(ListItem.TVShowTitle)">RunScript(script.extendedinfo,info=extendedtvinfo,dbid=$INFO[ListItem.DBID],name=$INFO[ListItem.TVShowTitle])</onload>
+    <onload condition="Skin.HasSetting(ForceExtendedInfo) + System.HasAddon(script.extendedinfo) + Container.Content(tvshows) + Skin.String(ListItem.IMDBNumber) + !Skin.String(ListItem.TVShowTitle)">RunScript(script.extendedinfo,info=extendedtvinfo,dbid=$INFO[ListItem.DBID],tvdb_id=$INFO[ListItem.IMDBNumber],name=$INFO[ListItem.Title])</onload>
+    <onload condition="Skin.HasSetting(ForceExtendedInfo) + System.HasAddon(script.extendedinfo) + Container.Content(tvshows) + !Skin.String(ListItem.IMDBNumber) + !Skin.String(ListItem.TVShowTitle)">RunScript(script.extendedinfo,info=extendedtvinfo,dbid=$INFO[ListItem.DBID],name=$INFO[ListItem.Title])</onload>
     <onload condition="Skin.HasSetting(ForceExtendedInfo) + System.HasAddon(script.extendedinfo) + Container.Content(seasons)">RunScript(script.extendedinfo,info=seasoninfo,tvshow=$INFO[ListItem.TVShowTitle],dbid=$INFO[ListItem.DBID],season=$INFO[ListItem.Season])</onload>
     <onload condition="Skin.HasSetting(ForceExtendedInfo) + System.HasAddon(script.extendedinfo) + Container.Content(episodes)">RunScript(script.extendedinfo,info=extendedepisodeinfo,tvshow=$INFO[ListItem.TVShowTitle],dbid=$INFO[ListItem.DBID],episode=$INFO[ListItem.Episode],season=$INFO[ListItem.Season])</onload>
 

diff --git a/1080i/Includes_Items.xml b/1080i/Includes_Items.xml
@@ -524,6 +524,13 @@
                 <visible>Control.IsEnabled(8)</visible>
             </item>
             <!-- Filter -->
+            <item>
+                <label>$LOCALIZE[587]: $VAR[Label_Filtered]</label>
+                <icon>$VAR[Image_Filtered]</icon>
+                <onclick>SendClick(19)</onclick>
+                <visible>!Container.CanFilterAdvanced</visible>
+                <visible>Container.CanFilter</visible>
+            </item>
             <item>
                 <label>$LOCALIZE[587]: $VAR[Label_Filtered]</label>
                 <icon>$VAR[Image_Filtered]</icon>

diff --git a/1080i/Includes_OSD.xml b/1080i/Includes_OSD.xml
@@ -210,7 +210,7 @@
         <control type="group">
             <visible>!VideoPlayer.Content(musicvideos)</visible>
             <visible>!Window.IsVisible(VideoOSDBookmarks.xml)</visible>
-            <visible>!String.IsEmpty(Window(Home).Property(OSDInfo)) | Player.Caching | Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding | Player.ShowInfo | Window.IsActive(musicosd) | Window.IsActive(videoosd) | Window.IsActive(DialogFullScreenInfo.xml) | Window.IsVisible(DialogPlayerProcessInfo.xml)</visible>
+            <visible>!String.IsEmpty(Window(Home).Property(OSDInfo)) | Player.Caching | Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding | Player.ShowInfo | Window.IsActive(musicosd) | Window.IsActive(videoosd) | Window.IsActive(DialogFullScreenInfo.xml) | Window.IsVisible(DialogPlayerProcessInfo.xml) | !String.IsEmpty(Player.SeekNumeric)</visible>
             <animation effect="fade" start="0" end="100" time="300">VisibleChange</animation>
             <animation effect="fade" start="0" end="100" time="300" condition="![Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding | Player.ShowInfo | Window.IsActive(musicosd) | Window.IsActive(videoosd) | Window.IsActive(DialogFullScreenInfo.xml)]">WindowOpen</animation>
             <control type="image">

diff --git a/1080i/Includes_Object.xml b/1080i/Includes_Object.xml
@@ -1007,7 +1007,7 @@
                     <centertop>50%</centertop>
                     <height>64</height>
                     <texture colordiffuse="$PARAM[colordiffuse]">flags/$PARAM[directory]/other/bluray.png</texture>
-                    <visible>[String.Contains($PARAM[container]$PARAM[source]FileNameAndPath,blu-ray) | String.Contains($PARAM[container]$PARAM[source]FileNameAndPath,bluray) | String.Contains($PARAM[container]$PARAM[source]FileNameAndPath,bdrip) | String.Contains($PARAM[container]$PARAM[source]FileNameAndPath,bd25) | String.Contains($PARAM[container]$PARAM[source]FileNameAndPath,bd50)]</visible>
+                    <visible>[String.Contains($PARAM[container]$PARAM[source]FileNameAndPath,blu-ray) | String.Contains($PARAM[container]$PARAM[source]FileNameAndPath,bluray) | String.Contains($PARAM[container]$PARAM[source]FileNameAndPath,bdrip) | String.Contains($PARAM[container]$PARAM[source]FileNameAndPath,bd25) | String.Contains($PARAM[container]$PARAM[source]FileNameAndPath,bd50) | String.Contains($PARAM[container]$PARAM[source]FileNameAndPath,bdmv)]</visible>
                     <visible>![String.Contains($PARAM[container]$PARAM[source]FileNameAndPath,2160p) | String.Contains($PARAM[container]$PARAM[source]FileNameAndPath,UHD) | String.Contains($PARAM[container]$PARAM[source]FileNameAndPath,UltraHD) | String.Contains($PARAM[container]$PARAM[source]FileNameAndPath,Ultra-HD) | String.Contains($PARAM[container]$PARAM[source]FileNameAndPath,4K)]</visible>
                 </control>
                 <control type="image">

diff --git a/1080i/Includes_Statusbar.xml b/1080i/Includes_Statusbar.xml
@@ -131,6 +131,16 @@
                 <label>$INFO[VideoPlayer.TvShowTitle,[COLOR=main_fg_70],[/COLOR][COLOR=main_fg_30]  •  [/COLOR]]$INFO[MusicPlayer.Artist,[COLOR=main_fg_70],[/COLOR][COLOR=main_fg_30]  •  [/COLOR]]$INFO[VideoPlayer.Season,,x]$INFO[VideoPlayer.Episode,,. ]$INFO[Player.Title]</label>
                 <animation effect="fade" end="100" start="0" delay="300" time="1" reversible="false">Visible</animation>
                 <visible>![!String.IsEmpty(Window(Home).Property(OSDInfo)) | Player.ShowInfo | Window.IsActive(DialogFullScreenInfo.xml) | [Player.Paused + Skin.HasSetting(ShowInfoPaused)]]</visible>
+                <visible>String.IsEmpty(Player.SeekNumeric)</visible>
+            </control>
+            <control type="label">
+                <align>center</align>
+                <width>100%</width>
+                <textcolor>main_fg_100</textcolor>
+                <include>Statusbar_Menubar_Items</include>
+                <label>$INFO[Player.SeekNumeric]</label>
+                <visible>!String.IsEmpty(Player.SeekNumeric)</visible>
+                <animation effect="fade" start="100" end="0" delay="300" time="1" reversible="false">Hidden</animation>
             </control>
             <control type="label">
                 <align>center</align>
@@ -139,6 +149,7 @@
                 <include>Statusbar_Menubar_Items</include>
                 <label>$VAR[Label_OSD_FinishTime]</label>
                 <visible>!String.IsEmpty(Window(Home).Property(OSDInfo)) | Player.ShowInfo | Window.IsActive(DialogFullScreenInfo.xml) | [Player.Paused + Skin.HasSetting(ShowInfoPaused)]</visible>
+                <visible>String.IsEmpty(Player.SeekNumeric)</visible>
                 <animation effect="fade" start="100" end="0" delay="300" time="1" reversible="false">Hidden</animation>
             </control>
         </control>

diff --git a/1080i/MyMusicNav.xml b/1080i/MyMusicNav.xml
@@ -24,6 +24,10 @@
             <label>589</label>
             <include>Defs_Hidden_Button</include>
         </control>
+        <control type="radiobutton" id="19">
+            <description>Filter</description>
+            <include>Defs_Hidden_Button</include>
+        </control>
         <control type="button" id="20">
             <description>Library</description>
             <label>653</label>

diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml
@@ -26,6 +26,10 @@
             <description>Watched Unwatched</description>
             <include>Defs_Hidden_Button</include>
         </control>
+        <control type="radiobutton" id="19">
+            <description>Filter</description>
+            <include>Defs_Hidden_Button</include>
+        </control>
         <control type="button" id="20">
             <description>Library</description>
             <label>653</label>

diff --git a/1080i/script-script.extendedinfo-DialogVideoInfo.xml b/1080i/script-script.extendedinfo-DialogVideoInfo.xml
@@ -169,7 +169,7 @@
                         <param name="onup" value="150" />
                         <param name="id" value="250" />
                         <param name="ondown" value="350" />
-                        <param name="label" value="$LOCALIZE[31206]" />
+                        <param name="label" value="$LOCALIZE[31260]" />
                         <param name="infolabel" value="false" />
                         <param name="include_content" value="false" />
                     </include>

diff --git a/addon.xml b/addon.xml
@@ -1,4 +1,4 @@
-<addon id="skin.auratimod" version="1.0.4" name="AuraTiMod" provider-name="jurialmunkey">
+<addon id="skin.aura" name="Aura" provider-name="jurialmunkey" version="1.0.4">
     <requires>
         <import addon="xbmc.gui" version="5.14.0" />
         <import addon="script.skinshortcuts" version="0.4.0" />

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,8 @@
+[B]1.0.5[/B]
+Add basic filter to views
+Fix for bluray bdmv
+Add seeknumeric time
+
 [B]1.0.4[/B]
 Fix for login screen