From 110efa0c6386f3755e02897a7adfbc6cd0be6bf3 Mon Sep 17 00:00:00 2001 From: jurialmunkey Date: Sun, 24 Dec 2023 16:46:52 +1100 Subject: [PATCH] :bug: Fix up playlist window --- 1080i/Includes_Actions.xml | 1 + 1080i/Includes_Dialogs.xml | 2 + 1080i/Includes_Labels.xml | 6 + 1080i/Includes_MediaFilter.xml | 259 +++++++++++++++++++++------------ 1080i/Includes_Views.xml | 6 +- 1080i/Includes_Views_List.xml | 4 +- 1080i/MyPlaylist.xml | 54 ++++++- 7 files changed, 229 insertions(+), 103 deletions(-) diff --git a/1080i/Includes_Actions.xml b/1080i/Includes_Actions.xml index 50816fee6..ac7b6fa90 100644 --- a/1080i/Includes_Actions.xml +++ b/1080i/Includes_Actions.xml @@ -450,6 +450,7 @@ + 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) 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) 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) 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) diff --git a/1080i/Includes_Dialogs.xml b/1080i/Includes_Dialogs.xml index 48f864089..0e64bc24f 100644 --- a/1080i/Includes_Dialogs.xml +++ b/1080i/Includes_Dialogs.xml @@ -397,6 +397,8 @@ $PARAM[label] $PARAM[icon] $PARAM[textcolor] + $PARAM[nf_opacity] + $PARAM[db_opacity] $PARAM[visible] $PARAM[control] true diff --git a/1080i/Includes_Labels.xml b/1080i/Includes_Labels.xml index b792857b0..6e075203d 100644 --- a/1080i/Includes_Labels.xml +++ b/1080i/Includes_Labels.xml @@ -1027,6 +1027,8 @@ $LOCALIZE[19033] $VAR[Label_Header_Mini] + $LOCALIZE[559] + $LOCALIZE[559] $LOCALIZE[8] $LOCALIZE[7] $LOCALIZE[10503] @@ -1054,6 +1056,10 @@ $INFO[Container(512).ListItem.Label] $INFO[Container(522).ListItem.Label] + + $LOCALIZE[10025] + $LOCALIZE[134] + $LOCALIZE[33054] $LOCALIZE[132] diff --git a/1080i/Includes_MediaFilter.xml b/1080i/Includes_MediaFilter.xml index 6ff55d040..9726623f6 100644 --- a/1080i/Includes_MediaFilter.xml +++ b/1080i/Includes_MediaFilter.xml @@ -323,22 +323,156 @@ - + + + false + 04 + $LOCALIZE[587] + $VAR[Image_Filtered] + main_fg + 30 + 12 + Container.CanFilterAdvanced + SetProperty(DialogSettings.Style,mediafilter,Home) + Filter + + + false + 05 + $LOCALIZE[192] + special://skin/extras/icons/triangle-exclamation.png + main_fg + 30 + 12 + !Container.CanFilterAdvanced + RunScript(script.skinvariables,set_editcontrol=19,window_id=1105,setfocus=9001) + ClearProperty(MediaFilter.Genre) + ClearProperty(MediaFilter.Studio) + ClearProperty(MediaFilter.Country) + ClearProperty(MediaFilter.MPAA) + ClearProperty(MediaFilter.Director) + ClearProperty(MediaFilter.Writer) + + + false + 06 + $VAR[Label_Watched] + $VAR[Image_Watched] + Window.IsVisible(videos) + main_fg + 30 + 12 + SendClick(14) + + + false + 07 + $VAR[Label_SortMethod] + special://skin/extras/icons/arrow-updown-short-wide.png + Window.IsMedia + main_fg + 30 + 12 + SetProperty(DialogSelectType,Menu,Home) + SendClick(3) + RunScript(script.skinvariables,run_dialog=select,heading=$LOCALIZE[581],separator=||,list=title||genre||year||rating||playcount||director||originaltitle||lastplayed||writer||studio||mpaa||country||premiered||top250||votes,"executebuiltin=SetProperty(MediaFilter.SortBy,{v})||route=run_executebuiltin=special://skin/shortcuts/builtins/skinvariables-mediafilter.json&use_rules=True") + + + false + 08 + $VAR[Label_SortDirection] + $VAR[Image_SortDirection] + Window.IsMedia + main_fg + 30 + 12 + SetProperty(DialogSelectType,Menu,Home) + SendClick(4) + + SetProperty(MediaFilter.SortHow,desc) + ClearProperty(MediaFilter.SortHow) + + RunScript(script.skinvariables,"run_executebuiltin=special://skin/shortcuts/builtins/skinvariables-mediafilter.json",use_rules) + + + false + 09 + $LOCALIZE[31319] + special://skin/extras/icons/object-group.png + main_fg + 30 + 12 + Runscript(script.skinvariables,action=buildviews,contentid=$VAR[Items_ViewMode_Switch],pluginname=$INFO[Container.PluginName]) + + - - !$EXP[Exp_InfoDialogs] - !String.IsEmpty(Window.Property(MediaFilterBase)) + [!$EXP[Exp_ScrollbarVisible_H] | !Skin.HasSetting(Navigation.MediaFilterWall)] - - 0 - Visible - + + + false + button + 04 + $LOCALIZE[192] + special://skin/extras/icons/triangle-exclamation.png + main_fg + 30 + 12 + SendClick(22) + + + false + button + 21 + 9021 + $LOCALIZE[190] + special://skin/extras/icons/floppy-disk.png + main_fg + 30 + 12 + + + false + button + 23 + 9023 + $LOCALIZE[208] + special://skin/extras/icons/play3.png + main_fg + 30 + 12 + + + false + radiobutton + 20 + 9020 + $LOCALIZE[191] + $VAR[Image_OSD_Shuffle] + main_fg + 30 + 12 + + + false + button + 09 + Repeat + $VAR[Image_OSD_Repeat] + main_fg + 30 + 12 + SendClick(26) + + + + + 160 720 100 view_pad - + 9001 MediaFilter_Node_ClearAll SetFocus(19) @@ -356,8 +490,10 @@ left SetProperty(List.ViewContainer,19) 333 - 9002 - 64 + 9002 + 64 + ClearProperty(MediaFilterBase) + 50 9004 19 @@ -381,8 +517,10 @@ 68 SetProperty(List.ViewContainer,9000) 333 - 9002 - 68 + 9002 + 68 + ClearProperty(MediaFilterBase) + 50 19 @@ -394,88 +532,23 @@ 9009 - - false - 04 - $LOCALIZE[587] - $VAR[Image_Filtered] - main_fg - 30 - 12 - Container.CanFilterAdvanced - SetProperty(DialogSettings.Style,mediafilter,Home) - Filter - - - false - 05 - $LOCALIZE[192] - special://skin/extras/icons/triangle-exclamation.png - main_fg - 30 - 12 - !Container.CanFilterAdvanced - RunScript(script.skinvariables,set_editcontrol=19,window_id=1105,setfocus=9001) - ClearProperty(MediaFilter.Genre) - ClearProperty(MediaFilter.Studio) - ClearProperty(MediaFilter.Country) - ClearProperty(MediaFilter.MPAA) - ClearProperty(MediaFilter.Director) - ClearProperty(MediaFilter.Writer) - - - false - 06 - $VAR[Label_Watched] - $VAR[Image_Watched] - Window.IsVisible(videos) - main_fg - 30 - 12 - SendClick(14) - - - false - 07 - $VAR[Label_SortMethod] - special://skin/extras/icons/arrow-updown-short-wide.png - Window.IsMedia - main_fg - 30 - 12 - SetProperty(DialogSelectType,Menu,Home) - SendClick(3) - RunScript(script.skinvariables,run_dialog=select,heading=$LOCALIZE[581],separator=||,list=title||genre||year||rating||playcount||director||originaltitle||lastplayed||writer||studio||mpaa||country||premiered||top250||votes,"executebuiltin=SetProperty(MediaFilter.SortBy,{v})||route=run_executebuiltin=special://skin/shortcuts/builtins/skinvariables-mediafilter.json&use_rules=True") - - - false - 08 - $VAR[Label_SortDirection] - $VAR[Image_SortDirection] - Window.IsMedia - main_fg - 30 - 12 - SetProperty(DialogSelectType,Menu,Home) - SendClick(4) - - SetProperty(MediaFilter.SortHow,desc) - ClearProperty(MediaFilter.SortHow) - - RunScript(script.skinvariables,"run_executebuiltin=special://skin/shortcuts/builtins/skinvariables-mediafilter.json",use_rules) - - - false - 09 - $LOCALIZE[31319] - special://skin/extras/icons/object-group.png - main_fg - 30 - 12 - Runscript(script.skinvariables,action=buildviews,contentid=$VAR[Items_ViewMode_Switch],pluginname=$INFO[Container.PluginName]) - + MediaFilter_Node_Buttons + MediaFilter_Node_PlaylistButtons + + + + + + + !$EXP[Exp_InfoDialogs] + !String.IsEmpty(Window.Property(MediaFilterBase)) + [!$EXP[Exp_ScrollbarVisible_H] | !Skin.HasSetting(Navigation.MediaFilterWall)] + + 0 + Visible + + MediaFilter_Node_TopRow MediaFilter_Node_Alphabet MediaFilter_Node_Filters diff --git a/1080i/Includes_Views.xml b/1080i/Includes_Views.xml index 6f1a06458..23469e8a2 100644 --- a/1080i/Includes_Views.xml +++ b/1080i/Includes_Views.xml @@ -177,6 +177,10 @@ + View_Scrollbars_Vert + + + view_top view_poster_item_h @@ -275,7 +279,7 @@ Animation_Half_WindowChange !$EXP[Exp_InfoDialogs] - View_Scrollbars + View_Scrollbars $EXP[Exp_FurnitureVisible] diff --git a/1080i/Includes_Views_List.xml b/1080i/Includes_Views_List.xml index f3d67941a..014c0f2be 100644 --- a/1080i/Includes_Views_List.xml +++ b/1080i/Includes_Views_List.xml @@ -269,8 +269,10 @@ 65 SetFocus(65) - Action_View_Movement_OnDown + Action_View_Movement_OnDown $VAR[Action_Var_ToMediaFilter] + SetProperty(List.ViewContainer,$NUMBER[$PARAM[id]]) + 330 1 2 diff --git a/1080i/MyPlaylist.xml b/1080i/MyPlaylist.xml index 8d0669b88..7928cdd98 100644 --- a/1080i/MyPlaylist.xml +++ b/1080i/MyPlaylist.xml @@ -6,22 +6,60 @@ Action_Blur_Onload + View_Bumper Defs_TMDbHelper_Loader Background_Main Background_Transition - Animation_View_WindowChange - - 50 - $LOCALIZE[31121] - [true] - - View_Row_Info + Animation_Group_Bumper + + Animation_View_WindowChange + + 50 + $LOCALIZE[31121] + [true] + 802.67 + View_MediaList_PosterLandscape + + + 50 + $LOCALIZE[31121] + [true] + 896.67 + View_MediaList_SquareLandscape + + + !$EXP[Exp_InfoDialogs] + Animation_Transition_InfoPanel_Hide + + view_top + info_panel_w + view_side + + + + true + true + + + View_Scrollbars_Vert - View_Furniture_Edges + Home_Fade + + 50 + + + Animation_Group_Bumper + + !String.IsEmpty(Window.Property(MediaFilterBase)) + MediaFilter_Node_TopRow + + View_Row_Header + View_Row_Gutter + View_Dialog_Plot