⚡ Update info dialog buttons

jurialmunkey · Mar 22, 2024 · 85dfeaa · 85dfeaa
1 parent 586c989
commit 85dfeaa
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 40 deletions.
diff --git a/1080i/FileBrowser.xml b/1080i/FileBrowser.xml
@@ -21,12 +21,14 @@
             <include>Dimension_DialogWideMenu</include>
             <include>Animation_Right_Delay</include>
             <include content="Dialog_Dim_Side">
-                <param name="slide_condition">ControlGroup(9000).HasFocus() | Control.IsVisible(450)</param>
+                <!-- <param name="slide_condition">ControlGroup(9000).HasFocus() | Control.IsVisible(450)</param> -->
+                <param name="slide_condition">True</param>
             </include>
 
             <!-- Bottom Layer -->
             <include content="Dialog_Background_Side">
-                <param name="slide_condition">ControlGroup(9000).HasFocus() | Control.IsVisible(450)</param>
+                <!-- <param name="slide_condition">ControlGroup(9000).HasFocus() | Control.IsVisible(450)</param> -->
+                <param name="slide_condition">True</param>
                 <param name="dialog_size">Dimension_DialogWideMenu</param>
                 <!-- Side Buttons -->
                 <include content="Dialog_Body">
@@ -56,13 +58,24 @@
                             <param name="visible">Control.IsEnabled(415) + Control.IsVisible(415)</param>
                             <onclick>SendClick(415)</onclick>
                         </include>
+                        <include content="Dialog_Side_Button">
+                            <param name="id">04</param>
+                            <param name="label">$LOCALIZE[1000]</param>
+                            <param name="icon">special://skin/extras/icons/image.png</param>
+                            <param name="visible">Control.IsVisible(451) + [String.IsEqual(Control.GetLabel(411),$LOCALIZE[13511]) | String.IsEqual(Control.GetLabel(411),$LOCALIZE[20437])]</param>
+                            <param name="control">radiobutton</param>
+                            <param name="radiocross">true</param>
+                            <selected>!Skin.HasSetting(Dialog.DisableArtworkPreview)</selected>
+                            <onclick>Skin.ToggleSetting(Dialog.DisableArtworkPreview)</onclick>
+                        </include>
                     </include>
                 </include>
             </include>
 
             <include content="Dialog_Foreground_Side">
                 <param name="dialog_size">Dimension_DialogWideMenu</param>
-                <param name="slide_condition">ControlGroup(9000).HasFocus() | Control.IsVisible(450)</param>
+                <!-- <param name="slide_condition">ControlGroup(9000).HasFocus() | Control.IsVisible(450)</param> -->
+                <param name="slide_condition">True</param>
                 <param name="lines_right">0</param>
                 <param name="topline">true</param>
                 <param name="subline">true</param>
@@ -127,9 +140,11 @@
         <control type="group">
             <left>120</left>
             <right>-120</right>
+            <visible>!Skin.HasSetting(Dialog.DisableArtworkPreview)</visible>
             <include>Animation_Right_Delay</include>
             <include content="Animation_SlideIn_Dialog_Side">
-                <param name="slide_condition">ControlGroup(9000).HasFocus()</param>
+                <param name="slide_condition">True</param>
+                <!-- <param name="slide_condition">ControlGroup(9000).HasFocus()</param> -->
             </include>
             <include content="Dialog_Preview">
                 <param name="icon">$INFO[Container(451).ListItem.Icon]</param>

diff --git a/1080i/Includes_Actions.xml b/1080i/Includes_Actions.xml
@@ -358,16 +358,19 @@
     </include>
 
     <include name="Action_Info_Recommendations_OnClick">
-        <onclick>SetProperty(Item_Title,$VAR[Label_Title],1121)</onclick>
-        <onclick>SetProperty(Item_Query,$VAR[Path_Param_Query],1121)</onclick>
-        <onclick>SetProperty(Item_Type,$VAR[Path_Param_Type],1121)</onclick>
-        <onclick>SetProperty(Item_Year,$INFO[ListItem.Year],1121)</onclick>
-
-        <onclick>SetProperty(Genre_Title,$INFO[Container(99950).ListItem.Property(Genre.1.Name)]$INFO[Container(99950).ListItem.Property(Genre.2.Name), / ,]$INFO[Container(99950).ListItem.Property(Genre.3.Name), / ,],1121)</onclick>
-        <onclick>SetProperty(Genre_Query,$INFO[Container(99950).ListItem.Property(Genre.1.TMDB_ID),&amp;with_separator=AND&amp;with_id=True&amp;with_genres=,]$INFO[Container(99950).ListItem.Property(Genre.2.TMDB_ID), / ,]$INFO[Container(99950).ListItem.Property(Genre.3.TMDB_ID), / ,],1121)</onclick>
-        <onclick>SetFocus(7001)</onclick>
-        <onclick>ActivateWindow(1121)</onclick>
-        <onclick>SetFocus(4000)</onclick>
+        <param name="condition">true</param>
+        <definition>
+            <onclick condition="$PARAM[condition]">SetProperty(Item_Title,$VAR[Label_Title],1121)</onclick>
+            <onclick condition="$PARAM[condition]">SetProperty(Item_Query,$VAR[Path_Param_Query],1121)</onclick>
+            <onclick condition="$PARAM[condition]">SetProperty(Item_Type,$VAR[Path_Param_Type],1121)</onclick>
+            <onclick condition="$PARAM[condition]">SetProperty(Item_Year,$INFO[ListItem.Year],1121)</onclick>
+
+            <onclick condition="$PARAM[condition]">SetProperty(Genre_Title,$INFO[Container(99950).ListItem.Property(Genre.1.Name)]$INFO[Container(99950).ListItem.Property(Genre.2.Name), / ,]$INFO[Container(99950).ListItem.Property(Genre.3.Name), / ,],1121)</onclick>
+            <onclick condition="$PARAM[condition]">SetProperty(Genre_Query,$INFO[Container(99950).ListItem.Property(Genre.1.TMDB_ID),&amp;with_separator=AND&amp;with_id=True&amp;with_genres=,]$INFO[Container(99950).ListItem.Property(Genre.2.TMDB_ID), / ,]$INFO[Container(99950).ListItem.Property(Genre.3.TMDB_ID), / ,],1121)</onclick>
+            <onclick condition="$PARAM[condition]">SetFocus(7001)</onclick>
+            <onclick condition="$PARAM[condition]">ActivateWindow(1121)</onclick>
+            <onclick condition="$PARAM[condition]">SetFocus(4000)</onclick>
+        </definition>
     </include>
 
     <include name="Action_View_Explore_OnDown">

diff --git a/1080i/Includes_DialogInfo.xml b/1080i/Includes_DialogInfo.xml
@@ -526,7 +526,17 @@
                 <param name="id">5004</param>
             </include>
             <onclick>SetFocus(61)</onclick>
-            <content target="videos">$VAR[Path_VideoInfo_Generic,,&amp;info=trakt_comments]</content>
+
+
+            <content>
+                <item>
+                    <label>$LOCALIZE[31064]</label>
+                    <property name="sublabel">$INFO[Container(99950).ListItem.Property(Awards)]</property>
+                    <property name="plotlabel">$VAR[Label_Critics]</property>
+                </item>
+            </content>
+
+            <content>$VAR[Path_VideoInfo_Generic,,&amp;info=trakt_comments]</content>
             <visible>String.IsEqual(Window.Property(DetailsView),Reviews)</visible>
             <animation effect="fade" start="100" end="0" condition="Container(5004).IsUpdating">Conditional</animation>
             <onfocus>SetProperty(ReviewsActive,1)</onfocus>
@@ -622,27 +632,20 @@
                 <include content="Home_Fade">
                     <param name="visible">true</param>
                 </include>
-                <include content="Home_Menu_Button_Icon" condition="!Skin.HasSetting(Home.SideMenu.DisableSearchOptions)">
+                <!-- <include content="Home_Menu_Button_Icon" condition="!Skin.HasSetting(Home.SideMenu.DisableSearchOptions)">
                     <param name="id">4008</param>
                     <param name="icon">special://skin/extras/icons/search.png</param>
                     <param name="color_nf">main_fg_70</param>
                     <include content="Home_Menu_Button_Back">
                         <param name="id">4008</param>
                         <onleft>SetProperty(ReturnFromPlot,4008)</onleft>
                         <onleft>61</onleft>
-                        <!-- <onright>SetProperty(ReturnFromPlot,4008)</onright>
-                        <onright>61</onright> -->
                         <onup>4009</onup>
-                        <!-- <onup>SetProperty(ReturnFromPlot,4008)</onup>
-                        <onup>61</onup> -->
                         <ondown>4000</ondown>
-                        <!-- <onleft>Control.Move(7003,-1)</onleft>
-                        <onright>Control.Move(7003,1)</onright> -->
                         <onclick>SetProperty(CustomSearchTerm,$ESCINFO[ListItem.Title],Home)</onclick>
                         <onclick>SetProperty(ReplaceWindow,1105,Home)</onclick>
                         <onclick>Close</onclick>
                         <onclick>ActivateWindow(1105)</onclick>
-                        <!-- <onfocus>SetProperty(DetailsView,Artwork)</onfocus> -->
                         <onfocus>ClearProperty(DetailsView)</onfocus>
                     </include>
                     <left>view_menu</left>
@@ -657,8 +660,6 @@
                         <param name="id">4009</param>
                         <onup>4000</onup>
                         <ondown>4008</ondown>
-                        <!-- <ondown>SetProperty(ReturnFromPlot,4009)</ondown>
-                        <ondown>61</ondown> -->
                         <onleft>Control.Move(7003,-1)</onleft>
                         <onright>Control.Move(7003,1)</onright>
                         <onclick condition="Window.IsVisible(DialogVideoInfo.xml) | Window.IsVisible(DialogMusicInfo.xml)">SendClick(10)</onclick>
@@ -667,16 +668,16 @@
                     <left>view_menu</left>
                     <bottom>view_pad</bottom>
                     <visible>$PARAM[settings_visible]</visible>
-                </include>
+                </include> -->
                 <control type="grouplist" id="4000">
                     <top>250</top>
                     <itemgap>0</itemgap>
                     <orientation>vertical</orientation>
                     <width>160</width>
                     <left>view_list</left>
 
-                    <onup condition="!Skin.HasSetting(Home.SideMenu.DisableSearchOptions)">4008</onup>
-                    <ondown condition="!Skin.HasSetting(Home.SideMenu.DisableSearchOptions)">4009</ondown>
+                    <!-- <onup condition="!Skin.HasSetting(Home.SideMenu.DisableSearchOptions)">4008</onup>
+                    <ondown condition="!Skin.HasSetting(Home.SideMenu.DisableSearchOptions)">4009</ondown> -->
 
                     <onback>Dialog.Close(movieinformation)</onback>
 

diff --git a/1080i/Includes_DialogSelect.xml b/1080i/Includes_DialogSelect.xml
@@ -115,6 +115,7 @@
         <control type="group">
             <left>120</left>
             <right>-120</right>
+            <visible>!Skin.HasSetting(Dialog.DisableArtworkPreview)</visible>
             <include>Animation_Right_Delay</include>
             <include content="Animation_SlideIn_Dialog_Side">
                 <param name="slide_condition">True</param>
@@ -192,6 +193,16 @@
             <onclick>Close</onclick>
             <onclick>SendClick(12003,7)</onclick>
         </include>
+        <include content="Dialog_Side_Button">
+            <param name="id">06</param>
+            <param name="label">$LOCALIZE[1000]</param>
+            <param name="icon">special://skin/extras/icons/image.png</param>
+            <param name="visible">[String.IsEqual(Control.GetLabel(1),$LOCALIZE[13511]) | String.IsEqual(Control.GetLabel(1),$LOCALIZE[20437]) | String.IsEqual(Control.GetLabel(1),$LOCALIZE[13521])]</param>
+            <param name="control">radiobutton</param>
+            <param name="radiocross">true</param>
+            <selected>!Skin.HasSetting(Dialog.DisableArtworkPreview)</selected>
+            <onclick>Skin.ToggleSetting(Dialog.DisableArtworkPreview)</onclick>
+        </include>
     </include>
 
     <include name="DialogVideoManager_Main">

diff --git a/1080i/Includes_Images.xml b/1080i/Includes_Images.xml
@@ -21,7 +21,7 @@
 
     <variable name="Image_DialogInfo_TraktRating">
         <value condition="!String.IsEmpty(Window(Home).Property(TMDbHelper.TraktIsAuth))">special://skin/extras/icons/watchlist.png</value>
-        <value>special://skin/extras/icons/star.png</value>
+        <value>special://skin/extras/icons/globe.png</value>
     </variable>
 
     <variable name="Image_Widget_Style">

diff --git a/1080i/Includes_Items.xml b/1080i/Includes_Items.xml
@@ -838,7 +838,8 @@
                 <onclick condition="!String.IsEmpty(Window(Home).Property(TMDbHelper.TraktIsAuth)) + String.IsEmpty(ListItem.Property(tmdb_id)) + !String.IsEmpty(Container(99950).ListItem.Property(tmdb_id)) + [String.IsEqual(ListItem.DBType,movie) | String.IsEqual(ListItem.DBType,tvshow) | String.IsEqual(ListItem.DBType,season)]">RunScript(plugin.video.themoviedb.helper,sync_trakt,tmdb_id=$INFO[Container(99950).ListItem.Property(tmdb_id)],$VAR[Path_Param_Type],cache_refresh)</onclick>
                 <onclick condition="!String.IsEmpty(Window(Home).Property(TMDbHelper.TraktIsAuth)) + !String.IsEmpty(ListItem.Property(tmdb_id)) + String.IsEqual(ListItem.DBType,episode)">RunScript(plugin.video.themoviedb.helper,sync_trakt,tmdb_id=$INFO[ListItem.Property(tmdb_id)],$VAR[Path_Param_Type],season=$INFO[ListItem.Season],episode=$INFO[ListItem.Episode],cache_refresh)</onclick>
                 <onclick condition="!String.IsEmpty(Window(Home).Property(TMDbHelper.TraktIsAuth)) + String.IsEmpty(ListItem.Property(tmdb_id)) + !String.IsEmpty(Container(99950).ListItem.Property(tmdb_id)) + String.IsEqual(ListItem.DBType,episode)">RunScript(plugin.video.themoviedb.helper,sync_trakt,tmdb_id=$INFO[Container(99950).ListItem.Property(tmdb_id)],$VAR[Path_Param_Type],season=$INFO[ListItem.Season],episode=$INFO[ListItem.Episode],cache_refresh)</onclick>
-                <onclick condition="String.IsEmpty(Window(Home).Property(TMDbHelper.TraktIsAuth))">SendClick(12003,7)</onclick>
+                <!-- <onclick condition="String.IsEmpty(Window(Home).Property(TMDbHelper.TraktIsAuth))">SendClick(12003,7)</onclick> -->
+                <onclick condition="String.IsEmpty(Window(Home).Property(TMDbHelper.TraktIsAuth))">runscript(script.wikipedia,wikipedia=$VAR[Path_Wikipedia_Title],tmdb_type=$VAR[Path_Wikipedia_Type])</onclick>
                 <onfocus>SetProperty(DetailsView,Reviews)</onfocus>
                 <onfocus>ClearProperty(ReviewsActive)</onfocus>
                 <include content="DialogInfo_Button_HintLabel">
@@ -852,15 +853,22 @@
                 <param name="id">4005</param>
                 <param name="groupid">4105</param>
                 <param name="sliceid">4205</param>
-                <param name="label">Wiki</param>
-                <param name="icon">special://skin/extras/icons/globe.png</param>
+                <param name="label">$LOCALIZE[39123]</param>
+                <param name="icon">special://skin/extras/icons/image.png</param>
+                <!-- <param name="label">Wiki</param>
+                <param name="icon">special://skin/extras/icons/globe.png</param> -->
                 <param name="zoom_in_delay">240</param>
                 <param name="zoom_in_include">$PARAM[zoom_in_include]</param>
-                <onclick>runscript(script.wikipedia,wikipedia=$VAR[Path_Wikipedia_Title],tmdb_type=$VAR[Path_Wikipedia_Type])</onclick>
-                <onfocus>SetProperty(DetailsView,Critics)</onfocus>
+                <!-- <onclick>runscript(script.wikipedia,wikipedia=$VAR[Path_Wikipedia_Title],tmdb_type=$VAR[Path_Wikipedia_Type])</onclick> -->
+                <!-- <onfocus>SetProperty(DetailsView,Critics)</onfocus> -->
+                <onleft>Control.Move(7003,-1)</onleft>
+                <onright>Control.Move(7003,1)</onright>
+                <onclick condition="Window.IsVisible(DialogVideoInfo.xml) | Window.IsVisible(DialogMusicInfo.xml)">SendClick(10)</onclick>
+                <onfocus>SetProperty(DetailsView,Artwork)</onfocus>
                 <onfocus>ClearProperty(ReviewsActive)</onfocus>
                 <include content="DialogInfo_Button_HintLabel">
-                    <param name="label">Wiki</param>
+                    <param name="label">$LOCALIZE[39123]</param>
+                    <!-- <param name="label">Wiki</param> -->
                 </include>
             </include>
         </definition>

diff --git a/1080i/Includes_Labels.xml b/1080i/Includes_Labels.xml
@@ -87,7 +87,7 @@
 
     <variable name="Label_DialogInfo_TraktRating">
         <value condition="!String.IsEmpty(Window(Home).Property(TMDbHelper.TraktIsAuth))">Trakt</value>
-        <value>$LOCALIZE[563]</value>
+        <value>Wiki</value>
     </variable>
 
     <variable name="Label_TraktStats_Recent_0_Type">
@@ -1318,7 +1318,7 @@
     </variable>
 
     <variable name="Label_Overlay_PlotBox">
-        <value condition="!String.IsEmpty(Window.Property(ReviewsActive))">$INFO[Container(5004).ListItem.Label,[B][COLOR=dialog_fg_90],[/COLOR][/B][CR]]$INFO[Container(5004).ListItem.Plot]</value>
+        <value condition="!String.IsEmpty(Window.Property(ReviewsActive))">$INFO[Container(5004).ListItem.Label,[B][COLOR=dialog_fg_90],[/COLOR][/B][CR]]$INFO[Container(5004).ListItem.Plot]$INFO[Container(5004).ListItem.Property(plotlabel)]</value>
         <value>$INFO[ListItem.Tagline,[B][COLOR=dialog_fg_90]$LOCALIZE[202][/COLOR][/B][CR],[CR][CR]]$VAR[Label_Plot,[B][COLOR=dialog_fg_90]$LOCALIZE[31028][/COLOR][/B][CR],]$VAR[Label_Overlay_Critics,[CR][CR],]$VAR[Label_Overlay_Directing,[CR][CR][B][COLOR=dialog_fg_90]$LOCALIZE[31038][/COLOR][/B][CR],]$VAR[Label_Overlay_Writing,[CR][CR][B][COLOR=dialog_fg_90]$LOCALIZE[31039][/COLOR][/B][CR],]$VAR[Label_Overlay_TopCast,[CR][CR][B][COLOR=dialog_fg_90]$LOCALIZE[31076][/COLOR][/B][CR],]$VAR[Label_Overlay_Production,[CR][CR][B][COLOR=dialog_fg_90]$LOCALIZE[31383][/COLOR][/B][CR],]$VAR[Label_Overlay_Sound,[CR][CR][B][COLOR=dialog_fg_90]$LOCALIZE[31052][/COLOR][/B][CR],]$VAR[Label_Overlay_ArtDepartment,[CR][CR][B][COLOR=dialog_fg_90]$LOCALIZE[31072][/COLOR][/B][CR],]$VAR[Label_Overlay_Cinematography,[CR][CR][B][COLOR=dialog_fg_90]$LOCALIZE[31067][/COLOR][/B][CR],]$VAR[Label_Overlay_Editing,[CR][CR][B][COLOR=dialog_fg_90]$LOCALIZE[31075][/COLOR][/B][CR],]$INFO[Container(99950).ListItem.Property(Awards),[CR][CR][B][COLOR=dialog_fg_90]$LOCALIZE[31064][/COLOR][/B][CR],]$VAR[Label_Overlay_AwardsWon]$VAR[Label_Overlay_AwardsNominated]</value>
     </variable>
 

diff --git a/1080i/Includes_Layouts.xml b/1080i/Includes_Layouts.xml
@@ -2178,21 +2178,21 @@
                         <include content="Object_InfoCircle" condition="$PARAM[selected]">
                             <param name="icon">special://skin/extras/icons/person.png</param>
                             <param name="role">$INFO[ListItem.Label]</param>
-                            <param name="name">$INFO[ListItem.Rating,, - ]$INFO[ListItem.Premiered]</param>
+                            <param name="name">$INFO[ListItem.Rating,, - ]$INFO[ListItem.Premiered]$INFO[ListItem.Property(sublabel)]</param>
                             <param name="textcolor_top">$VAR[ColorSelected]</param>
                             <param name="textcolor_sub">$VAR[ColorSelected]</param>
                         </include>
                         <include content="Object_InfoCircle" condition="!$PARAM[selected]">
                             <param name="icon">special://skin/extras/icons/person.png</param>
                             <param name="role">$INFO[ListItem.Label]</param>
-                            <param name="name">$INFO[ListItem.Rating,, - ]$INFO[ListItem.Premiered]</param>
+                            <param name="name">$INFO[ListItem.Rating,, - ]$INFO[ListItem.Premiered]$INFO[ListItem.Property(sublabel)]</param>
                         </include>
                     </control>
                 </control>
                 <control type="textbox">
                     <font>font_mini_plot</font>
                     <textcolor>main_fg_70</textcolor>
-                    <label>$INFO[ListItem.Plot]</label>
+                    <label>$INFO[ListItem.Plot]$INFO[ListItem.Property(plotlabel)]</label>
                     <aligny>top</aligny>
                     <top>75</top>
                     <bottom>-5</bottom>