diff options
| author | ronie <ronie@users.noreply.github.com> | 2016-03-05 02:43:43 +0100 |
|---|---|---|
| committer | ronie <ronie@users.noreply.github.com> | 2016-03-06 02:23:33 +0100 |
| commit | a6843e6f5e695ba1b09aa5a4cdeb86cbe68834a7 (patch) | |
| tree | 1cde54df9b3336a3541ceeba1d77b38b218373da | |
| parent | ae1f6bf4ab4252386e01d84d57994301b8100abe (diff) | |
[Estouchy] update
143 files changed, 487 insertions, 415 deletions
diff --git a/addons/skin.estouchy/_screenshots/screenshot01.jpg b/addons/skin.estouchy/_screenshots/screenshot01.jpg Binary files differdeleted file mode 100644 index b486eaf300..0000000000 --- a/addons/skin.estouchy/_screenshots/screenshot01.jpg +++ /dev/null diff --git a/addons/skin.estouchy/_screenshots/screenshot02.jpg b/addons/skin.estouchy/_screenshots/screenshot02.jpg Binary files differdeleted file mode 100644 index 6b370270ac..0000000000 --- a/addons/skin.estouchy/_screenshots/screenshot02.jpg +++ /dev/null diff --git a/addons/skin.estouchy/_screenshots/screenshot03.jpg b/addons/skin.estouchy/_screenshots/screenshot03.jpg Binary files differdeleted file mode 100644 index d1342d1a97..0000000000 --- a/addons/skin.estouchy/_screenshots/screenshot03.jpg +++ /dev/null diff --git a/addons/skin.estouchy/_screenshots/screenshot04.jpg b/addons/skin.estouchy/_screenshots/screenshot04.jpg Binary files differdeleted file mode 100644 index e3e1927424..0000000000 --- a/addons/skin.estouchy/_screenshots/screenshot04.jpg +++ /dev/null diff --git a/addons/skin.estouchy/_screenshots/screenshot05.jpg b/addons/skin.estouchy/_screenshots/screenshot05.jpg Binary files differdeleted file mode 100644 index 7920e68c01..0000000000 --- a/addons/skin.estouchy/_screenshots/screenshot05.jpg +++ /dev/null diff --git a/addons/skin.estouchy/_screenshots/screenshot06.jpg b/addons/skin.estouchy/_screenshots/screenshot06.jpg Binary files differdeleted file mode 100644 index ad4c7f8fc2..0000000000 --- a/addons/skin.estouchy/_screenshots/screenshot06.jpg +++ /dev/null diff --git a/addons/skin.estouchy/_screenshots/screenshot07.jpg b/addons/skin.estouchy/_screenshots/screenshot07.jpg Binary files differdeleted file mode 100644 index 9609b04448..0000000000 --- a/addons/skin.estouchy/_screenshots/screenshot07.jpg +++ /dev/null diff --git a/addons/skin.estouchy/_screenshots/screenshot08.jpg b/addons/skin.estouchy/_screenshots/screenshot08.jpg Binary files differdeleted file mode 100644 index 248464b8f4..0000000000 --- a/addons/skin.estouchy/_screenshots/screenshot08.jpg +++ /dev/null diff --git a/addons/skin.estouchy/_screenshots/screenshot09.jpg b/addons/skin.estouchy/_screenshots/screenshot09.jpg Binary files differdeleted file mode 100644 index 9407d0f86d..0000000000 --- a/addons/skin.estouchy/_screenshots/screenshot09.jpg +++ /dev/null diff --git a/addons/skin.estouchy/_screenshots/screenshot10.jpg b/addons/skin.estouchy/_screenshots/screenshot10.jpg Binary files differdeleted file mode 100644 index c7a580a771..0000000000 --- a/addons/skin.estouchy/_screenshots/screenshot10.jpg +++ /dev/null diff --git a/addons/skin.estouchy/addon.xml b/addons/skin.estouchy/addon.xml index e7c79e0fe0..f3c15bacf2 100644 --- a/addons/skin.estouchy/addon.xml +++ b/addons/skin.estouchy/addon.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<addon id="skin.estouchy" version="1.0.0" name="Estouchy" provider-name="Team Kodi"> +<addon id="skin.estouchy" version="1.0.2" name="Estouchy" provider-name="Team Kodi"> <requires> <import addon="xbmc.gui" version="5.11.0"/> </requires> diff --git a/addons/skin.estouchy/background/SKINDEFAULT.jpg b/addons/skin.estouchy/background/SKINDEFAULT.jpg Binary files differindex 36917f894f..2faf289c5f 100644 --- a/addons/skin.estouchy/background/SKINDEFAULT.jpg +++ b/addons/skin.estouchy/background/SKINDEFAULT.jpg diff --git a/addons/skin.estouchy/background/tv.jpg b/addons/skin.estouchy/background/tv.jpg Binary files differindex daedca6f5e..754f82d9e5 100644 --- a/addons/skin.estouchy/background/tv.jpg +++ b/addons/skin.estouchy/background/tv.jpg diff --git a/addons/skin.estouchy/changelog.txt b/addons/skin.estouchy/changelog.txt index 3ed46866b8..0ad69b8f02 100644 --- a/addons/skin.estouchy/changelog.txt +++ b/addons/skin.estouchy/changelog.txt @@ -1,3 +1,9 @@ +v1.0.2 +- Cosmetics + +v1.0.1 +- Fixes + v1.0.0 - Initial release diff --git a/addons/skin.estouchy/fonts/DejaVuSans-Bold-Caps.ttf b/addons/skin.estouchy/fonts/DejaVuSans-Bold-Caps.ttf Binary files differdeleted file mode 100644 index 5af21ea3d6..0000000000 --- a/addons/skin.estouchy/fonts/DejaVuSans-Bold-Caps.ttf +++ /dev/null diff --git a/addons/skin.estouchy/media/defaulticons/DefaultActor.png b/addons/skin.estouchy/media/defaulticons/DefaultActor.png Binary files differindex f6e0ee01e7..d9b825442d 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultActor.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultActor.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddSource.png b/addons/skin.estouchy/media/defaulticons/DefaultAddSource.png Binary files differindex 32080a0c60..dd2486de41 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddSource.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddSource.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddon.png b/addons/skin.estouchy/media/defaulticons/DefaultAddon.png Binary files differindex 8f70449c3c..2b48cdc42e 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddon.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddon.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonAlbumInfo.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonAlbumInfo.png Binary files differindex 9dff113911..fe2bd9b63e 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonAlbumInfo.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonAlbumInfo.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonArtistInfo.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonArtistInfo.png Binary files differindex e449fe74b7..0799d8e393 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonArtistInfo.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonArtistInfo.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonAudioDSP.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonAudioDSP.png Binary files differindex 3003167da5..08eef237b2 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonAudioDSP.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonAudioDSP.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonAudioDecoder.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonAudioDecoder.png Binary files differindex 417763dbb8..9231462d04 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonAudioDecoder.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonAudioDecoder.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonAudioEncoder.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonAudioEncoder.png Binary files differindex 3003167da5..b126d9d51a 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonAudioEncoder.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonAudioEncoder.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonContextItem.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonContextItem.png Binary files differindex 439c581b1f..48d3ba41b0 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonContextItem.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonContextItem.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonHelper.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonHelper.png Binary files differindex db45d8df12..2a1eb43ad2 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonHelper.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonHelper.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonImages.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonImages.png Binary files differindex 48c2b2a5fe..ad73f24d66 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonImages.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonImages.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonInfoLibrary.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonInfoLibrary.png Binary files differindex 44776f36f5..36b7e00d54 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonInfoLibrary.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonInfoLibrary.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonInfoProvider.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonInfoProvider.png Binary files differindex be56dc53f0..85ab1ea3f9 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonInfoProvider.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonInfoProvider.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonLanguage.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonLanguage.png Binary files differindex 402ee03056..e9c117e8a4 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonLanguage.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonLanguage.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonLibrary.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonLibrary.png Binary files differindex 8f70449c3c..ee48355b85 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonLibrary.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonLibrary.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonLookAndFeel.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonLookAndFeel.png Binary files differindex 7f18709814..86840fec6f 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonLookAndFeel.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonLookAndFeel.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonLyrics.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonLyrics.png Binary files differindex b55b3e4927..e5a65d5f7b 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonLyrics.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonLyrics.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonMovieInfo.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonMovieInfo.png Binary files differindex e666c8a6a9..93ac667725 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonMovieInfo.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonMovieInfo.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonMusic.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonMusic.png Binary files differindex 2149932fc1..106bdcb848 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonMusic.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonMusic.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonMusicVideoInfo.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonMusicVideoInfo.png Binary files differindex fb77dae4a3..bb21fd6e6f 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonMusicVideoInfo.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonMusicVideoInfo.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonNone.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonNone.png Binary files differindex b432b776d1..816fdf9287 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonNone.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonNone.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonPVRClient.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonPVRClient.png Binary files differindex 154a90f3be..46b35b7814 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonPVRClient.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonPVRClient.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonPicture.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonPicture.png Binary files differindex 192182f32a..e0761ff77f 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonPicture.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonPicture.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonProgram.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonProgram.png Binary files differindex 13ed6ed736..9de0752cd6 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonProgram.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonProgram.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonRepository.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonRepository.png Binary files differindex 8407b09eeb..9ae0e33161 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonRepository.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonRepository.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonScreensaver.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonScreensaver.png Binary files differindex 45937d7847..6db3c6be6d 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonScreensaver.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonScreensaver.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonService.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonService.png Binary files differindex 6684bae5e1..a1fb1230c7 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonService.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonService.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonSkin.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonSkin.png Binary files differindex 7f18709814..431298654c 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonSkin.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonSkin.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonSubtitles.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonSubtitles.png Binary files differindex fd29cc054d..1199689c9f 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonSubtitles.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonSubtitles.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonTvInfo.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonTvInfo.png Binary files differindex 2b91259f41..bd422c15e3 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonTvInfo.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonTvInfo.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonUISounds.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonUISounds.png Binary files differindex 70b6d799f3..b69ad5665c 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonUISounds.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonUISounds.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonVideo.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonVideo.png Binary files differindex 729c84fdbd..86f4afee63 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonVideo.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonVideo.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonVisualization.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonVisualization.png Binary files differindex dce0930889..f920e3b243 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonVisualization.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonVisualization.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonWeather.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonWeather.png Binary files differindex 6e6dc0f1dc..990527cc4e 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonWeather.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonWeather.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonWebSkin.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonWebSkin.png Binary files differindex fa3850329b..b2eb96a5bc 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAddonWebSkin.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonWebSkin.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonsInstalled.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonsInstalled.png Binary files differnew file mode 100644 index 0000000000..f75a80b7fb --- /dev/null +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonsInstalled.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonsRepo.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonsRepo.png Binary files differnew file mode 100644 index 0000000000..e89764c00f --- /dev/null +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonsRepo.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonsSearch.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonsSearch.png Binary files differnew file mode 100644 index 0000000000..f07ce7bea1 --- /dev/null +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonsSearch.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonsUpdates.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonsUpdates.png Binary files differnew file mode 100644 index 0000000000..c0cc01c317 --- /dev/null +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonsUpdates.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonsZip.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonsZip.png Binary files differnew file mode 100644 index 0000000000..bfe05a8b1c --- /dev/null +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonsZip.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAlbumCover.png b/addons/skin.estouchy/media/defaulticons/DefaultAlbumCover.png Binary files differindex 78bca92117..2611a75f64 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAlbumCover.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAlbumCover.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultArtist.png b/addons/skin.estouchy/media/defaulticons/DefaultArtist.png Binary files differindex 4b62eefabf..910628adf2 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultArtist.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultArtist.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAudio.png b/addons/skin.estouchy/media/defaulticons/DefaultAudio.png Binary files differindex 4a68d7c9db..106bdcb848 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultAudio.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultAudio.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultCDDA.png b/addons/skin.estouchy/media/defaulticons/DefaultCDDA.png Binary files differindex 78bca92117..06495e8bc3 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultCDDA.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultCDDA.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultCountry.png b/addons/skin.estouchy/media/defaulticons/DefaultCountry.png Binary files differindex fa3850329b..75e7d41e6a 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultCountry.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultCountry.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultDVDEmpty.png b/addons/skin.estouchy/media/defaulticons/DefaultDVDEmpty.png Binary files differindex 886d5c545d..3dc967fa6d 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultDVDEmpty.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultDVDEmpty.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultDVDFull.png b/addons/skin.estouchy/media/defaulticons/DefaultDVDFull.png Binary files differindex fb45dcbf9b..fd0666a147 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultDVDFull.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultDVDFull.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultDVDRom.png b/addons/skin.estouchy/media/defaulticons/DefaultDVDRom.png Binary files differindex fb45dcbf9b..27e10ec01e 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultDVDRom.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultDVDRom.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultDirector.png b/addons/skin.estouchy/media/defaulticons/DefaultDirector.png Binary files differindex f6e0ee01e7..7b0b3058f2 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultDirector.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultDirector.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultFile.png b/addons/skin.estouchy/media/defaulticons/DefaultFile.png Binary files differindex 82b0bc2189..7b3ab506c4 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultFile.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultFile.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultFolder.png b/addons/skin.estouchy/media/defaulticons/DefaultFolder.png Binary files differindex 4cd26bd118..81d7406bcc 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultFolder.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultFolder.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultFolderBack.png b/addons/skin.estouchy/media/defaulticons/DefaultFolderBack.png Binary files differindex a0d5aaba30..576907e304 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultFolderBack.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultFolderBack.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultGames.png b/addons/skin.estouchy/media/defaulticons/DefaultGames.png Binary files differnew file mode 100644 index 0000000000..d5dbb286f3 --- /dev/null +++ b/addons/skin.estouchy/media/defaulticons/DefaultGames.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultGenre.png b/addons/skin.estouchy/media/defaulticons/DefaultGenre.png Binary files differindex 8a269a4c02..f18baa8ea0 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultGenre.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultGenre.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultHardDisk.png b/addons/skin.estouchy/media/defaulticons/DefaultHardDisk.png Binary files differindex 083394b037..de3fb4c746 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultHardDisk.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultHardDisk.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultInProgressShows.png b/addons/skin.estouchy/media/defaulticons/DefaultInProgressShows.png Binary files differindex 6b1b24cb28..2a91b28f20 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultInProgressShows.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultInProgressShows.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultMovieTitle.png b/addons/skin.estouchy/media/defaulticons/DefaultMovieTitle.png Binary files differindex 4ad807f0db..d3991b112e 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultMovieTitle.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultMovieTitle.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultMovies.png b/addons/skin.estouchy/media/defaulticons/DefaultMovies.png Binary files differindex 6d510f2c51..800b02784d 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultMovies.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultMovies.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultMusicAlbums.png b/addons/skin.estouchy/media/defaulticons/DefaultMusicAlbums.png Binary files differindex 78bca92117..a1f8c84a36 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultMusicAlbums.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultMusicAlbums.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultMusicArtists.png b/addons/skin.estouchy/media/defaulticons/DefaultMusicArtists.png Binary files differindex cba36df733..910628adf2 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultMusicArtists.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultMusicArtists.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultMusicCompilations.png b/addons/skin.estouchy/media/defaulticons/DefaultMusicCompilations.png Binary files differindex 03acc4dc29..9b0b939dbb 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultMusicCompilations.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultMusicCompilations.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultMusicGenres.png b/addons/skin.estouchy/media/defaulticons/DefaultMusicGenres.png Binary files differindex 6d51e37831..c142f61a13 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultMusicGenres.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultMusicGenres.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultMusicPlaylists.png b/addons/skin.estouchy/media/defaulticons/DefaultMusicPlaylists.png Binary files differindex d96a3cac68..9d94336c3e 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultMusicPlaylists.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultMusicPlaylists.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultMusicRecentlyAdded.png b/addons/skin.estouchy/media/defaulticons/DefaultMusicRecentlyAdded.png Binary files differindex d337d68b42..271a129f60 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultMusicRecentlyAdded.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultMusicRecentlyAdded.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultMusicRecentlyPlayed.png b/addons/skin.estouchy/media/defaulticons/DefaultMusicRecentlyPlayed.png Binary files differindex 57ebd5433b..5124d541a0 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultMusicRecentlyPlayed.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultMusicRecentlyPlayed.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultMusicSearch.png b/addons/skin.estouchy/media/defaulticons/DefaultMusicSearch.png Binary files differnew file mode 100644 index 0000000000..777231b830 --- /dev/null +++ b/addons/skin.estouchy/media/defaulticons/DefaultMusicSearch.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultMusicSongs.png b/addons/skin.estouchy/media/defaulticons/DefaultMusicSongs.png Binary files differindex 66104631de..a5a7e31fbf 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultMusicSongs.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultMusicSongs.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultMusicTop100.png b/addons/skin.estouchy/media/defaulticons/DefaultMusicTop100.png Binary files differindex fc1df4bb15..851d251f67 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultMusicTop100.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultMusicTop100.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultMusicTop100Albums.png b/addons/skin.estouchy/media/defaulticons/DefaultMusicTop100Albums.png Binary files differindex 557a266674..88c5089287 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultMusicTop100Albums.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultMusicTop100Albums.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultMusicTop100Songs.png b/addons/skin.estouchy/media/defaulticons/DefaultMusicTop100Songs.png Binary files differindex 66104631de..cf95367eff 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultMusicTop100Songs.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultMusicTop100Songs.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultMusicVideoTitle.png b/addons/skin.estouchy/media/defaulticons/DefaultMusicVideoTitle.png Binary files differindex 909f14c8e0..5331c11671 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultMusicVideoTitle.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultMusicVideoTitle.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultMusicVideos.png b/addons/skin.estouchy/media/defaulticons/DefaultMusicVideos.png Binary files differindex 909f14c8e0..5331c11671 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultMusicVideos.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultMusicVideos.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultMusicYears.png b/addons/skin.estouchy/media/defaulticons/DefaultMusicYears.png Binary files differindex c82a4b1e49..ca46e10da3 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultMusicYears.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultMusicYears.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultNetwork.png b/addons/skin.estouchy/media/defaulticons/DefaultNetwork.png Binary files differindex 107a2c0234..dca051c66a 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultNetwork.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultNetwork.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultPicture.png b/addons/skin.estouchy/media/defaulticons/DefaultPicture.png Binary files differindex 48c2b2a5fe..06b816afff 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultPicture.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultPicture.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultPlaylist.png b/addons/skin.estouchy/media/defaulticons/DefaultPlaylist.png Binary files differindex 8a269a4c02..9d94336c3e 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultPlaylist.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultPlaylist.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultProgram.png b/addons/skin.estouchy/media/defaulticons/DefaultProgram.png Binary files differindex 55041a4325..9de0752cd6 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultProgram.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultProgram.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultRecentlyAddedEpisodes.png b/addons/skin.estouchy/media/defaulticons/DefaultRecentlyAddedEpisodes.png Binary files differindex 683ebc2b42..7d4ae7171a 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultRecentlyAddedEpisodes.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultRecentlyAddedEpisodes.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultRecentlyAddedMovies.png b/addons/skin.estouchy/media/defaulticons/DefaultRecentlyAddedMovies.png Binary files differindex df6abb3c11..9f9f5cad1f 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultRecentlyAddedMovies.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultRecentlyAddedMovies.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultRecentlyAddedMusicVideos.png b/addons/skin.estouchy/media/defaulticons/DefaultRecentlyAddedMusicVideos.png Binary files differindex a60043cae0..8d74ee97bc 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultRecentlyAddedMusicVideos.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultRecentlyAddedMusicVideos.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultRemovableDisk.png b/addons/skin.estouchy/media/defaulticons/DefaultRemovableDisk.png Binary files differindex 083394b037..9a070af387 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultRemovableDisk.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultRemovableDisk.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultScript.png b/addons/skin.estouchy/media/defaulticons/DefaultScript.png Binary files differindex 6684bae5e1..016d54a47c 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultScript.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultScript.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultSets.png b/addons/skin.estouchy/media/defaulticons/DefaultSets.png Binary files differindex 5b926763ac..8f1ee11d66 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultSets.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultSets.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultStudios.png b/addons/skin.estouchy/media/defaulticons/DefaultStudios.png Binary files differindex 4ad807f0db..e1c95a07d5 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultStudios.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultStudios.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultTVShowTitle.png b/addons/skin.estouchy/media/defaulticons/DefaultTVShowTitle.png Binary files differindex d87de0dcce..93b79c2c52 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultTVShowTitle.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultTVShowTitle.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultTVShows.png b/addons/skin.estouchy/media/defaulticons/DefaultTVShows.png Binary files differindex d81d436506..93b79c2c52 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultTVShows.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultTVShows.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultTags.png b/addons/skin.estouchy/media/defaulticons/DefaultTags.png Binary files differindex 9dff113911..e78b752f7b 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultTags.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultTags.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultVCD.png b/addons/skin.estouchy/media/defaulticons/DefaultVCD.png Binary files differindex fb45dcbf9b..b3a120af8c 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultVCD.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultVCD.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultVideo.png b/addons/skin.estouchy/media/defaulticons/DefaultVideo.png Binary files differindex a389117f36..3caf345a98 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultVideo.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultVideo.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultVideoCover.png b/addons/skin.estouchy/media/defaulticons/DefaultVideoCover.png Binary files differindex a389117f36..d3991b112e 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultVideoCover.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultVideoCover.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultVideoDeleted.png b/addons/skin.estouchy/media/defaulticons/DefaultVideoDeleted.png Binary files differindex a389117f36..66ee221a05 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultVideoDeleted.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultVideoDeleted.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultVideoPlaylists.png b/addons/skin.estouchy/media/defaulticons/DefaultVideoPlaylists.png Binary files differindex d96a3cac68..a2edc36d8f 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultVideoPlaylists.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultVideoPlaylists.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultYear.png b/addons/skin.estouchy/media/defaulticons/DefaultYear.png Binary files differindex ce7866f768..ca46e10da3 100644 --- a/addons/skin.estouchy/media/defaulticons/DefaultYear.png +++ b/addons/skin.estouchy/media/defaulticons/DefaultYear.png diff --git a/addons/skin.estouchy/media/flagging/video/h262.png b/addons/skin.estouchy/media/flagging/video/h262.png Binary files differnew file mode 100644 index 0000000000..327fa27950 --- /dev/null +++ b/addons/skin.estouchy/media/flagging/video/h262.png diff --git a/addons/skin.estouchy/media/icon_button_volume.png b/addons/skin.estouchy/media/osd_volume.png Binary files differindex 3c943d21d6..3c943d21d6 100644 --- a/addons/skin.estouchy/media/icon_button_volume.png +++ b/addons/skin.estouchy/media/osd_volume.png diff --git a/addons/skin.estouchy/xml/AddonBrowser.xml b/addons/skin.estouchy/xml/AddonBrowser.xml index ec51473fd9..bd2b21ed35 100644 --- a/addons/skin.estouchy/xml/AddonBrowser.xml +++ b/addons/skin.estouchy/xml/AddonBrowser.xml @@ -2,12 +2,13 @@ <window> <defaultcontrol always="true">50</defaultcontrol> <views>50,500,550</views> - <onunload>ClearProperty(DropdownMenuVisible,Home)</onunload> + <onunload>ClearProperty(PopupMenuVisible,Home)</onunload> <controls> <include>CommonBackground</include> - <include>MediaBladeLeft</include> - <include>CommonBackgroundOverlay</include> + <include>SideMenu</include> + <include>Header</include> <include>CommonNowPlaying</include> + <include>Footer</include> <control type="label"> <description>Window label</description> <include>MediaWindowTitleCommons</include> @@ -52,8 +53,8 @@ </include> </control> <include>ScrollBarCommons</include> - <include>MediaSubMenu</include> - <include name="DropdownMenu"> + <include>BottomMenu</include> + <include name="PopupMenu"> <param name="panel-posy">80</param> <param name="panel-height">480</param> </include> diff --git a/addons/skin.estouchy/xml/CustomVolume.xml b/addons/skin.estouchy/xml/CustomVolume.xml index 6699bc7a7a..62f780bc77 100644 --- a/addons/skin.estouchy/xml/CustomVolume.xml +++ b/addons/skin.estouchy/xml/CustomVolume.xml @@ -14,28 +14,28 @@ <visible>![Window.IsVisible(Notification) | Window.IsVisible(VolumeBar)]</visible> </control> <control type="group"> - <posx>390</posx> + <posx>430</posx> <posy>0</posy> - <width>500</width> + <width>420</width> <height>78</height> <include>16x9_xPos_Relocation</include> <visible>![Window.IsVisible(Notification) | Window.IsVisible(VolumeBar)]</visible> <control type="label"> <description>label</description> - <posx>0</posx> + <posx>20</posx> <posy>10</posy> <height>58</height> - <width>500</width> + <width>400</width> <label>13376</label> <font>font20_title</font> <aligny>center</aligny> </control> <control type="label"> <description>Volumelabel</description> - <posx>500</posx> + <posx>400</posx> <posy>10</posy> <height>58</height> - <width>500</width> + <width>400</width> <label>$INFO[Control.GetLabel(1)]</label> <font>font20_title</font> <align>right</align> @@ -45,7 +45,7 @@ <description>Volume</description> <posx>0</posx> <posy>68</posy> - <width>500</width> + <width>420</width> <height>10</height> <texturebg colordiffuse="grey3">white.png</texturebg> <midtexture colordiffuse="blue">white.png</midtexture> @@ -55,7 +55,7 @@ <description>Volume Slider</description> <posx>0</posx> <posy>10</posy> - <width>500</width> + <width>420</width> <height>80</height> <info>Player.Volume</info> <action>Volume</action> diff --git a/addons/skin.estouchy/xml/DialogConfirm.xml b/addons/skin.estouchy/xml/DialogConfirm.xml index cdf5d2fd32..49f791e159 100644 --- a/addons/skin.estouchy/xml/DialogConfirm.xml +++ b/addons/skin.estouchy/xml/DialogConfirm.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <window> - <onload condition="Window.IsVisible(yesnodialog)">SetFocus(11)</onload> + <onload condition="Window.IsVisible(yesnodialog)">SetFocus(10)</onload> <coordinates> <posx>290</posx> <posy>300</posy> @@ -10,7 +10,6 @@ <controls> <include>BehindDialogFadeOut</include> <control type="image"> - <description>Header Background</description> <posx>0</posx> <posy>0</posy> <width>700</width> @@ -88,15 +87,15 @@ <width>660</width> <height>60</height> <visible>Window.IsVisible(yesnodialog)</visible> - <control type="button" id="10"> - <description>OK button</description> + <control type="button" id="11"> + <description>Yes button</description> <posx>0</posx> <posy>0</posy> <width>200</width> <include>ButtonInfoDialogsCommonValues</include> </control> - <control type="button" id="11"> - <description>Cancel button</description> + <control type="button" id="10"> + <description>No button</description> <posx>210</posx> <posy>0</posy> <width>200</width> diff --git a/addons/skin.estouchy/xml/DialogContextMenu.xml b/addons/skin.estouchy/xml/DialogContextMenu.xml index 7b43230889..3f6361bf14 100644 --- a/addons/skin.estouchy/xml/DialogContextMenu.xml +++ b/addons/skin.estouchy/xml/DialogContextMenu.xml @@ -9,7 +9,6 @@ <controls> <include>BehindDialogFadeOut</include> <control type="image"> - <description>Header Background</description> <posx>0</posx> <posy>0</posy> <width>400</width> diff --git a/addons/skin.estouchy/xml/DialogNumeric.xml b/addons/skin.estouchy/xml/DialogNumeric.xml index 1fd26777a8..565a2dc167 100644 --- a/addons/skin.estouchy/xml/DialogNumeric.xml +++ b/addons/skin.estouchy/xml/DialogNumeric.xml @@ -14,7 +14,6 @@ <animation effect="slide" start="0,0" end="0,-820" time="500" easing="in" tween="quadratic" >WindowClose</animation> <include>16x9_xPos_Relocation</include> <control type="image"> - <description>Header Background</description> <posx>0</posx> <posy>0</posy> <width>376</width> diff --git a/addons/skin.estouchy/xml/EventLog.xml b/addons/skin.estouchy/xml/EventLog.xml index 9d3b16d912..4758602654 100644 --- a/addons/skin.estouchy/xml/EventLog.xml +++ b/addons/skin.estouchy/xml/EventLog.xml @@ -2,12 +2,13 @@ <window> <defaultcontrol always="true">50</defaultcontrol> <views>50</views> - <onunload>ClearProperty(DropdownMenuVisible,Home)</onunload> + <onunload>ClearProperty(PopupMenuVisible,Home)</onunload> <controls> <include>CommonBackground</include> - <include>MediaBladeLeft</include> - <include>CommonBackgroundOverlay</include> + <include>SideMenu</include> + <include>Header</include> <include>CommonNowPlaying</include> + <include>Footer</include> <control type="label"> <description>Window label</description> <include>MediaWindowTitleCommons</include> @@ -27,8 +28,8 @@ </include> </control> <include>ScrollBarCommons</include> - <include>MediaSubMenu</include> - <include name="DropdownMenu"> + <include>BottomMenu</include> + <include name="PopupMenu"> <param name="panel-posy">240</param> <param name="panel-height">360</param> </include> diff --git a/addons/skin.estouchy/xml/FileManager.xml b/addons/skin.estouchy/xml/FileManager.xml index b26814a267..e7a9b98438 100644 --- a/addons/skin.estouchy/xml/FileManager.xml +++ b/addons/skin.estouchy/xml/FileManager.xml @@ -3,8 +3,9 @@ <defaultcontrol>20</defaultcontrol> <controls> <include>CommonBackground</include> - <include>CommonBackgroundOverlay</include> + <include>Header</include> <include>CommonNowPlaying</include> + <include>Footer</include> <control type="label"> <description>Window label</description> <include>MediaWindowTitleCommons</include> @@ -281,7 +282,7 @@ <control type="panel" id="9002"> <visible>!Window.IsActive(PlayerControls)</visible> <include>VisibleFadeEffect</include> - <include>SubMenuCommonLayout</include> + <include>BottomMenuLayout</include> <content> <item> <label>31200</label> diff --git a/addons/skin.estouchy/xml/Home.xml b/addons/skin.estouchy/xml/Home.xml index a74d132439..473870824c 100644 --- a/addons/skin.estouchy/xml/Home.xml +++ b/addons/skin.estouchy/xml/Home.xml @@ -11,6 +11,9 @@ <label>$INFO[Weather.FanartCode]</label> <!-- trigger weather retrieval --> </control> <include>CommonBackground</include> + <include>Header</include> + <include>CommonNowPlaying</include> + <include>Footer</include> <control type="group"> <include>Window_OpenClose_Animation</include> <animation effect="slide" start="0,0" end="106,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3)">Conditional</animation> @@ -224,9 +227,8 @@ </item> <item> <label>13376</label> - <onclick>ActivateWindow(1112)</onclick> - <icon>icon_button_volume.png</icon> - <visible>!System.Platform.IOS</visible> + <onclick>ActivateWindow(FileManager)</onclick> + <icon>icon_button_filemanager.png</icon> </item> <item> <label>1036</label> @@ -250,7 +252,5 @@ <param name="group-posx">430r</param> <param name="panel-width">420</param> </include> - <include>CommonBackgroundOverlay</include> - <include>CommonNowPlaying</include> </controls> </window> diff --git a/addons/skin.estouchy/xml/Includes.xml b/addons/skin.estouchy/xml/Includes.xml index eb09d09fd4..dadc3186a4 100644 --- a/addons/skin.estouchy/xml/Includes.xml +++ b/addons/skin.estouchy/xml/Includes.xml @@ -48,6 +48,10 @@ <value condition="!IsEmpty(ListItem.Art(poster))">$INFO[ListItem.Art(poster)]</value> <value condition="IsEmpty(ListItem.Art(poster))">$INFO[ListItem.Icon]</value> </variable> + <variable name="PVRListLabel"> + <value condition="![Window.IsVisible(TVChannels) | Window.IsVisible(RadioChannels)]">$INFO[ListItem.Label]</value> + <value condition="Window.IsVisible(TVChannels) | Window.IsVisible(RadioChannels)">$INFO[ListItem.Title]</value> + </variable> <variable name="PVRSection"> <value condition="Window.IsVisible(TVChannels) | Window.IsVisible(TVGuide) | Window.IsVisible(TVRecordings) | Window.IsVisible(TVTimers) | Window.IsVisible(TVTimerRules) | Window.IsVisible(TVSearch)">$LOCALIZE[31556]</value> <value condition="Window.IsVisible(RadioChannels) | Window.IsVisible(RadioGuide) | Window.IsVisible(RadioRecordings) | Window.IsVisible(RadioTimers) | Window.IsVisible(RadioTimerRules) | Window.IsVisible(RadioSearch)">$LOCALIZE[19021]</value> @@ -80,6 +84,10 @@ <value condition="Player.Forwarding16x | Player.Rewinding16x">16x</value> <value condition="Player.Forwarding32x | Player.Rewinding32x">32x</value> </variable> + <variable name="MediaPlayingTitle"> + <value condition="Player.HasAudio">[B]$INFO[MusicPlayer.Title][/B]</value> + <value condition="Player.HasVideo">[B]$INFO[VideoPlayer.Title][/B]</value> + </variable> <include name="ScreenWidth"> <include condition="StringCompare(Skin.AspectRatio,16:9)">ScreenWidth-16x9</include> @@ -178,7 +186,7 @@ <visible>[!IsEmpty(ListItem.Art(fanart)) + !Player.HasMedia] | [!Skin.HasSetting(HideVizBackground) + Player.HasAudio] | [!Skin.HasSetting(HideVideoBackground) + Player.HasVideo + !Window.IsVisible(TVChannels) + !Window.IsVisible(RadioChannels) + !Window.IsVisible(TVGuide) + !Window.IsVisible(RadioGuide) + !Window.IsVisible(TVSearch) + !Window.IsVisible(RadioSearch) + !Window.IsVisible(TVTimers) + !Window.IsVisible(RadioTimers) + !Window.IsVisible(TVTimerRules) + !Window.IsVisible(RadioTimerRules) + !Window.IsVisible(TVRecordings) + !Window.IsVisible(RadioRecordings)]</visible> </control> </include> - <include name="CommonBackgroundOverlay"> + <include name="Header"> <control type="group"> <include>VisibleFadeEffect</include> <control type="image"> @@ -208,42 +216,19 @@ <texture>kodi_logo.png</texture> <include>VisibleFadeEffect</include> </control> - <control type="image"> - <posx>0</posx> - <posy>80r</posy> - <include>ScreenWidth</include> - <height>80</height> - <texture flipy="true">header.png</texture> - </control> - <control type="rss"> - <posx>0</posx> - <posy>58r</posy> - <height>30</height> - <include>ScreenWidth</include> - <font>font24_title</font> - <urlset>1</urlset> - <textcolor>white</textcolor> - <titlecolor>blue</titlecolor> - <headlinecolor>FFC0C0C0</headlinecolor> - <include>Window_OpenClose_Animation</include> - <visible>Window.IsVisible(Home)</visible> - </control> - <control type="image"> - <description>Window label Position Image</description> - <posx>10</posx> - <posy>58r</posy> - <width>40</width> - <height>40</height> - <aspectratio>keep</aspectratio> - <texture>$VAR[Breadcrumb-Icon]</texture> - <colordiffuse>blue</colordiffuse> - <visible>!Window.IsVisible(Home)</visible> - <animation effect="fade" time="200" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="fade" time="200" condition="Window.Next(Home)">WindowClose</animation> - </control> + </control> + <control type="button"> + <posx>370r</posx> + <posy>16</posy> + <height>45</height> + <width>145</width> + <font>-</font> + <texturefocus>-</texturefocus> + <texturenofocus>-</texturenofocus> + <onclick>ActivateWindow(weather)</onclick> + <visible>!IsEmpty(Window(Weather).Property(Current.Temperature)) + !Player.HasMedia</visible> </control> <control type="grouplist"> - <!-- weather & time --> <include>VisibleFadeEffect</include> <posx>415r</posx> <posy>16</posy> @@ -272,8 +257,43 @@ </control> </control> </include> + <include name="Footer"> + <control type="image"> + <posx>0</posx> + <posy>80r</posy> + <include>ScreenWidth</include> + <height>80</height> + <texture flipy="true">header.png</texture> + </control> + <control type="rss"> + <posx>0</posx> + <posy>58r</posy> + <height>30</height> + <include>ScreenWidth</include> + <font>font24_title</font> + <urlset>1</urlset> + <textcolor>white</textcolor> + <titlecolor>blue</titlecolor> + <headlinecolor>FFC0C0C0</headlinecolor> + <include>Window_OpenClose_Animation</include> + <visible>Window.IsVisible(Home)</visible> + </control> + <control type="image"> + <description>Window Icon</description> + <posx>10</posx> + <posy>58r</posy> + <width>40</width> + <height>40</height> + <aspectratio>keep</aspectratio> + <texture>$VAR[Breadcrumb-Icon]</texture> + <colordiffuse>blue</colordiffuse> + <visible>!Window.IsVisible(Home)</visible> + <animation effect="fade" time="200" condition="Window.Previous(Home)">WindowOpen</animation> + <animation effect="fade" time="200" condition="Window.Next(Home)">WindowClose</animation> + </control> + </include> <include name="WeatherIcon"> - <control type="button"> + <control type="label"> <description>Weather label</description> <height>45</height> <width>100</width> @@ -281,13 +301,10 @@ <textcolor>white</textcolor> <align>right</align> <animation effect="fade" time="300">VisibleChange</animation> - <texturefocus>-</texturefocus> - <texturenofocus>-</texturenofocus> <aligny>center</aligny> <textoffsetx>0</textoffsetx> - <onclick>ActivateWindow(weather)</onclick> <label>$INFO[Window(Weather).Property(Current.Temperature)]$INFO[System.TemperatureUnits]</label> - <visible>!IsEmpty(Window(Weather).Property(Current.Temperature))</visible> + <visible>!IsEmpty(Window(Weather).Property(Current.Temperature)) + !Player.HasMedia</visible> </control> <control type="image"> <description>Weather</description> @@ -297,7 +314,7 @@ <aspectratio align="left">keep</aspectratio> <texture colordiffuse="blue">weather/$INFO[Window(Weather).Property(Current.FanartCode)].png</texture> <animation effect="fade" time="300">VisibleChange</animation> - <visible>!IsEmpty(Window(Weather).Property(Current.Temperature))</visible> + <visible>!IsEmpty(Window(Weather).Property(Current.Temperature)) + !Player.HasMedia</visible> </control> </include> <include name="BehindDialogFadeOut"> @@ -314,7 +331,7 @@ <include name="MediaWindowTitleCommons"> <posx>65</posx> <posy>70r</posy> - <width>610</width> + <width>730</width> <height>64</height> <align>left</align> <aligny>center</aligny> @@ -381,7 +398,7 @@ <texturenofocus>icon_dialog_close.png</texturenofocus> </control> </include> - <include name="MediaSubMenu"> + <include name="BottomMenu"> <control type="button" id="2"> <description>View button needed for panel below to work</description> <visible>false</visible> @@ -396,21 +413,27 @@ </control> <control type="panel" id="9002"> <include>VisibleFadeEffect</include> - <include>SubMenuCommonLayout</include> + <include>BottomMenuLayout</include> <content> <item> + <label>31200</label> + <onclick condition="Window.IsVisible(MusicOSD) | Window.IsVisible(VideoOSD)">Dialog.Close(all,true)</onclick> + <onclick>ParentDir</onclick> + <icon>icon_button_back.png</icon> + </item> + <item> <label>587</label> <onclick condition="!Container.CanFilterAdvanced">SendClick(19)</onclick> <onclick condition="Container.CanFilterAdvanced">Filter</onclick> <icon>icon_button_filter.png</icon> - <visible>!Container.Filtered + ![Window.IsVisible(TVChannels) | Window.IsVisible(RadioChannels) | Window.IsVisible(TVRecordings) | Window.IsVisible(RadioRecordings) | Window.IsVisible(TVTimers) | Window.IsVisible(RadioTimers) | Window.IsVisible(TVTimerRules) | Window.IsVisible(RadioTimerRules) | Window.IsVisible(TVSearch) | Window.IsVisible(RadioSearch) | Window.IsVisible(MusicOSD) | Window.IsVisible(VideoOSD)]</visible> + <visible>!Container.Filtered + ![Window.IsVisible(TVChannels) | Window.IsVisible(RadioChannels) | Window.IsVisible(TVRecordings) | Window.IsVisible(RadioRecordings) | Window.IsVisible(TVTimers) | Window.IsVisible(RadioTimers) | Window.IsVisible(TVTimerRules) | Window.IsVisible(RadioTimerRules) | Window.IsVisible(TVSearch) | Window.IsVisible(RadioSearch) | Window.IsVisible(MusicOSD) | Window.IsVisible(VideoOSD) | Window.IsVisible(MusicPlaylist) | Window.IsVisible(VideoPlaylist)]</visible> </item> <item> <label>587</label> <onclick condition="!Container.CanFilterAdvanced">SendClick(19)</onclick> <onclick condition="Container.CanFilterAdvanced">Filter</onclick> <icon>icon_button_filtered.png</icon> - <visible>Container.Filtered + ![Window.IsVisible(TVChannels) | Window.IsVisible(RadioChannels) | Window.IsVisible(TVRecordings) | Window.IsVisible(RadioRecordings) | Window.IsVisible(TVTimers) | Window.IsVisible(RadioTimers) | Window.IsVisible(TVTimerRules) | Window.IsVisible(RadioTimerRules) | Window.IsVisible(TVSearch) | Window.IsVisible(RadioSearch) | Window.IsVisible(MusicOSD) | Window.IsVisible(VideoOSD)]</visible> + <visible>Container.Filtered + ![Window.IsVisible(TVChannels) | Window.IsVisible(RadioChannels) | Window.IsVisible(TVRecordings) | Window.IsVisible(RadioRecordings) | Window.IsVisible(TVTimers) | Window.IsVisible(RadioTimers) | Window.IsVisible(TVTimerRules) | Window.IsVisible(RadioTimerRules) | Window.IsVisible(TVSearch) | Window.IsVisible(RadioSearch) | Window.IsVisible(MusicOSD) | Window.IsVisible(VideoOSD) | Window.IsVisible(MusicPlaylist) | Window.IsVisible(VideoPlaylist)]</visible> </item> <item> <label>587</label> @@ -423,30 +446,19 @@ <onclick condition="![Window.IsVisible(TVGuide) | Window.IsVisible(RadioGuide)]">Container.NextViewMode</onclick> <onclick condition="Window.IsVisible(TVGuide) | Window.IsVisible(RadioGuide)">SendClick(2)</onclick> <icon>icon_button_view.png</icon> - <visible>![Window.IsVisible(TVChannels) | Window.IsVisible(RadioChannels) | Window.IsVisible(TVRecordings) | Window.IsVisible(RadioRecordings) | Window.IsVisible(TVTimers) | Window.IsVisible(RadioTimers) | Window.IsVisible(TVTimerRules) | Window.IsVisible(RadioTimerRules) | Window.IsVisible(TVSearch) | Window.IsVisible(RadioSearch) | Window.IsVisible(MusicOSD) | Window.IsVisible(VideoOSD)]</visible> - </item> - <item> - <label>31200</label> - <onclick condition="Window.IsVisible(MusicOSD) | Window.IsVisible(VideoOSD)">Dialog.Close(all,true)</onclick> - <onclick>ParentDir</onclick> - <icon>icon_button_back.png</icon> - </item> - <item> - <label>1036</label> - <onclick>ActivateWindow(Favourites)</onclick> - <icon>icon_button_favourites.png</icon> - <visible>![Window.IsVisible(MusicOSD) | Window.IsVisible(VideoOSD)]</visible> + <visible>![Window.IsVisible(TVChannels) | Window.IsVisible(RadioChannels) | Window.IsVisible(TVRecordings) | Window.IsVisible(RadioRecordings) | Window.IsVisible(TVTimers) | Window.IsVisible(RadioTimers) | Window.IsVisible(TVTimerRules) | Window.IsVisible(RadioTimerRules) | Window.IsVisible(TVSearch) | Window.IsVisible(RadioSearch) | Window.IsVisible(MusicOSD) | Window.IsVisible(VideoOSD) | Window.IsVisible(MusicPlaylist) | Window.IsVisible(VideoPlaylist)]</visible> </item> <item> <label>5</label> - <onclick condition="IsEmpty(Window(Home).Property(DropdownMenuVisible))">SetProperty(DropdownMenuVisible,Show,Home)</onclick> - <onclick condition="!IsEmpty(Window(Home).Property(DropdownMenuVisible))">ClearProperty(DropdownMenuVisible,Home)</onclick> + <onclick condition="IsEmpty(Window(Home).Property(PopupMenuVisible))">SetProperty(PopupMenuVisible,Show,Home)</onclick> + <onclick condition="!IsEmpty(Window(Home).Property(PopupMenuVisible))">ClearProperty(PopupMenuVisible,Home)</onclick> <icon>icon_button_settings.png</icon> + <visible>![Window.IsVisible(MusicPlaylist) | Window.IsVisible(VideoPlaylist)]</visible> </item> </content> </control> </include> - <include name="SubMenuCommonLayout"> + <include name="BottomMenuLayout"> <animation effect="fade" start="100" end="0" time="300" condition="Window.Next(Home)">WindowClose</animation> <animation effect="fade" end="100" start="0" time="300" condition="Window.Previous(Home)">WindowOpen</animation> <animation effect="slide" start="0,0" end="120,0" time="0" condition="StringCompare(Container(9002).NumItems,5)">conditional</animation> @@ -552,11 +564,11 @@ </include> <include name="CommonNowPlaying"> <control type="group"> - <posx>390</posx> + <posx>300</posx> <posy>0</posy> <include>VisibleFadeEffect</include> <include>16x9_xPos_Relocation</include> - <visible>Player.HasMedia + ![Window.IsVisible(busydialog) | Window.IsVisible(Notification) | Window.IsVisible(volumebar) | Window.IsVisible(1112)]</visible> + <visible>Player.HasMedia + ![Window.IsVisible(busydialog) | Window.IsVisible(Notification) | Window.IsVisible(volumebar)]</visible> <control type="image"> <posx>0</posx> <posy>0</posy> @@ -565,9 +577,28 @@ <texture border="2">separator.png</texture> <colordiffuse>FF464646</colordiffuse> </control> + <control type="button"> + <description>Volume Button</description> + <posx>13</posx> + <posy>20</posy> + <width>40</width> + <height>40</height> + <label>-</label> + <texturenofocus>osd_volume.png</texturenofocus> + <texturefocus colordiffuse="blue">osd_volume.png</texturefocus> + <onclick>ActivateWindow(1112)</onclick> + </control> + <control type="image"> + <posx>64</posx> + <posy>0</posy> + <width>2</width> + <height>78</height> + <texture border="2">separator.png</texture> + <colordiffuse>FF464646</colordiffuse> + </control> <control type="togglebutton"> <description>Play Button</description> - <posx>13</posx> + <posx>77</posx> <posy>20</posy> <width>40</width> <height>40</height> @@ -580,104 +611,107 @@ <onclick>PlayerControl(Play)</onclick> </control> <control type="image"> - <posx>64</posx> + <posx>128</posx> <posy>0</posy> <width>2</width> <height>78</height> <texture border="2">separator.png</texture> <colordiffuse>FF464646</colordiffuse> </control> - <control type="progress"> - <description>Progressbar</description> - <posx>66</posx> - <posy>73</posy> - <width>368</width> - <height>5</height> - <info>Player.Progress</info> - <texturebg colordiffuse="grey3">white.png</texturebg> - <midtexture colordiffuse="blue">white.png</midtexture> - </control> - <control type="button"> - <posx>76</posx> - <posy>0</posy> - <width>348</width> - <height>80</height> - <texturefocus>-</texturefocus> - <texturenofocus>-</texturenofocus> - <onclick condition="Player.HasAudio">ActivateWindow(Visualisation)</onclick> - <onclick condition="Player.HasVideo">ActivateWindow(FullscreenVideo)</onclick> - </control> - <control type="fadelabel"> - <posx>70</posx> - <posy>16</posy> - <width>360</width> - <height>20</height> - <scrollout>false</scrollout> - <pauseatend>3000</pauseatend> - <label>[B]$INFO[MusicPlayer.Title]$INFO[VideoPlayer.Title][/B]</label> - <align>center</align> - <aligny>center</aligny> - <font>font20</font> - <textcolor>blue</textcolor> - </control> - <control type="fadelabel"> - <posx>70</posx> - <posy>45</posy> - <width>360</width> - <height>15</height> - <scrollout>false</scrollout> - <pauseatend>3000</pauseatend> - <label>[B]$INFO[MusicPlayer.Artist][/B]</label> - <align>center</align> - <aligny>center</aligny> - <font>font20</font> - <textcolor>white</textcolor> - <visible>Player.HasAudio</visible> - </control> - <control type="fadelabel"> - <posx>70</posx> - <posy>45</posy> - <width>360</width> - <height>15</height> - <scrollout>false</scrollout> - <pauseatend>3000</pauseatend> - <label>[B]$INFO[VideoPlayer.Year] - $INFO[VideoPlayer.Duration][/B]</label> - <align>center</align> - <aligny>center</aligny> - <font>font20</font> - <textcolor>white</textcolor> - <visible>Player.HasVideo + VideoPlayer.Content(Movies)</visible> - </control> - <control type="fadelabel"> - <posx>70</posx> - <posy>45</posy> - <width>360</width> - <height>15</height> - <scrollout>false</scrollout> - <pauseatend>3000</pauseatend> - <label>[B]$INFO[VideoPlayer.TVShowTitle][/B]</label> - <align>center</align> - <aligny>center</aligny> - <font>font20</font> - <textcolor>white</textcolor> - <visible>Player.HasVideo + VideoPlayer.Content(Episodes)</visible> - </control> - <control type="fadelabel"> - <posx>70</posx> - <posy>45</posy> - <width>360</width> - <height>15</height> - <scrollout>false</scrollout> - <pauseatend>3000</pauseatend> - <label>[B]$INFO[VideoPlayer.Artist][/B]</label> - <align>center</align> - <aligny>center</aligny> - <font>font20</font> - <textcolor>white</textcolor> - <visible>Player.HasVideo + VideoPlayer.Content(MusicVideos)</visible> + <control type="group"> + <visible>!Window.IsVisible(1112)</visible> + <control type="progress"> + <description>Progressbar</description> + <posx>130</posx> + <posy>73</posy> + <width>420</width> + <height>5</height> + <info>Player.Progress</info> + <texturebg colordiffuse="grey3">white.png</texturebg> + <midtexture colordiffuse="blue">white.png</midtexture> + </control> + <control type="button"> + <posx>140</posx> + <posy>0</posy> + <width>400</width> + <height>80</height> + <texturefocus>-</texturefocus> + <texturenofocus>-</texturenofocus> + <onclick condition="Player.HasAudio">ActivateWindow(Visualisation)</onclick> + <onclick condition="Player.HasVideo">ActivateWindow(FullscreenVideo)</onclick> + </control> + <control type="fadelabel"> + <posx>134</posx> + <posy>16</posy> + <width>412</width> + <height>20</height> + <scrollout>false</scrollout> + <pauseatend>3000</pauseatend> + <label>$VAR[MediaPlayingTitle]</label> + <align>center</align> + <aligny>center</aligny> + <font>font20</font> + <textcolor>blue</textcolor> + </control> + <control type="fadelabel"> + <posx>134</posx> + <posy>45</posy> + <width>412</width> + <height>15</height> + <scrollout>false</scrollout> + <pauseatend>3000</pauseatend> + <label>[B]$INFO[MusicPlayer.Artist][/B]</label> + <align>center</align> + <aligny>center</aligny> + <font>font20</font> + <textcolor>white</textcolor> + <visible>Player.HasAudio</visible> + </control> + <control type="fadelabel"> + <posx>134</posx> + <posy>45</posy> + <width>412</width> + <height>15</height> + <scrollout>false</scrollout> + <pauseatend>3000</pauseatend> + <label>[B]$INFO[VideoPlayer.Year] - $INFO[VideoPlayer.Duration][/B]</label> + <align>center</align> + <aligny>center</aligny> + <font>font20</font> + <textcolor>white</textcolor> + <visible>Player.HasVideo + VideoPlayer.Content(Movies)</visible> + </control> + <control type="fadelabel"> + <posx>134</posx> + <posy>45</posy> + <width>412</width> + <height>15</height> + <scrollout>false</scrollout> + <pauseatend>3000</pauseatend> + <label>[B]$INFO[VideoPlayer.TVShowTitle][/B]</label> + <align>center</align> + <aligny>center</aligny> + <font>font20</font> + <textcolor>white</textcolor> + <visible>Player.HasVideo + VideoPlayer.Content(Episodes)</visible> + </control> + <control type="fadelabel"> + <posx>134</posx> + <posy>45</posy> + <width>412</width> + <height>15</height> + <scrollout>false</scrollout> + <pauseatend>3000</pauseatend> + <label>[B]$INFO[VideoPlayer.Artist][/B]</label> + <align>center</align> + <aligny>center</aligny> + <font>font20</font> + <textcolor>white</textcolor> + <visible>Player.HasVideo + VideoPlayer.Content(MusicVideos)</visible> + </control> </control> <control type="image"> - <posx>434</posx> + <posx>550</posx> <posy>0</posy> <width>2</width> <height>78</height> @@ -686,17 +720,36 @@ </control> <control type="button"> <description>Next Button</description> - <posx>447</posx> + <posx>563</posx> <posy>20</posy> <width>40</width> <height>40</height> <label>-</label> <texturenofocus>osd_next.png</texturenofocus> - <texturefocus colordiffuse="blue">osd_ext.png</texturefocus> + <texturefocus colordiffuse="blue">osd_next.png</texturefocus> <onclick>PlayerControl(Next)</onclick> </control> <control type="image"> - <posx>498</posx> + <posx>614</posx> + <posy>0</posy> + <width>2</width> + <height>78</height> + <texture border="2">separator.png</texture> + <colordiffuse>FF464646</colordiffuse> + </control> + <control type="button"> + <description>Stop Button</description> + <posx>627</posx> + <posy>20</posy> + <width>40</width> + <height>40</height> + <label>-</label> + <texturenofocus>osd_stop.png</texturenofocus> + <texturefocus colordiffuse="blue">osd_stop.png</texturefocus> + <onclick>PlayerControl(Stop)</onclick> + </control> + <control type="image"> + <posx>678</posx> <posy>0</posy> <width>2</width> <height>78</height> @@ -734,7 +787,7 @@ </control> </control> </include> - <include name="MediaBladeLeft"> + <include name="SideMenu"> <control type="group"> <posx>0</posx> <posy>80</posy> @@ -1036,9 +1089,9 @@ <align>center</align> <aligny>center</aligny> </include> - <include name="DropdownMenu"> + <include name="PopupMenu"> <control type="group"> - <visible>!IsEmpty(Window(Home).Property(DropdownMenuVisible))</visible> + <visible>!IsEmpty(Window(Home).Property(PopupMenuVisible))</visible> <include>VisibleFadeEffect</include> <animation effect="fade" time="250">WindowClose</animation> <control type="button"> @@ -1049,7 +1102,7 @@ <height>960</height> <texturenofocus>-</texturenofocus> <texturefocus>-</texturefocus> - <onclick>ClearProperty(DropdownMenuVisible,Home)</onclick> + <onclick>ClearProperty(PopupMenuVisible,Home)</onclick> </control> <control type="group"> <posx>360r</posx> @@ -1196,7 +1249,7 @@ <textwidth>240</textwidth> <label>589</label> <include>MenuButtonCommonValues</include> - <onclick>ClearProperty(DropdownMenuVisible,Home)</onclick> + <onclick>ClearProperty(PopupMenuVisible,Home)</onclick> </control> <control type="button" id="1467"> <description>Current Playlist</description> @@ -1309,13 +1362,13 @@ <description>Slideshow</description> <include>MenuButtonCommonValues</include> <label>108</label> - <onclick>ClearProperty(DropdownMenuVisible,Home)</onclick> + <onclick>ClearProperty(PopupMenuVisible,Home)</onclick> </control> <control type="button" id="7"> <description>Recersive Slideshow</description> <include>MenuButtonCommonValues</include> <label>361</label> - <onclick>ClearProperty(DropdownMenuVisible,Home)</onclick> + <onclick>ClearProperty(PopupMenuVisible,Home)</onclick> </control> <control type="radiobutton" id="9"> <description>Randomize Toggle</description> diff --git a/addons/skin.estouchy/xml/IncludesPlayerControls.xml b/addons/skin.estouchy/xml/IncludesPlayerControls.xml index cebe0c4d20..27b53fc270 100644 --- a/addons/skin.estouchy/xml/IncludesPlayerControls.xml +++ b/addons/skin.estouchy/xml/IncludesPlayerControls.xml @@ -30,68 +30,84 @@ <include>VisibleFadeEffect</include> </control> <control type="group"> - <posx>0</posx> + <posx>300</posx> <posy>10</posy> <include>VisibleFadeEffect</include> <include>16x9_xPos_Relocation</include> - <visible>![Window.IsVisible(busydialog) | Window.IsVisible(extendedprogressdialog) | Window.IsVisible(Notification) | Window.IsVisible(volumebar) | Window.IsVisible(1112)]</visible> - <control type="label"> - <posx>250</posx> - <posy>0</posy> - <width>180</width> - <height>32</height> - <font>font20_title</font> - <aligny>center</aligny> - <label>$INFO[Player.Time(hh:mm:ss)]</label> - </control> - <control type="label"> - <posx>250</posx> - <posy>0</posy> - <width>780</width> - <height>32</height> - <font>font20_title</font> - <align>center</align> - <aligny>center</aligny> - <label>$VAR[SeekLabel]</label> - </control> - <control type="label"> - <posx>1030</posx> - <posy>0</posy> - <width>180</width> - <height>32</height> - <font>font20_title</font> - <align>right</align> - <aligny>center</aligny> - <label>$INFO[Player.Duration(hh:mm:ss)]</label> - </control> - <control type="progress"> - <description>Progressbar</description> - <posx>250</posx> - <posy>40</posy> - <width>780</width> - <height>12</height> - <info>Player.Cache</info> - <midtexture colordiffuse="grey2">white.png</midtexture> - <texturebg>-</texturebg> - </control> - <control type="progress"> - <description>Progressbar</description> - <posx>250</posx> - <posy>40</posy> - <width>780</width> - <height>12</height> - <info>Player.Progress</info> + <visible>![Window.IsVisible(busydialog) | Window.IsVisible(extendedprogressdialog) | Window.IsVisible(Notification) | Window.IsVisible(volumebar)]</visible> + <control type="button"> + <description>Volume Button</description> + <posx>0</posx> + <posy>10</posy> + <width>40</width> + <height>40</height> + <label>-</label> + <texturenofocus>osd_volume.png</texturenofocus> + <texturefocus colordiffuse="blue">osd_volume.png</texturefocus> + <onclick>ActivateWindow(1112)</onclick> </control> - <control type="slider" id="87"> - <description>Seek Slider</description> - <posx>250</posx> - <posy>30</posy> - <width>780</width> - <height>32</height> - <action>seek</action> - <texturesliderbar>-</texturesliderbar> - <textureslidernib>-</textureslidernib> - <textureslidernibfocus>-</textureslidernibfocus> + <control type="group"> + <posx>64</posx> + <include>VisibleFadeEffect</include> + <visible>!Window.IsVisible(1112)</visible> + <control type="label"> + <posx>0</posx> + <posy>0</posy> + <width>180</width> + <height>32</height> + <font>font20_title</font> + <aligny>center</aligny> + <label>$INFO[Player.Time(hh:mm:ss)]</label> + </control> + <control type="label"> + <posx>0</posx> + <posy>0</posy> + <width>552</width> + <height>32</height> + <font>font20_title</font> + <align>center</align> + <aligny>center</aligny> + <label>$VAR[SeekLabel]</label> + </control> + <control type="label"> + <posx>552</posx> + <posy>0</posy> + <width>180</width> + <height>32</height> + <font>font20_title</font> + <align>right</align> + <aligny>center</aligny> + <label>$INFO[Player.Duration(hh:mm:ss)]</label> + </control> + <control type="progress"> + <description>Progressbar</description> + <posx>0</posx> + <posy>40</posy> + <width>552</width> + <height>12</height> + <info>Player.Cache</info> + <midtexture colordiffuse="grey2">white.png</midtexture> + <texturebg>-</texturebg> + </control> + <control type="progress"> + <description>Progressbar</description> + <posx>0</posx> + <posy>40</posy> + <width>552</width> + <height>12</height> + <info>Player.Progress</info> + </control> + <control type="slider" id="87"> + <description>Seek Slider</description> + <posx>0</posx> + <posy>30</posy> + <width>552</width> + <height>32</height> + <action>seek</action> + <texturesliderbar>-</texturesliderbar> + <textureslidernib>-</textureslidernib> + <textureslidernibfocus>-</textureslidernibfocus> + </control> </control> </control> <control type="group"> @@ -117,6 +133,13 @@ <texturenofocus>icon_dialog_close.png</texturenofocus> </control> </control> + <control type="image"> + <posx>0</posx> + <posy>80r</posy> + <include>ScreenWidth</include> + <height>80</height> + <texture flipy="true">header.png</texture> + </control> <control type="group"> <posx>0</posx> <posy>230r</posy> @@ -135,25 +158,25 @@ <description>cover image</description> <posx>0</posx> <posy>0</posy> - <width>150</width> - <height>150</height> + <width>230</width> + <height>230</height> <texture>$VAR[OSDImage]</texture> <aspectratio>keep</aspectratio> <fadetime>IconCrossfadeTime</fadetime> </control> <control type="label"> - <posx>170</posx> - <posy>5</posy> - <width>920</width> + <posx>250</posx> + <posy>10</posy> + <width>750</width> <height>25</height> <align>left</align> - <font>font20</font> + <font>font25</font> <label>$VAR[OSDLabel1]</label> </control> <control type="label"> - <posx>200</posx> - <posy>38</posy> - <width>1080</width> + <posx>280</posx> + <posy>50</posy> + <width>720</width> <height>30</height> <font>font30_title</font> <align>left</align> @@ -161,42 +184,42 @@ <label>$VAR[OSDLabel2]</label> </control> <control type="label"> - <posx>170</posx> - <posy>70</posy> - <width>1110</width> + <posx>250</posx> + <posy>85</posy> + <width>750</width> <height>25</height> <align>left</align> - <font>font20</font> + <font>font24</font> <label>$VAR[OSDLabel3]</label> </control> <control type="group"> - <posx>170</posx> - <posy>100</posy> - <width>600</width> - <height>48</height> + <posx>275r</posx> + <posy>30</posy> + <width>275</width> + <height>100</height> <visible>Window.IsVisible(MusicOSD)</visible> <control type="image"> - <description>Audio Codec Image</description> + <description>Rating</description> <posx>0</posx> <posy>0</posy> - <width>100</width> - <height>44</height> - <texture>$INFO[MusicPlayer.Codec,flagging/audio/,.png]</texture> - </control> - <control type="image"> - <description>Rating</description> - <posx>115</posx> - <posy>8</posy> <width>256</width> <height>32</height> <texture fallback="rating/0.png">$INFO[MusicPlayer.UserRating,rating/,.png]</texture> </control> + <control type="image"> + <description>Audio Codec Image</description> + <posx>156</posx> + <posy>32</posy> + <width>100</width> + <height>44</height> + <texture>$INFO[MusicPlayer.Codec,flagging/audio/,.png]</texture> + </control> </control> <control type="group"> - <posx>170</posx> - <posy>100</posy> - <width>600</width> - <height>48</height> + <posx>230r</posx> + <posy>30</posy> + <width>250</width> + <height>100</height> <visible>Window.IsVisible(VideoOSD)</visible> <control type="image"> <description>Video Codec Image</description> @@ -216,16 +239,16 @@ </control> <control type="image"> <description>Audio Codec Image</description> - <posx>230</posx> - <posy>0</posy> + <posx>0</posx> + <posy>40</posy> <width>100</width> <height>44</height> <texture>$INFO[VideoPlayer.AudioCodec,flagging/audio/,.png]</texture> </control> <control type="image"> <description>Audio Codec Image</description> - <posx>345</posx> - <posy>0</posy> + <posx>115</posx> + <posy>40</posy> <width>100</width> <height>44</height> <texture>$INFO[VideoPlayer.AudioChannels,flagging/audio/,.png]</texture> @@ -243,7 +266,7 @@ </control> <control type="label"> <posx>20r</posx> - <posy>115</posy> + <posy>122</posy> <width>840</width> <height>25</height> <label>$VAR[OSDLabel5]</label> @@ -255,13 +278,6 @@ </control> <control type="group"> <posy>80r</posy> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <include>ScreenWidth</include> - <height>80</height> - <texture flipy="true">header.png</texture> - </control> <control type="grouplist"> <posx>0</posx> <posy>15</posy> @@ -328,8 +344,8 @@ </control> </control> </control> - <include>MediaSubMenu</include> - <include name="DropdownMenu"> + <include>BottomMenu</include> + <include name="PopupMenu"> <param name="panel-posy">0</param> <param name="panel-height">560</param> </include> diff --git a/addons/skin.estouchy/xml/LoginScreen.xml b/addons/skin.estouchy/xml/LoginScreen.xml index 2786d656db..e5c64219eb 100644 --- a/addons/skin.estouchy/xml/LoginScreen.xml +++ b/addons/skin.estouchy/xml/LoginScreen.xml @@ -3,8 +3,9 @@ <defaultcontrol></defaultcontrol> <controls> <include>CommonBackground</include> - <include>CommonBackgroundOverlay</include> + <include>Header</include> <include>CommonNowPlaying</include> + <include>Footer</include> <control type="label"> <description>Window label</description> <include>MediaWindowTitleCommons</include> @@ -130,7 +131,7 @@ </control> <control type="panel" id="9002"> <include>VisibleFadeEffect</include> - <include>SubMenuCommonLayout</include> + <include>BottomMenuLayout</include> <content> <item> <label>13012</label> diff --git a/addons/skin.estouchy/xml/MusicVisualisation.xml b/addons/skin.estouchy/xml/MusicVisualisation.xml index 5c0b29d4d9..895111c095 100644 --- a/addons/skin.estouchy/xml/MusicVisualisation.xml +++ b/addons/skin.estouchy/xml/MusicVisualisation.xml @@ -2,7 +2,7 @@ <window> <defaultcontrol>-</defaultcontrol> <onload>ActivateWindow(MusicOSD)</onload> - <onunload>ClearProperty(DropdownMenuVisible,Home)</onunload> + <onunload>ClearProperty(PopupMenuVisible,Home)</onunload> <controls> <control type="image"> <description>fanart</description> diff --git a/addons/skin.estouchy/xml/MyMusicNav.xml b/addons/skin.estouchy/xml/MyMusicNav.xml index 7be1b1a8c9..1b53a1cd0c 100644 --- a/addons/skin.estouchy/xml/MyMusicNav.xml +++ b/addons/skin.estouchy/xml/MyMusicNav.xml @@ -2,12 +2,13 @@ <window> <defaultcontrol always="true">50</defaultcontrol> <views>50,500,550</views> - <onunload>ClearProperty(DropdownMenuVisible,Home)</onunload> + <onunload>ClearProperty(PopupMenuVisible,Home)</onunload> <controls> <include>CommonBackground</include> - <include>MediaBladeLeft</include> - <include>CommonBackgroundOverlay</include> + <include>SideMenu</include> + <include>Header</include> <include>CommonNowPlaying</include> + <include>Footer</include> <control type="label"> <description>Window label</description> <include>MediaWindowTitleCommons</include> @@ -45,8 +46,8 @@ </include> </control> <include>ScrollBarCommons</include> - <include>MediaSubMenu</include> - <include name="DropdownMenu"> + <include>BottomMenu</include> + <include name="PopupMenu"> <param name="panel-posy">80</param> <param name="panel-height">480</param> </include> diff --git a/addons/skin.estouchy/xml/MyMusicPlaylistEditor.xml b/addons/skin.estouchy/xml/MyMusicPlaylistEditor.xml index 0c07d815b1..d0eb03b3b9 100644 --- a/addons/skin.estouchy/xml/MyMusicPlaylistEditor.xml +++ b/addons/skin.estouchy/xml/MyMusicPlaylistEditor.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <window> <defaultcontrol allways="true">6</defaultcontrol> - <onunload>ClearProperty(DropdownMenuVisible,Home)</onunload> + <onunload>ClearProperty(PopupMenuVisible,Home)</onunload> <controls> <include>CommonBackground</include> - <include>CommonBackgroundOverlay</include> + <include>Header</include> <include>CommonNowPlaying</include> + <include>Footer</include> <control type="label"> <description>Window label</description> <include>MediaWindowTitleCommons</include> @@ -279,7 +280,7 @@ </control> <control type="panel" id="9002"> <include>VisibleFadeEffect</include> - <include>SubMenuCommonLayout</include> + <include>BottomMenuLayout</include> <content> <item> <label>31200</label> @@ -293,7 +294,7 @@ </item> </content> </control> - <include name="DropdownMenu"> + <include name="PopupMenu"> <param name="panel-posy">320</param> <param name="panel-height">240</param> </include> diff --git a/addons/skin.estouchy/xml/MyPVRChannels.xml b/addons/skin.estouchy/xml/MyPVRChannels.xml index b8f45c399a..2f74bd587f 100644 --- a/addons/skin.estouchy/xml/MyPVRChannels.xml +++ b/addons/skin.estouchy/xml/MyPVRChannels.xml @@ -2,12 +2,13 @@ <window> <defaultcontrol always="true">50</defaultcontrol> <views>50</views> - <onunload>ClearProperty(DropdownMenuVisible,Home)</onunload> + <onunload>ClearProperty(PopupMenuVisible,Home)</onunload> <controls> <include>CommonBackground</include> - <include>MediaBladeLeft</include> - <include>CommonBackgroundOverlay</include> + <include>SideMenu</include> + <include>Header</include> <include>CommonNowPlaying</include> + <include>Footer</include> <control type="label"> <description>Window label</description> <include>MediaWindowTitleCommons</include> @@ -44,8 +45,8 @@ </include> </control> <include>ScrollBarCommons</include> - <include>MediaSubMenu</include> - <include name="DropdownMenu"> + <include>BottomMenu</include> + <include name="PopupMenu"> <param name="panel-posy">-80</param> <param name="panel-height">640</param> </include> diff --git a/addons/skin.estouchy/xml/MyPVRGuide.xml b/addons/skin.estouchy/xml/MyPVRGuide.xml index 8717b4caeb..eaaea84002 100644 --- a/addons/skin.estouchy/xml/MyPVRGuide.xml +++ b/addons/skin.estouchy/xml/MyPVRGuide.xml @@ -2,12 +2,13 @@ <window> <defaultcontrol always="true">10</defaultcontrol> <views>10,11,12,13</views> - <onunload>ClearProperty(DropdownMenuVisible,Home)</onunload> + <onunload>ClearProperty(PopupMenuVisible,Home)</onunload> <controls> <include>CommonBackground</include> - <include>MediaBladeLeft</include> - <include>CommonBackgroundOverlay</include> + <include>SideMenu</include> + <include>Header</include> <include>CommonNowPlaying</include> + <include>Footer</include> <control type="label"> <description>Window label</description> <include>MediaWindowTitleCommons</include> @@ -73,8 +74,8 @@ </include> </control> <include>ScrollBarCommons</include> - <include>MediaSubMenu</include> - <include name="DropdownMenu"> + <include>BottomMenu</include> + <include name="PopupMenu"> <param name="panel-posy">0</param> <param name="panel-height">560</param> </include> diff --git a/addons/skin.estouchy/xml/MyPVRRecordings.xml b/addons/skin.estouchy/xml/MyPVRRecordings.xml index fbe814251d..e8777ccecc 100644 --- a/addons/skin.estouchy/xml/MyPVRRecordings.xml +++ b/addons/skin.estouchy/xml/MyPVRRecordings.xml @@ -2,12 +2,13 @@ <window> <defaultcontrol always="true">50</defaultcontrol> <views>50</views> - <onunload>ClearProperty(DropdownMenuVisible,Home)</onunload> + <onunload>ClearProperty(PopupMenuVisible,Home)</onunload> <controls> <include>CommonBackground</include> - <include>MediaBladeLeft</include> - <include>CommonBackgroundOverlay</include> + <include>SideMenu</include> + <include>Header</include> <include>CommonNowPlaying</include> + <include>Footer</include> <control type="label"> <description>Window label</description> <include>MediaWindowTitleCommons</include> @@ -41,8 +42,8 @@ </include> </control> <include>ScrollBarCommons</include> - <include>MediaSubMenu</include> - <include name="DropdownMenu"> + <include>BottomMenu</include> + <include name="PopupMenu"> <param name="panel-posy">-80</param> <param name="panel-height">640</param> </include> diff --git a/addons/skin.estouchy/xml/MyPVRSearch.xml b/addons/skin.estouchy/xml/MyPVRSearch.xml index 674161813a..8b9440ef5f 100644 --- a/addons/skin.estouchy/xml/MyPVRSearch.xml +++ b/addons/skin.estouchy/xml/MyPVRSearch.xml @@ -2,12 +2,13 @@ <window> <defaultcontrol always="true">50</defaultcontrol> <views>50</views> - <onunload>ClearProperty(DropdownMenuVisible,Home)</onunload> + <onunload>ClearProperty(PopupMenuVisible,Home)</onunload> <controls> <include>CommonBackground</include> - <include>MediaBladeLeft</include> - <include>CommonBackgroundOverlay</include> + <include>SideMenu</include> + <include>Header</include> <include>CommonNowPlaying</include> + <include>Footer</include> <control type="label"> <description>Window label</description> <include>MediaWindowTitleCommons</include> @@ -41,8 +42,8 @@ </include> </control> <include>ScrollBarCommons</include> - <include>MediaSubMenu</include> - <include name="DropdownMenu"> + <include>BottomMenu</include> + <include name="PopupMenu"> <param name="panel-posy">0</param> <param name="panel-height">560</param> </include> diff --git a/addons/skin.estouchy/xml/MyPVRTimers.xml b/addons/skin.estouchy/xml/MyPVRTimers.xml index 3cc7bbaa02..0a7835373c 100644 --- a/addons/skin.estouchy/xml/MyPVRTimers.xml +++ b/addons/skin.estouchy/xml/MyPVRTimers.xml @@ -2,12 +2,13 @@ <window> <defaultcontrol always="true">50</defaultcontrol> <views>50</views> - <onunload>ClearProperty(DropdownMenuVisible,Home)</onunload> + <onunload>ClearProperty(PopupMenuVisible,Home)</onunload> <controls> <include>CommonBackground</include> - <include>MediaBladeLeft</include> - <include>CommonBackgroundOverlay</include> + <include>SideMenu</include> + <include>Header</include> <include>CommonNowPlaying</include> + <include>Footer</include> <control type="label"> <description>Window label</description> <include>MediaWindowTitleCommons</include> @@ -41,8 +42,8 @@ </include> </control> <include>ScrollBarCommons</include> - <include>MediaSubMenu</include> - <include name="DropdownMenu"> + <include>BottomMenu</include> + <include name="PopupMenu"> <param name="panel-posy">0</param> <param name="panel-height">560</param> </include> diff --git a/addons/skin.estouchy/xml/MyPics.xml b/addons/skin.estouchy/xml/MyPics.xml index f894803afa..c83ef0181f 100644 --- a/addons/skin.estouchy/xml/MyPics.xml +++ b/addons/skin.estouchy/xml/MyPics.xml @@ -2,12 +2,13 @@ <window> <defaultcontrol always="true">50</defaultcontrol> <views>50,500</views> - <onunload>ClearProperty(DropdownMenuVisible,Home)</onunload> + <onunload>ClearProperty(PopupMenuVisible,Home)</onunload> <controls> <include>CommonBackground</include> - <include>MediaBladeLeft</include> - <include>CommonBackgroundOverlay</include> + <include>SideMenu</include> + <include>Header</include> <include>CommonNowPlaying</include> + <include>Footer</include> <control type="label"> <description>Window label</description> <include>MediaWindowTitleCommons</include> @@ -35,8 +36,8 @@ </include> </control> <include>ScrollBarCommons</include> - <include>MediaSubMenu</include> - <include name="DropdownMenu"> + <include>BottomMenu</include> + <include name="PopupMenu"> <param name="panel-posy">160</param> <param name="panel-height">400</param> </include> diff --git a/addons/skin.estouchy/xml/MyPlaylist.xml b/addons/skin.estouchy/xml/MyPlaylist.xml index 08e509da15..f6037b8449 100644 --- a/addons/skin.estouchy/xml/MyPlaylist.xml +++ b/addons/skin.estouchy/xml/MyPlaylist.xml @@ -2,14 +2,14 @@ <window> <defaultcontrol always="true">50</defaultcontrol> <views>50,500,550</views> - <onunload>ClearProperty(DropdownMenuVisible,Home)</onunload> + <onunload>ClearProperty(PopupMenuVisible,Home)</onunload> <controls> <include>CommonBackground</include> - <include>MediaBladeLeft</include> - <include>CommonBackgroundOverlay</include> + <include>SideMenu</include> + <include>Header</include> <include>CommonNowPlaying</include> + <include>Footer</include> <control type="label"> - <description>Window label</description> <include>MediaWindowTitleCommons</include> <label>$VAR[PlaylistHeader]</label> </control> @@ -44,23 +44,8 @@ <param name="textbox-width-episodes" value="810"/> </include> </control> - <control type="panel" id="9002"> - <include>VisibleFadeEffect</include> - <include>SubMenuCommonLayout</include> - <content> - <item> - <label>31200</label> - <onclick>ParentDir</onclick> - <icon>icon_button_back.png</icon> - </item> - <item> - <label>1036</label> - <onclick>ActivateWindow(Favourites)</onclick> - <icon>icon_button_favourites.png</icon> - </item> - </content> - </control> - <include name="DropdownMenu"> + <include>BottomMenu</include> + <include name="PopupMenu"> <param name="panel-posy">240</param> <param name="panel-height">320</param> </include> diff --git a/addons/skin.estouchy/xml/MyPrograms.xml b/addons/skin.estouchy/xml/MyPrograms.xml index 9e0dca8840..ec74d750ac 100644 --- a/addons/skin.estouchy/xml/MyPrograms.xml +++ b/addons/skin.estouchy/xml/MyPrograms.xml @@ -2,12 +2,13 @@ <window> <defaultcontrol always="true">50</defaultcontrol> <views>50,500,550</views> - <onunload>ClearProperty(DropdownMenuVisible,Home)</onunload> + <onunload>ClearProperty(PopupMenuVisible,Home)</onunload> <controls> <include>CommonBackground</include> - <include>MediaBladeLeft</include> - <include>CommonBackgroundOverlay</include> + <include>SideMenu</include> + <include>Header</include> <include>CommonNowPlaying</include> + <include>Footer</include> <control type="label"> <description>Window label</description> <include>MediaWindowTitleCommons</include> @@ -45,8 +46,8 @@ </include> </control> <include>ScrollBarCommons</include> - <include>MediaSubMenu</include> - <include name="DropdownMenu"> + <include>BottomMenu</include> + <include name="PopupMenu"> <param name="panel-posy">400</param> <param name="panel-height">160</param> </include> diff --git a/addons/skin.estouchy/xml/MyVideoNav.xml b/addons/skin.estouchy/xml/MyVideoNav.xml index 49f47051d1..23b8ef26cc 100644 --- a/addons/skin.estouchy/xml/MyVideoNav.xml +++ b/addons/skin.estouchy/xml/MyVideoNav.xml @@ -2,12 +2,13 @@ <window> <defaultcontrol always="true">50</defaultcontrol> <views>50,500,550</views> - <onunload>ClearProperty(DropdownMenuVisible,Home)</onunload> + <onunload>ClearProperty(PopupMenuVisible,Home)</onunload> <controls> <include>CommonBackground</include> - <include>MediaBladeLeft</include> - <include>CommonBackgroundOverlay</include> + <include>SideMenu</include> + <include>Header</include> <include>CommonNowPlaying</include> + <include>Footer</include> <control type="label"> <description>Window label</description> <include>MediaWindowTitleCommons</include> @@ -45,8 +46,8 @@ </include> </control> <include>ScrollBarCommons</include> - <include>MediaSubMenu</include> - <include name="DropdownMenu"> + <include>BottomMenu</include> + <include name="PopupMenu"> <param name="panel-posy">0</param> <param name="panel-height">560</param> </include> diff --git a/addons/skin.estouchy/xml/MyWeather.xml b/addons/skin.estouchy/xml/MyWeather.xml index d37939ac93..98a3d3c4f2 100644 --- a/addons/skin.estouchy/xml/MyWeather.xml +++ b/addons/skin.estouchy/xml/MyWeather.xml @@ -3,8 +3,9 @@ <defaultcontrol always="true">50</defaultcontrol> <controls> <include>CommonBackground</include> - <include>CommonBackgroundOverlay</include> + <include>Header</include> <include>CommonNowPlaying</include> + <include>Footer</include> <control type="label"> <description>Window label</description> <include>MediaWindowTitleCommons</include> @@ -502,9 +503,14 @@ <include>ScrollBarCommons</include> <control type="panel" id="9002"> <include>VisibleFadeEffect</include> - <include>SubMenuCommonLayout</include> + <include>BottomMenuLayout</include> <content> <item> + <label>31200</label> + <onclick>ParentDir</onclick> + <icon>icon_button_back.png</icon> + </item> + <item> <label>184</label> <onclick>Weather.Refresh</onclick> <icon>icon_button_refresh.png</icon> @@ -515,11 +521,6 @@ <icon>icon_button_city.png</icon> </item> <item> - <label>31200</label> - <onclick>ParentDir</onclick> - <icon>icon_button_back.png</icon> - </item> - <item> <label>1036</label> <onclick>ActivateWindow(Favourites)</onclick> <icon>icon_button_favourites.png</icon> diff --git a/addons/skin.estouchy/xml/Settings.xml b/addons/skin.estouchy/xml/Settings.xml index e0e9951c51..48567b3fa4 100644 --- a/addons/skin.estouchy/xml/Settings.xml +++ b/addons/skin.estouchy/xml/Settings.xml @@ -3,8 +3,9 @@ <defaultcontrol always="true">9000</defaultcontrol> <controls> <include>CommonBackground</include> - <include>CommonBackgroundOverlay</include> + <include>Header</include> <include>CommonNowPlaying</include> + <include>Footer</include> <control type="label"> <description>Window label</description> <include>MediaWindowTitleCommons</include> @@ -12,29 +13,24 @@ </control> <control type="panel" id="9002"> <include>VisibleFadeEffect</include> - <include>SubMenuCommonLayout</include> + <include>BottomMenuLayout</include> <content> <item> + <label>31200</label> + <onclick>Back</onclick> + <icon>icon_button_back.png</icon> + </item> + <item> <label>13200</label> <onclick>ActivateWindow(Profiles)</onclick> <icon>icon_button_profile.png</icon> </item> <item> - <label>7</label> - <onclick>ActivateWindow(FileManager)</onclick> - <icon>icon_button_filemanager.png</icon> - </item> - <item> <label>130</label> <onclick>ActivateWindow(SystemInfo)</onclick> <icon>icon_button_systeminfo.png</icon> </item> <item> - <label>31200</label> - <onclick>Back</onclick> - <icon>icon_button_back.png</icon> - </item> - <item> <label>1036</label> <onclick>ActivateWindow(Favourites)</onclick> <icon>icon_button_favourites.png</icon> diff --git a/addons/skin.estouchy/xml/SettingsCategory.xml b/addons/skin.estouchy/xml/SettingsCategory.xml index ad3a3e101c..86643e5224 100644 --- a/addons/skin.estouchy/xml/SettingsCategory.xml +++ b/addons/skin.estouchy/xml/SettingsCategory.xml @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <window> <defaultcontrol>3</defaultcontrol> - <onunload>ClearProperty(DropdownMenuVisible,Home)</onunload> + <onunload>ClearProperty(PopupMenuVisible,Home)</onunload> <controls> <include>CommonBackground</include> - <include>CommonBackgroundOverlay</include> + <include>Header</include> <include>CommonNowPlaying</include> <include>ScrollBarCommons</include> + <include>Footer</include> <control type="label"> <description>Window label</description> <include>MediaWindowTitleCommons</include> @@ -14,7 +15,7 @@ </control> <control type="panel" id="9002"> <include>VisibleFadeEffect</include> - <include>SubMenuCommonLayout</include> + <include>BottomMenuLayout</include> <content> <item> <label>31200</label> @@ -28,8 +29,8 @@ </item> <item> <label>5</label> - <onclick condition="IsEmpty(Window(Home).Property(DropdownMenuVisible))">SetProperty(DropdownMenuVisible,Show,Home)</onclick> - <onclick condition="!IsEmpty(Window(Home).Property(DropdownMenuVisible))">ClearProperty(DropdownMenuVisible,Home)</onclick> + <onclick condition="IsEmpty(Window(Home).Property(PopupMenuVisible))">SetProperty(PopupMenuVisible,Show,Home)</onclick> + <onclick condition="!IsEmpty(Window(Home).Property(PopupMenuVisible))">ClearProperty(PopupMenuVisible,Home)</onclick> <icon>icon_button_settings.png</icon> </item> </content> @@ -181,7 +182,7 @@ <font>-</font> <visible>false</visible> </control> - <include name="DropdownMenu"> + <include name="PopupMenu"> <param name="panel-posy">400</param> <param name="panel-height">160</param> </include> diff --git a/addons/skin.estouchy/xml/SettingsProfile.xml b/addons/skin.estouchy/xml/SettingsProfile.xml index c5fc5fe2e4..61b8defd27 100644 --- a/addons/skin.estouchy/xml/SettingsProfile.xml +++ b/addons/skin.estouchy/xml/SettingsProfile.xml @@ -3,9 +3,9 @@ <defaultcontrol always="true">2</defaultcontrol> <controls> <include>CommonBackground</include> - <include>CommonBackgroundOverlay</include> + <include>Header</include> <include>CommonNowPlaying</include> - <include>ScrollBarCommons</include> + <include>Footer</include> <control type="label"> <description>Window label</description> <include>MediaWindowTitleCommons</include> @@ -13,7 +13,7 @@ </control> <control type="panel" id="9002"> <include>VisibleFadeEffect</include> - <include>SubMenuCommonLayout</include> + <include>BottomMenuLayout</include> <content> <item> <label>31200</label> @@ -242,5 +242,6 @@ </control> </control> </control> + <include>ScrollBarCommons</include> </controls> </window> diff --git a/addons/skin.estouchy/xml/SettingsSystemInfo.xml b/addons/skin.estouchy/xml/SettingsSystemInfo.xml index 9b57b0e451..8cfc4328e3 100644 --- a/addons/skin.estouchy/xml/SettingsSystemInfo.xml +++ b/addons/skin.estouchy/xml/SettingsSystemInfo.xml @@ -3,8 +3,9 @@ <defaultcontrol always="true">95</defaultcontrol> <controls> <include>CommonBackground</include> - <include>CommonBackgroundOverlay</include> + <include>Header</include> <include>CommonNowPlaying</include> + <include>Footer</include> <control type="label"> <description>Window label</description> <include>MediaWindowTitleCommons</include> @@ -12,7 +13,7 @@ </control> <control type="panel" id="9002"> <include>VisibleFadeEffect</include> - <include>SubMenuCommonLayout</include> + <include>BottomMenuLayout</include> <content> <item> <label>31200</label> diff --git a/addons/skin.estouchy/xml/SkinSettings.xml b/addons/skin.estouchy/xml/SkinSettings.xml index 737d58fd92..0271f7b10f 100644 --- a/addons/skin.estouchy/xml/SkinSettings.xml +++ b/addons/skin.estouchy/xml/SkinSettings.xml @@ -3,9 +3,9 @@ <defaultcontrol>91</defaultcontrol> <controls> <include>CommonBackground</include> - <include>CommonBackgroundOverlay</include> + <include>Header</include> <include>CommonNowPlaying</include> - <include>ScrollBarCommons</include> + <include>Header</include> <control type="label"> <description>Window label</description> <include>MediaWindowTitleCommons</include> @@ -13,7 +13,7 @@ </control> <control type="panel" id="9002"> <include>VisibleFadeEffect</include> - <include>SubMenuCommonLayout</include> + <include>BottomMenuLayout</include> <content> <item> <label>31200</label> @@ -542,5 +542,6 @@ </control> </control> </control> + <include>ScrollBarCommons</include> </controls> </window> diff --git a/addons/skin.estouchy/xml/VideoFullScreen.xml b/addons/skin.estouchy/xml/VideoFullScreen.xml index 488dbbdd4c..3ae930562a 100644 --- a/addons/skin.estouchy/xml/VideoFullScreen.xml +++ b/addons/skin.estouchy/xml/VideoFullScreen.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <window> <defaultcontrol>-</defaultcontrol> - <onunload>ClearProperty(DropdownMenuVisible,Home)</onunload> + <onunload>ClearProperty(PopupMenuVisible,Home)</onunload> <controls> <!-- codec info --> <control type="group" id="0"> diff --git a/addons/skin.estouchy/xml/ViewsList.xml b/addons/skin.estouchy/xml/ViewsList.xml index 2173fefdd0..1cda62fed6 100644 --- a/addons/skin.estouchy/xml/ViewsList.xml +++ b/addons/skin.estouchy/xml/ViewsList.xml @@ -179,7 +179,7 @@ <height>62</height> <texture background="true">$VAR[PosterThumb]</texture> <aspectratio>keep</aspectratio> - <visible>Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | [Container.Content(Addons) + !ListItem.IsFolder] | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !IsEmpty(Container.FolderPath)]</visible> + <visible>Container.Content(Movies) | Container.Content(Seasons) | Container.Content(TVShows) | Container.Content(Episodes) | Container.Content(MusicVideos) | Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | [Container.Content(Addons) + !ListItem.IsFolder] | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !IsEmpty(Container.FolderPath)]</visible> </control> <control type="image"> <posx>4</posx> diff --git a/addons/skin.estouchy/xml/ViewsPVR.xml b/addons/skin.estouchy/xml/ViewsPVR.xml index 769612b0c7..6a3bb3f1a9 100644 --- a/addons/skin.estouchy/xml/ViewsPVR.xml +++ b/addons/skin.estouchy/xml/ViewsPVR.xml @@ -47,7 +47,7 @@ <selectedcolor>selected</selectedcolor> <align>left</align> <aligny>center</aligny> - <label>$INFO[ListItem.Label]</label> + <label>$VAR[PVRListLabel]</label> </control> <control type="label"> <posx>100</posx> @@ -117,7 +117,7 @@ <selectedcolor>selected</selectedcolor> <align>left</align> <aligny>center</aligny> - <label>$INFO[ListItem.Label]</label> + <label>$VAR[PVRListLabel]</label> </control> <control type="label"> <posx>100</posx> diff --git a/addons/skin.estouchy/xml/ViewsThumbnail.xml b/addons/skin.estouchy/xml/ViewsThumbnail.xml index 8ec35a930c..12e86219ee 100644 --- a/addons/skin.estouchy/xml/ViewsThumbnail.xml +++ b/addons/skin.estouchy/xml/ViewsThumbnail.xml @@ -32,7 +32,7 @@ <height>200</height> <texture background="true">$INFO[Listitem.Icon]</texture> <aspectratio>scale</aspectratio> - <visible>Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | [Container.Content(Addons) + !ListItem.IsFolder] | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !IsEmpty(Container.FolderPath)]</visible> + <visible>Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | Container.Content(Addons) | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !IsEmpty(Container.FolderPath)]</visible> </control> <control type="image"> <posx>67</posx> @@ -41,7 +41,7 @@ <height>86</height> <texture background="true">defaulticons/$INFO[Listitem.Icon]</texture> <aspectratio>keep</aspectratio> - <visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Container.Content(Addons) + ListItem.IsFolder] | [Window.IsVisible(Pictures) + IsEmpty(Container.FolderPath)]</visible> + <visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Window.IsVisible(Pictures) + IsEmpty(Container.FolderPath)]</visible> </control> <control type="image"> <posx>10</posx> @@ -86,7 +86,7 @@ <height>200</height> <texture background="true">$INFO[Listitem.Icon]</texture> <aspectratio>scale</aspectratio> - <visible>Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | [Container.Content(Addons) + !ListItem.IsFolder] | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !IsEmpty(Container.FolderPath)]</visible> + <visible>Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | Container.Content(Addons) | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !IsEmpty(Container.FolderPath)]</visible> </control> <control type="image"> <posx>67</posx> @@ -95,7 +95,7 @@ <height>86</height> <texture background="true">defaulticons/$INFO[Listitem.Icon]</texture> <aspectratio>keep</aspectratio> - <visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Container.Content(Addons) + ListItem.IsFolder] | [Window.IsVisible(Pictures) + IsEmpty(Container.FolderPath)]</visible> + <visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Window.IsVisible(Pictures) + IsEmpty(Container.FolderPath)]</visible> </control> <control type="image"> <posx>10</posx> |
