diff --git a/720p/DialogMusicInfo.xml b/720p/DialogMusicInfo.xml index 0c6b892..7a75bd5 100644 --- a/720p/DialogMusicInfo.xml +++ b/720p/DialogMusicInfo.xml @@ -69,8 +69,8 @@ 49 49 9000 - 50 - 9000 + 50 + 9000 - 200 @@ -135,9 +135,9 @@ - MusicInfoArtistInfo - MusicInfoAlbumInfo - MusicInfoSongInfo + MusicInfoArtistInfo + MusicInfoAlbumInfo + MusicInfoSongInfo @@ -168,7 +168,7 @@ 4 stretch separator.png - Container.Content(Songs) + String.IsEqual(ListItem.DBTYPE,song) Thumb @@ -179,7 +179,7 @@ $VAR[MusicInfoListThumb] keep - + @@ -196,7 +196,7 @@ justify white Skin.HasSetting(AutoScroll) - Container.Content(Songs) + String.IsEqual(ListItem.DBTYPE,song) 210 @@ -208,8 +208,8 @@ horizontal 9000 9000 - 50 - 49 + 50 + 49 49 Refresh diff --git a/720p/DialogVideoInfo.xml b/720p/DialogVideoInfo.xml index 2490efd..d2ca645 100644 --- a/720p/DialogVideoInfo.xml +++ b/720p/DialogVideoInfo.xml @@ -56,7 +56,7 @@ 2 horizontal VisibleFadeEffect - !Control.IsVisible(50) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)] + !Control.IsVisible(50) + [String.IsEqual(ListItem.DBTYPE,movie) | String.IsEqual(ListItem.DBTYPE,episode) | String.IsEqual(ListItem.DBTYPE,musicvideo)] VideoCodecFlaggingConditions AudioCodecFlaggingConditions AudioChannelsFlaggingConditions @@ -108,7 +108,7 @@ - [!container.content(tvshows) + !container.content(episodes) + !container.content(musicvideos)] + ![Control.HasFocus(12) | Control.HasFocus(15)] + [!String.IsEqual(ListItem.DBTYPE,tvshow) + !String.IsEqual(ListItem.DBTYPE,episode) + !String.IsEqual(ListItem.DBTYPE,musicvideo)] + ![Control.HasFocus(12) | Control.HasFocus(15)] 90 210 VisibleFadeEffect @@ -294,7 +294,7 @@ - Container.Content(TVShows) + !Control.HasFocus(12) + String.IsEqual(ListItem.DBTYPE,tvshow) + !Control.HasFocus(12) 90 210 VisibleFadeEffect @@ -444,7 +444,7 @@ - container.content(episodes) + !Control.HasFocus(12) + String.IsEqual(ListItem.DBTYPE,episode) + !Control.HasFocus(12) 90 210 VisibleFadeEffect @@ -625,7 +625,7 @@ - container.content(musicvideos) + !Control.HasFocus(12) + String.IsEqual(ListItem.DBTYPE,musicvideo) + !Control.HasFocus(12) 90 210 VisibleFadeEffect @@ -932,7 +932,7 @@ button-focus.png button-nofocus.png 1024 - Container.Content(TVShows) + String.IsEqual(ListItem.DBTYPE,tvshow) Cast/Review diff --git a/720p/script-globalsearch-main.xml b/720p/script-globalsearch-main.xml index 514770f..dfc3ec4 100644 --- a/720p/script-globalsearch-main.xml +++ b/720p/script-globalsearch-main.xml @@ -300,6 +300,12 @@ Control.IsVisible(189) + + $LOCALIZE[31206] $INFO[Control.GetLabel(230)] $LOCALIZE[31025] + noop + Control.IsVisible(239) + + $LOCALIZE[31207] Control.Setfocus(9000,0) @@ -435,12 +441,12 @@ 750 530 9000 - 178 + 228 221 221 list 2 - 178 + 228 0 @@ -826,7 +832,7 @@ 211 panel 2 - 118 + 218 0 @@ -1010,6 +1016,8 @@ ScrollBarV_bar_focus.png ScrollBarNib.png ScrollBarNib.png + 218 + 218 211 9000 false @@ -2179,6 +2187,239 @@ Container(9000).HasFocus(10) + + 0 + 0 + 750 + 530 + + + 2000 + 2000 + 100 + 0 + + - + - + + + Container(9000).Hasfocus(11) + VisibleFadeEffect + 0 + 0 + 750 + 530 + 9000 + 238 + 231 + 231 + panel + 2 + 238 + + + 0 + 0 + 370 + 125 + button-nofocus.png + + + 5 + 5 + 80 + 115 + $INFO[ListItem.Icon] + keep + + + 50 + 70 + 30 + 30 + OverlayWatched.png + Integer.IsGreater(ListItem.Property(PlayCount),0) + + + 100 + 10 + 265 + 12 + + font12 + white + center + + + 100 + 30 + 265 + 15 + + font12 + grey2 + center + !String.Contains(ListItem.Property(Duration),min) + + + 100 + 30 + 265 + 15 + + font12 + grey2 + center + String.Contains(ListItem.Property(Duration),min) + + + 100 + 47 + 265 + 73 + + font10 + white + + + 100 + 47 + 265 + 73 + + font10 + white + String.IsEmpty(ListItem.Property(TagLine)) + + + 100 + 47 + 265 + 73 + + font10 + white + String.IsEmpty(ListItem.Property(TagLine)) + String.IsEmpty(ListItem.Property(PlotOutline)) + + + + + 0 + 0 + 370 + 125 + button-focus2.png + + + 5 + 5 + 80 + 115 + $INFO[ListItem.Icon] + keep + + + 50 + 70 + 30 + 30 + OverlayWatched.png + Integer.IsGreater(ListItem.Property(PlayCount),0) + + + 100 + 10 + 265 + 12 + + font12 + white + center + + + 100 + 30 + 265 + 15 + + font12 + grey2 + center + !String.Contains(ListItem.Property(Duration),min) + + + 100 + 30 + 265 + 15 + + font12 + grey2 + center + String.Contains(ListItem.Property(Duration),min) + + + 100 + 47 + 265 + 73 + + font10 + white + + + 100 + 47 + 265 + 73 + + font10 + white + String.IsEmpty(ListItem.Property(TagLine)) + + + 100 + 47 + 265 + 73 + + font10 + white + String.IsEmpty(ListItem.Property(TagLine)) + String.IsEmpty(ListItem.Property(PlotOutline)) + + + + + 770 + 0 + 25 + 530 + ScrollBarV.png + ScrollBarV_bar.png + ScrollBarV_bar_focus.png + ScrollBarNib.png + ScrollBarNib.png + 231 + 9000 + false + vertical + Container(9000).Hasfocus(11) + + + number of files/pages in list text label + 250 + 530 + 500 + 35 + font12 + right + center + true + grey + + Container(9000).Hasfocus(11) + + diff --git a/addon.xml b/addon.xml index c522ede..5497987 100644 --- a/addon.xml +++ b/addon.xml @@ -1,7 +1,7 @@ @@ -40,7 +40,7 @@ Pel Confluence por Jezz_Z. (Pel predefinida do Kodi) המעטפת Confluence של Jezz_X. (ברירת המחדל של Kodi) Confluence presvlaka autora Jezz_X. (uobičajena Kodi presvlaka) - Confluence felszín. Készítő: Jezz_X (Kodi alapértelmezett felszín) + Confluence felszín. Készítő: Jezz_X (Kodi alapértelmezett felszín) ''Confluence'' - տեսք՝ Jezz_X. կողմից (Kodi - հիմնական տեսք) Skin Confluence oleh Jezz_X. (Skin bawaan Kodi) Confluence eftir Jezz_X. (Sjálfgefið útlit Kodi) @@ -116,7 +116,7 @@ Confluence é a skin padrão do Kodi 9.11 e acima. É uma combinação de conceitos das mais populares skins, visando abraçar e integrar as boas ideias em uma skin que seja fácil de entender e usar, destinada aos usuários iniciantes do Kodi. O tema "Confluence" é o tema padrão do Kodi 14.0 e superior. É uma combinação de conceitos a partir de muitos temas populares e tenta integrar as boas ideias dos mesmos, num tema que deverá ser fácil de entender e utilizar pelos novos utilizadores do Kodi. Confluence este costumul implicit pentru Kodi 9.11 și versiunile ulterioare. Este o combinație de concepte împrumutate de la mai multe costume populare, care încearcă să îmbrățișeze și să integreze ideile lor bune într-un costum care să fie ușor de înțeles și folosit de către utilizatorii Kodi începători. - Confluence — это стандартная обложка Kodi, начиная с версии 9.11. Она представляет собой сочетание концепций, взятых из многих популярных обложек, в попытке интегрировать их удачные идеи в обложке, которая была бы простой для использования и понимания новыми пользователями Kodi. + Confluence — это стандартная обложка Kodi, начиная с версии 9.11. Она представляет собой сочетание концепций, взятых из многих популярных обложек, в попытке интегрировать их удачные идеи в обложке, которая была бы простой для использования и понимания новыми пользователями Kodi. Confluence je predvolený pre Kodi 9.11 a vyššie. Je kombináciou konceptov z mnoho populárnych skinov a pokusom integrovať ich dobré nápady do skinu, ktorý by bol ľahko zrozumiteľný a použiteľný pre nových používateľov Kodi. Confluence je privzeta preobleka za Kodi 14.0 in novejše. Je kombinacija konceptov mnogih priljubljenih preoblek in poskuša zaobjeti in integrirati njihove dobre ideje v preobleko, ki bi bila preprosta za uporabo in razumevanje tudi novim uporabnikom. Confluence është maska kryesore për Kodi 9.11 dhe verzionet më të lartë. Është nje kombinim nga shumë maska e popullarizuar dhe përpjeket për të përqafuar dhe integruar idetë më të mira në një maskë që të jetë sa më lehtë në përdorim dhe kuptim për përdoruasit duke e përdorur Kodi për herë të parë. @@ -138,4 +138,4 @@ https://github.com/xbmc/skin.confluence - + \ No newline at end of file diff --git a/changelog.txt b/changelog.txt index 48a410f..c427cf4 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +[B]3.0.10[/B] + +- Updated global search +- Updated music and video info +- Added DefaultAddonsRecentlyUpdated.png and DefaultMusicRoles.png + [B]3.0.9[/B] - Updated language files from Transifex @@ -226,4 +232,4 @@ [B]1.0.0[/B] -- Initial Commit to the SVN +- Initial Commit to the SVN \ No newline at end of file diff --git a/media/DefaultAddonsRecentlyUpdated.png b/media/DefaultAddonsRecentlyUpdated.png new file mode 100644 index 0000000..58c839c Binary files /dev/null and b/media/DefaultAddonsRecentlyUpdated.png differ diff --git a/media/DefaultMusicRoles.png b/media/DefaultMusicRoles.png new file mode 100644 index 0000000..9e3b328 Binary files /dev/null and b/media/DefaultMusicRoles.png differ