From 0916d6cc0164231048d7ccdbf7710503f0498310 Mon Sep 17 00:00:00 2001 From: realcopacetic Date: Mon, 29 Apr 2024 09:35:25 +0100 Subject: [PATCH] globalsearch wip --- 16x9/Components_Viewtypes.xml | 36 --------------------- 16x9/Custom_1180_globalsearch.xml | 2 ++ 16x9/Navigation.xml | 2 -- 16x9/Scrollbars.xml | 29 +++++++++++++++++ 16x9/Templates_Widgets.xml | 7 ++-- 16x9/Variables_Labels_Media.xml | 9 ++++++ 16x9/Variables_Paths_Widgets.xml | 2 +- 16x9/Variables_Textures_Artwork_Widgets.xml | 1 + 8 files changed, 45 insertions(+), 43 deletions(-) diff --git a/16x9/Components_Viewtypes.xml b/16x9/Components_Viewtypes.xml index f59ecba1..e19d9b01 100644 --- a/16x9/Components_Viewtypes.xml +++ b/16x9/Components_Viewtypes.xml @@ -99,42 +99,6 @@ - - - - - 1 - 1 - $INFO[ListItem.Art(clearlogo)] - - - 1 - 1 - $INFO[ListItem.Art(clearlogo-alt)] - - - 1 - 1 - $INFO[ListItem.Art(clearlogo-billboard)] - - - 1 - 1 - $INFO[Container(3100).ListItem.Art(clearlogo)] - - - 1 - 1 - $INFO[Container(3100).ListItem.Art(clearlogo-alt)] - - - 1 - 1 - $INFO[Container(3100).ListItem.Art(clearlogo-billboard)] - - - - diff --git a/16x9/Custom_1180_globalsearch.xml b/16x9/Custom_1180_globalsearch.xml index 1d8046df..bac00d84 100644 --- a/16x9/Custom_1180_globalsearch.xml +++ b/16x9/Custom_1180_globalsearch.xml @@ -4,6 +4,7 @@ 3000 + false Focus @@ -30,6 +31,7 @@ + \ No newline at end of file diff --git a/16x9/Navigation.xml b/16x9/Navigation.xml index d6bea5b5..eeb3a79e 100644 --- a/16x9/Navigation.xml +++ b/16x9/Navigation.xml @@ -497,13 +497,11 @@ SetFocus(3204) SetFocus(3205) SetFocus(3206) - SetFocus(3207) SetFocus($PARAM[bounce_id]) - SetFocus(3000) 0 0 3202 diff --git a/16x9/Scrollbars.xml b/16x9/Scrollbars.xml index 466d31d4..1a71c1b7 100644 --- a/16x9/Scrollbars.xml +++ b/16x9/Scrollbars.xml @@ -650,6 +650,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/16x9/Templates_Widgets.xml b/16x9/Templates_Widgets.xml index 03735ead..80d5c926 100644 --- a/16x9/Templates_Widgets.xml +++ b/16x9/Templates_Widgets.xml @@ -435,7 +435,7 @@ - !$EXP[Infoscreen_IsVisible] + !Control.HasFocus(4010) + !$EXP[Infoscreen_IsVisible] + !Control.HasFocus(4010) + !$EXP[globalsearch_IsVisible] @@ -709,6 +709,7 @@ + @@ -897,7 +898,7 @@ - + @@ -910,8 +911,6 @@ title, album, artist, genre - - --> \ No newline at end of file diff --git a/16x9/Variables_Labels_Media.xml b/16x9/Variables_Labels_Media.xml index e6282b1a..20e03be7 100644 --- a/16x9/Variables_Labels_Media.xml +++ b/16x9/Variables_Labels_Media.xml @@ -866,6 +866,15 @@ $INFO[ListItem.SortLetter] + + + "Apple TV" + "Paramount" + "Disney" + $ESCINFO[Window(home).Property(StudioSplit.0)] + $ESCINFO[ListItem.Studio] + + $LOCALIZE[31408] $LOCALIZE[31407] diff --git a/16x9/Variables_Paths_Widgets.xml b/16x9/Variables_Paths_Widgets.xml index 9a9a8a3c..48132233 100644 --- a/16x9/Variables_Paths_Widgets.xml +++ b/16x9/Variables_Paths_Widgets.xml @@ -66,7 +66,7 @@ - videodb://tvshows/titles/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22studio%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B$ESCINFO[Window(home).Property(StudioSplit.0)]%5D%7D%2C%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22isnot%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Title]%5D%7D%5D%7D%2C%22type%22%3A%22tvshows%22%7D + videodb://tvshows/titles/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22studio%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B$VAR[Studio_Label]%5D%7D%2C%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22isnot%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Title]%5D%7D%5D%7D%2C%22type%22%3A%22tvshows%22%7D videodb://movies/titles/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22studio%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B$ESCINFO[Window(home).Property(StudioSplit.0)]%5D%7D%2C%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22isnot%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Title]%5D%7D%5D%7D%2C%22type%22%3A%22movies%22%7D videodb://tvshows/titles/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22studio%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Studio]%5D%7D%2C%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22isnot%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Title]%5D%7D%5D%7D%2C%22type%22%3A%22tvshows%22%7D videodb://movies/titles/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22studio%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Studio]%5D%7D%2C%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22isnot%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Title]%5D%7D%5D%7D%2C%22type%22%3A%22movies%22%7D diff --git a/16x9/Variables_Textures_Artwork_Widgets.xml b/16x9/Variables_Textures_Artwork_Widgets.xml index b639982a..ed6e966b 100644 --- a/16x9/Variables_Textures_Artwork_Widgets.xml +++ b/16x9/Variables_Textures_Artwork_Widgets.xml @@ -1029,6 +1029,7 @@ $INFO[Container(50).ListItem(0).Icon] $INFO[Container(3203).ListItem(0).Icon] $INFO[Container(3204).ListItem(0).Art(fanart)] + $INFO[Container(3204).ListItem(0).Art(thumb)] $INFO[Container(3205).ListItem(0).Art(fanart)] $INFO[Container(3205).ListItem(0).Icon] $INFO[Container(3206).ListItem(0).Art(fanart)]