From e1297ae7de6ed8669a4e4284fa38d4d3fbd91385 Mon Sep 17 00:00:00 2001
From: beatmasterRS <danysahne333@yahoo.de>
Date: Wed, 13 Dec 2023 12:51:29 +0100
Subject: [PATCH] [Versions] added versions support (#1053)

* [Versions] added versions support

* [Update]

* [Update]

* [Update]

* [Update]
---
 1080i/Custom_DialogInfoSettings.xml         |   7 +
 1080i/DialogVideoVersion.xml                |  49 +++
 1080i/Includes.xml                          |  23 ++
 1080i/Includes_Animations.xml               |   6 +
 1080i/Includes_Defs.xml                     | 358 ++++++++++++++++++++
 1080i/Includes_DialogVideoInfo.xml          |   4 +-
 1080i/Includes_Labels.xml                   |   6 +
 1080i/SkinSettings.xml                      |  11 +-
 language/resource.language.en_gb/strings.po |  16 +
 9 files changed, 477 insertions(+), 3 deletions(-)
 create mode 100644 1080i/DialogVideoVersion.xml

diff --git a/1080i/Custom_DialogInfoSettings.xml b/1080i/Custom_DialogInfoSettings.xml
index 88ec18fef..f9c59f75c 100644
--- a/1080i/Custom_DialogInfoSettings.xml
+++ b/1080i/Custom_DialogInfoSettings.xml
@@ -83,6 +83,13 @@
                     <onclick>Skin.ToggleSetting(hidebutton.video.rating)</onclick>
                     <visible>Window.IsVisible(DialogVideoInfo.xml)</visible>
                 </control>
+                <control type="radiobutton" id="130">
+                    <include>DefContextButtonGradientSelect</include>
+                    <label>40000</label>
+                    <selected>!Skin.HasSetting(hidebutton.video.versions)</selected>
+                    <onclick>Skin.ToggleSetting(hidebutton.video.versions)</onclick>
+                    <visible>Window.IsVisible(DialogVideoInfo.xml)</visible>
+                </control>
                 <control type="radiobutton" id="104">
                     <include>DefContextButtonGradientSelect</include>
                     <label>31282</label>
diff --git a/1080i/DialogVideoVersion.xml b/1080i/DialogVideoVersion.xml
new file mode 100644
index 000000000..3f42e7470
--- /dev/null
+++ b/1080i/DialogVideoVersion.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<window>
+<defaultcontrol always="true">200</defaultcontrol>
+<onload condition="Window.IsActive(videoversionselect)">Control.SetFocus(50)</onload>
+    <controls>
+    <include>GlobalOverlay</include>
+        <control type="group">
+            <include>DefDialogBackground</include>
+            <control type="label" id="2">
+                <include>DefDialogHeader</include>
+                <label/>
+            </control>
+            <include content="Kodi_Logo">
+                <param name="dimensions" value="40"/>
+                <param name="top" value="40"/>
+                <param name="left" value="40"/>
+            </include>
+            
+            <!-- Lines -->
+            <control type="image">
+                <top>95</top>
+                <left>40</left>
+                <right>40</right>
+                <height>1</height>
+                <bottom>10</bottom>
+                <colordiffuse>Black12</colordiffuse>
+                <texture>common/white.png</texture>
+            </control>
+            <control type="image">
+                <posx>340</posx>
+                <top>115</top>
+                <height>730</height>
+                <width>1</width>
+                <texture colordiffuse="Black12">common/white.png</texture>
+            </control>
+            <control type="image">
+                <posx>741</posx>
+                <top>115</top>
+                <height>700</height>
+                <width>1</width>
+                <texture colordiffuse="Black12">common/white.png</texture>
+                <visible>Window.IsActive(videoversion)</visible>
+            </control>
+            
+            <include condition="Window.IsActive(videoversion)">DialogVideoVersionLayout</include>
+            <include condition="Window.IsActive(videoversionselect)">DialogVideoVersionSelectLayout</include>
+        </control>
+    </controls>
+</window>
\ No newline at end of file
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index 64f7444e2..72363be57 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -1914,6 +1914,16 @@
                 <visible>[String.IsEqual(ListItem.DBType,movie) | String.IsEqual(ListItem.DBType,tvshow) | String.IsEqual(ListItem.DBType,episode)] + Control.IsEnabled(7)</visible>
                 <visible>!Skin.HasSetting(hidebutton.video.rating)</visible>
             </control>
+            <control type="radiobutton" id="14">
+                <onfocus>ClearProperty(moviecontent)</onfocus>
+                <onfocus>ClearProperty(ShowDisc)</onfocus>
+                <include>buttondimensions</include>
+                <include content="buttontextures">
+                    <param name="icon" value="buttonsdialogs/seasons.png"/>
+                </include>
+                <visible>String.IsEqual(ListItem.DBTYPE,movie)</visible>
+                <visible>!Skin.HasSetting(hidebutton.video.versions)</visible>
+            </control>
             <control type="radiobutton" id="1236">
                 <onfocus>ClearProperty(moviecontent)</onfocus>
                 <onfocus>ClearProperty(ShowDisc)</onfocus>
@@ -5159,4 +5169,17 @@
         <value condition="String.Contains(System.Language,Spanish)">es</value>
         <value>en</value>
     </variable>
+    
+    <variable name="VideoVersionPosterVar">
+        <value condition="ControlGroup(200).HasFocus(201) + !String.IsEmpty(Container(50).ListItem.Art(poster))">$INFO[Container(50).ListItem.Art(poster)]</value>
+        <value condition="ControlGroup(200).HasFocus(201) + String.IsEmpty(Container(51).ListItem.Art(poster))">$INFO[Container(50).ListItem.Art(thumb)]</value>
+        <value condition="ControlGroup(200).HasFocus(202) + !String.IsEmpty(Container(51).ListItem.Art(poster))">$INFO[Container(51).ListItem.Art(poster)]</value>
+        <value condition="ControlGroup(200).HasFocus(202) + String.IsEmpty(Container(51).ListItem.Art(poster))">$INFO[Container(51).ListItem.Art(thumb)]</value>
+    </variable>
+    
+    <variable name="VideoVersionFileVar">
+        <value condition="Control.HasFocus(50)">$INFO[Container(50).ListItem.FileNameAndPath]</value>
+        <value condition="Control.HasFocus(51)">$INFO[Container(51).ListItem.FileNameAndPath]</value>
+        <value>$INFO[ListItem.FileNameAndPath]</value>
+    </variable>
 </includes>
diff --git a/1080i/Includes_Animations.xml b/1080i/Includes_Animations.xml
index 772bff36e..69d19c358 100644
--- a/1080i/Includes_Animations.xml
+++ b/1080i/Includes_Animations.xml
@@ -172,6 +172,9 @@
         <animation type="Conditional" condition="Control.HasFocus(9015) + ControlGroup(9000).HasFocus()" reversible="false">
             <effect type="fade" end="100" start="0" time="400" delay="2300"/>
         </animation>
+        <animation type="Conditional" condition="Control.HasFocus(14) + ControlGroup(9000).HasFocus()" reversible="false">
+            <effect type="fade" end="100" start="0" time="400" delay="2300"/>
+        </animation>
         <animation type="Conditional" condition="Control.HasFocus(49) + ControlGroup(9000).HasFocus()" reversible="false">
             <effect type="fade" end="100" start="0" time="400" delay="2300"/>
         </animation>
@@ -271,6 +274,9 @@
         <animation type="Conditional" condition="Control.HasFocus(9077) + !String.IsEmpty(ListItem.FileNameAndPath)" reversible="false">
             <effect type="fade" end="0" start="100" time="400" delay="2000"/>
         </animation>
+        <animation type="Conditional" condition="Control.HasFocus(14) + !String.IsEmpty(ListItem.FileNameAndPath)" reversible="false">
+            <effect type="fade" end="0" start="100" time="400" delay="2000"/>
+        </animation>
         <animation type="Conditional" condition="Control.HasFocus(9078) + !String.IsEmpty(ListItem.FileNameAndPath)" reversible="false">
             <effect type="fade" end="0" start="100" time="400" delay="2000"/>
         </animation>
diff --git a/1080i/Includes_Defs.xml b/1080i/Includes_Defs.xml
index 6a18952c3..5a0ab49e7 100644
--- a/1080i/Includes_Defs.xml
+++ b/1080i/Includes_Defs.xml
@@ -3514,6 +3514,14 @@
                  <texture colordiffuse="$VAR[ColorIndicatorBackgroundNew]" background="true">misc/overlaywatched.png</texture>
                  <visible>!ListItem.IsResumable + !$EXP[IsTVShowInProgress] + !ListItem.IsPlaying + [[String.IsEqual(ListItem.Overlay,OverlayUnwatched.png) + [$EXP[IsNewMovie] | $EXP[IsNewTVShow] | $EXP[IsNewEpisode]]]] + !Skin.HasSetting(hide.markers.newcontent)</visible>
             </control>
+            <control type="image">
+                 <right>8</right>
+                 <top>8</top>
+                 <width>100</width>
+                 <height>100</height>
+                 <texture colordiffuse="$VAR[ColorIndicatorBackgroundInprogress]" background="true">misc/overlaywatched.png</texture>
+                 <visible>![!ListItem.IsResumable + !$EXP[IsTVShowInProgress] + !ListItem.IsPlaying + [[String.IsEqual(ListItem.Overlay,OverlayUnwatched.png) + [$EXP[IsNewMovie] | $EXP[IsNewTVShow] | $EXP[IsNewEpisode]]]] + !Skin.HasSetting(hide.markers.newcontent)] + [ListItem.HasVideoVersions + !Skin.HasSetting(hide.markers.versions)]</visible>
+            </control>
             <control type="label">
                  <right>-9</right>
                  <top>8</top>
@@ -3598,6 +3606,14 @@
                  <texture colordiffuse="$VAR[ColorIndicatorBackgroundNew]">misc/overlaywatched.png</texture>
                  <visible>!Container(301).ListItem.IsResumable + !$EXP[IsTVShowInProgress301] + !Container(301).ListItem.IsPlaying + [[String.IsEqual(Container(301).ListItem.Overlay,OverlayUnwatched.png) + [$EXP[IsNewMovie301] | $EXP[IsNewTVShow301] | $EXP[IsNewEpisode301]]]] + !Skin.HasSetting(hide.markers.newcontent)</visible>
             </control>
+            <control type="image">
+                 <right>8</right>
+                 <top>8</top>
+                 <width>100</width>
+                 <height>100</height>
+                 <texture colordiffuse="$VAR[ColorIndicatorBackgroundNew]">misc/overlaywatched.png</texture>
+                 <visible>![!Container(301).ListItem.IsResumable + !$EXP[IsTVShowInProgress301] + !Container(301).ListItem.IsPlaying + [[String.IsEqual(Container(301).ListItem.Overlay,OverlayUnwatched.png) + [$EXP[IsNewMovie301] | $EXP[IsNewTVShow301] | $EXP[IsNewEpisode301]]]] + !Skin.HasSetting(hide.markers.newcontent)] + [Container(301).ListItem.HasVideoVersions + !Skin.HasSetting(hide.markers.versions)]</visible>
+            </control>
             <control type="label">
                  <right>-9</right>
                  <top>8</top>
@@ -4913,4 +4929,346 @@
         <scrollspeed>40</scrollspeed>
         <scrollsuffix>  ••  </scrollsuffix>
     </include>
+    
+    <include name="DialogVideoVersionLayout">
+        <control type="group">
+            <centertop>50%</centertop>
+            <centerleft>50%</centerleft>
+            <width>1020</width>
+            <height>710</height>
+            <include>DialogVideoVersionCommonLayout</include>
+            <include content="Def_Gradient_Settings_Image">
+                <param name="controlid" value="101"/>
+                <param name="left" value="712"/>
+                <param name="top" value="20"/>
+                <param name="width" value="298"/>
+                <param name="height" value="66"/>
+                <param name="slide" value="66"/>
+            </include>
+            <control type="grouplist" id="101">
+                <height>462</height>
+                <width>300</width>
+                <top>20</top>
+                <right>10</right>
+                <onleft condition="ControlGroup(200).HasFocus(201) | Integer.IsGreater(Container(51).NumItems,0)">100</onleft>
+                <onleft condition="ControlGroup(200).HasFocus(202) + Integer.IsEqual(Container(51).NumItems,0)">200</onleft>
+                <usecontrolcoords>true</usecontrolcoords>
+                <itemgap>0</itemgap>
+                <scrolltime>0</scrolltime>
+                <control type="button" id="21">
+                    <width>300</width>
+                    <include>DefContextButtonGradientSelect</include>
+                    <label>$LOCALIZE[208]</label>
+                </control>
+                <control type="button" id="22">
+                    <width>300</width>
+                    <include>DefContextButtonGradientSelect</include>
+                    <label>$LOCALIZE[31719]</label>
+                    <visible>ControlGroup(200).HasFocus(201)</visible>
+                </control>
+                <control type="button" id="23">
+                    <width>300</width>
+                    <include>DefContextButtonGradientSelect</include>
+                    <label>$LOCALIZE[31720]</label>
+                    <visible>ControlGroup(200).HasFocus(202)</visible>
+                </control>
+                <control type="button" id="27">
+                    <width>300</width>
+                    <include>DefContextButtonGradientSelect</include>
+                    <label>$LOCALIZE[13511]</label>
+                </control>
+                <control type="button" id="24">
+                    <width>300</width>
+                    <include>DefContextButtonGradientSelect</include>
+                    <label>$LOCALIZE[118]</label>
+                </control>
+                <control type="button" id="26">
+                    <width>300</width>
+                    <include>DefContextButtonGradientSelect</include>
+                    <label>$LOCALIZE[15015]</label>
+                </control>
+                <control type="button" id="25">
+                    <width>300</width>
+                    <include>DefContextButtonGradientSelect</include>
+                    <label>$LOCALIZE[31721]</label>
+                    <visible>ControlGroup(200).HasFocus(201)</visible>
+                </control>
+            </control>
+        </control>
+    </include>
+
+    <include name="DialogVideoVersionSelectLayout">
+        <control type="group">
+            <centertop>50%</centertop>
+            <centerleft>50%</centerleft>
+            <width>1020</width>
+            <height>710</height>
+            <include>DialogVideoVersionCommonLayout</include>
+        </control>
+    </include>
+
+    <include name="DialogVideoVersionCommonLayout">
+        <include content="Def_Gradient_Settings_Image">
+            <param name="controlid" value="200"/>
+            <param name="left" value="-22"/>
+            <param name="top" value="20"/>
+            <param name="width" value="332"/>
+            <param name="height" value="66"/>
+            <param name="slide" value="66"/>
+            <param name="visible" value="ControlGroup(200).HasFocus() | ControlGroup(100).HasFocus() | ControlGroup(101).HasFocus()"/>
+        </include>
+        <control type="grouplist" id="200">
+            <itemgap>0</itemgap>
+            <scrolltime>0</scrolltime>
+            <orientation>vertical</orientation>
+            <onright condition="ControlGroup(200).HasFocus(201)">50</onright>
+            <onright condition="ControlGroup(200).HasFocus(202)">51</onright>
+            <left>-18</left>
+            <top>20</top>
+            <control type="button" id="201">
+                <width>330</width>
+                <include>DefContextButtonGradientSelect</include>
+                <label>$LOCALIZE[40000]</label>
+                <visible>Window.IsActive(videoversion)| Window.IsActive(videoversionselect) + Integer.IsGreater(Container(50).NumItems,0)</visible>
+            </control>
+            <control type="button" id="202">
+                <width>330</width>
+                <include>DefContextButtonGradientSelect</include>
+                <label>$LOCALIZE[31722]</label>
+                <visible>Window.IsActive(videoversion) | Window.IsActive(videoversionselect) + Integer.IsGreater(Container(51).NumItems,0)</visible>
+            </control>
+        </control>
+        <control type="image">
+            <description>Large Icon Image</description>
+            <top>312</top>
+            <left>10</left>
+            <width>300</width>
+            <height>450</height>
+            <texture fallback="DefaultAddonNone.png">$VAR[VideoVersionPosterVar]</texture>
+            <aspectratio align="center" aligny="bottom">keep</aspectratio>
+        </control>
+        <control type="group" id="100">
+            <control type="list" id="50">
+                <left>311</left>
+                <top>20</top>
+                <width>800</width>
+                <height>483</height>
+                <onup>50</onup>
+                <ondown>50</ondown>
+                <onleft>200</onleft>
+                <onright condition="Window.IsActive(videoversion)">101</onright>
+                <visible>ControlGroup(200).HasFocus(201)</visible>
+                <itemlayout height="69" width="400" condition="Window.IsActive(videoversion)">
+                    <control type="label">
+                        <left>30</left>
+                        <right>30</right>
+                        <font>Small</font>
+                        <textcolor>Black70</textcolor>
+                        <height>66</height>
+                        <aligny>center</aligny>
+                        <info>ListItem.Label</info>
+                    </control>
+                </itemlayout>
+                <focusedlayout height="69" width="400" condition="Window.IsActive(videoversion)">
+                    <control type="image">
+                        <left>0</left>
+                        <right>0</right>
+                        <height>66</height>
+                        <texture border="5" colordiffuse="$VAR[ColorSelectOtherBar]">common/white.png</texture>
+                        <visible>Control.HasFocus(50) | ControlGroup(101).HasFocus()</visible>
+                    </control>
+                    <control type="image">
+                        <left>0</left>
+                        <right>0</right>
+                        <height>66</height>
+                        <texture border="8" colordiffuse="$VAR[ColorHighlightOtherBar]">common/gradient-box-wide.png</texture>
+                        <visible>Control.HasFocus(50) | ControlGroup(101).HasFocus()</visible>
+                    </control>
+                    <control type="label">
+                        <left>30</left>
+                        <right>30</right>
+                        <height>66</height>
+                        <font>Small</font>
+                        <aligny>center</aligny>
+                        <textcolor>Selected</textcolor>
+                        <info>ListItem.Label</info>
+                        <visible>Control.HasFocus(50)</visible>
+                    </control>
+                    <control type="label">
+                        <left>30</left>
+                        <right>30</right>
+                        <height>66</height>
+                        <font>Small</font>
+                        <aligny>center</aligny>
+                        <textcolor>Black70</textcolor>
+                        <info>ListItem.Label</info>
+                        <visible>!Control.HasFocus(50)</visible>
+                    </control>
+                </focusedlayout>
+                <itemlayout height="69" width="698" condition="!Window.IsActive(videoversion)">
+                    <control type="label">
+                        <left>30</left>
+                        <right>30</right>
+                        <font>Small</font>
+                        <textcolor>Black70</textcolor>
+                        <height>66</height>
+                        <aligny>center</aligny>
+                        <info>ListItem.Label</info>
+                    </control>
+                </itemlayout>
+                <focusedlayout height="69" width="698" condition="!Window.IsActive(videoversion)">
+                    <control type="image">
+                        <left>0</left>
+                        <right>0</right>
+                        <height>66</height>
+                        <texture border="5" colordiffuse="$VAR[ColorSelectOtherBar]">common/white.png</texture>
+                        <visible>Control.HasFocus(50) | ControlGroup(101).HasFocus()</visible>
+                    </control>
+                    <control type="image">
+                        <left>0</left>
+                        <right>0</right>
+                        <height>66</height>
+                        <texture border="8" colordiffuse="$VAR[ColorHighlightOtherBar]">common/gradient-box-wide.png</texture>
+                        <visible>Control.HasFocus(50) | ControlGroup(101).HasFocus()</visible>
+                    </control>
+                    <control type="label">
+                        <left>30</left>
+                        <right>30</right>
+                        <height>66</height>
+                        <font>Small</font>
+                        <aligny>center</aligny>
+                        <textcolor>Selected</textcolor>
+                        <info>ListItem.Label</info>
+                        <visible>Control.HasFocus(50)</visible>
+                    </control>
+                    <control type="label">
+                        <left>30</left>
+                        <right>30</right>
+                        <height>66</height>
+                        <font>Small</font>
+                        <aligny>center</aligny>
+                        <textcolor>Black70</textcolor>
+                        <info>ListItem.Label</info>
+                        <visible>!Control.HasFocus(50)</visible>
+                    </control>
+                </focusedlayout>
+            </control>
+            <control type="list" id="51">
+                <left>311</left>
+                <top>20</top>
+                <width>800</width>
+                <height>483</height>
+                <onup>50</onup>
+                <ondown>50</ondown>
+                <onleft>200</onleft>
+                <onright condition="Window.IsActive(videoversion)">101</onright>
+                <visible>ControlGroup(200).HasFocus(202)</visible>
+                <itemlayout height="69" width="400" condition="Window.IsActive(videoversion)">
+                    <control type="label">
+                        <left>30</left>
+                        <right>30</right>
+                        <font>Small</font>
+                        <textcolor>Black70</textcolor>
+                        <height>66</height>
+                        <aligny>center</aligny>
+                        <info>ListItem.Label</info>
+                    </control>
+                </itemlayout>
+                <focusedlayout height="69" width="400" condition="Window.IsActive(videoversion)">
+                    <control type="image">
+                        <left>0</left>
+                        <right>0</right>
+                        <height>66</height>
+                        <texture border="5" colordiffuse="$VAR[ColorSelectOtherBar]">common/white.png</texture>
+                        <visible>Control.HasFocus(51) | ControlGroup(101).HasFocus()</visible>
+                    </control>
+                    <control type="image">
+                        <left>0</left>
+                        <right>0</right>
+                        <height>66</height>
+                        <texture border="8" colordiffuse="$VAR[ColorHighlightOtherBar]">common/gradient-box-wide.png</texture>
+                        <visible>Control.HasFocus(51) | ControlGroup(101).HasFocus()</visible>
+                    </control>
+                    <control type="label">
+                        <left>30</left>
+                        <right>30</right>
+                        <height>66</height>
+                        <font>Small</font>
+                        <aligny>center</aligny>
+                        <textcolor>Selected</textcolor>
+                        <info>ListItem.Label</info>
+                        <visible>Control.HasFocus(51)</visible>
+                    </control>
+                    <control type="label">
+                        <left>30</left>
+                        <right>30</right>
+                        <height>66</height>
+                        <font>Small</font>
+                        <aligny>center</aligny>
+                        <textcolor>Black70</textcolor>
+                        <info>ListItem.Label</info>
+                        <visible>!Control.HasFocus(51)</visible>
+                    </control>
+                </focusedlayout>
+                <itemlayout height="69" width="698" condition="!Window.IsActive(videoversion)">
+                    <control type="label">
+                        <left>30</left>
+                        <right>30</right>
+                        <font>Small</font>
+                        <textcolor>Black70</textcolor>
+                        <height>66</height>
+                        <aligny>center</aligny>
+                        <info>ListItem.Label</info>
+                    </control>
+                </itemlayout>
+                <focusedlayout height="69" width="698" condition="!Window.IsActive(videoversion)">
+                    <control type="image">
+                        <left>0</left>
+                        <right>0</right>
+                        <height>66</height>
+                        <texture border="5" colordiffuse="$VAR[ColorSelectOtherBar]">common/white.png</texture>
+                        <visible>Control.HasFocus(51) | ControlGroup(101).HasFocus()</visible>
+                    </control>
+                    <control type="image">
+                        <left>0</left>
+                        <right>0</right>
+                        <height>66</height>
+                        <texture border="8" colordiffuse="$VAR[ColorHighlightOtherBar]">common/gradient-box-wide.png</texture>
+                        <visible>Control.HasFocus(51) | ControlGroup(101).HasFocus()</visible>
+                    </control>
+                    <control type="label">
+                        <left>30</left>
+                        <right>30</right>
+                        <height>66</height>
+                        <font>Small</font>
+                        <aligny>center</aligny>
+                        <textcolor>Selected</textcolor>
+                        <info>ListItem.Label</info>
+                        <visible>Control.HasFocus(51)</visible>
+                    </control>
+                    <control type="label">
+                        <left>30</left>
+                        <right>30</right>
+                        <height>66</height>
+                        <font>Small</font>
+                        <aligny>center</aligny>
+                        <textcolor>Black70</textcolor>
+                        <info>ListItem.Label</info>
+                        <visible>!Control.HasFocus(51)</visible>
+                    </control>
+                </focusedlayout>
+            </control>
+        </control>
+        <control type="label">
+            <visible>Control.HasFocus(50) | Control.HasFocus(51)</visible>
+            <left>340</left>
+            <right>10</right>
+            <font>Tiny</font>
+            <height>50</height>
+            <top>720</top>
+            <align>right</align>
+            <textcolor>Black70</textcolor>
+            <label>$VAR[VideoVersionFileVar]</label>
+        </control>
+    </include>
 </includes>
diff --git a/1080i/Includes_DialogVideoInfo.xml b/1080i/Includes_DialogVideoInfo.xml
index 812903a73..d79f3361f 100644
--- a/1080i/Includes_DialogVideoInfo.xml
+++ b/1080i/Includes_DialogVideoInfo.xml
@@ -906,7 +906,7 @@
                         <param name="arrowright" value="155"/>
                         <param name="fallbackpicture" value="DefaultActor.png"/>
                         <param name="visi" value="String.IsEmpty(Window.Property(moviecontent)) + !Skin.HasSetting(HideActorImages) + ![Window.IsVisible(script-wikipedia.xml) + !Skin.HasSetting(hidebutton.video.wiki)]"/>
-                        <param name="visible.layouts" value="Control.HasFocus(50) | Control.HasFocus(6) | Control.HasFocus(10) | Window.IsVisible(DialogBusy.xml)"/>
+                        <param name="visible.layouts" value="[Control.HasFocus(50) + !Window.IsActive(videoversion)] | Control.HasFocus(6) | Control.HasFocus(10) | Window.IsVisible(DialogBusy.xml)"/>
                         <param name="storageicon.backgroundlist" value="false"/>
                         <param name="animation" value="Animation.cast.test"/>
                         <param name="controlid" value="50"/>
@@ -925,7 +925,7 @@
                         <param name="condition.issets" value="true"/>
                         <param name="condition.isnotsets" value="false"/>
                         <param name="visi" value="String.IsEmpty(Window.Property(moviecontent)) + !Skin.HasSetting(HideActorImages)"/>
-                        <param name="visible.layouts" value="Control.HasFocus(50) | Control.HasFocus(6) | Control.HasFocus(10) | Window.IsVisible(DialogBusy.xml)"/>
+                        <param name="visible.layouts" value="[Control.HasFocus(50) + !Window.IsActive(videoversion)] | Control.HasFocus(6) | Control.HasFocus(10) | Window.IsVisible(DialogBusy.xml)"/>
                         <param name="storageicon.backgroundlist" value="false"/>
                         <param name="animation" value="Animation.cast.test"/>
                         <param name="controlid" value="50"/>
diff --git a/1080i/Includes_Labels.xml b/1080i/Includes_Labels.xml
index 5a4d0c4ae..51cfe13ce 100644
--- a/1080i/Includes_Labels.xml
+++ b/1080i/Includes_Labels.xml
@@ -135,6 +135,7 @@
         <value condition="String.IsEqual(ListItem.Overlay,OverlayWatched.png) + Skin.HasSetting(hide.markers.watched)"></value>
         <value condition="String.IsEqual(ListItem.Overlay,OverlayWatched.png)">[COLOR=FF00DD44]&#10003;[/COLOR]</value>
         <value condition="String.IsEqual(ListItem.Overlay,OverlayUnwatched.png) + [$EXP[IsNewMovie] | $EXP[IsNewTVShow] | $EXP[IsNewEpisode]] + !Skin.HasSetting(hide.markers.newcontent)">[COLOR=ColoredIcons]&#62079;[/COLOR]</value>
+        <value condition="ListItem.HasVideoVersions + !Skin.HasSetting(hide.markers.versions)">&#61451;</value>
     </variable>
 
     <variable name="IndicatorFlagLabel">
@@ -145,6 +146,7 @@
         <value condition="String.IsEqual(ListItem.Overlay,OverlayWatched.png) + Skin.HasSetting(hide.markers.watched)"></value>
         <value condition="String.IsEqual(ListItem.Overlay,OverlayWatched.png)">$LOCALIZE[31493]</value>
         <value condition="String.IsEqual(ListItem.Overlay,OverlayUnwatched.png) + [$EXP[IsNewMovie] | $EXP[IsNewTVShow] | $EXP[IsNewEpisode]] + !Skin.HasSetting(hide.markers.newcontent)">$LOCALIZE[31494]</value>
+        <value condition="ListItem.HasVideoVersions + !Skin.HasSetting(hide.markers.versions)">$LOCALIZE[40000]</value>
     </variable>
 
     <variable name="IndicatorFlagLabelIsResumable">
@@ -166,6 +168,7 @@
         <value condition="String.IsEqual(Container(301).ListItem.Overlay,OverlayWatched.png) + Skin.HasSetting(hide.markers.watched)"></value>
         <value condition="String.IsEqual(Container(301).ListItem.Overlay,OverlayWatched.png)">[COLOR=FF00DD44]&#10003;[/COLOR]</value>
         <value condition="String.IsEqual(Container(301).ListItem.Overlay,OverlayUnwatched.png) + [$EXP[IsNewMovie301] | $EXP[IsNewTVShow301] | $EXP[IsNewEpisode301]] + !Skin.HasSetting(hide.markers.newcontent)">[COLOR=ColoredIcons]&#62079;[/COLOR]</value>
+        <value condition="Container(301).ListItem.HasVideoVersions + !Skin.HasSetting(hide.markers.versions)">&#61451;</value>
     </variable>
     
     <variable name="IndicatorFlagLabel301">
@@ -176,6 +179,7 @@
         <value condition="String.IsEqual(Container(301).ListItem.Overlay,OverlayWatched.png) + Skin.HasSetting(hide.markers.watched)"></value>
         <value condition="String.IsEqual(Container(301).ListItem.Overlay,OverlayWatched.png)">$LOCALIZE[31493]</value>
         <value condition="String.IsEqual(Container(301).ListItem.Overlay,OverlayUnwatched.png) + [$EXP[IsNewMovie301] | $EXP[IsNewTVShow301] | $EXP[IsNewEpisode301]] + !Skin.HasSetting(hide.markers.newcontent)">$LOCALIZE[31494]</value>
+        <value condition="Container(301).ListItem.HasVideoVersions + !Skin.HasSetting(hide.markers.versions)">$LOCALIZE[40000]</value>
     </variable>
     
     <variable name="IndicatorFlagLabelIsResumable301">
@@ -202,6 +206,7 @@
         <value condition="String.IsEqual(ListItem.Overlay,OverlayWatched.png) + Skin.HasSetting(hide.markers.watched)"></value>
         <value condition="String.IsEqual(ListItem.Overlay,OverlayWatched.png)">[COLOR=FF00DD44]&#10003;[/COLOR]</value>
         <value condition="String.IsEqual(ListItem.Overlay,OverlayUnwatched.png) + [$EXP[IsNewMovie] | $EXP[IsNewTVShow] | $EXP[IsNewEpisode]] + !Skin.HasSetting(hide.markers.newcontent)">[COLOR=ColoredIcons]&#62079;[/COLOR]</value>
+        <value condition="ListItem.HasVideoVersions + !Skin.HasSetting(hide.markers.versions)">&#61451;</value>
         <value condition="String.IsEqual(ListItem.Overlay,OverlayUnwatched.png) + !Skin.HasSetting(hide.markers.unwatched)">&#61833;</value>
     </variable>
 
@@ -1342,6 +1347,7 @@
         <value condition="Control.HasFocus(9015) + Window.IsVisible(DialogVideoInfo.xml)">$LOCALIZE[31498]</value>
         <value condition="Control.HasFocus(9011) + Window.IsVisible(DialogVideoInfo.xml)">$LOCALIZE[31486]</value>
         <value condition="Control.HasFocus(9013) + Window.IsVisible(DialogVideoInfo.xml)">$LOCALIZE[31711]</value>
+        <value condition="Control.HasFocus(14) + Window.IsVisible(DialogVideoInfo.xml)">$LOCALIZE[40000]</value>
         <value condition="Control.HasFocus(12) + Window.IsVisible(DialogAddonInfo.xml)">$LOCALIZE[518]</value>
         <value condition="Control.HasFocus(9) + Window.IsVisible(DialogAddonInfo.xml)">$LOCALIZE[24020]</value>
         <value condition="Control.HasFocus(8) + Window.IsVisible(DialogAddonInfo.xml)">$LOCALIZE[24138]</value>
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index 38b304c72..6fec99192 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -1796,7 +1796,7 @@
                             <include content="DefContextButtonColorbox">
                                 <param name="colorcode" value="$VAR[ColorIndicatorBackgroundInprogress]"/>
                             </include>
-                            <label>$LOCALIZE[31110] - $LOCALIZE[575]</label>
+                            <label>$LOCALIZE[31110] - $LOCALIZE[575]/$LOCALIZE[40000]</label>
                             <colorbox>$INFO[Skin.String(indicatorcolorbackgroundinprogress.name)]</colorbox>
                             <onclick>SetProperty(colorstring,$INFO[Skin.String(indicatorcolorbackgroundinprogress.name)],home)</onclick>
                             <onclick>SetProperty(colordesc,indicatorcolorbackgroundinprogress.name,home)</onclick>
@@ -2675,6 +2675,15 @@
                             <selected>!Skin.HasSetting(hide.markers.newcontent)</selected>
                             <onclick>Skin.ToggleSetting(hide.markers.newcontent)</onclick>
                         </control>
+                        <control type="radiobutton" id="95891">
+                            <visible>ControlGroup(9100).HasFocus(9106)</visible>
+                            <include>DefSettingsButtonGradientSkinSettings</include>
+                            <label>$LOCALIZE[31297]$LOCALIZE[40000]</label>
+                            <align>left</align>
+                            <enable>!Skin.HasSetting(hide.markers)</enable>
+                            <selected>!Skin.HasSetting(hide.markers.versions)</selected>
+                            <onclick>Skin.ToggleSetting(hide.markers.versions)</onclick>
+                        </control>
                         <control type="radiobutton" id="9591">
                             <visible>ControlGroup(9100).HasFocus(9106)</visible>
                             <include>DefSettingsButtonGradientSkinSettings</include>
diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index c7e0d4320..d790965da 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -2616,3 +2616,19 @@ msgstr ""
 msgctxt "#31718"
 msgid "Sandy yellow"
 msgstr ""
+
+msgctxt "#31719"
+msgid "Add version"
+msgstr ""
+
+msgctxt "#31720"
+msgid "Add extras"
+msgstr ""
+
+msgctxt "#31721"
+msgid "Set default"
+msgstr ""
+
+msgctxt "#31722"
+msgid "Extras"
+msgstr ""