long shot fix for video trailer - #17

jurialmunkey · Jun 6, 2022 · 0dd3740 · 0dd3740
1 parent 98a3fe1
commit 0dd3740
Show file tree

Hide file tree

Showing 3 changed files with 108 additions and 107 deletions.
diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml
@@ -68,40 +68,16 @@
                                 <include>Action_Recommendations_OnDown</include>
                             </include>
                         </control>
-                        <control type="group">
+                        <include content="Dialog_VideoInfoDetails">
                             <top>480</top>
-                            <include>Dialog_VideoInfoDetails</include>
-                        </control>
-                    </control>
-
-                    <!-- Plot Box -->
-                    <control type="group">
-                        <include>Dimension_Info</include>
-                        <include>Info_Title</include>
-                        <visible allowhiddenfocus="true">Control.HasFocus(61)</visible>
-                        <include content="Object_Control">
-                            <param name="control" value="textbox" />
-                            <top>120</top>
-                            <bottom>80</bottom>
-                            <align>left</align>
-                            <textcolor>main_fg_70</textcolor>
-                            <font>font_overlay_plotbox</font>
-                            <label fallback="19055">$INFO[ListItem.Tagline,[B]$LOCALIZE[202][/B][CR],[CR][CR]]$VAR[Label_Plot,[B]$LOCALIZE[31028][/B][CR],]$VAR[Label_OverlayCritics]$INFO[Window(Home).Property(ResetScroll)]</label>
-                            <pagecontrol>61</pagecontrol>
-                            <autoscroll delay="8000" time="4000" repeat="12000">false</autoscroll>
                         </include>
-                        <control type="scrollbar" id="61">
-                            <centerright>-40</centerright>
-                            <width>8</width>
+                    </control>
 
-                            <onleft>SetFocus(5000)</onleft>
-                            <onright>SetFocus(5000)</onright>
-                            <ondown>SetFocus(5000)</ondown>
-                            <onup>SetFocus(5000)</onup>
+                    <!-- Trailer -->
+                    <include>Dialog_VideoInfoTrailer</include>
 
-                            <visible allowhiddenfocus="true">false</visible>
-                        </control>
-                    </control>
+                    <!-- Plot Box -->
+                    <include>Dialog_VideoInfoPlotBox</include>
 
                     <!-- Codecs -->
                     <control type="group">
@@ -194,28 +170,5 @@
             <ondown condition="Skin.HasSetting(DisableTrailerWindow) + Player.HasVideo">ClearProperty(HasTrailer,Home)</ondown>
         </control>
 
-        <!-- Trailer -->
-        <control type="group">
-            <left>big_poster_w</left>
-            <control type="group">
-                <include content="Object_Include" condition="![Skin.String(DividerStyle,Split) | Skin.String(DividerStyle,Solid)]">
-                    <left>-80</left>
-                </include>
-                <control type="group">
-                    <include>Dimension_Info</include>
-                    <visible>Player.HasVideo</visible>
-                    <control type="image">
-                        <include>Texture_Shadow_40</include>
-                        <visible>Control.HasFocus(7001)</visible>
-                        <include>Animation_Right_Delay</include>
-                        <texture colordiffuse="black" border="10">common/box.png</texture>
-                    </control>
-                    <control type="videowindow">
-                        <visible>Control.HasFocus(7001)</visible>
-                        <visible>!String.IsEmpty(Window(Home).Property(HasTrailer))</visible>
-                    </control>
-                </control>
-            </control>
-        </control>
     </controls>
 </window>
diff --git a/1080i/Dialogs.xml b/1080i/Dialogs.xml
@@ -739,61 +739,109 @@
         </definition>
     </include>
 
-    <include name="Dialog_VideoInfoDetails">
-        <control type="grouplist">
-            <width>400</width>
-            <height>240</height>
-            <orientation>vertical</orientation>
-            <itemgap>20</itemgap>
-            <include content="Object_InfoCircle">
-                <param name="icon" value="$VAR[Image_DirectorIcon]" />
-                <param name="role" value="$LOCALIZE[20339]" />
-                <param name="name" value="$INFO[ListItem.Director]" />
-                <visible>!String.IsEmpty(ListItem.Director)</visible>
-            </include>
-            <include content="Object_InfoCircle">
-                <param name="icon" value="$VAR[Image_WriterIcon]" />
-                <param name="role" value="$LOCALIZE[20417]" />
-                <param name="name" value="$INFO[ListItem.Writer]" />
-                <visible>!String.IsEmpty(ListItem.Writer)</visible>
-            </include>
-            <include content="Object_InfoCircle">
-                <param name="icon" value="$VAR[Image_CreatorIcon]" />
-                <param name="role" value="$LOCALIZE[31065]" />
-                <param name="name" value="$INFO[Window(Home).Property(TMDbHelper.ListItem.Creator)]" />
-                <visible>!String.IsEmpty(Window(Home).Property(TMDbHelper.ListItem.Creator))</visible>
-            </include>
-            <include content="Object_InfoCircle">
-                <param name="icon" value="special://skin/extras/icons/director.png" />
-                <param name="role" value="$LOCALIZE[572]" />
-                <param name="name" value="$INFO[ListItem.Studio]" />
-                <visible>!String.IsEmpty(ListItem.Studio)</visible>
-            </include>
+    <include name="Dialog_VideoInfoTrailer">
+        <control type="group">
+            <include>Dimension_Info</include>
+            <control type="image">
+                <include>Texture_Shadow_40</include>
+                <visible>Control.HasFocus(7001)</visible>
+                <include>Animation_Right_Delay</include>
+                <texture colordiffuse="black" border="10">common/box.png</texture>
+            </control>
+            <control type="videowindow">
+                <visible>Player.HasVideo</visible>
+                <visible>Control.HasFocus(7001)</visible>
+                <visible>!String.IsEmpty(Window(Home).Property(HasTrailer))</visible>
+            </control>
         </control>
-        <control type="grouplist">
-            <left>445</left>
-            <orientation>vertical</orientation>
-            <itemgap>20</itemgap>
-            <height>240</height>
-            <include content="Object_InfoCircle">
-                <param name="icon" value="special://skin/extras/icons/trophy.png" />
-                <param name="role" value="$LOCALIZE[31064]" />
-                <param name="name" value="$INFO[Window(Home).Property(TMDbHelper.ListItem.Awards)]" />
-                <visible>!String.IsEmpty(Window(Home).Property(TMDbHelper.ListItem.Awards))</visible>
-            </include>
-            <include content="Object_InfoCircle">
-                <param name="icon" value="special://skin/extras/icons/coins.png" />
-                <param name="role" value="Revenue / Budget" />
-                <param name="name" value="$INFO[Window(Home).Property(TMDbHelper.ListItem.Revenue),, $LOCALIZE[19159] ]$INFO[Window(Home).Property(TMDbHelper.ListItem.Budget)]" />
-                <visible>!String.IsEmpty(Window(Home).Property(TMDbHelper.ListItem.Revenue)) | !String.IsEmpty(Window(Home).Property(TMDbHelper.ListItem.Budget))</visible>
-                <visible>!String.IsEqual(Window(Home).Property(TMDbHelper.ListItem.Budget),$0)</visible>
-            </include>
-            <include content="Object_InfoCircle">
-                <param name="icon" value="special://skin/extras/icons/genre.png" />
-                <param name="role" value="$LOCALIZE[515]" />
-                <param name="name" value="$INFO[ListItem.Genre]" />
-                <visible>!String.IsEmpty(ListItem.Genre)</visible>
+    </include>
+
+    <include name="Dialog_VideoInfoPlotBox">
+        <control type="group">
+            <include>Dimension_Info</include>
+            <include>Info_Title</include>
+            <visible allowhiddenfocus="true">Control.HasFocus(61)</visible>
+            <include content="Object_Control">
+                <param name="control" value="textbox" />
+                <top>120</top>
+                <bottom>80</bottom>
+                <align>left</align>
+                <textcolor>main_fg_70</textcolor>
+                <font>font_overlay_plotbox</font>
+                <label fallback="19055">$INFO[ListItem.Tagline,[B]$LOCALIZE[202][/B][CR],[CR][CR]]$VAR[Label_Plot,[B]$LOCALIZE[31028][/B][CR],]$VAR[Label_OverlayCritics]$INFO[Window(Home).Property(ResetScroll)]</label>
+                <pagecontrol>61</pagecontrol>
+                <autoscroll delay="8000" time="4000" repeat="12000">false</autoscroll>
             </include>
+            <control type="scrollbar" id="61">
+                <centerright>-40</centerright>
+                <width>8</width>
+                <onleft>SetFocus(5000)</onleft>
+                <onright>SetFocus(5000)</onright>
+                <ondown>SetFocus(5000)</ondown>
+                <onup>SetFocus(5000)</onup>
+                <visible allowhiddenfocus="true">false</visible>
+            </control>
+        </control>
+    </include>
+
+    <include name="Dialog_VideoInfoDetails">
+        <control type="group">
+            <nested />
+            <control type="grouplist">
+                <width>400</width>
+                <height>240</height>
+                <orientation>vertical</orientation>
+                <itemgap>20</itemgap>
+                <include content="Object_InfoCircle">
+                    <param name="icon" value="$VAR[Image_DirectorIcon]" />
+                    <param name="role" value="$LOCALIZE[20339]" />
+                    <param name="name" value="$INFO[ListItem.Director]" />
+                    <visible>!String.IsEmpty(ListItem.Director)</visible>
+                </include>
+                <include content="Object_InfoCircle">
+                    <param name="icon" value="$VAR[Image_WriterIcon]" />
+                    <param name="role" value="$LOCALIZE[20417]" />
+                    <param name="name" value="$INFO[ListItem.Writer]" />
+                    <visible>!String.IsEmpty(ListItem.Writer)</visible>
+                </include>
+                <include content="Object_InfoCircle">
+                    <param name="icon" value="$VAR[Image_CreatorIcon]" />
+                    <param name="role" value="$LOCALIZE[31065]" />
+                    <param name="name" value="$INFO[Window(Home).Property(TMDbHelper.ListItem.Creator)]" />
+                    <visible>!String.IsEmpty(Window(Home).Property(TMDbHelper.ListItem.Creator))</visible>
+                </include>
+                <include content="Object_InfoCircle">
+                    <param name="icon" value="special://skin/extras/icons/director.png" />
+                    <param name="role" value="$LOCALIZE[572]" />
+                    <param name="name" value="$INFO[ListItem.Studio]" />
+                    <visible>!String.IsEmpty(ListItem.Studio)</visible>
+                </include>
+            </control>
+            <control type="grouplist">
+                <left>445</left>
+                <orientation>vertical</orientation>
+                <itemgap>20</itemgap>
+                <height>240</height>
+                <include content="Object_InfoCircle">
+                    <param name="icon" value="special://skin/extras/icons/trophy.png" />
+                    <param name="role" value="$LOCALIZE[31064]" />
+                    <param name="name" value="$INFO[Window(Home).Property(TMDbHelper.ListItem.Awards)]" />
+                    <visible>!String.IsEmpty(Window(Home).Property(TMDbHelper.ListItem.Awards))</visible>
+                </include>
+                <include content="Object_InfoCircle">
+                    <param name="icon" value="special://skin/extras/icons/coins.png" />
+                    <param name="role" value="Revenue / Budget" />
+                    <param name="name" value="$INFO[Window(Home).Property(TMDbHelper.ListItem.Revenue),, $LOCALIZE[19159] ]$INFO[Window(Home).Property(TMDbHelper.ListItem.Budget)]" />
+                    <visible>!String.IsEmpty(Window(Home).Property(TMDbHelper.ListItem.Revenue)) | !String.IsEmpty(Window(Home).Property(TMDbHelper.ListItem.Budget))</visible>
+                    <visible>!String.IsEqual(Window(Home).Property(TMDbHelper.ListItem.Budget),$0)</visible>
+                </include>
+                <include content="Object_InfoCircle">
+                    <param name="icon" value="special://skin/extras/icons/genre.png" />
+                    <param name="role" value="$LOCALIZE[515]" />
+                    <param name="name" value="$INFO[ListItem.Genre]" />
+                    <visible>!String.IsEmpty(ListItem.Genre)</visible>
+                </include>
+            </control>
         </control>
     </include>
 

diff --git a/addon.xml b/addon.xml
@@ -1,4 +1,4 @@
-<addon id="skin.arctic.horizon.2" name="Arctic Horizon 2" provider-name="jurialmunkey" version="0.1.8">
+<addon id="skin.arctic.horizon.2" name="Arctic Horizon 2" provider-name="jurialmunkey" version="0.1.9">
     <requires>
         <import addon="xbmc.gui" version="5.15.0" />
         <import addon="script.skinshortcuts" version="0.4.0" />