🐛 Fix up playlist window

jurialmunkey · Dec 24, 2023 · 110efa0 · 110efa0
1 parent b5298d1
commit 110efa0
Show file tree

Hide file tree

Showing 7 changed files with 229 additions and 103 deletions.
diff --git a/1080i/Includes_Actions.xml b/1080i/Includes_Actions.xml
@@ -450,6 +450,7 @@
     </include>
 
     <variable name="Action_Var_ToMediaFilter">
+        <value condition="Window.IsVisible(MyPlaylist.xml)">Runscript(script.skinvariables,"run_executebuiltin=special://skin/shortcuts/builtins/skinvariables-mediafilter-setfocus.json",use_rules,id=$VAR[Action_View_ContentID],focus_id=19,clear_prop_one=Null,clear_prop_two=Null)</value>
         <value condition="$EXP[Exp_FilterWall_IsViewtype] + Skin.HasSetting(Navigation.MediaFilterWall)">Runscript(script.skinvariables,$VAR[MediaWall_ScriptTypeDef],use_rules,id=$VAR[Action_View_ContentID],win_prop=WallSlideIn,focus_id=64,clear_prop_one=Null,clear_prop_two=Null)</value>
         <value condition="$EXP[Exp_FilterWall_IsViewtype]">Runscript(script.skinvariables,"run_executebuiltin=special://skin/shortcuts/builtins/skinvariables-mediafilter-setfocus.json",use_rules,id=$VAR[Action_View_ContentID],focus_id=64,clear_prop_one=Null,clear_prop_two=Null)</value>
         <value condition="!Skin.HasSetting(Navigation.MediaFilterWall)">Runscript(script.skinvariables,"run_executebuiltin=special://skin/shortcuts/builtins/skinvariables-mediafilter-setfocus.json",use_rules,id=$VAR[Action_View_ContentID],focus_id=9501,clear_prop_one=Null,clear_prop_two=Null)</value>

diff --git a/1080i/Includes_Dialogs.xml b/1080i/Includes_Dialogs.xml
@@ -397,6 +397,8 @@
                 <param name="label">$PARAM[label]</param>
                 <param name="icon">$PARAM[icon]</param>
                 <param name="textcolor">$PARAM[textcolor]</param>
+                <param name="nf_opacity">$PARAM[nf_opacity]</param>
+                <param name="db_opacity">$PARAM[db_opacity]</param>
                 <param name="visible">$PARAM[visible]</param>
                 <param name="control">$PARAM[control]</param>
                 <param name="builtin">true</param>

diff --git a/1080i/Includes_Labels.xml b/1080i/Includes_Labels.xml
@@ -1027,6 +1027,8 @@
         <!-- <value>$INFO[System.Time]</value> -->
         <value condition="$EXP[Exp_InfoDialogs] | [Window.IsVisible(1190) | Window.IsVisible(1191)]">$LOCALIZE[19033]</value>
         <value condition="$EXP[Exp_SettingsDialogs]">$VAR[Label_Header_Mini]</value>
+        <value condition="Window.IsVisible(videoplaylist)">$LOCALIZE[559]</value>
+        <value condition="Window.IsVisible(musicplaylist)">$LOCALIZE[559]</value>
         <value condition="Window.IsVisible(weather)">$LOCALIZE[8]</value>
         <value condition="Window.IsVisible(filemanager)">$LOCALIZE[7]</value>
         <value condition="Window.IsVisible(MyMusicPlaylistEditor.xml)">$LOCALIZE[10503]</value>
@@ -1054,6 +1056,10 @@
         <value condition="Window.IsMedia + Control.IsVisible(512)">$INFO[Container(512).ListItem.Label]</value>
         <value condition="Window.IsMedia + Control.IsVisible(522)">$INFO[Container(522).ListItem.Label]</value>
 
+        <!-- Playlist label -->
+        <value condition="Window.IsVisible(videoplaylist)">$LOCALIZE[10025]</value>
+        <value condition="Window.IsVisible(musicplaylist)">$LOCALIZE[134]</value>
+
         <!-- Content Labels -->
         <value condition="Container.Content(seasons)">$LOCALIZE[33054]</value>
         <value condition="Container.Content(albums)">$LOCALIZE[132]</value>

diff --git a/1080i/Includes_MediaFilter.xml b/1080i/Includes_MediaFilter.xml
diff --git a/1080i/Includes_Views.xml b/1080i/Includes_Views.xml
@@ -177,6 +177,10 @@
         </control>
 
         <!-- Scrollbar V -->
+        <include>View_Scrollbars_Vert</include>
+    </include>
+
+    <include name="View_Scrollbars_Vert">
         <control type="group">
             <bottom>view_top</bottom>
             <height>view_poster_item_h</height>
@@ -275,7 +279,7 @@
             <include>Animation_Half_WindowChange</include>
             <visible>!$EXP[Exp_InfoDialogs]</visible>
             <control type="group">
-                <include>View_Scrollbars</include>
+                <include condition="!Window.IsVisible(MyPlaylist.xml)">View_Scrollbars</include>
             </control>
             <control type="group">
                 <visible>$EXP[Exp_FurnitureVisible]</visible>

diff --git a/1080i/Includes_Views_List.xml b/1080i/Includes_Views_List.xml
@@ -269,8 +269,10 @@
                             <param name="onleft">65</param>
                         </include>
                         <onright>SetFocus(65)</onright>
-                        <include>Action_View_Movement_OnDown</include>
+                        <include condition="!Window.IsVisible(MyPlaylist.xml)">Action_View_Movement_OnDown</include>
                         <onup>$VAR[Action_Var_ToMediaFilter]</onup>
+                        <ondown condition="Window.IsVisible(MyPlaylist.xml)">SetProperty(List.ViewContainer,$NUMBER[$PARAM[id]])</ondown>
+                        <ondown condition="Window.IsVisible(MyPlaylist.xml)">330</ondown>
 
                         <focusposition>1</focusposition>
                         <movement>2</movement>

diff --git a/1080i/MyPlaylist.xml b/1080i/MyPlaylist.xml
@@ -6,22 +6,60 @@
     <include>Action_Blur_Onload</include>
     <controls>
 
+        <include>View_Bumper</include>
         <include>Defs_TMDbHelper_Loader</include>
         <include>Background_Main</include>
         <include>Background_Transition</include>
 
         <control type="group">
             <control type="group">
-                <include>Animation_View_WindowChange</include>
-                <include content="View_List_Include">
-                    <param name="id">50</param>
-                    <param name="viewtype_label">$LOCALIZE[31121]</param>
-                    <param name="visible">[true]</param>
-                </include>
-                <include>View_Row_Info</include>
+                <include>Animation_Group_Bumper</include>
+                <control type="group">
+                    <include>Animation_View_WindowChange</include>
+                    <include content="View_MediaList_Include" condition="Window.IsVisible(videoplaylist)">
+                        <param name="id">50</param>
+                        <param name="viewtype_label">$LOCALIZE[31121]</param>
+                        <param name="visible">[true]</param>
+                        <param name="right">802.67</param>
+                        <include>View_MediaList_PosterLandscape</include>
+                    </include>
+                    <include content="View_MediaList_Include" condition="Window.IsVisible(musicplaylist)">
+                        <param name="id">50</param>
+                        <param name="viewtype_label">$LOCALIZE[31121]</param>
+                        <param name="visible">[true]</param>
+                        <param name="right">896.67</param>
+                        <include>View_MediaList_SquareLandscape</include>
+                    </include>
+                    <control type="group">
+                        <visible>!$EXP[Exp_InfoDialogs]</visible>
+                        <include>Animation_Transition_InfoPanel_Hide</include>
+                        <include content="Info_Panel">
+                            <top>view_top</top>
+                            <width>info_panel_w</width>
+                            <left>view_side</left>
+                        </include>
+                    </control>
+                    <include content="Info_Viewline">
+                        <param name="sort_condition">true</param>
+                        <param name="library_condition">true</param>
+                    </include>
+                </control>
+                <include>View_Scrollbars_Vert</include>
             </control>
 
-            <include>View_Furniture_Edges</include>
+            <include>Home_Fade</include>
+            <include content="Home_Menu">
+                <param name="onlist">50</param>
+            </include>
+            <control type="group">
+                <include>Animation_Group_Bumper</include>
+                <control type="group">
+                    <visible>!String.IsEmpty(Window.Property(MediaFilterBase))</visible>
+                    <include>MediaFilter_Node_TopRow</include>
+                </control>
+                <include>View_Row_Header</include>
+                <include>View_Row_Gutter</include>
+            </control>
         </control>
 
         <include>View_Dialog_Plot</include>