[Embuary.Info] added seasons and collections, fixed issue

beatmasterRS · Sep 24, 2019 · 1c8ad9a · 1c8ad9a
1 parent 10cb1e1
commit 1c8ad9a
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 17 deletions.
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
@@ -2882,6 +2882,8 @@
 			<onup condition="String.IsEqual(Window.Property(videoinfo),2)">10054</onup>
             <onup condition="String.IsEqual(Window.Property(videoinfo),3)">10055</onup>
             <onup condition="String.IsEqual(Window.Property(videoinfo),4)">10056</onup>
+            <onup condition="String.IsEqual(Window.Property(videoinfo),5)">10058</onup>
+            <onup condition="String.IsEqual(Window.Property(videoinfo),6)">10057</onup>
             <onup condition="String.IsEmpty(Window.Property(videoinfo))">10052</onup>
 
 			<bottom>224</bottom>
@@ -2944,6 +2946,28 @@
 				</include>								
 			</control>
 
+            <control type="radiobutton" id ="9006">
+                <visible>Integer.IsGreater(Container(10058).NumItems,0)</visible>
+                <onfocus condition="!String.IsEqual(Window.Property(videoinfo),5)">ClearProperty(videoinfo)</onfocus>                
+                <onfocus condition="!Skin.HasSetting(dontclickonfocus)">SetProperty(videoinfo,5)</onfocus>  
+                <onclick>SetProperty(videoinfo,5)</onclick>                         
+				<include>buttondimensions</include>
+				<include content="buttontextures">
+					<param name="icon" value="buttonsdialogs/set.png" />
+				</include>								
+			</control>
+
+            <control type="radiobutton" id ="9008">
+                <visible>Integer.IsGreater(Container(10057).NumItems,0)</visible>
+                <onfocus condition="!String.IsEqual(Window.Property(videoinfo),6)">ClearProperty(videoinfo)</onfocus>                
+                <onfocus condition="!Skin.HasSetting(dontclickonfocus)">SetProperty(videoinfo,6)</onfocus>  
+                <onclick>SetProperty(videoinfo,6)</onclick>                         
+				<include>buttondimensions</include>
+				<include content="buttontextures">
+					<param name="icon" value="buttonsdialogs/seasons.png" />
+				</include>								
+			</control>
+
             <control type="radiobutton" id ="9004">
                 <onfocus condition="!String.IsEqual(Window.Property(videoinfo),3)">ClearProperty(videoinfo)</onfocus>                
                 <onfocus condition="!Skin.HasSetting(dontclickonfocus)">SetProperty(videoinfo,3)</onfocus>     

diff --git a/1080i/Includes_Animations.xml b/1080i/Includes_Animations.xml
@@ -508,7 +508,7 @@
     </include>
 
     <include name="Animation.VideoFadeOut">
-        <animation condition="ControlGroup(9600).HasFocus() | Control.HasFocus(9501) | Control.HasFocus(50) | Control.HasFocus(9502) | Control.HasFocus(9503) | Control.HasFocus(9504) | Control.HasFocus(10052) | Control.HasFocus(10053) | Control.HasFocus(10054) | Control.HasFocus(10056)" effect="fade" end="0"  start="100" time="300">Conditional</animation>
+        <animation condition="ControlGroup(9600).HasFocus() | Control.HasFocus(9501) | Control.HasFocus(50) | Control.HasFocus(9502) | Control.HasFocus(9503) | Control.HasFocus(9504) | Control.HasFocus(10052) | Control.HasFocus(10053) | Control.HasFocus(10054) | Control.HasFocus(10056) | Control.HasFocus(10057) | Control.HasFocus(10058)" effect="fade" end="0"  start="100" time="300">Conditional</animation>
     </include>
 
     <include name="Animation.FadeOutInfo">

diff --git a/1080i/Includes_Labels.xml b/1080i/Includes_Labels.xml
@@ -674,7 +674,9 @@
         <value condition="Control.HasFocus(9003) + Window.IsVisible(script-embuary-video.xml) + Skin.HasSetting(wipinfo)">$LOCALIZE[37696]</value>
         <value condition="Control.HasFocus(9004) + Window.IsVisible(script-embuary-video.xml) + Skin.HasSetting(wipinfo)">$LOCALIZE[37695]</value>
         <value condition="Control.HasFocus(9005) + Window.IsVisible(script-embuary-video.xml) + Skin.HasSetting(wipinfo)">$LOCALIZE[37697]</value>
+        <value condition="Control.HasFocus(9006) + Window.IsVisible(script-embuary-video.xml) + Skin.HasSetting(wipinfo)">$LOCALIZE[33054]</value>
         <value condition="Control.HasFocus(9007) + Window.IsVisible(script-embuary-video.xml) + Skin.HasSetting(wipinfo)">$LOCALIZE[5]</value>
+        <value condition="Control.HasFocus(9008) + Window.IsVisible(script-embuary-video.xml) + Skin.HasSetting(wipinfo)">$LOCALIZE[37719]</value>        
 
         <value condition="Control.HasFocus(9001) + Window.IsVisible(DialogMusicInfo.xml) + Skin.HasSetting(wipinfo)">$LOCALIZE[208]</value>
         <value condition="Control.HasFocus(9002) + Window.IsVisible(DialogMusicInfo.xml) + Skin.HasSetting(wipinfo)">$LOCALIZE[37551]</value>
@@ -776,6 +778,8 @@
         <value condition="Control.HasFocus(10053) + Window.IsVisible(script-embuary-person.xml)">$LOCALIZE[37678] $INFO[Container(10051).ListItem.Label]</value>
         <value condition="Control.HasFocus(10052) + Window.IsVisible(script-embuary-person.xml)">$LOCALIZE[37677] $INFO[Container(10051).ListItem.Label]</value>
 
+        <value condition="Control.HasFocus(10058) + Window.IsVisible(script-embuary-video.xml)">$LOCALIZE[37717] $INFO[Container(10051).ListItem.Label]</value>
+        <value condition="Control.HasFocus(10057) + Window.IsVisible(script-embuary-video.xml)">$LOCALIZE[37718] $INFO[Container(10051).ListItem.Label]</value>
         <value condition="Control.HasFocus(10056) + Window.IsVisible(script-embuary-video.xml)">$LOCALIZE[37676] $INFO[Container(10051).ListItem.Label]</value>
         <value condition="Control.HasFocus(10055) + Window.IsVisible(script-embuary-video.xml)">$LOCALIZE[37674] $INFO[Container(10051).ListItem.Label]</value>
         <value condition="Control.HasFocus(10054) + Window.IsVisible(script-embuary-video.xml)">$LOCALIZE[37675] $INFO[Container(10051).ListItem.Label]</value>
@@ -803,6 +807,8 @@
         <value condition="String.IsEqual(Window.Property(videoinfo),2) + Window.IsVisible(script-embuary-video.xml)">$LOCALIZE[37675] $INFO[Container(10051).ListItem.Label]</value>
         <value condition="String.IsEqual(Window.Property(videoinfo),3) + Window.IsVisible(script-embuary-video.xml)">$LOCALIZE[37674] $INFO[Container(10051).ListItem.Label]</value>
         <value condition="String.IsEqual(Window.Property(videoinfo),4) + Window.IsVisible(script-embuary-video.xml)">$LOCALIZE[37676] $INFO[Container(10051).ListItem.Label]</value>
+        <value condition="String.IsEqual(Window.Property(videoinfo),5) + Window.IsVisible(script-embuary-video.xml)">$LOCALIZE[37717] $INFO[Container(10051).ListItem.Label]</value>
+        <value condition="String.IsEqual(Window.Property(videoinfo),6) + Window.IsVisible(script-embuary-video.xml)">$LOCALIZE[37718] $INFO[Container(10051).ListItem.Label]</value>
 
         <value condition="String.IsEqual(Window.Property(moviecontent),1)">$LOCALIZE[37665] $INFO[ListItem.Label]</value>
         <value condition="String.IsEqual(Window.Property(moviecontent),2)">$LOCALIZE[37673] $INFO[ListItem.Label]</value>

diff --git a/1080i/script-embuary-video.xml b/1080i/script-embuary-video.xml
@@ -8,6 +8,9 @@
     <onload>SetProperty(onback_10053,SetFocus(9000))</onload>
     <onload>SetProperty(onback_10054,SetFocus(9000))</onload>
     <onload>SetProperty(onback_10055,SetFocus(9000))</onload>
+    <onload>SetProperty(onback_10056,SetFocus(9000))</onload>
+    <onload>SetProperty(onback_10057,SetFocus(9000))</onload>
+    <onload>SetProperty(onback_10058,SetFocus(9000))</onload>
 	<controls>
 
 		<!-- Storage container for the item details -->
@@ -113,17 +116,7 @@
                         <width>78%</width>
                         <label fallback="19055">$VAR[LabelWIPDialogVideoInfoTagline]</label>
                         <aligny>center</aligny>
-                    </control>          
-                    <control type="label">
-                        <top>-5</top>
-                        <height>36</height>
-                        <font>Tiny</font>
-                        <textcolor>Dark1</textcolor>
-                        <width>78%</width>
-                        <label fallback="19055">DBID vorhanden</label>
-                        <visible>!String.IsEmpty(ListItem.DBID)</visible>
-                        <aligny>center</aligny>
-                    </control>                   
+                    </control>                          
                 </control>                
                 <control type="group">
                     <include>Animation.DelayFadeIn</include>
@@ -340,7 +333,7 @@
                 <control type="group">
                     <top>200</top>
                     <left>200</left>
-                    <!-- Images -->
+                    <!-- Crew -->
                     <include content="VideoList">
                         <param name="fallbackpicture" value="pbtmdb.png" />
                         <param name="arrowleft" value="-12" />
@@ -368,7 +361,7 @@
                         <param name="alignbottom" value="240" />
                     </include>
 
-                    <!-- Movies -->
+                    <!-- Similar -->
                     <include content="VideoList">
                         <param name="fallbackpicture" value="pbtmdb.png" />
                         <param name="arrowleft" value="-12" />
@@ -452,15 +445,15 @@
                         <param name="alignbottom" value="240" />
                     </include>
 
-                    <!-- Simliar -->
+                    <!-- Seasons -->
                     <include content="VideoList">
                         <param name="fallbackpicture" value="pbtmdb.png" />
                         <param name="arrowleft" value="-12" />
                         <param name="arrowtop" value="342" />
                         <param name="arrowright" value="158" />
                         <param name="visi" value="String.IsEqual(Window.Property(videoinfo),5)" />
                         <param name="animation" value="Animation.extendedcast" />
-                        <param name="controlid" value="10053" />                     
+                        <param name="controlid" value="10058" />                     
                         <param name="focusposition" value="2" />                
                         <param name="listbottom" value="30" />
                         <param name="listleft" value="-255" />
@@ -475,7 +468,35 @@
                     </include>
                     <include content="ListInfoUpdating">
                         <param name="visi" value="String.IsEqual(Window.Property(videoinfo),5)" />
-                        <param name="controlid" value="10053" />
+                        <param name="controlid" value="10058" />
+                        <param name="alignleft" value="750" />
+                        <param name="alignbottom" value="240" />
+                    </include>
+
+                    <!-- Seasons -->
+                    <include content="VideoList">
+                        <param name="fallbackpicture" value="pbtmdb.png" />
+                        <param name="arrowleft" value="-12" />
+                        <param name="arrowtop" value="342" />
+                        <param name="arrowright" value="158" />
+                        <param name="visi" value="String.IsEqual(Window.Property(videoinfo),6)" />
+                        <param name="animation" value="Animation.extendedcast" />
+                        <param name="controlid" value="10057" />                     
+                        <param name="focusposition" value="2" />                
+                        <param name="listbottom" value="30" />
+                        <param name="listleft" value="-255" />
+                        <param name="width" value="260" />
+                        <param name="headerbottom" value="710" />
+                        <param name="headerleft" value="570" />
+                        <param name="labelbottom" value="-110" />
+                        <param name="labelleft" value="-20" />
+                        <param name="labeltwovisible" value="true" />
+                        <param name="labeltwobottom" value="-150" />
+                        <param name="labeltwoleft" value="130" />     
+                    </include>
+                    <include content="ListInfoUpdating">
+                        <param name="visi" value="String.IsEqual(Window.Property(videoinfo),6)" />
+                        <param name="controlid" value="10057" />
                         <param name="alignleft" value="750" />
                         <param name="alignbottom" value="240" />
                     </include>

diff --git a/language/English/strings.po b/language/English/strings.po
@@ -1626,6 +1626,18 @@ msgctxt "#37716"
 msgid "Startup image"
 msgstr ""
 
+msgctxt "#37717"
+msgid "Seasons of"
+msgstr ""
+
+msgctxt "#37718"
+msgid "Collections of"
+msgstr ""
+
+msgctxt "#37719"
+msgid "Collections"
+msgstr ""
+
 msgctxt "#31001"
 msgid "Backup / Restore"
 msgstr "Backup / Restore"

diff --git a/media/buttonsdialogs/seasons.png b/media/buttonsdialogs/seasons.png