⚡ Tidy up status settings

jurialmunkey · Jul 28, 2024 · 4227882 · 4227882
1 parent 846789e
commit 4227882
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 37 deletions.
diff --git a/1080i/Includes_Info.xml b/1080i/Includes_Info.xml
@@ -798,7 +798,8 @@
                     <param name="item">Item04</param>
                     <param name="container">$PARAM[container]</param>
                     <param name="is_player">$PARAM[is_player]</param>
-                    <param name="visible_tvshows">[!Skin.HasSetting(CustomRating.TVShows.EnablePremiereStatusDates) | Skin.HasSetting(CustomRating.TVShows.DisablePremiereStatus)]</param>
+                    <param name="visible_movies">[!Skin.HasSetting(CustomRating.EnablePremiereStatusDates) | !Skin.HasSetting(CustomRating.Movies.EnablePremiereStatus)]</param>
+                    <param name="visible_tvshows">[!Skin.HasSetting(CustomRating.EnablePremiereStatusDates) | Skin.HasSetting(CustomRating.TVShows.DisablePremiereStatus)]</param>
                 </include>
 
                 <include content="Info_Ratings_Item" condition="Skin.HasSetting(CustomRating.TVShows.DisablePremiereStatus) | !Skin.HasSetting(CustomRating.Movies.EnablePremiereStatus)">

diff --git a/1080i/Includes_Labels.xml b/1080i/Includes_Labels.xml
@@ -6,10 +6,24 @@
         <value>$LOCALIZE[31163]</value>
     </variable>
 
-    <variable name="Label_Setting_TVShow_PremiereStatus">
-        <value condition="Skin.HasSetting(CustomRating.TVShows.DisablePremiereStatus)">$LOCALIZE[1223]</value>
-        <value condition="Skin.HasSetting(CustomRating.TVShows.EnablePremiereStatusDates)">$LOCALIZE[31137]</value>
-        <value>$LOCALIZE[10036]</value>
+    <variable name="Label_Setting_PremiereStatus">
+        <value condition="Skin.HasSetting(CustomRating.TVShows.DisablePremiereStatus) + !Skin.HasSetting(CustomRating.Movies.EnablePremiereStatus)" />
+        <value condition="!Skin.HasSetting(CustomRating.TVShows.DisablePremiereStatus) + !Skin.HasSetting(CustomRating.Movies.EnablePremiereStatus) + !Skin.HasSetting(CustomRating.EnablePremiereStatusDates)">$LOCALIZE[20343]: $LOCALIZE[10036]</value>
+        <value condition="!Skin.HasSetting(CustomRating.TVShows.DisablePremiereStatus) + !Skin.HasSetting(CustomRating.Movies.EnablePremiereStatus) + Skin.HasSetting(CustomRating.EnablePremiereStatusDates)">$LOCALIZE[20343]: $LOCALIZE[31137]</value>
+        <value condition="Skin.HasSetting(CustomRating.TVShows.DisablePremiereStatus) + Skin.HasSetting(CustomRating.Movies.EnablePremiereStatus) + !Skin.HasSetting(CustomRating.EnablePremiereStatusDates)">$LOCALIZE[342]: $LOCALIZE[10036]</value>
+        <value condition="Skin.HasSetting(CustomRating.TVShows.DisablePremiereStatus) + Skin.HasSetting(CustomRating.Movies.EnablePremiereStatus) + Skin.HasSetting(CustomRating.EnablePremiereStatusDates)">$LOCALIZE[342]: $LOCALIZE[31137]</value>
+        <value condition="!Skin.HasSetting(CustomRating.EnablePremiereStatusDates)">$LOCALIZE[21475]: $LOCALIZE[10036]</value>
+        <value>$LOCALIZE[21475]: $LOCALIZE[31137]</value>
+    </variable>
+
+    <variable name="Label_Setting_PremiereStatus_Preselect">
+        <value condition="Skin.HasSetting(CustomRating.TVShows.DisablePremiereStatus) + !Skin.HasSetting(CustomRating.Movies.EnablePremiereStatus)">0</value>
+        <value condition="!Skin.HasSetting(CustomRating.TVShows.DisablePremiereStatus) + !Skin.HasSetting(CustomRating.Movies.EnablePremiereStatus) + !Skin.HasSetting(CustomRating.EnablePremiereStatusDates)">1</value>
+        <value condition="!Skin.HasSetting(CustomRating.TVShows.DisablePremiereStatus) + !Skin.HasSetting(CustomRating.Movies.EnablePremiereStatus) + Skin.HasSetting(CustomRating.EnablePremiereStatusDates)">2</value>
+        <value condition="Skin.HasSetting(CustomRating.TVShows.DisablePremiereStatus) + Skin.HasSetting(CustomRating.Movies.EnablePremiereStatus) + !Skin.HasSetting(CustomRating.EnablePremiereStatusDates)">3</value>
+        <value condition="Skin.HasSetting(CustomRating.TVShows.DisablePremiereStatus) + Skin.HasSetting(CustomRating.Movies.EnablePremiereStatus) + Skin.HasSetting(CustomRating.EnablePremiereStatusDates)">4</value>
+        <value condition="!Skin.HasSetting(CustomRating.EnablePremiereStatusDates)">5</value>
+        <value>6</value>
     </variable>
 
     <variable name="Label_ColorPicker_Type">
@@ -1273,7 +1287,10 @@
     </variable>
 
     <variable name="Label_ListItem_StatusDate">
-        <value condition="!Skin.HasSetting(CustomRating.TVShows.EnablePremiereStatusDates)" />
+        <value condition="!Skin.HasSetting(CustomRating.EnablePremiereStatusDates)" />
+
+        <value condition="String.IsEqual(Container(99950).ListItem.DBType,movie) + !String.IsEmpty(Container(99950).ListItem.Year)">$INFO[Container(99950).ListItem.Year]</value>
+        <value condition="String.IsEqual(Container(99950).ListItem.DBType,movie)">$LOCALIZE[31546]</value>
 
         <value condition="!String.IsEmpty(Container(99950).ListItem.Property(Next_Aired.Days_Until_Aired)) + Integer.IsEqual(Container(99950).ListItem.Property(Next_Aired.Days_Until_Aired),0)">$LOCALIZE[33006]</value>
         <value condition="!String.IsEmpty(Container(99950).ListItem.Property(Next_Aired.Days_Until_Aired)) + Integer.IsEqual(Container(99950).ListItem.Property(Next_Aired.Days_Until_Aired),1)">$LOCALIZE[33007]</value>

diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
@@ -845,6 +845,20 @@
                             <selected>!Skin.HasSetting(Info.DisableAllRatings)</selected>
                         </include>
 
+                        <include content="Settings_Button" description="">
+                            <param name="dialog">true</param>
+                            <param name="id">7025</param>
+                            <param name="control">radiobutton</param>
+                            <label>$LOCALIZE[126]</label>
+                            <label2>$VAR[Label_Setting_PremiereStatus,       ,       ]</label2>
+                            <visible>Container(3).HasFocus(7)</visible>
+                            <visible>!Skin.HasSetting(Info.DisableAllRatings)</visible>
+
+                            <onclick>RunScript(script.skinvariables,run_dialog=select,preselect=$VAR[Label_Setting_PremiereStatus_Preselect],heading=$LOCALIZE[126],separator=||,list=$LOCALIZE[13106]||$LOCALIZE[20343]: $LOCALIZE[10036]||$LOCALIZE[20343]: $LOCALIZE[31137]||$LOCALIZE[20342]: $LOCALIZE[10036]||$LOCALIZE[20342]: $LOCALIZE[31137]||$LOCALIZE[21475]: $LOCALIZE[10036]||$LOCALIZE[21475]: $LOCALIZE[31137],"executebuiltin_0=Skin.SetBool(CustomRating.TVShows.DisablePremiereStatus)||Skin.Reset(CustomRating.Movies.EnablePremiereStatus)||Skin.Reset(CustomRating.EnablePremiereStatusDates)","executebuiltin_1=Skin.Reset(CustomRating.TVShows.DisablePremiereStatus)||Skin.Reset(CustomRating.Movies.EnablePremiereStatus)||Skin.Reset(CustomRating.EnablePremiereStatusDates)","executebuiltin_2=Skin.Reset(CustomRating.TVShows.DisablePremiereStatus)||Skin.Reset(CustomRating.Movies.EnablePremiereStatus)||Skin.SetBool(CustomRating.EnablePremiereStatusDates)","executebuiltin_3=Skin.SetBool(CustomRating.TVShows.DisablePremiereStatus)||Skin.SetBool(CustomRating.Movies.EnablePremiereStatus)||Skin.Reset(CustomRating.EnablePremiereStatusDates)","executebuiltin_4=Skin.SetBool(CustomRating.TVShows.DisablePremiereStatus)||Skin.SetBool(CustomRating.Movies.EnablePremiereStatus)||Skin.SetBool(CustomRating.EnablePremiereStatusDates)","executebuiltin_5=Skin.Reset(CustomRating.TVShows.DisablePremiereStatus)||Skin.SetBool(CustomRating.Movies.EnablePremiereStatus)||Skin.Reset(CustomRating.EnablePremiereStatusDates)","executebuiltin_6=Skin.Reset(CustomRating.TVShows.DisablePremiereStatus)||Skin.SetBool(CustomRating.Movies.EnablePremiereStatus)||Skin.SetBool(CustomRating.EnablePremiereStatusDates)")</onclick>
+
+                            <selected>!Skin.HasSetting(CustomRating.TVShows.DisablePremiereStatus) | Skin.HasSetting(CustomRating.Movies.EnablePremiereStatus)</selected>
+                        </include>
+
                         <include content="Settings_Label" description="Details">
                             <param name="id">7005</param>
                             <label>$LOCALIZE[342] $LOCALIZE[31202]</label>
@@ -895,6 +909,7 @@
                             <label2>$INFO[Skin.String(CustomRating.Movies.Item04)]</label2>
                             <visible>Container(3).HasFocus(7)</visible>
                             <visible>!Skin.HasSetting(Info.DisableAllRatings)</visible>
+                            <visible>!Skin.HasSetting(CustomRating.EnablePremiereStatusDates) | !Skin.HasSetting(CustomRating.Movies.EnablePremiereStatus)</visible>
                             <onclick>SetProperty(ConfigureRatingItem,Item04,Home)</onclick>
                             <onclick>SetProperty(ConfigureRatingContent,Movies,Home)</onclick>
                             <onclick>ActivateWindow(1119)</onclick>
@@ -926,17 +941,6 @@
                             <onclick>ActivateWindow(1119)</onclick>
                         </include>
 
-                        <include content="Settings_Button" description="">
-                            <param name="dialog">true</param>
-                            <param name="id">7026</param>
-                            <param name="control">radiobutton</param>
-                            <label>$LOCALIZE[126]</label>
-                            <visible>Container(3).HasFocus(7)</visible>
-                            <visible>!Skin.HasSetting(Info.DisableAllRatings)</visible>
-                            <onclick>Skin.ToggleSetting(CustomRating.Movies.EnablePremiereStatus)</onclick>
-                            <selected>Skin.HasSetting(CustomRating.Movies.EnablePremiereStatus)</selected>
-                        </include>
-
                         <include content="Settings_Label" description="Details">
                             <param name="id">7010</param>
                             <label>$LOCALIZE[20343] $LOCALIZE[31202]</label>
@@ -987,7 +991,7 @@
                             <label2>$INFO[Skin.String(CustomRating.TVShows.Item04)]</label2>
                             <visible>Container(3).HasFocus(7)</visible>
                             <visible>!Skin.HasSetting(Info.DisableAllRatings)</visible>
-                            <visible>!Skin.HasSetting(CustomRating.TVShows.EnablePremiereStatusDates)</visible>
+                            <visible>!Skin.HasSetting(CustomRating.EnablePremiereStatusDates) | Skin.HasSetting(CustomRating.TVShows.DisablePremiereStatus)</visible>
                             <onclick>SetProperty(ConfigureRatingItem,Item04,Home)</onclick>
                             <onclick>SetProperty(ConfigureRatingContent,TVShows,Home)</onclick>
                             <onclick>ActivateWindow(1119)</onclick>
@@ -1019,25 +1023,6 @@
                             <onclick>ActivateWindow(1119)</onclick>
                         </include>
 
-                        <include content="Settings_Button" description="">
-                            <param name="dialog">true</param>
-                            <param name="id">7025</param>
-                            <param name="control">button</param>
-                            <label>$LOCALIZE[126]</label>
-                            <label2>$VAR[Label_Setting_TVShow_PremiereStatus]</label2>
-                            <visible>Container(3).HasFocus(7)</visible>
-                            <visible>!Skin.HasSetting(Info.DisableAllRatings)</visible>
-
-                            <onclick condition="Skin.HasSetting(CustomRating.TVShows.DisablePremiereStatus)">Skin.Reset(CustomRating.TVShows.DisablePremiereStatus)</onclick>
-
-                            <onclick condition="!Skin.HasSetting(CustomRating.TVShows.DisablePremiereStatus) + !Skin.HasSetting(CustomRating.TVShows.EnablePremiereStatusDates)">Skin.SetBool(CustomRating.TVShows.EnablePremiereStatusDates)</onclick>
-
-                            <onclick condition="Skin.HasSetting(CustomRating.TVShows.EnablePremiereStatusDates)">Skin.SetBool(CustomRating.TVShows.DisablePremiereStatus)</onclick>
-                            <onclick condition="Skin.HasSetting(CustomRating.TVShows.EnablePremiereStatusDates)">Skin.Reset(CustomRating.TVShows.EnablePremiereStatusDates)</onclick>
-
-                            <selected>!Skin.HasSetting(CustomRating.TVShows.DisablePremiereStatus)</selected>
-                        </include>
-
                         <include content="Settings_Label" description="Details">
                             <param name="id">7015</param>
                             <label>$LOCALIZE[31235]</label>