From b5298d1f6e1d3ed76bf18ff410763b4af9b306f2 Mon Sep 17 00:00:00 2001 From: jurialmunkey Date: Sun, 24 Dec 2023 15:39:26 +1100 Subject: [PATCH] :zap: Consolidate movements further --- 1080i/Includes_Actions.xml | 24 ++-- 1080i/Includes_Expressions.xml | 10 +- 1080i/Includes_MediaFilter.xml | 104 +++++++------- 1080i/Includes_MediaWall.xml | 2 +- 1080i/Includes_Views.xml | 134 ++++++++++-------- 1080i/Includes_Views_Combined.xml | 11 +- 1080i/Includes_Views_List.xml | 1 - 1080i/SkinSettings.xml | 4 +- .../skinvariables-mediafilter-setfocus.json | 13 ++ 9 files changed, 165 insertions(+), 138 deletions(-) create mode 100644 shortcuts/builtins/skinvariables-mediafilter-setfocus.json diff --git a/1080i/Includes_Actions.xml b/1080i/Includes_Actions.xml index ea04e7021..50816fee6 100644 --- a/1080i/Includes_Actions.xml +++ b/1080i/Includes_Actions.xml @@ -32,9 +32,7 @@ RunScript(script.skinvariables,action=buildviews) ClearProperty(MediaFilterBase) - ClearProperty(View.WallSwitchPosition) ClearProperty(MediaFilterBase) - ClearProperty(View.WallSwitchPosition) @@ -144,7 +142,7 @@ Control.Move(303,1) - + [![$PARAM[condition]] + $PARAM[bump] + Skin.String(Navigation.OnDown,Explore)] @@ -299,7 +297,7 @@ SetFocus(4000) - + True SetProperty(Item_Title,$VAR[Label_Title_Container],1181) @@ -325,9 +323,9 @@ - Action_Info_Recommendations_OnDown - SetProperty(List.ViewContainer,$NUMBER[$PARAM[id]]) - 330 + Action_View_Explore_OnDown + SetProperty(List.ViewContainer,$NUMBER[$PARAM[id]]) + 330 @@ -444,20 +442,20 @@ - 9600 - SetFocus(68) + 9600 + SetFocus(19) 68 SetFocus(68) SetFocus(68) - 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,preaction=SetProperty(View.WallSwitchPosition,1)) + 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) + Runscript(script.skinvariables,"run_executebuiltin=special://skin/shortcuts/builtins/skinvariables-mediafilter-setfocus.json",use_rules,id=$VAR[Action_View_ContentID],focus_id=9001,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,preaction=ClearProperty(View.WallSwitchPosition)) - Art(fanart) diff --git a/1080i/Includes_Expressions.xml b/1080i/Includes_Expressions.xml index 4b8378891..befd3c309 100644 --- a/1080i/Includes_Expressions.xml +++ b/1080i/Includes_Expressions.xml @@ -113,19 +113,19 @@ - [Control.IsVisible(55) + !Integer.IsEqual(Container(553).NumItems,0) + !Skin.HasSetting(DisableMediaFilterWall)] + [Control.IsVisible(55) + !Integer.IsEqual(Container(553).NumItems,0) + Skin.HasSetting(Navigation.MediaFilterWall)] [!String.IsEmpty(Window.Property(MediaFilterBase)) + $EXP[Exp_FilterWall_IsEnabled] + $EXP[Exp_FilterWall_IsViewtype]] - [Window.IsMedia + !Skin.HasSetting(DisableMediaFilterWall)] - [Control.IsVisible(50) | Control.IsVisible(51) | Control.IsVisible(52) | Control.IsVisible(502) | Control.IsVisible(512) | Control.IsVisible(522)] + [Window.IsMedia + Skin.HasSetting(Navigation.MediaFilterWall)] + [Control.IsVisible(50) | Control.IsVisible(51) | Control.IsVisible(52) | [[Control.IsVisible(502) | Control.IsVisible(512) | Control.IsVisible(522)] + !Skin.HasSetting(Views.UseAltCombined)]] - [!String.IsEmpty(Window.Property(MediaFilterBase)) + !String.IsEmpty(Window.Property(View.WallSwitchPosition))] + [!String.IsEmpty(Window.Property(MediaFilterBase)) + !Skin.HasSetting(Navigation.MediaFilterWall)] - [$EXP[Exp_FilterWall_IsMedia] | $EXP[Exp_FilterWall_IsDiscover] | $EXP[Exp_MediaFilterVisible] | [Window.IsVisible(1105) + !$EXP[Exp_Search_WidgetGroup_HasFocus]]] + [$EXP[Exp_FilterWall_IsMedia] | $EXP[Exp_FilterWall_IsDiscover] | !String.IsEmpty(Window.Property(MediaFilterBase)) | [Window.IsVisible(1105) + !$EXP[Exp_Search_WidgetGroup_HasFocus]]] diff --git a/1080i/Includes_MediaFilter.xml b/1080i/Includes_MediaFilter.xml index 16715f0b6..6ff55d040 100644 --- a/1080i/Includes_MediaFilter.xml +++ b/1080i/Includes_MediaFilter.xml @@ -308,66 +308,65 @@ + + + 140 + 160 + 720 + + 9002 + 9003 + 19 + 9500 + 68 + + + + !$EXP[Exp_InfoDialogs] - $EXP[Exp_MediaFilterVisible] + !String.IsEmpty(Window.Property(MediaFilterBase)) + [!$EXP[Exp_ScrollbarVisible_H] | !Skin.HasSetting(Navigation.MediaFilterWall)] 0 Visible - + 160 720 - - - 100 + 100 + view_pad + + 9001 + MediaFilter_Node_ClearAll + SetFocus(19) + + + + Filter + font_midi_black + 00ffffff + 00ffffff + 00ffffff + $VAR[ColorSelected] view_pad - - 9001 - MediaFilter_Node_ClearAll - - SetProperty(View.WallSwitchPosition,1) - SetFocus(19) + 40 + left + SetProperty(List.ViewContainer,19) + 333 + 9002 + 64 + 9004 + + 19 + 9009 + 308 - - - Filter - font_midi_black - 00ffffff - 00ffffff - 00ffffff - $VAR[ColorSelected] - view_pad - 40 - left - SetProperty(List.ViewContainer,19) - 333 - 9002 - 9004 - - 19 - 9009 - 308 - - - 19 - 9009 - - - - - - 140 - 0 - - 9002 - 9003 - 19 - 9500 - 68 + + 19 + 9009 @@ -378,11 +377,12 @@ horizontal 160 -20 - SetFocus(9001) + SetFocus(19) 68 SetProperty(List.ViewContainer,9000) 333 - SetFocus(68) + 9002 + 68 19 @@ -475,9 +475,11 @@ Runscript(script.skinvariables,action=buildviews,contentid=$VAR[Items_ViewMode_Switch],pluginname=$INFO[Container.PluginName]) - MediaFilter_Node_Filters + + MediaFilter_Node_Alphabet + MediaFilter_Node_Filters - MediaFilter_Node_Dialog + MediaFilter_Node_Dialog diff --git a/1080i/Includes_MediaWall.xml b/1080i/Includes_MediaWall.xml index 566c45481..27c3a4311 100644 --- a/1080i/Includes_MediaWall.xml +++ b/1080i/Includes_MediaWall.xml @@ -736,7 +736,7 @@ - + 553 $EXP[Exp_FilterWall_IsDiscover] [!Container(553).IsUpdating] diff --git a/1080i/Includes_Views.xml b/1080i/Includes_Views.xml index 97556ab30..6f1a06458 100644 --- a/1080i/Includes_Views.xml +++ b/1080i/Includes_Views.xml @@ -12,10 +12,17 @@ !Window.IsVisible(DialogGameControllers.xml) !Window.IsVisible(DialogPVRChannelManager.xml) !Window.IsVisible(DialogPVRGroupManager.xml) - + + Control.HasFocus(19) + + $PARAM[label] - + + $PARAM[label] + Conditional + Conditional + @@ -68,10 +75,10 @@ 68 - SetFocus(50) + SetFocus($VAR[Action_View_ContentID]) ClearProperty(MediaFilterBase) ClearProperty(View.WallSwitchRow) - Runscript(script.skinvariables,$VAR[MediaWall_ScriptTypeDef],use_rules,id=$VAR[Action_View_ContentID],win_prop=WallSlideOut,focus_id=$VAR[Action_View_ContentID],clear_prop_one=MediaFilterBase,clear_prop_two=View.WallSwitchPosition) + Runscript(script.skinvariables,$VAR[MediaWall_ScriptTypeDef],use_rules,id=$VAR[Action_View_ContentID],win_prop=WallSlideOut,focus_id=$VAR[Action_View_ContentID],clear_prop_one=MediaFilterBase,clear_prop_two=Null) @@ -98,49 +105,73 @@ Action(PageDown) Action(PageDown) SetFocus(64) + $EXP[Exp_FilterWall_IsViewtype] scrollbar_w + Conditional 440 view_side - 680 !$EXP[Exp_InfoDialogs] $EXP[Exp_MediaFilterVisible] | $EXP[Exp_ScrollbarVisible_H] 0 Visible - - common/white.png - 1 - 50% - - - horizontal - - Texture_Scrollbar_SliderBar_H - Texture_Scrollbar_H - true - Action_Scrollbar - SetFocus(64) - $EXP[Exp_ScrollbarVisible_H] - - 20 - 20 - - left - font_hint_black - main_fg_30 - + 800 + scrollbar_w + 50% + + common/white.png + 1 + 50% - - right - font_hint_black - main_fg_30 - + + horizontal + + Texture_Scrollbar_SliderBar_H + Texture_Scrollbar_H + true + Action_Scrollbar + SetFocus(64) + $EXP[Exp_FilterWall_IsViewtype] + $EXP[Exp_ScrollbarVisible_H] + + + 50 + 50% + + + 10 + 0 + center + left + font_hint_black + main_fg_30 + + + + + 10 + 0 + center + right + font_hint_black + main_fg_30 + + @@ -224,7 +255,12 @@ !$EXP[Exp_InfoDialogs] Animation_Transition_InfoPanel_Hide - ![$EXP[Exp_FilterWall_IsMedia] | $EXP[Exp_FilterWall_IsDiscover]] + + + + + + true true @@ -243,15 +279,13 @@ $EXP[Exp_FurnitureVisible] - ![$EXP[Exp_MediaFilterVisible] + [$EXP[Exp_FilterWall_IsMedia] | $EXP[Exp_FilterWall_IsDiscover]]] - 200 Visible - [$EXP[Exp_ScrollbarVisible_H] | $EXP[Exp_FilterWall_IsMedia] | $EXP[Exp_FilterWall_IsDiscover]] | !Skin.HasSetting(Furniture.DisableCount) + !Skin.HasSetting(Furniture.DisableCount) grouplist @@ -273,7 +307,6 @@ - ![$EXP[Exp_ScrollbarVisible_H] | $EXP[Exp_FilterWall_IsMedia] | $EXP[Exp_FilterWall_IsDiscover]] Skin.HasSetting(Furniture.DisableCount) @@ -352,10 +385,7 @@ Home_Fade - - !Control.HasFocus(19) - View_Row_Header - + View_Row_Header View_Row_Gutter Animation_Group_Bumper @@ -365,26 +395,8 @@ - - Conditional - Conditional - - - $EXP[Exp_FilterWall_IsMedia] | $EXP[Exp_FilterWall_IsDiscover] - - - - - - - - true - true - - - MediaWall_Discover - MediaWall_All - + MediaWall_Discover + MediaWall_All diff --git a/1080i/Includes_Views_Combined.xml b/1080i/Includes_Views_Combined.xml index 0922eaf4b..5067e8e6b 100644 --- a/1080i/Includes_Views_Combined.xml +++ b/1080i/Includes_Views_Combined.xml @@ -40,21 +40,21 @@ Visible - 40 - 300 Hidden - 320 200 !$EXP[Exp_InfoDialogs] + 40 + 300 $EXP[Exp_InfoDialogs] - 300 + 320 + 200 @@ -78,6 +78,9 @@ $PARAM[id]3 + Action_View_Movement_OnDown + $VAR[Action_Var_ToMediaFilter] + $PARAM[id]3 SetProperty(TMDbHelper.WidgetContainer,$PARAM[id]3) ClearProperty(SpecialFolderPath) diff --git a/1080i/Includes_Views_List.xml b/1080i/Includes_Views_List.xml index 3557b73e1..f3d67941a 100644 --- a/1080i/Includes_Views_List.xml +++ b/1080i/Includes_Views_List.xml @@ -270,7 +270,6 @@ SetFocus(65) Action_View_Movement_OnDown - $VAR[Action_Var_ToMediaFilter] 1 diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml index 7af5aaeac..c163a96fe 100644 --- a/1080i/SkinSettings.xml +++ b/1080i/SkinSettings.xml @@ -344,8 +344,8 @@ radiobutton Container(3).HasFocus(4) - Skin.ToggleSetting(DisableMediaFilterWall) - !Skin.HasSetting(DisableMediaFilterWall) + Skin.ToggleSetting(Navigation.MediaFilterWall) + Skin.HasSetting(Navigation.MediaFilterWall) diff --git a/shortcuts/builtins/skinvariables-mediafilter-setfocus.json b/shortcuts/builtins/skinvariables-mediafilter-setfocus.json new file mode 100644 index 000000000..8cc33ed3d --- /dev/null +++ b/shortcuts/builtins/skinvariables-mediafilter-setfocus.json @@ -0,0 +1,13 @@ +{ + "infolabels": { + "folderpath": "Container({id}).FolderPath" + }, + "actions": [ + "ClearProperty(View.WallSwitchRow.Action,Home)", + "SetProperty(MediaFilterBase,{folderpath})", + "{preaction}", + "SetFocus({focus_id})", + "ClearProperty({clear_prop_one})", + "ClearProperty({clear_prop_two})" + ] +} \ No newline at end of file