From f686ebb38095eeeaa21037ddf29c6d9cc4d839d2 Mon Sep 17 00:00:00 2001 From: realcopacetic Date: Thu, 25 Apr 2024 14:22:50 +0100 Subject: [PATCH] globalsearch --- 16x9/Actions.xml | 42 ++++-- 16x9/Buttons_Infoscreen_Path_Tracer.xml | 4 +- 16x9/Colors.xml | 32 ++++- 16x9/Components_Viewtypes.xml | 38 +----- 16x9/Content_Viewtype_Options.xml | 8 -- 16x9/Custom_1180_globalsearch.xml | 39 ++++++ 16x9/DialogKeyboard.xml | 34 ++--- 16x9/Expressions.xml | 9 +- 16x9/Home.xml | 20 ++- 16x9/Navigation.xml | 138 ++++++++++++++++++-- 16x9/Scrollbars.xml | 31 ++++- 16x9/Templates_Buttons.xml | 2 +- 16x9/Templates_MyWindows.xml | 9 +- 16x9/Templates_Widgets.xml | 129 +++++++++++++++++- 16x9/Variables_Labels_Media.xml | 9 ++ 16x9/Variables_Paths_Widgets.xml | 34 ++++- 16x9/Variables_Textures_Artwork_Widgets.xml | 7 + 16x9/Viewtype_504_Strip.xml | 10 +- 16x9/_IDs | 1 + README.md | 9 ++ addon.xml | 2 +- 21 files changed, 493 insertions(+), 114 deletions(-) create mode 100644 16x9/Custom_1180_globalsearch.xml diff --git a/16x9/Actions.xml b/16x9/Actions.xml index f1782479..5a3f7e1c 100644 --- a/16x9/Actions.xml +++ b/16x9/Actions.xml @@ -26,15 +26,15 @@ - RunScript(script.copacetic.helper,action=play_items,id=3201,type=$PARAM[type],method=$PARAM[method]) - RunScript(script.copacetic.helper,action=play_items,id=3202,type=$PARAM[type],method=$PARAM[method]) - RunScript(script.copacetic.helper,action=play_items,id=3203,type=$PARAM[type],method=$PARAM[method]) - RunScript(script.copacetic.helper,action=play_items,id=3204,type=$PARAM[type],method=$PARAM[method]) - RunScript(script.copacetic.helper,action=play_items,id=3205,type=$PARAM[type],method=$PARAM[method]) - RunScript(script.copacetic.helper,action=play_items,id=3206,type=$PARAM[type],method=$PARAM[method]) - RunScript(script.copacetic.helper,action=play_items,id=3207,type=$PARAM[type],method=$PARAM[method]) - RunScript(script.copacetic.helper,action=play_items,id=3208,type=$PARAM[type],method=$PARAM[method]) - RunScript(script.copacetic.helper,action=play_items,id=3209,type=$PARAM[type],method=$PARAM[method]) + RunScript(script.copacetic.helper,action=play_items,id=3201,type=$PARAM[type],method=$PARAM[method]) + RunScript(script.copacetic.helper,action=play_items,id=3202,type=$PARAM[type],method=$PARAM[method]) + RunScript(script.copacetic.helper,action=play_items,id=3203,type=$PARAM[type],method=$PARAM[method]) + RunScript(script.copacetic.helper,action=play_items,id=3204,type=$PARAM[type],method=$PARAM[method]) + RunScript(script.copacetic.helper,action=play_items,id=3205,type=$PARAM[type],method=$PARAM[method]) + RunScript(script.copacetic.helper,action=play_items,id=3206,type=$PARAM[type],method=$PARAM[method]) + RunScript(script.copacetic.helper,action=play_items,id=3207,type=$PARAM[type],method=$PARAM[method]) + RunScript(script.copacetic.helper,action=play_items,id=3208,type=$PARAM[type],method=$PARAM[method]) + RunScript(script.copacetic.helper,action=play_items,id=3209,type=$PARAM[type],method=$PARAM[method]) @@ -110,6 +110,11 @@ ActivateWindow(music,musicdb://albums/$INFO[Container.ListItem.DBID]/-2/?albumid=$INFO[Container.ListItem.DBID],return) + + Dialog.Close(all) + + + @@ -123,16 +128,33 @@ PlayMedia($ESCINFO[ListItem.Filenameandpath]) + + Dialog.Close(all) + PlayMedia($ESCINFO[ListItem.Filenameandpath]) + + Dialog.Close(all) SetProperty(SentFromInfo,true,movieinformation) ActivateWindow(Videos,$INFO[Container(3202).ListItem.FolderPath]/,return) + + Dialog.Close(all) + SetProperty(SentFromInfo,true,musicinformation) + ActivateWindow(music,musicdb://artists/$INFO[Container(3202).ListItem.DBID]/,return) + + Dialog.Close(all) SetProperty(SentFromInfo,true,musicinformation) - ActivateWindow(music,musicdb://albums/$INFO[Container(3202).ListItem.DBID]/-2/,return) + ActivateWindow(music,musicdb://albums/$INFO[Container(3202).ListItem.DBID]/-2/,return) + ActivateWindow(music,musicdb://albums/$INFO[Container(3205).ListItem.DBID]/-2/,return) + + + + Dialog.Close(all) + ActivateWindow(videos,videodb://tvshows/titles/$INFO[ListItem.DBID]/,return) diff --git a/16x9/Buttons_Infoscreen_Path_Tracer.xml b/16x9/Buttons_Infoscreen_Path_Tracer.xml index c5e622da..db9a9990 100644 --- a/16x9/Buttons_Infoscreen_Path_Tracer.xml +++ b/16x9/Buttons_Infoscreen_Path_Tracer.xml @@ -59,7 +59,7 @@ ClearProperty(ContainerPath_1,$PARAM[window]) ClearProperty(Breadcrumb_Level,$PARAM[window]) - Dialog.Close(all,true) + Dialog.Close ActivateWindow(home) SetFocus(6001) ClearProperty(Origin,home) @@ -100,7 +100,7 @@ ClearProperty(ContainerPath_10,$PARAM[window]) SetProperty(Breadcrumb_Level,9,$PARAM[window]) - Dialog.Close(all,true) + Dialog.Close SetFocus(6001) diff --git a/16x9/Colors.xml b/16x9/Colors.xml index c91c6400..17a6ce50 100644 --- a/16x9/Colors.xml +++ b/16x9/Colors.xml @@ -526,15 +526,15 @@ $VAR[Accent_Color] - $VAR[Light_Color] + $VAR[Breadcrumb_Label_Color] $VAR[Accent_Color] - $VAR[Light_Color] + $VAR[Breadcrumb_Label_Color] $VAR[Accent_Color] - $VAR[Light_Color] + $VAR[Breadcrumb_Label_Color] $VAR[Alpha_15]$VAR[Light_Hex] @@ -720,7 +720,7 @@ $VAR[Primary_Color] - $VAR[Alpha_15]$VAR[Light_Hex] + $VAR[Alpha_15]$VAR[Light_Hex] $VAR[Alpha_15]$VAR[Dark_Hex] $VAR[Alpha_15]$VAR[Light_Hex] $VAR[Alpha_15]$VAR[Light_Hex] @@ -788,7 +788,7 @@ $VAR[Alpha_15]$VAR[Light_Hex] - $VAR[Light_Color] + $VAR[Light_Color] $VAR[Dark_Grey_Color] $VAR[Light_Color] $VAR[Light_Color] @@ -854,6 +854,28 @@ $VAR[Light_Color] $VAR[Primary_Color] + + + $VAR[Alpha_15]$VAR[Light_Hex] + $VAR[Alpha_15]$VAR[Light_Hex] + $VAR[Alpha_15]$VAR[Light_Hex] + $VAR[Alpha_15]$VAR[Light_Hex] + $VAR[Alpha_15]$VAR[Light_Hex] + $VAR[Alpha_15]$VAR[Light_Hex] + $VAR[Alpha_15]$VAR[Dark_Hex] + $VAR[Alpha_15]$VAR[Light_Hex] + + + $VAR[Light_Color] + $VAR[Light_Color] + $VAR[Light_Color] + $VAR[Light_Color] + $VAR[Light_Color] + $VAR[Light_Color] + $VAR[Dark_Grey_Color] + $VAR[Light_Color] + + $VAR[Alpha_15]$VAR[Dark_Hex] $VAR[Alpha_15]$VAR[Light_Hex] diff --git a/16x9/Components_Viewtypes.xml b/16x9/Components_Viewtypes.xml index f59ecba1..3a9d9c89 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)] - - - - @@ -757,7 +721,7 @@ - + diff --git a/16x9/Content_Viewtype_Options.xml b/16x9/Content_Viewtype_Options.xml index b51a0b49..5adc7b81 100644 --- a/16x9/Content_Viewtype_Options.xml +++ b/16x9/Content_Viewtype_Options.xml @@ -92,14 +92,6 @@ - - - SetFocus(50) - SendClick(8) - - $LOCALIZE[137] - Window.Is(videos) + Control.IsEnabled(8) - SetFocus(50) ActivateWindow(musicplaylist) diff --git a/16x9/Custom_1180_globalsearch.xml b/16x9/Custom_1180_globalsearch.xml new file mode 100644 index 00000000..3f4e9fa9 --- /dev/null +++ b/16x9/Custom_1180_globalsearch.xml @@ -0,0 +1,39 @@ + + + + + 3000 + + + + + false + Focus + + + + + + false + Focus + + + + + + + !$EXP[Infoscreen_IsVisible] + + + + + + + + + + + + + + \ No newline at end of file diff --git a/16x9/DialogKeyboard.xml b/16x9/DialogKeyboard.xml index 5f42529c..d0d33557 100644 --- a/16x9/DialogKeyboard.xml +++ b/16x9/DialogKeyboard.xml @@ -61,8 +61,8 @@ - - + + @@ -70,19 +70,19 @@ - - + + - - + + - + @@ -90,7 +90,7 @@ - + @@ -98,13 +98,13 @@ - - + + - + @@ -112,20 +112,20 @@ - - + + - - + + - - + + diff --git a/16x9/Expressions.xml b/16x9/Expressions.xml index e89508ee..db349352 100644 --- a/16x9/Expressions.xml +++ b/16x9/Expressions.xml @@ -2,17 +2,18 @@ - Window.IsVisible(home) + [String.IsEmpty(Window(home).Property(Home_Widget)) | $EXP[BillboardView_Display_IsFanart_Widget_Home]] + Window.IsVisible(home) + [String.IsEmpty(Window(home).Property(Home_Widget)) | $EXP[BillboardView_Display_IsFanart_Widget_Home]] + !$EXP[globalsearch_IsVisible] Window.IsVisible(settings) | Window.IsVisible(skinsettings) | Window.IsVisible(appearancesettings) | Window.IsVisible(mediasettings) | Window.IsVisible(playersettings) | Window.IsVisible(servicesettings) | Window.IsVisible(systemsettings) | Window.IsVisible(pvrsettings) | Window.IsVisible(gamesettings) | Window.IsVisible(profiles) | Window.IsVisible(systeminfo) | Window.IsVisible(filemanager) - Window.IsVisible(addonsettings) + !String.IsEmpty(ListItem.Art(fanart))] | [Window.IsVisible(addonbrowser) + !Container.Content(addons)] | Window.IsVisible(favouritesbrowser) | Window.IsVisible(loginscreen) | Window.IsVisible(musicplaylisteditor) - $EXP[ListView_Display_IsBackground] | $EXP[BillboardView_IsVisible] | $EXP[ShowcaseView_Display_HasBackground] + [Window.IsVisible(addonsettings) + !String.IsEmpty(ListItem.Art(fanart))] | [Window.IsVisible(addonbrowser) + !Container.Content(addons)] | Window.IsVisible(favouritesbrowser) | Window.IsVisible(loginscreen) | Window.IsVisible(musicplaylisteditor) + [$EXP[ListView_Display_IsBackground] | $EXP[BillboardView_IsVisible] | $EXP[ShowcaseView_Display_HasBackground]] + !$EXP[globalsearch_IsVisible] Container.Content(videoversions) | Container.Content(genres) | Container.Content(years) | Container.Content(playlists) | Container.Content(sources) | Container.Content(studios) | Container.Content(directors) | Container.Content(tags) | Container.Content(countries) | Container.Content(roles) [Window.IsVisible(movieinformation) + [Window.IsVisible(1104) | Window.IsVisible(1150) | !String.IsEmpty(Window(movieinformation).Property(Focused_Button)) | String.IsEqual(Window(home).Property(Infoscreen_Widget),3205)]] | [Window.IsVisible(musicinformation) + String.IsEqual(Window(musicinformation).Property(Info_Type),artist) + [Window.IsVisible(1104) | Window.IsVisible(1150) | !String.IsEmpty(Window(musicinformation).Property(Focused_Button))]] | [Window.IsVisible(musicinformation) + String.IsEqual(Window(musicinformation).Property(Focused_Button),$LOCALIZE[21891])] - $EXP[Home_HasBackground] | $EXP[Settings_Window_IsVisible] | $EXP[Container_HasBackground] | $EXP[Content_HasBackground] | $EXP[Infoscreen_HasBackground] | [Container.Content() + $EXP[ListView_Display_IsBackground] + [Window.IsVisible(videos) | Window.IsVisible(music)]] + $EXP[Home_HasBackground] | $EXP[Settings_Window_IsVisible] | $EXP[Window_HasBackground] | $EXP[Container_HasBackground] | $EXP[Content_HasBackground] | $EXP[Infoscreen_HasBackground] | [Container.Content() + $EXP[ListView_Display_IsBackground] + [Window.IsVisible(videos) | Window.IsVisible(music)]] Window.IsVisible(movieinformation) | Window.IsVisible(musicinformation) | Window.IsVisible(songinformation) | Window.IsVisible(addoninformation) | $EXP[Infoscreen_Widget_Transition] | Window.IsVisible(pvrguideinfo) | Window.IsVisible(pvrrecordinginfo) $EXP[Infoscreen_IsVisible] + [String.IsEmpty(Window(movieinformation).Property(Focused_Button)) + String.IsEmpty(Window(musicinformation).Property(Focused_Button)) + String.IsEmpty(Window(addoninformation).Property(Focused_Button)) + String.IsEmpty(Window(pvrguideinfo).Property(Focused_Button))] Control.HasFocus(6001) | Control.HasFocus(6002) | String.IsEqual(Window(home).Property(Infoscreen_Transition),true) + Window.IsVisible(1180) Window.IsVisible(selectdialog) | Window.IsVisible(selectvideoversion) | !String.IsEmpty(Window(home).Property(SelectDialog)) | Window.IsVisible(filebrowser) | Window.IsVisible(virtualkeyboard) | Window.IsVisible(numericinput) | Window.IsVisible(mediasource) | Window.IsVisible(mediafilter) | Window.IsVisible(smartplaylistrule) | Window.IsVisible(addonsettings) | Window.IsVisible(osdsubtitlesettings) | Window.IsVisible(osdvideosettings) | Window.IsVisible(osdaudiosettings) | Window.IsVisible(networksetup) | Window.IsVisible(profilesettings) | Window.IsVisible(locksettings) | Window.IsVisible(contentsettings) | Window.IsVisible(libexportsettings) | Window.IsVisible(peripheralsettings) | Window.IsVisible(osdcmssettings) | Window.IsVisible(infoprovidersettings) | Window.IsVisible(pvrtimersetting) | Window.IsVisible(gamevideofilter) | Window.IsVisible(visualisationpresetlist) | Window.IsVisible(managevideoversions) | Window.IsVisible(managevideoextras) String.IsEqual(Window(home).Property(OptionsMenu),Active) | Window.IsVisible(shutdownmenu) | Window.IsVisible(contextmenu) | Window.IsVisible(okdialog) | Window.IsVisible(yesnodialog) | Window.IsVisible(progressdialog) | Window.IsVisible(10148) | Window.IsVisible(dialogcolorpicker) diff --git a/16x9/Home.xml b/16x9/Home.xml index 2157c481..02f8af30 100644 --- a/16x9/Home.xml +++ b/16x9/Home.xml @@ -35,14 +35,14 @@ - [Control.HasFocus(4010) | Control.HasFocus(3000) | Control.HasFocus(4300) | $EXP[Music_Player_HasFocus]] + !$EXP[Infoscreen_IsVisible] + [Control.HasFocus(4010) | Control.HasFocus(4201) | Control.HasFocus(3000) | Control.HasFocus(4300) | $EXP[Music_Player_HasFocus]] + !$EXP[Infoscreen_IsVisible] + !$EXP[globalsearch_IsVisible] - + @@ -52,14 +52,26 @@ - Control.HasFocus(3000) | $EXP[Music_Player_HasFocus] - !$EXP[TransparentDialog_IsVisible] + !$EXP[Infoscreen_IsVisible] + Control.HasFocus(3000) | $EXP[Music_Player_HasFocus] | Control.HasFocus(4201) + !$EXP[TransparentDialog_IsVisible] + !$EXP[Infoscreen_IsVisible] + !$EXP[globalsearch_IsVisible] + + 120 + 120 + 30 + 30 + icons/icon_browse_unfocused_120.png + icons/icon_browse_focused_120.png + + + RunScript(script.copacetic.helper,action=globalsearch_input) + + diff --git a/16x9/Navigation.xml b/16x9/Navigation.xml index 904c4e6a..bd0535eb 100644 --- a/16x9/Navigation.xml +++ b/16x9/Navigation.xml @@ -193,6 +193,7 @@ 3000 3000 3000 + 4201 50 50 SetFocus(3000,0,absolute) @@ -225,15 +226,7 @@ SetFocus(3500,1) - 3209 - 3208 - 3207 - 3206 - 3205 - 3204 - 3203 - 3202 - 3201 + 4201 3201 3202 3203 @@ -246,6 +239,21 @@ + + 3209 + 3208 + 3207 + 3206 + 3205 + 3204 + 3203 + 3202 + 3201 + SetFocus(3500,1) + SetFocus(3000) + SetFocus(3000) + + Control.Move(3201,$INFO[Container(3201).CurrentItem,-]) Control.Move(3201,1) @@ -480,6 +488,110 @@ SetFocus(3000) + + + + SetFocus(3201) + SetFocus(3202) + SetFocus(3203) + SetFocus(3204) + SetFocus(3205) + SetFocus(3206) + SetFocus($PARAM[bounce_id]) + + + + + 0 + 0 + 3202 + 3203 + 3204 + 3205 + 3206 + 3207 + 3203 + 3204 + 3205 + 3206 + 3207 + 3201 + 3204 + 3205 + 3206 + 3207 + 3201 + 3202 + 3203 + 3205 + 3206 + 3207 + 3201 + 3202 + 3203 + 3206 + 3207 + 3201 + 3202 + 3203 + 3204 + 3207 + 3201 + 3202 + 3203 + 3204 + 3205 + 3201 + 3202 + 3203 + 3204 + 3205 + 3206 + + 3206 + 3205 + 3204 + 3203 + 3202 + 3201 + 3205 + 3204 + 3203 + 3202 + 3201 + 3207 + 3204 + 3203 + 3202 + 3201 + 3207 + 3206 + 3203 + 3202 + 3201 + 3207 + 3206 + 3205 + 3202 + 3201 + 3207 + 3206 + 3205 + 3204 + 3201 + 3207 + 3206 + 3205 + 3204 + 3203 + 3207 + 3206 + 3205 + 3204 + 3203 + 3202 + + ClearProperty(Multiart_0,home) ClearProperty(Multiart_1,home) @@ -501,10 +613,10 @@ - Control.Move(3000,$INFO[Container(3000).CurrentItem,-]) - Control.Move(3000,1) - Control.Move(50,$INFO[Container(50).CurrentItem,-]) - Control.Move(50,1) + Control.Move(3000,$INFO[Container(3000).CurrentItem,-]) + Control.Move(3000,1) + Control.Move(50,$INFO[Container(50).CurrentItem,-]) + Control.Move(50,1) Control.Move(3201,$INFO[Container(3201).CurrentItem,-]) Control.Move(3201,1) Control.Move(3202,$INFO[Container(3202).CurrentItem,-]) diff --git a/16x9/Scrollbars.xml b/16x9/Scrollbars.xml index 466d31d4..0e4a3fc3 100644 --- a/16x9/Scrollbars.xml +++ b/16x9/Scrollbars.xml @@ -619,7 +619,7 @@ - + @@ -650,6 +650,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/16x9/Templates_Buttons.xml b/16x9/Templates_Buttons.xml index 9fde0885..757856f4 100644 --- a/16x9/Templates_Buttons.xml +++ b/16x9/Templates_Buttons.xml @@ -229,7 +229,7 @@ - + diff --git a/16x9/Templates_MyWindows.xml b/16x9/Templates_MyWindows.xml index dc4ef5b2..2b76ab0a 100644 --- a/16x9/Templates_MyWindows.xml +++ b/16x9/Templates_MyWindows.xml @@ -212,7 +212,7 @@ - + @@ -761,6 +761,13 @@ + + SetFocus(50) + RunScript(script.copacetic.helper,action=globalsearch_input) + + $LOCALIZE[137] + Control.IsEnabled(8) + diff --git a/16x9/Templates_Widgets.xml b/16x9/Templates_Widgets.xml index 88f6a6a8..3acf7dbc 100644 --- a/16x9/Templates_Widgets.xml +++ b/16x9/Templates_Widgets.xml @@ -29,7 +29,7 @@ Integer.IsGreaterOrEqual(Container($PARAM[id]).NumItems,$PARAM[min_items]) | Container($PARAM[id]).IsUpdating | $PARAM[bypass_min_items] SetProperty(Home_Widget,$PARAM[id],home) - SetProperty(Infoscreen_Widget,$PARAM[id],home) + SetProperty(Infoscreen_Widget,$PARAM[id],home) ClearProperty(Focused_Button,movieinformation) ClearProperty(Focused_Button,musicinformation) ClearProperty(Focused_Button,addoninformation) @@ -435,7 +435,7 @@ - !$EXP[Infoscreen_IsVisible] + !Control.HasFocus(4010) + !$EXP[Infoscreen_IsVisible] + !Control.HasFocus(4010) + !$EXP[globalsearch_IsVisible] @@ -452,6 +452,7 @@ + @@ -469,7 +470,7 @@ - + @@ -708,6 +709,7 @@ + @@ -788,4 +790,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/16x9/Variables_Labels_Media.xml b/16x9/Variables_Labels_Media.xml index e6282b1a..f49effd4 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 55a732aa..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 @@ -93,7 +93,6 @@ musicdb://artists/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B$ESCINFO[Window(home).Property(RandomGenre)]%5D%7D%2C%7B%22field%22%3A%22artist%22%2C%22operator%22%3A%22isnot%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Artist]%5D%7D%5D%7D%2C%22type%22%3A%22artists%22%7D%0A musicdb://artists/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Genre]%5D%7D%2C%7B%22field%22%3A%22artist%22%2C%22operator%22%3A%22isnot%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Label]%5D%7D%5D%7D%2C%22type%22%3A%22artists%22%7D%0A musicdb://artists/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Genre]%5D%7D%2C%7B%22field%22%3A%22artist%22%2C%22operator%22%3A%22isnot%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Artist]%5D%7D%5D%7D%2C%22type%22%3A%22artists%22%7D%0A - @@ -106,4 +105,35 @@ musicdb://songs/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Genre]%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%22songs%22%7D%0A + + + + videodb://movies/titles/?xsp=%7B%22rules%22%3A%7B%22or%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22plot%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22set%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22director%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22actor%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22studio%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22tag%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%5D%7D%2C%22type%22%3A%22movies%22%7D + + + + + videodb://tvshows/titles/?xsp=%7B%22rules%22%3A%7B%22or%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22plot%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22director%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22actor%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22studio%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22tag%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%5D%7D%2C%22type%22%3A%22tvshows%22%7D + + + + + videodb://recentlyaddedepisodes/?xsp=%7B%22rules%22%3A%7B%22or%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22plot%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22director%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22actor%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%5D%7D%2C%22type%22%3A%22episodes%22%7D + + + + + musicdb://artists/?xsp=%7B%22rules%22%3A%7B%22or%22%3A%5B%7B%22field%22%3A%22artist%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22biography%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%5D%7D%2C%22type%22%3A%22artists%22%7D + + + + + musicdb://albums/?xsp=%7B%22rules%22%3A%7B%22or%22%3A%5B%7B%22field%22%3A%22album%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22artist%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22review%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22label%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%5D%7D%2C%22type%22%3A%22albums%22%7D + + + + + musicdb://songs/?xsp=%7B%22rules%22%3A%7B%22or%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22album%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22artist%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%5D%7D%2C%22type%22%3A%22songs%22%7D + + \ No newline at end of file diff --git a/16x9/Variables_Textures_Artwork_Widgets.xml b/16x9/Variables_Textures_Artwork_Widgets.xml index f399a195..ed6e966b 100644 --- a/16x9/Variables_Textures_Artwork_Widgets.xml +++ b/16x9/Variables_Textures_Artwork_Widgets.xml @@ -1027,6 +1027,9 @@ $INFO[Container(3201).ListItem(0).Art(fanart)] $INFO[Container(3201).ListItem(0).Icon] $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)] @@ -1069,6 +1072,10 @@ $INFO[Container(3201).ListItem(0).Icon] $INFO[Container(3202).ListItem(0).Icon] + $INFO[Container(3203).ListItem(0).Icon] + $INFO[Container(3204).ListItem(0).Icon] + $INFO[Container(3205).ListItem(0).Icon] + $INFO[Container(3206).ListItem(0).Icon] $INFO[Container(3207).ListItem(0).Icon] diff --git a/16x9/Viewtype_504_Strip.xml b/16x9/Viewtype_504_Strip.xml index 55268165..dce59ac8 100644 --- a/16x9/Viewtype_504_Strip.xml +++ b/16x9/Viewtype_504_Strip.xml @@ -48,14 +48,14 @@ - + Conditional - Conditional - Conditional + Conditional + Conditional - + @@ -66,7 +66,7 @@ Conditional - + diff --git a/16x9/_IDs b/16x9/_IDs index 70f62311..fd8319f4 100644 --- a/16x9/_IDs +++ b/16x9/_IDs @@ -50,6 +50,7 @@ BUTTONS 4022 Infoscreen star rating down button 410X Set focus away from secondary list 4200 Reset widgets +4201 Global search button 4300 Set focus to screensaver ANIMATION DELAYS diff --git a/README.md b/README.md index feacf951..6a005685 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,15 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc ### Changelog --- +**1.3.4** +- fix for globalsearch scrollbar colour + +**1.3.3** +- misc bug fixes + +**1.3.2** +- globalsearch + **1.3.1** - Support for videoversions management dialog and embedded lists [omega] - Support for videoversions folder views [omega] diff --git a/addon.xml b/addon.xml index 3db7d92a..6eb31c39 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - +