From fc15a2ef5d6f8428406eb4f389689951ad2fc1fa Mon Sep 17 00:00:00 2001 From: theDeadMan Date: Tue, 6 Mar 2018 21:04:34 +0000 Subject: [PATCH] global search skinned --- 1080i/DialogPVRChannelManager.xml | 41 +- 1080i/DialogPVRGroupManager.xml | 49 +- 1080i/DialogVideoInfo.xml | 2 +- 1080i/FileManager.xml | 11 +- 1080i/Includes.xml | 1 + 1080i/Includes_hubOptionsItems.xml | 4 +- 1080i/Includes_variables.xml | 2 +- 1080i/MyGames.xml | 2 +- 1080i/MyVideoNav.xml | 2 +- 1080i/View_Games.xml | 106 +++ 1080i/View_MusicVideos.xml | 33 +- 1080i/script-globalsearch-contextmenu.xml | 7 - 1080i/script-globalsearch-infodialog.xml | 8 - 1080i/script-globalsearch-main.xml | 761 ---------------------- 1080i/script-globalsearch.xml | 217 ++++++ 1080i/script-skinshortcuts.xml | 1 + changelog.txt | 10 +- language/English/strings.po | 4 + 18 files changed, 391 insertions(+), 870 deletions(-) create mode 100644 1080i/View_Games.xml delete mode 100644 1080i/script-globalsearch-contextmenu.xml delete mode 100644 1080i/script-globalsearch-infodialog.xml delete mode 100644 1080i/script-globalsearch-main.xml create mode 100644 1080i/script-globalsearch.xml diff --git a/1080i/DialogPVRChannelManager.xml b/1080i/DialogPVRChannelManager.xml index 8974f39..e89263b 100644 --- a/1080i/DialogPVRChannelManager.xml +++ b/1080i/DialogPVRChannelManager.xml @@ -28,6 +28,15 @@ colors/black.png overlay stretch + + + 0 + 2-row + 22-col + 71 + colors/black.png + textboxInactive + stretch 6-col @@ -63,14 +72,6 @@ - - 0 - 2-row - 8-col - 71 - colors/white.png - stretch - name label 24 @@ -79,7 +80,7 @@ 2-row center itemSubTitle - black + textActive @@ -147,23 +148,15 @@ - - 8-col - 2-row - 8-col - 71 - colors/white.png - stretch - name label - 444 + 456 2-row 8-col 2-row center itemSubTitle - black + textActive @@ -295,15 +288,7 @@ 32 - - - 16-col - 2-row - 6-col - 71 - colors/white.png - stretch - + 17-col 4-row diff --git a/1080i/DialogPVRGroupManager.xml b/1080i/DialogPVRGroupManager.xml index 7a3adfd..a256602 100644 --- a/1080i/DialogPVRGroupManager.xml +++ b/1080i/DialogPVRGroupManager.xml @@ -36,6 +36,15 @@ colors/black.png overlay stretch + + + 0 + 2-row + 20-col + 71 + colors/black.png + stretch + textboxInactive 24 @@ -49,15 +58,6 @@ - - 0 - 2-row - 4-col - 71 - colors/white.png - stretch - FFFFFFFF - name label 24 @@ -66,7 +66,7 @@ 2-row center itemSubTitle - black + textActive @@ -114,20 +114,11 @@ - Grouped Channels list 4-col 2-row - - 0 - 0 - 6-col - 71 - colors/white.png - stretch - name label 12 @@ -136,7 +127,7 @@ 2-row center itemSubTitle - black + textActive 0 @@ -213,14 +204,6 @@ ListItem.ChannelNumberLabel,(,) - ]$INFO[ListItem.ChannelName] Channels list 10-col 2-row - - 0 - 0 - 6-col - 71 - colors/white.png - stretch - name label 12 @@ -229,7 +212,7 @@ ListItem.ChannelNumberLabel,(,) - ]$INFO[ListItem.ChannelName] 2-row center itemSubTitle - black + textActive 0 @@ -302,14 +285,6 @@ ListItem.ChannelNumberLabel,(,) - ]$INFO[ListItem.ChannelName] - - 16-col - 2-row - 4-col - 71 - colors/white.png - stretch - 16-col 4-row diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml index 160ef73..7cd5285 100644 --- a/1080i/DialogVideoInfo.xml +++ b/1080i/DialogVideoInfo.xml @@ -26,7 +26,7 @@ - itemShowcase + itemShowcase container.content(musicvideos) diff --git a/1080i/FileManager.xml b/1080i/FileManager.xml index 09f638a..07ca00d 100644 --- a/1080i/FileManager.xml +++ b/1080i/FileManager.xml @@ -46,7 +46,8 @@ 2-row 18-col 71 - colors/white.png + colors/black.png + textboxInactive stretch @@ -61,8 +62,8 @@ 2-row 8-col-gutter - settingsCategory - black + itemSubtitle + textActive @@ -132,8 +133,8 @@ 9-col-gutter 2-row - settingsCategory - black + itemSubtitle + textActive 0 diff --git a/1080i/Includes.xml b/1080i/Includes.xml index 15e872a..8ade38a 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -22,6 +22,7 @@ + diff --git a/1080i/Includes_hubOptionsItems.xml b/1080i/Includes_hubOptionsItems.xml index 4a49f16..42ab259 100644 --- a/1080i/Includes_hubOptionsItems.xml +++ b/1080i/Includes_hubOptionsItems.xml @@ -10,7 +10,7 @@ 6-col dialog.close(1104) - RunScript(script.globalsearch,movies=true&tvshows=true&episodes=true) + RunScript(script.globalsearch,movies=true&tvshows=true&episodes=true&livetv=true&actors=true&directors=true) !String.IsEmpty(Container.SortMethod) @@ -97,7 +97,7 @@ 6-col dialog.close(1104) - RunScript(script.globalsearch,artists=true&albums=true) + RunScript(script.globalsearch,artists=true&albums=true&songs=true&musicvideos=true) !String.IsEmpty(Container.SortMethod) diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml index f7261b9..15d706a 100644 --- a/1080i/Includes_variables.xml +++ b/1080i/Includes_variables.xml @@ -28,7 +28,7 @@ $LOCALIZE[10506] $LOCALIZE[31123] $LOCALIZE[31056] - $LOCALIZE[31232] + $LOCALIZE[31232] $INFO[Container.NumAllItems,, $LOCALIZE[31014]] $VAR[unwatchedOnly] diff --git a/1080i/MyGames.xml b/1080i/MyGames.xml index bcd3f27..03c70ef 100644 --- a/1080i/MyGames.xml +++ b/1080i/MyGames.xml @@ -13,7 +13,7 @@ contentOpen 9000 - videofiles + games diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml index 52c6415..328858c 100644 --- a/1080i/MyVideoNav.xml +++ b/1080i/MyVideoNav.xml @@ -4,7 +4,7 @@ PlayerControl(stop) Skin.SetString(recentitems,video) fadeInOut - 50,51,52,53,54,58 + 50,51,52,53,54,58,59 globalBackground diff --git a/1080i/View_Games.xml b/1080i/View_Games.xml new file mode 100644 index 0000000..8a4a636 --- /dev/null +++ b/1080i/View_Games.xml @@ -0,0 +1,106 @@ + + + + + col-1-begin + row-5-begin + 24-col + 23-row + 9000 + 60 + 50 + 50 + 60 + + + 0 + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] + + + 1-col + 0 + 23-col + 69 + stretch + colors/black.png + textboxInactive + + + 1-col-indent + 0 + 22-col-gutter + 2-row + center + itemTitle + textActive + + + + + !String.IsEmpty(ListItem.playcount) + 23-col-gutter + 0 + 1-col + 2-row + center + right + symbolLarge + textActive + + + + + + + 0 + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] + + + + + + + 1-col + 0 + 23-col + 2-row + stretch + colors/white.png + highlight + + + 1-col-indent + 0 + 22-col-gutter + 2-row + center + itemTitle + textActive + + + + + !String.IsEmpty(ListItem.playcount) + 23-col-gutter + 0 + 1-col + 2-row + center + right + symbolLarge + textActive + + + + + + + diff --git a/1080i/View_MusicVideos.xml b/1080i/View_MusicVideos.xml index 953a94c..d8f6271 100644 --- a/1080i/View_MusicVideos.xml +++ b/1080i/View_MusicVideos.xml @@ -2,7 +2,7 @@ - + $EXP[isMusicVideo] col-1-begin row-5-begin @@ -10,8 +10,6 @@ 25-row 9000 60 - 50 - 50 9000 600 60 @@ -22,10 +20,10 @@ 6-col-gutter 4-col-gutter scale - DefaultPoster.png - colors/black.png + colors/black.png + colors/black.png 6 - 44FFFFFF + overlay 0 @@ -33,10 +31,9 @@ 6-col-gutter 4-col-gutter scale - $INFO[Listitem.thumb] - colors/black.png + $INFO[Listitem.Art(thumb)] 6 - ffffffff + 77ffffff 12 @@ -46,7 +43,7 @@ center thumbTitle textActive - + 12 @@ -62,14 +59,24 @@ focusThumb + + 0 + 0 + 6-col-gutter + 4-col-gutter + scale + colors/black.png + colors/white.png + 6 + FF000000 + 0 0 6-col-gutter 4-col-gutter scale - $INFO[Listitem.thumb] - colors/white.png + $INFO[Listitem.thumb] 6 @@ -80,7 +87,7 @@ center thumbTitle textActive - + 12 diff --git a/1080i/script-globalsearch-contextmenu.xml b/1080i/script-globalsearch-contextmenu.xml deleted file mode 100644 index d094bd6..0000000 --- a/1080i/script-globalsearch-contextmenu.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - action(back) - - - - diff --git a/1080i/script-globalsearch-infodialog.xml b/1080i/script-globalsearch-infodialog.xml deleted file mode 100644 index dc8aae1..0000000 --- a/1080i/script-globalsearch-infodialog.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - action(back) - - - - diff --git a/1080i/script-globalsearch-main.xml b/1080i/script-globalsearch-main.xml deleted file mode 100644 index ab4caf2..0000000 --- a/1080i/script-globalsearch-main.xml +++ /dev/null @@ -1,761 +0,0 @@ - - - - fadeInOut - - modalDialog - - - col-1-begin - row-1-begin - - 0 - 0 - 8-col - - pageTitle - textActive - - - 0 - 40 - horizontal - - - true - 0 - 0 - auto - - pageSubTitle - textActive - - - true - 0 - 0 - auto - - pageSubTitle - textActive - - - - true - 0 - 0 - auto - - pageSubTitle - textActive - - - - false - 0 - 0 - auto - - pageSubTitle - textActive - - - - - false - 0 - 1-row - 4-col - - itemSubTitle - textActive - center - center - colors/white.png - colors/black.png - 101 - 101 - 101 - 101 - - - - - 0 - 4-row - 24-col - 23-row - horizontal - 600 - - - - 8-col - - - 0 - -12 - 8-col - 2-row - center - regularStrong - - textActive - - - - false - - - 0 - 2-row - 8-col - 21-row - 181 - 121 - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.thumb] - - - 1-col-indent - 0 - 6-col - 2-row - center - itemTitle - textActive - - - - - - - 1-col - 0 - 7-col-gutter - 2-row - stretch - colors/white.png - highlight - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.thumb] - - - - - - - 1-col-indent - 0 - 6-col - 2-row - center - itemTitle - textActive - - - - - - - - - 8-col - - - 0 - -12 - 8-col - 2-row - center - regularStrong - - textActive - - - - false - - - - 0 - 2-row - 8-col - 21-row - 111 - 131 - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.thumb] - - - 1-col-indent - 0 - 6-col - 2-row - center - itemTitle - textActive - - - - - - - 1-col - 0 - 7-col-gutter - 2-row - stretch - colors/white.png - highlight - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.thumb] - - - - - - - 1-col-indent - 0 - 6-col - 2-row - center - itemTitle - textActive - - - - - - - - - 8-col - - - 0 - -12 - 8-col - 2-row - center - regularStrong - - textActive - - - - false - - - - 0 - 2-row - 8-col - 21-row - 121 - 141 - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.thumb] - - - 1-col-indent - 0 - 6-col - 2-row - center - itemTitle - textActive - - - - - - - 1-col - 0 - 7-col-gutter - 2-row - stretch - colors/white.png - highlight - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.thumb] - - - - - - - 1-col-indent - 0 - 6-col - 2-row - center - itemTitle - textActive - - - - - - - - - 8-col - - 0 - -12 - 8-col - 2-row - center - regularStrong - - textActive - - - - false - - - - 0 - 2-row - 8-col - 21-row - 131 - 151 - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.thumb] - - - 1-col-indent - 0 - 6-col - 2-row - center - itemTitle - textActive - - - - - - - 1-col - 0 - 7-col-gutter - 2-row - stretch - colors/white.png - highlight - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.thumb] - - - - - - - 1-col-indent - 0 - 6-col - 2-row - center - itemTitle - textActive - - - - - - - - - 8-col - - 0 - -12 - 8-col - 2-row - center - regularStrong - - textActive - - - - false - - - - 0 - 2-row - 8-col - 21-row - 141 - 161 - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.thumb] - - - 1-col-indent - 0 - 6-col - 2-row - center - itemTitle - textActive - - - - - - - 1-col - 0 - 7-col-gutter - 2-row - stretch - colors/white.png - highlight - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.thumb] - - - - - - - 1-col-indent - 0 - 6-col - 2-row - center - itemTitle - textActive - - - - - - - - - 8-col - - - 0 - -12 - 8-col - 2-row - center - regularStrong - - textActive - - - - false - - - - 0 - 2-row - 8-col - 21-row - 151 - 171 - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.thumb] - - - 1-col-indent - 0 - 6-col - 2-row - center - itemTitle - textActive - - - - - - - 1-col - 0 - 7-col-gutter - 2-row - stretch - colors/white.png - highlight - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.thumb] - - - - - - - 1-col-indent - 0 - 6-col - 2-row - center - itemTitle - textActive - - - - - - - - - 8-col - - - 0 - -12 - 8-col - 2-row - center - regularStrong - - textActive - - - - false - - - - 0 - 2-row - 8-col - 21-row - 161 - 181 - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.thumb] - - - 1-col-indent - 0 - 6-col - 2-row - center - itemTitle - textActive - - - - - - - 1-col - 0 - 7-col-gutter - 2-row - stretch - colors/white.png - highlight - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.thumb] - - - - - - - 1-col-indent - 0 - 6-col - 2-row - center - itemTitle - textActive - - - - - - - - - 8-col - - - 0 - -12 - 8-col - 2-row - center - regularStrong - - textActive - - - - false - - - - 0 - 2-row - 8-col - 21-row - 171 - 111 - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.thumb] - - - 1-col-indent - 0 - 6-col - 2-row - center - itemTitle - textActive - - - - - - - 1-col - 0 - 7-col-gutter - 2-row - stretch - colors/white.png - highlight - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.thumb] - - - - - - - 1-col-indent - 0 - 6-col - 2-row - center - itemTitle - textActive - - - - - - - - - - DebugGrid - - DialogID - - - - diff --git a/1080i/script-globalsearch.xml b/1080i/script-globalsearch.xml new file mode 100644 index 0000000..3d99437 --- /dev/null +++ b/1080i/script-globalsearch.xml @@ -0,0 +1,217 @@ + + + 50 + + globalBackground + + + modalDialogContentShift + ![Window.IsVisible(DialogVideoInfo.xml) | Window.IsVisible(DialogMusicInfo.xml)] + + + col-1-begin + row-5-begin + 4-col + 18-row + 50 + + + 0 + 0 + 4-col + 69 + stretch + colors/black.png + textboxInactive + + + 12 + 0 + 2-row + 276 + center + itemTitle + + + + + + 0 + 0 + 4-col + 2-row + stretch + colors/white.png + highlight + + + 12 + 0 + 2-row + 276 + center + itemTitle + + + + + + + col-6-begin + row-5-begin + 19-col + 23-row + 9000 + 60 + 50 + 50 + 60 + + + 0 + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] + + + 1-col + 0 + 23-col + 69 + stretch + colors/black.png + textboxInactive + + + 1-col-indent + 0 + 18-col + 2-row + center + itemTitle + textActive + + + + + + + 0 + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] + + + + + + + 1-col + 0 + 18-col + 2-row + stretch + colors/white.png + highlight + + + 1-col-indent + 0 + 18-col + 2-row + center + itemTitle + textActive + + + + + + + + Control.IsVisible(60) + conditional + + 54r + row-8-begin + 20-row + 50 + 50 + + + + + col-1-begin + row-1-begin + + + 0 + 0 + 18-col + pageTitle + + textActive + + + + 0 + 1-row + 12-col + 2-row + pageSubTitle + + textActive + + + + 24-col + 0 + 12-col + right + pageTitle + + textActive + + + + 24-col + 1-row + 12-col + 2-row + right + pageSubTitle + + textActive + + + + + + + -2000 + + + -2000 + + + -2000 + + + + miniVideoPlayer + + hubMenu + + loadingIndicator + + DebugGrid + + WindowID + + + + diff --git a/1080i/script-skinshortcuts.xml b/1080i/script-skinshortcuts.xml index c178d4f..086414c 100644 --- a/1080i/script-skinshortcuts.xml +++ b/1080i/script-skinshortcuts.xml @@ -54,6 +54,7 @@ 2-row 4-col 17-row + 0 Add a new shortcut 211 diff --git a/changelog.txt b/changelog.txt index 386f838..29e1476 100644 --- a/changelog.txt +++ b/changelog.txt @@ -26,14 +26,14 @@ - [COMPLETE] DialogPVRChannelManager.xml updated - [COMPLETE] MyMusicPlaylistEditor.xml updated - [COMPLETE] Subtitle Update +- [COMPLETE] Music Videos +- [COMPLETE] global search addon skinned -[ADDON BROWSER.XML cleanup] - -- global search needs updating -- check controls for new window: MyGames.xml - new dialog: GameOSD.xml -- musicvideos +- dialogsettings.xml - check controls (irl fails...) + +- check controls for new window: MyGames.xml - Screenshots etc need updating diff --git a/language/English/strings.po b/language/English/strings.po index 1882302..aef9d21 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -972,3 +972,7 @@ msgstr "" msgctxt "#31236" msgid "Radio / TV" msgstr "" + +msgctxt "#31237" +msgid "Results for" +msgstr ""