From 16cb5b42e339f1a4dc95db959126f30e4c5471b4 Mon Sep 17 00:00:00 2001 From: jurialmunkey Date: Sun, 10 Oct 2021 15:16:21 +1100 Subject: [PATCH] skin settings > library > alphabet strip - #92 --- 16x9/Defaults.xml | 4 + 16x9/Includes_Object.xml | 388 +++++++++++++++++++- 16x9/MyVideoNav.xml | 20 + 16x9/SkinSettings.xml | 12 + addon.xml | 2 +- language/resource.language.en_gb/strings.po | 5 + 6 files changed, 427 insertions(+), 4 deletions(-) diff --git a/16x9/Defaults.xml b/16x9/Defaults.xml index 2b25307c..db34e589 100644 --- a/16x9/Defaults.xml +++ b/16x9/Defaults.xml @@ -143,4 +143,8 @@ true + [String.IsEqual(ListItem.SortLetter,$NUMBER[0]) | String.IsEqual(ListItem.SortLetter,$NUMBER[1]) | String.IsEqual(ListItem.SortLetter,$NUMBER[2]) | String.IsEqual(ListItem.SortLetter,$NUMBER[3]) | String.IsEqual(ListItem.SortLetter,$NUMBER[4]) | String.IsEqual(ListItem.SortLetter,$NUMBER[5]) | String.IsEqual(ListItem.SortLetter,$NUMBER[6]) | String.IsEqual(ListItem.SortLetter,$NUMBER[7]) | String.IsEqual(ListItem.SortLetter,$NUMBER[8]) | String.IsEqual(ListItem.SortLetter,$NUMBER[9])] + + [String.IsEqual(ListItem.SortLetter,A) | String.IsEqual(ListItem.SortLetter,B) | String.IsEqual(ListItem.SortLetter,C) | String.IsEqual(ListItem.SortLetter,D) | String.IsEqual(ListItem.SortLetter,E) | String.IsEqual(ListItem.SortLetter,F) | String.IsEqual(ListItem.SortLetter,G) | String.IsEqual(ListItem.SortLetter,H) | String.IsEqual(ListItem.SortLetter,I) | String.IsEqual(ListItem.SortLetter,J) | String.IsEqual(ListItem.SortLetter,K) | String.IsEqual(ListItem.SortLetter,L) | String.IsEqual(ListItem.SortLetter,M) | String.IsEqual(ListItem.SortLetter,N) | String.IsEqual(ListItem.SortLetter,O) | String.IsEqual(ListItem.SortLetter,P) | String.IsEqual(ListItem.SortLetter,Q) | String.IsEqual(ListItem.SortLetter,R) | String.IsEqual(ListItem.SortLetter,S) | String.IsEqual(ListItem.SortLetter,T) | String.IsEqual(ListItem.SortLetter,U) | String.IsEqual(ListItem.SortLetter,V) | String.IsEqual(ListItem.SortLetter,W) | String.IsEqual(ListItem.SortLetter,X) | String.IsEqual(ListItem.SortLetter,Y) | String.IsEqual(ListItem.SortLetter,Z)] + \ No newline at end of file diff --git a/16x9/Includes_Object.xml b/16x9/Includes_Object.xml index 0328eb61..a48fb4b4 100644 --- a/16x9/Includes_Object.xml +++ b/16x9/Includes_Object.xml @@ -475,12 +475,392 @@ + + + 6 + + + + + + + + 50% + $PARAM[visible] + + + + 44 + ActivateWindow($INFO[Window(home).Property(HubReturn)]) + 61 + 50 + SetFocus(50) + Action(nextletter) + + SetFocus($PARAM[id]) + SetFocus(50) + Action(prevletter) + + SetFocus($PARAM[id]) + + + + 50% + 44 + $PARAM[visible] + Object_Alphabet_Horz_ItemGap_Wide + 1 + horizontal + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Conditional + + + + + + + + + + 50% + $PARAM[visible] + + + + 64 + ActivateWindow($INFO[Window(home).Property(HubReturn)]) + 60 + 50 + SetFocus(50) + Action(nextletter) + + SetFocus($PARAM[id]) + SetFocus(50) + Action(prevletter) + + SetFocus($PARAM[id]) + + + + 50% + 64 + $PARAM[visible] + 8 + vertical + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ![String.IsEqual(ListItem.SortLetter,N) | String.IsEqual(ListItem.SortLetter,O) | String.IsEqual(ListItem.SortLetter,P) | String.IsEqual(ListItem.SortLetter,Q) | String.IsEqual(ListItem.SortLetter,R) | String.IsEqual(ListItem.SortLetter,S) | String.IsEqual(ListItem.SortLetter,T) | String.IsEqual(ListItem.SortLetter,U) | String.IsEqual(ListItem.SortLetter,V) | String.IsEqual(ListItem.SortLetter,W) | String.IsEqual(ListItem.SortLetter,X) | String.IsEqual(ListItem.SortLetter,Y) | String.IsEqual(ListItem.SortLetter,Z)] + Conditional + + + 50% + 64 + $PARAM[visible] + 8 + vertical + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + String.IsEqual(ListItem.SortLetter,N) | String.IsEqual(ListItem.SortLetter,O) | String.IsEqual(ListItem.SortLetter,P) | String.IsEqual(ListItem.SortLetter,Q) | String.IsEqual(ListItem.SortLetter,R) | String.IsEqual(ListItem.SortLetter,S) | String.IsEqual(ListItem.SortLetter,T) | String.IsEqual(ListItem.SortLetter,U) | String.IsEqual(ListItem.SortLetter,V) | String.IsEqual(ListItem.SortLetter,W) | String.IsEqual(ListItem.SortLetter,X) | String.IsEqual(ListItem.SortLetter,Y) | String.IsEqual(ListItem.SortLetter,Z) + Conditional + + + + + + + 64 + 44 + + center + center + Disabled + Font-ListInfo-Small + $PARAM[visible] + + + + + 64 + 44 + + center + center + SideArrow + Font-Button + $PARAM[visible] + !Control.HasFocus($PARAM[id]) + + + 64 + 44 + + center + center + $VAR[HighlightColor] + Font-Button + $PARAM[visible] + Control.HasFocus($PARAM[id]) + + + + + + + + + + + + + + + + + + + + + + + + + + + - ActivateWindow($INFO[Window(home).Property(HubReturn)]) + 62 + 63 + ActivateWindow($INFO[Window(home).Property(HubReturn)]) + $PARAM[left] 100% 50 @@ -495,9 +875,11 @@ - ActivateWindow($INFO[Window(home).Property(HubReturn)]) + 62 + 63 + ActivateWindow($INFO[Window(home).Property(HubReturn)]) 50 - -20 + 0 horizontal 50% headlinew diff --git a/16x9/MyVideoNav.xml b/16x9/MyVideoNav.xml index d8f5a789..afea8e57 100644 --- a/16x9/MyVideoNav.xml +++ b/16x9/MyVideoNav.xml @@ -10,12 +10,15 @@ SetProperty(HubReturn,$INFO[Container.FolderPath],home) + + Furniture_Background Furniture_RSS Furniture_TopBar + Conditional @@ -42,11 +45,27 @@ Viewtype_Lovefilm Viewtype_ShowCase + + bigpad bigpad bigpad posterh + + -84 + 80 + + + + + + -80 + 80 + + + + @@ -124,6 +143,7 @@ Furniture_OverlayInfo + \ No newline at end of file diff --git a/16x9/SkinSettings.xml b/16x9/SkinSettings.xml index e351ff9d..8e2d1d62 100644 --- a/16x9/SkinSettings.xml +++ b/16x9/SkinSettings.xml @@ -864,6 +864,18 @@ Defs_OptionButton ControlGroup(8000).HasFocus(8005) + + + settingsradioposx + 100% + + Skin.HasSetting(furniture.alphabet) + Skin.ToggleSetting(furniture.alphabet) + 72 + Defs_OptionButton + ControlGroup(8000).HasFocus(8005) + !Skin.HasSetting(global.widescreen) | !Skin.HasSetting(furniture.showflags) + settingsradioposx diff --git a/addon.xml b/addon.xml index f9f8a4aa..5c41f792 100644 --- a/addon.xml +++ b/addon.xml @@ -1,4 +1,4 @@ - + diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po index 2356b618..03e35f4b 100644 --- a/language/resource.language.en_gb/strings.po +++ b/language/resource.language.en_gb/strings.po @@ -1195,3 +1195,8 @@ msgstr "" msgctxt "#31278" msgid "Auto-close OSD" msgstr "" + +#: /16x9/SkinSettings.xml +msgctxt "#31279" +msgid "Show alphabet strip with scrollbar" +msgstr ""