From 04ae26c78a770ebf041d78243110130efc8a74af Mon Sep 17 00:00:00 2001 From: realcopacetic Date: Wed, 22 May 2024 18:19:54 +0100 Subject: [PATCH] wip --- 16x9/Buttons_Infoscreen_Path_Tracer.xml | 34 +++++++++------------ 16x9/Custom_1198_Path_Tracing.xml | 6 ++-- 16x9/Custom_1199_Test_Label.xml | 4 +-- 16x9/Navigation.xml | 20 +++++++----- 16x9/OnLoadUnload.xml | 7 ++--- 16x9/Templates_Dialogs.xml | 3 -- 16x9/Variables_Paths_Widgets.xml | 6 ++++ README.md | 1 + language/resource.language.en_gb/strings.po | 18 ++++++++++- 9 files changed, 59 insertions(+), 40 deletions(-) diff --git a/16x9/Buttons_Infoscreen_Path_Tracer.xml b/16x9/Buttons_Infoscreen_Path_Tracer.xml index 64e2de5f..a06bacdf 100644 --- a/16x9/Buttons_Infoscreen_Path_Tracer.xml +++ b/16x9/Buttons_Infoscreen_Path_Tracer.xml @@ -60,48 +60,42 @@ ClearProperty(ContainerPath_1,$PARAM[window]) ClearProperty(ContainerType_1,$PARAM[window]) ClearProperty(Breadcrumb_Level,$PARAM[window]) - Dialog.Close(all,true) - ActivateWindow(home) + Dialog.Close(all,true) + ActivateWindow(home) SetFocus(6001) - + Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_1)],replace) - ClearProperty(ContainerPath_2,$PARAM[window]) - SetProperty(Breadcrumb_Level,1,$PARAM[window]) - Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_2)],replace) + Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_3)],replace) + Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_4)],replace) + Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_5)],replace) + Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_6)],replace) + Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_7)],replace) + Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_8)],replace) + Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_9)],replace) + ClearProperty(ContainerPath_3,$PARAM[window]) SetProperty(Breadcrumb_Level,2,$PARAM[window]) - - Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_3)],replace) SetProperty(Breadcrumb_Level,3,$PARAM[window]) ClearProperty(ContainerPath_4,$PARAM[window]) - - Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_4)],replace) ClearProperty(ContainerPath_5,$PARAM[window]) SetProperty(Breadcrumb_Level,4,$PARAM[window]) - - Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_5)],replace) ClearProperty(ContainerPath_6,$PARAM[window]) SetProperty(Breadcrumb_Level,5,$PARAM[window]) - - Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_6)],replace) ClearProperty(ContainerPath_7,$PARAM[window]) SetProperty(Breadcrumb_Level,6,$PARAM[window]) - - Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_7)],replace) ClearProperty(ContainerPath_8,$PARAM[window]) SetProperty(Breadcrumb_Level,7,$PARAM[window]) - - Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_8)],replace) ClearProperty(ContainerPath_9,$PARAM[window]) SetProperty(Breadcrumb_Level,8,$PARAM[window]) - - Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_9)],replace) ClearProperty(ContainerPath_10,$PARAM[window]) SetProperty(Breadcrumb_Level,9,$PARAM[window]) Dialog.Close(all,true) SetFocus(6001) + + SetProperty(Breadcrumb_Level,1,$PARAM[window]) + ClearProperty(ContainerPath_2,$PARAM[window]) diff --git a/16x9/Custom_1198_Path_Tracing.xml b/16x9/Custom_1198_Path_Tracing.xml index c7c79ab6..214f9b3e 100644 --- a/16x9/Custom_1198_Path_Tracing.xml +++ b/16x9/Custom_1198_Path_Tracing.xml @@ -58,13 +58,15 @@ Unwatched_Indicator 30 - true + true + 200 Unwatched_Indicator 30 - true + true + 200 diff --git a/16x9/Custom_1199_Test_Label.xml b/16x9/Custom_1199_Test_Label.xml index b7eb82a0..6ef9e016 100644 --- a/16x9/Custom_1199_Test_Label.xml +++ b/16x9/Custom_1199_Test_Label.xml @@ -1,6 +1,6 @@ - true + false 3 @@ -8,7 +8,7 @@ 200 0 views/white_100.png - Player.HasVideo + Window.IsVisible(home) right diff --git a/16x9/Navigation.xml b/16x9/Navigation.xml index bd0535eb..cad0e23c 100644 --- a/16x9/Navigation.xml +++ b/16x9/Navigation.xml @@ -17,7 +17,8 @@ SetFocus(4013) SetFocus(3000,0,absolute) 50 - SetFocus(6001) + SetFocus(6001) + SetFocus(6001) @@ -81,7 +82,8 @@ 0 SetFocus(3000,0,absolute) 501 - SetFocus(6001) + SetFocus(6001) + SetFocus(6001) @@ -104,7 +106,8 @@ 0 SetFocus(3000,0,absolute) 502 - SetFocus(6001) + SetFocus(6001) + SetFocus(6001) @@ -127,7 +130,8 @@ 0 SetFocus(3000,0,absolute) 504 - SetFocus(6001) + SetFocus(6001) + SetFocus(6001) @@ -146,7 +150,8 @@ 505 0 0 - SetFocus(6001) + SetFocus(6001) + SetFocus(6001) @@ -375,7 +380,6 @@ - SetProperty(Infoscreen_Transition,true,home) SetFocus(4020) 3201 3202 @@ -497,7 +501,9 @@ SetFocus(3204) SetFocus(3205) SetFocus(3206) - SetFocus($PARAM[bounce_id]) + SetFocus($PARAM[bounce_id]) + Notification($LOCALIZE[31635],$LOCALIZE[31636],3000) + Back diff --git a/16x9/OnLoadUnload.xml b/16x9/OnLoadUnload.xml index 43c9cec7..1bc8d5f8 100644 --- a/16x9/OnLoadUnload.xml +++ b/16x9/OnLoadUnload.xml @@ -25,8 +25,7 @@ ClearProperty(ContainerType_9) ClearProperty(ContainerPath_10) ClearProperty(ContainerType_10) - - + SetProperty(ContainerPath_10,$VAR[ContainerPath_X]) SetProperty(ContainerType_10,$INFO[ListItem.DBType]) SetProperty(ContainerPath_9,$VAR[ContainerPath_X]) @@ -45,7 +44,7 @@ SetProperty(ContainerType_3,$INFO[ListItem.DBType]) SetProperty(ContainerPath_2,$VAR[ContainerPath_X]) SetProperty(ContainerType_2,$INFO[ListItem.DBType]) - + SetProperty(Breadcrumb_Level,2) SetProperty(Breadcrumb_Level,3) SetProperty(Breadcrumb_Level,4) @@ -55,7 +54,6 @@ SetProperty(Breadcrumb_Level,8) SetProperty(Breadcrumb_Level,9) SetProperty(Breadcrumb_Level,10) - ClearProperty(SentFromInfo) ClearProperty(Breadcrumb_GoToPrevious) ClearProperty(Breadcrumb_GoToNext) @@ -77,7 +75,6 @@ SetProperty(Info_Type,album,musicinformation) SetProperty(SelectedItem,$INFO[ListItem.DBID],musicinformation) SetProperty(ResetScroll," ") - ClearProperty(Focused_Button,musicinformation) diff --git a/16x9/Templates_Dialogs.xml b/16x9/Templates_Dialogs.xml index 82c36646..e918de30 100644 --- a/16x9/Templates_Dialogs.xml +++ b/16x9/Templates_Dialogs.xml @@ -16,9 +16,6 @@ - - - diff --git a/16x9/Variables_Paths_Widgets.xml b/16x9/Variables_Paths_Widgets.xml index d154ad13..d2742371 100644 --- a/16x9/Variables_Paths_Widgets.xml +++ b/16x9/Variables_Paths_Widgets.xml @@ -24,6 +24,12 @@ $INFO[Container.FolderPath] + videodb://movies/titles/?xsp=%7B%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%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%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%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%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Title]%5D%7D%5D%7D%2C%22type%22%3A%22episodes%22%7D + musicdb://artists/?xsp=%7B%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Title]%5D%7D%5D%7D%2C%22type%22%3A%22artists%22%7D + musicdb://albums/?xsp=%7B%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Title]%5D%7D%5D%7D%2C%22type%22%3A%22albums%22%7D + musicdb://songs/?xsp=%7B%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Title]%5D%7D%5D%7D%2C%22type%22%3A%22songs%22%7D $INFO[ListItem.FolderPath] diff --git a/README.md b/README.md index c7e51108..f5530223 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc - Added option to prefer TMDbHelper plugin if it's enabled as the content source for info screen widgets, under Settings > Copacetic > Customisations > Info screens https://github.com/realcopacetic/skin.copacetic/issues/105 - Fixed bug in window transition animations between home, settings etc to ensure that when background slideshow is the same between two windows, the transition is instantaneous - Fixed a bug in how views are displayed when a home widget redirects to a view in videos window https://github.com/realcopacetic/skin.copacetic/issues/167 +- Added error notification if global search returns 0 results. Still to do: - infoscreen transition when using tmdbhelper widgets diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po index b59a99a8..5d233518 100644 --- a/language/resource.language.en_gb/strings.po +++ b/language/resource.language.en_gb/strings.po @@ -1529,7 +1529,7 @@ msgstr "" #: M - +#: NEW #/16x9/MyPVRChannels.xml msgctxt "#31634" msgid "Now playing channel" @@ -1538,6 +1538,22 @@ msgstr "" +#: N +#: NEW +#/16x9/Navigation.xml +msgctxt "#31635" +msgid "Global search" +msgstr "" + +#: NEW +#/16x9/Navigation.xml +msgctxt "#31636" +msgid "Sorry no results found!" +msgstr "" + + + + #: V #/16x9/Variables_Labels_Windows.xml