diff options
| author | phil65 <philipptemminghoff@gmx.de> | 2017-02-23 02:40:51 +0100 |
|---|---|---|
| committer | phil65 <philipptemminghoff@gmx.de> | 2017-02-23 02:40:51 +0100 |
| commit | a5fe2e9cdad82298ef400ecdfb517e56a9530881 (patch) | |
| tree | 0cb2d97e7dbda9e37d3738a418f23f43be30984f /addons/skin.estuary | |
| parent | 21bcf804095d48ba9b032ce068dc43683ad3fa49 (diff) | |
[estuary] sync pt. 1
Diffstat (limited to 'addons/skin.estuary')
32 files changed, 469 insertions, 429 deletions
diff --git a/addons/skin.estuary/LICENSE.txt b/addons/skin.estuary/LICENSE.txt index 1c3720cb2e..18a79f431b 100644 --- a/addons/skin.estuary/LICENSE.txt +++ b/addons/skin.estuary/LICENSE.txt @@ -1,4 +1,4 @@ -Estuary by phil65 & Piers (Team Kodi) +Estuary by phil65 (Team Kodi) Estuary Artwork is licensed under a Creative Commons Attribution-ShareAlike 4.0 Unported License. diff --git a/addons/skin.estuary/addon.xml b/addons/skin.estuary/addon.xml index 067a15475f..dde4ffae04 100644 --- a/addons/skin.estuary/addon.xml +++ b/addons/skin.estuary/addon.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<addon id="skin.estuary" version="1.9.5" name="Estuary" provider-name="phil65, Piers"> +<addon id="skin.estuary" version="2.0.0" name="Estuary" provider-name="phil65, Ichabod Fletchman"> <requires> <import addon="xbmc.gui" version="5.13.0"/> </requires> @@ -7,6 +7,7 @@ <res width="1920" height="1440" aspect="4:3" default="false" folder="xml" /> <res width="1920" height="1280" aspect="3:2" default="false" folder="xml" /> <res width="1920" height="1200" aspect="16:10" default="false" folder="xml" /> + <res width="2040" height="1080" aspect="17:9" default="false" folder="xml" /> <res width="1920" height="1080" aspect="16:9" default="true" folder="xml" /> <res width="2560" height="1080" aspect="21:9" default="false" folder="xml" /> </extension> @@ -16,7 +17,7 @@ <summary lang="cs_CZ">Motiv vzhledu Estuary od autorů phil65 a Piers. (výchozí vzhled Kodi)</summary> <summary lang="de_DE">Estuary Skin von phil65 und Piers. (Kodi Standardskin)</summary> <summary lang="el_GR">Το κέλυφος Estuary από τον phil65 και τον Pier. (προεπιλεγμένο κέλυφος του Kodi)</summary> - <summary lang="en_GB">Estuary skin by phil65 and Piers. (Kodi's default skin)</summary> + <summary lang="en_GB">Estuary skin by phil65. (Kodi's default skin)</summary> <summary lang="en_NZ">Estuary skin by phil65 and Piers. (Kodi's default skin)</summary> <summary lang="en_US">Estuary skin by phil65 and Piers. (Kodi's default skin)</summary> <summary lang="es_AR">Skin Estuary por phil65 y Piers. (Skin por defecto de Kodi)</summary> diff --git a/addons/skin.estuary/language/resource.language.en_gb/strings.po b/addons/skin.estuary/language/resource.language.en_gb/strings.po index 4da4685cf7..d10d8f1a6c 100644 --- a/addons/skin.estuary/language/resource.language.en_gb/strings.po +++ b/addons/skin.estuary/language/resource.language.en_gb/strings.po @@ -16,42 +16,42 @@ msgstr "" "Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: /1080i/Home.xml /1080i/DialogFullScreenInfo.xml +#: /xml/Home.xml /xml/DialogSeekBar.xml msgctxt "#31000" msgid "Now playing" msgstr "" -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31001" msgid "Search..." msgstr "" -#: /1080i/SkinSettings.xml +#: /xml/SkinSettings.xml msgctxt "#31002" msgid "Show media fanart as background" msgstr "" -#: /1080i/DialogVideoInfo.xml +#: /xml/DialogVideoInfo.xml msgctxt "#31003" msgid "Cinema mode" msgstr "" -#: /1080i/VideoOSD.xml +#: /xml/VideoOSD.xml msgctxt "#31004" msgid "Change mode" msgstr "" -#: /1080i/VideoOSD.xml +#: /xml/VideoOSD.xml msgctxt "#31005" msgid "Watch as 2D" msgstr "" -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31006" msgid "Random movies" msgstr "" -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31007" msgid "Unwatched movies" msgstr "" @@ -61,645 +61,651 @@ msgctxt "#31008" msgid "Enable category widgets" msgstr "" -#: /1080i/MyVideoNav.xml +#: /xml/MyVideoNav.xml msgctxt "#31009" msgid "Download icons" msgstr "" -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31010" msgid "In progress movies" msgstr "" -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31011" msgid "Most played albums" msgstr "" -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31012" msgid "Random albums" msgstr "" -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31013" msgid "Random artists" msgstr "" -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31014" msgid "Unplayed albums" msgstr "" #. home screen recordings widget: recent tv / radio recordings -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31015" msgid "Recent recordings" msgstr "" #. home screen channel widget: recently played tv channels. (please note that in some non-english languages #31018 and #31016 might not be equal) -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31016" msgid "Recently played channels" msgstr "" -#: /1080i/DialogVideoInfo.xml +#: /xml/DialogVideoInfo.xml msgctxt "#31017" msgid "Rated" msgstr "" #. home screen channel widget: recently played radio channels. (please note that in some non-english languages #31018 and #31016 might not be equal) -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31018" msgid "Recently played channels" msgstr "" -#: /1080i/Home.xml /1080i/MyWeather.xml +#: /xml/Home.xml /xml/MyWeather.xml msgctxt "#31019" msgid "Forecast" msgstr "" -#: /1080i/MyMusicNav.xml /1080i/MyPics.xml /1080i/MyVideoNav.xml +#: /xml/MyMusicNav.xml /xml/MyPics.xml /xml/MyVideoNav.xml msgctxt "#31020" msgid "Actions" msgstr "" -#: /1080i/AddonBrowser.xml /1080i/DialogPVRChannelManager.xml /1080i/Includes_MediaMenu.xml /1080i/EventLog.xml +#: /xml/AddonBrowser.xml /xml/DialogPVRChannelManager.xml /xml/Includes_MediaMenu.xml /xml/EventLog.xml msgctxt "#31021" msgid "Misc options" msgstr "" -#: /1080i/Includes_MediaMenu.xml /1080i/Includes.xml +#: /xml/Includes_MediaMenu.xml /xml/Includes.xml msgctxt "#31022" msgid "Sort by" msgstr "" -#: /1080i/Includes_MediaMenu.xml +#: /xml/Includes_MediaMenu.xml msgctxt "#31023" msgid "Viewtype" msgstr "" -#empty string with id 31024 +#: /xml/SkinSettings.xml +msgctxt "#31024" +msgid "Choose rating to display for media items" +msgstr "" -#: /1080i/DialogFavourites.xml +#: /xml/DialogFavourites.xml msgctxt "#31025" msgid "No favourites found. You can add any item from media views to this list by using the context menu." msgstr "" -#empty strings from id 31026 to 31027 +#: /xml/DialogSeekBar.xml +msgctxt "#31026" +msgid "Timeshift" +msgstr "" -#: /1080i/DialogAlbumInfo.xml /1080i/DialogVideoInfo.xml +#: /xml/DialogAlbumInfo.xml /xml/DialogVideoInfo.xml msgctxt "#31028" msgid "Show fanart" msgstr "" -#: /1080i/SettingsProfile.xml +#: /xml/SettingsProfile.xml msgctxt "#31029" msgid "Last logged in" msgstr "" -#: /1080i/SettingsSystemInfo.xml +#: /xml/SettingsSystemInfo.xml msgctxt "#31030" msgid "System memory usage" msgstr "" -#: /1080i/SettingsSystemInfo.xml +#: /xml/SettingsSystemInfo.xml msgctxt "#31031" msgid "Version info" msgstr "" -#: /1080i/EventLog.xml /1080i/Includes_MediaMenu.xml /1080i/SmartPlaylistEditor.xml +#: /xml/EventLog.xml /xml/Includes_MediaMenu.xml /xml/SmartPlaylistEditor.xml msgctxt "#31032" msgid "Order" msgstr "" -#: /1080i/DialogVideoInfo.xml /1080i/DialogSongInfo.xml +#: /xml/DialogVideoInfo.xml /xml/DialogSongInfo.xml msgctxt "#31033" msgid "Your rating" msgstr "" -#: /1080i/DialogVideoInfo.xml +#: /xml/DialogVideoInfo.xml msgctxt "#31034" msgid "Extended info" msgstr "" -#: /1080i/DialogPVRChannelManager.xml /1080i/DialogPVRChannelsOSD.xml /1080i/DialogPVRGuideOSD.xml /1080i/Variables.xml /1080i/FileBrowser.xml +#: /xml/DialogPVRChannelManager.xml /xml/DialogPVRChannelsOSD.xml /xml/DialogPVRGuideOSD.xml /xml/Variables.xml /xml/FileBrowser.xml msgctxt "#31035" msgid "Pages" msgstr "" -#: /1080i/FileBrowser.xml /1080i/Variables.xml /1080i/MyPVRRecordings.xml +#: /xml/FileBrowser.xml /xml/Variables.xml /xml/MyPVRRecordings.xml msgctxt "#31036" msgid "items" msgstr "" #empty string with id 31037 -#: /1080i/Variables.xml +#: /xml/Variables.xml msgctxt "#31038" msgid "Rewind" msgstr "" -#: /1080i/Variables.xml +#: /xml/Variables.xml msgctxt "#31039" msgid "Fast forward" msgstr "" #empty string with id 31040 -#: /1080i/Variables.xml /1080i/MyPics.xml +#: /xml/Variables.xml /xml/MyPics.xml msgctxt "#31041" msgid "Camera manufacturer" msgstr "" -#: /1080i/SmartPlaylistEditor.xml +#: /xml/SmartPlaylistEditor.xml msgctxt "#31042" msgid "Playlist options" msgstr "" -#: /1080i/SmartPlaylistEditor.xml +#: /xml/SmartPlaylistEditor.xml msgctxt "#31043" msgid "Set the type and add rules to create a smart playlist. These playlists are dynamic and include all media items from your database which apply to your chosen rules." msgstr "" -#: /1080i/DialogPVRGroupManager.xml +#: /xml/DialogPVRGroupManager.xml msgctxt "#31044" msgid "Add group" msgstr "" -#: /1080i/DialogPVRGroupManager.xml +#: /xml/DialogPVRGroupManager.xml msgctxt "#31045" msgid "Rename group" msgstr "" -#: /1080i/DialogPVRGroupManager.xml +#: /xml/DialogPVRGroupManager.xml msgctxt "#31046" msgid "Delete group" msgstr "" #empty string with id 31047 -#: /1080i/DialogVideoInfo.xml +#: /xml/DialogVideoInfo.xml msgctxt "#31048" msgid "Available" msgstr "" #empty string with id 31049 -#: /1080i/Variables.xml +#: /xml/Variables.xml msgctxt "#31050" msgid "Press [B]OK[/B] to stop" msgstr "" -#: /1080i/VideoOSD.xml +#: /xml/VideoOSD.xml msgctxt "#31051" msgid "Toggle language" msgstr "" -#: /1080i/Includes.xml +#: /xml/Includes.xml msgctxt "#31052" msgid "filtered" msgstr "" -#: /1080i/Font.xml +#: /xml/Font.xml msgctxt "#31053" msgid "Arial based" msgstr "" -#: /1080i/Variables.xml +#: /xml/Variables.xml msgctxt "#31054" msgid "Press [B]Left[/B] to rewind, or [B]Right[/B] to fast-forward" msgstr "" #empty string with id 31055 -#: /1080i/MyMusicNav.xml /1080i/MyVideoNav.xml +#: /xml/MyMusicNav.xml /xml/MyVideoNav.xml msgctxt "#31056" msgid "Go to playlist" msgstr "" -#: /1080i/SettingsProfile.xml +#: /xml/SettingsProfile.xml msgctxt "#31057" msgid "Show login screen on startup" msgstr "" -#: /1080i/SettingsProfile.xml +#: /xml/SettingsProfile.xml msgctxt "#31058" msgid "Automatic Login on startup" msgstr "" #empty strings from id 31059 to 31060 -#: /1080i/SkinSettings.xml +#: /xml/SkinSettings.xml msgctxt "#31061" msgid "Main menu items" msgstr "" -#: /1080i/SkinSettings.xml +#: /xml/SkinSettings.xml msgctxt "#31062" msgid "Choose weather fanart pack" msgstr "" -#: /1080i/Includes_MediaMenu.xml +#: /xml/Includes_MediaMenu.xml msgctxt "#31063" msgid "Sections" msgstr "" #empty string with id 31064 -#: /1080i/MyVideoPlaylist.xml +#: /xml/MyVideoPlaylist.xml msgctxt "#31065" msgid "Video playlist" msgstr "" -#: /1080i/MyMusicPlaylist.xml +#: /xml/MyMusicPlaylist.xml msgctxt "#31066" msgid "Music playlist" msgstr "" -#: /1080i/EventLog.xml +#: /xml/EventLog.xml msgctxt "#31067" msgid "Event log" msgstr "" -#: /1080i/Custom_1105_MusicOSDSettings.xml +#: /xml/Custom_1105_MusicOSDSettings.xml msgctxt "#31068" msgid "Choose presets" msgstr "" -#: /1080i/AddonBrowser.xml +#: /xml/AddonBrowser.xml msgctxt "#31069" msgid "Last Updated" msgstr "" #empty string with id 31070 -#: /1080i/DialogAddonInfo.xml +#: /xml/DialogAddonInfo.xml msgctxt "#31071" msgid "by" msgstr "" -#: /1080i/DialogButtonMenu.xml /1080i/LoginScreen.xml +#: /xml/DialogButtonMenu.xml /xml/LoginScreen.xml msgctxt "#31072" msgid "Power Options" msgstr "" #empty strings from id 31073 to 31074 -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31075" msgid "Movie sets" msgstr "" #empty strings from id 31076 to 31078 -#: /1080i/DialogVideoInfo.xml +#: /xml/DialogVideoInfo.xml msgctxt "#31079" msgid "Cast not available" msgstr "" -#: /1080i/VideoOSD.xml +#: /xml/VideoOSD.xml msgctxt "#31080" msgid "Ends at" msgstr "" #empty string with id 31081 -#: /1080i/Custom_1105_MusicOSDSettings.xml +#: /xml/Custom_1105_MusicOSDSettings.xml msgctxt "#31082" msgid "Lyrics add-on" msgstr "" -#: /1080i/Custom_1105_MusicOSDSettings.xml +#: /xml/Custom_1105_MusicOSDSettings.xml msgctxt "#31083" msgid "Lyrics add-on settings" msgstr "" -#: /1080i/Custom_1105_MusicOSDSettings.xml +#: /xml/Custom_1105_MusicOSDSettings.xml msgctxt "#31084" msgid "Visualisation settings" msgstr "" #empty strings from id 31085 to 31088 -#: /1080i/DialogPVRGroupManager.xml +#: /xml/DialogPVRGroupManager.xml msgctxt "#31089" msgid "Available groups" msgstr "" -#: /1080i/DialogVideoInfo.xml +#: /xml/DialogVideoInfo.xml msgctxt "#31090" msgid "Search trailer" msgstr "" #empty string with id 31091 -#: /1080i/VideoOSD.xml /1080i/Variables.xml +#: /xml/VideoOSD.xml /xml/Variables.xml msgctxt "#31092" msgid "Video menu" msgstr "" -#: /1080i/SkinSettings.xml +#: /xml/SkinSettings.xml msgctxt "#31093" msgid "Show weather info in top bar" msgstr "" #empty string with id 31094 -#: /1080i/SkinSettings.xml +#: /xml/SkinSettings.xml msgctxt "#31095" msgid "Use slide animations" msgstr "" -#: /1080i/DialogSubtitles.xml +#: /xml/DialogSubtitles.xml msgctxt "#31096" msgid "Local subtitle available" msgstr "" -#: /1080i/DialogPVRChannelManager.xml +#: /xml/DialogPVRChannelManager.xml msgctxt "#31097" msgid "Channel options" msgstr "" -#: /1080i/LoginScreen.xml +#: /xml/LoginScreen.xml msgctxt "#31098" msgid "Select your Kodi user profile[CR]to login and continue" msgstr "" #. viewtype name -#: /1080i/View_52_IconWall.xml +#: /xml/View_52_IconWall.xml msgctxt "#31099" msgid "IconWall" msgstr "" #. viewtype name -#: /1080i/View_53_Shift.xml +#: /xml/View_53_Shift.xml msgctxt "#31100" msgid "Shift" msgstr "" #. viewtype name -#: /1080i/View_54_InfoWall.xml +#: /xml/View_54_InfoWall.xml msgctxt "#31101" msgid "InfoWall" msgstr "" #. viewtype name -#: /1080i/View_500_Wall.xml +#: /xml/View_500_Wall.xml msgctxt "#31102" msgid "Wall" msgstr "" -#: /1080i/SmartPlaylistRule.xml +#: /xml/SmartPlaylistRule.xml msgctxt "#31103" msgid "Enter text here..." msgstr "" -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31104" msgid "Your library is currently empty. In order to populate it with your personal media, enter \"Files\" section, add a media source and configure it. After the source has been added and indexed you will be able to browse your library." msgstr "" -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31105" msgid "Add video sources and set the appropriate content type in order to populate your video libraries." msgstr "" -#: /1080i/Variables.xml +#: /xml/Variables.xml msgctxt "#31106" msgid "Teletext" msgstr "" #. viewtype name -#: /1080i/View_55_WideList.xml +#: /xml/View_55_WideList.xml msgctxt "#31107" msgid "WideList" msgstr "" #empty strings from id 31108 to 31109 -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31110" msgid "Enter files section" msgstr "" -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31111" msgid "View your personal pictures or download one of the many image add-ons from the official repository." msgstr "" -#: /1080i/VideoOSD.xml +#: /xml/VideoOSD.xml msgctxt "#31112" msgid "Toggle audio stream" msgstr "" -#: /1080i/Custom_1107_SearchDialog.xml +#: /xml/Custom_1107_SearchDialog.xml msgctxt "#31113" msgid "Search local library" msgstr "" -#: /1080i/Custom_1107_SearchDialog.xml /1080i/DialogMusicInfo.xml +#: /xml/Custom_1107_SearchDialog.xml /xml/DialogMusicInfo.xml msgctxt "#31114" msgid "Search YouTube" msgstr "" -#: /1080i/Custom_1107_SearchDialog.xml +#: /xml/Custom_1107_SearchDialog.xml msgctxt "#31115" msgid "Search TheMovieDB" msgstr "" -#: /1080i/Includes_Home.xml +#: /xml/Includes_Home.xml msgctxt "#31116" msgid "Remove this main menu item" msgstr "" -#: /1080i/MyVideoNav.xml +#: /xml/MyVideoNav.xml msgctxt "#31117" msgid "Edit nodes" msgstr "" -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31118" msgid "Enter add-on browser" msgstr "" -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31119" msgid "You do not have any add-ons installed yet. Visit our add-on browser to browse through our collection and improve your Kodi experience." msgstr "" -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31120" msgid "You did not set up a weather provider yet. In order to view weather information, choose a weather provider and set up your location." msgstr "" -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31121" msgid "Set weather provider" msgstr "" -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31122" msgid "Unwatched TV Shows" msgstr "" -#: /1080i/DialogVideoInfo.xml +#: /xml/DialogVideoInfo.xml msgctxt "#31123" msgid "Same director" msgstr "" -#: /1080i/MyPics.xml +#: /xml/MyPics.xml msgctxt "#31124" msgid "Show images on map" msgstr "" -#: /1080i/DialogVideoInfo.xml +#: /xml/DialogVideoInfo.xml msgctxt "#31125" msgid "Press up for actor info" msgstr "" -#: /1080i/DialogVideoInfo.xml +#: /xml/DialogVideoInfo.xml msgctxt "#31126" msgid "Press OK to read plot" msgstr "" -#: /1080i/Includes_MediaMenu.xml +#: /xml/Includes_MediaMenu.xml msgctxt "#31127" msgid "Show icons" msgstr "" -#: /1080i/Variables.xml +#: /xml/Variables.xml msgctxt "#31128" msgid "Contributors" msgstr "" -#: /1080i/Variables.xml +#: /xml/Variables.xml msgctxt "#31129" msgid "General settings applying to all areas of the skin." msgstr "" -#: /1080i/Variables.xml +#: /xml/Variables.xml msgctxt "#31130" msgid "Main menu-related settings: Configure the home screen to your likings." msgstr "" -#: /1080i/SkinSettings.xml +#: /xml/SkinSettings.xml msgctxt "#31131" msgid "Choose skin fanart pack" msgstr "" #empty strings from id 31132 to 31133 -#: /1080i/DialogSeekBar.xml +#: /xml/DialogSeekBar.xml msgctxt "#31134" msgid "Remaining" msgstr "" #empty string with id 31135 -#: /1080i/DialogAddonInfo.xml +#: /xml/DialogAddonInfo.xml msgctxt "#31136" msgid "Click here to see latest changes..." msgstr "" -#: /1080i/DialogPlayerProcessInfo.xml +#: /xml/DialogPlayerProcessInfo.xml msgctxt "#31137" msgid "PVR info" msgstr "" -#: /1080i/DialogPlayerProcessInfo.xml +#: /xml/DialogPlayerProcessInfo.xml msgctxt "#31138" msgid "Player process info" msgstr "" -#: /1080i/DialogPlayerProcessInfo.xml +#: /xml/DialogPlayerProcessInfo.xml msgctxt "#31139" msgid "Video decoder" msgstr "" -#: /1080i/DialogPlayerProcessInfo.xml +#: /xml/DialogPlayerProcessInfo.xml msgctxt "#31140" msgid "Pixel format" msgstr "" -#: /1080i/DialogAddonInfo.xml +#: /xml/DialogAddonInfo.xml msgctxt "#31141" msgid "Changes for version" msgstr "" -#: /1080i/Variables.xml +#: /xml/Variables.xml msgctxt "#31142" msgid "Play speed" msgstr "" -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31143" msgid "You did not set up PVR yet. In order to use PVR, choose a PVR client addon and configure it. Please visit http://kodi.wiki/view/PVR to learn more." msgstr "" -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31144" msgid "Enter add-on browser" msgstr "" -#: /1080i/Custom_1107_SearchDialog.xml +#: /xml/Custom_1107_SearchDialog.xml msgctxt "#31145" msgid "Search add-ons" msgstr "" #empty strings from id 31146 to 31147 -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31148" msgid "Categories" msgstr "" -#: /1080i/SkinSettings.xml +#: /xml/SkinSettings.xml msgctxt "#31149" msgid "Select genre fanart pack" msgstr "" -#: /1080i/DialogAddonInfo.xml +#: /xml/DialogAddonInfo.xml msgctxt "#31150" msgid "Repository" msgstr "" -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31151" msgid "Unwatched music videos" msgstr "" -#: /1080i/Home.xml +#: /xml/Home.xml msgctxt "#31152" msgid "Random music videos" msgstr "" -#: /1080i/Includes.xml +#: /xml/Includes.xml msgctxt "#31153" msgid "You do not have any add-ons of this type installed. Enter the add-on browser to download add-ons created by our community." msgstr "" -#: /1080i/MyWeather.xml +#: /xml/MyWeather.xml msgctxt "#31154" msgid "Press OK to switch between locations" msgstr "" -#: /1080i/VideoOSDBookmarks.xml +#: /xml/VideoOSDBookmarks.xml msgctxt "#31155" msgid "No bookmarks created yet." msgstr "" -#: /1080i/SkinSettings.xml +#: /xml/SkinSettings.xml msgctxt "#31156" msgid "Choose background pattern" msgstr "" -#: /1080i/SkinSettings.xml +#: /xml/SkinSettings.xml msgctxt "#31157" msgid "Edit categories" msgstr "" -#: /1080i/SkinSettings.xml +#: /xml/SkinSettings.xml msgctxt "#31158" msgid "Touch mode" msgstr "" @@ -723,3 +729,9 @@ msgstr "" msgctxt "#31162" msgid "Play your personal games or download one of the many game add-ons from the official repository." msgstr "" + +#: /xml/Custom_1105_MusicOSDSettings.xml +msgctxt "#31163" +msgid "Show Fanart background" +msgstr "" + diff --git a/addons/skin.estuary/media/flags/videocodec/vc1.png b/addons/skin.estuary/media/flags/videocodec/vc1.png Binary files differnew file mode 100644 index 0000000000..843497f6a9 --- /dev/null +++ b/addons/skin.estuary/media/flags/videocodec/vc1.png diff --git a/addons/skin.estuary/resources/icon.png b/addons/skin.estuary/resources/icon.png Binary files differindex c438524a91..37b736cd51 100644 --- a/addons/skin.estuary/resources/icon.png +++ b/addons/skin.estuary/resources/icon.png diff --git a/addons/skin.estuary/xml/Custom_1101_SettingsList.xml b/addons/skin.estuary/xml/Custom_1101_SettingsList.xml index c767bb4e6b..81805648ec 100644 --- a/addons/skin.estuary/xml/Custom_1101_SettingsList.xml +++ b/addons/skin.estuary/xml/Custom_1101_SettingsList.xml @@ -92,6 +92,7 @@ <width>700</width> <include>DialogSettingButton</include> <label>$LOCALIZE[22006]</label> + <label2>$INFO[Player.SubtitleDelay,[B],[/B]]</label2> <onclick>SubtitleDelay</onclick> <enable>VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled</enable> </control> @@ -99,7 +100,7 @@ <width>700</width> <include>DialogSettingButton</include> <label>$LOCALIZE[31051]</label> - <label2>[B]$INFO[VideoPlayer.SubtitlesLanguage][/B]</label2> + <label2>$INFO[VideoPlayer.SubtitlesLanguage,[B],[/B]]</label2> <onclick>CycleSubtitle</onclick> <enable>VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled</enable> </control> diff --git a/addons/skin.estuary/xml/Custom_1105_MusicOSDSettings.xml b/addons/skin.estuary/xml/Custom_1105_MusicOSDSettings.xml index dabc8c8534..4148903f18 100644 --- a/addons/skin.estuary/xml/Custom_1105_MusicOSDSettings.xml +++ b/addons/skin.estuary/xml/Custom_1105_MusicOSDSettings.xml @@ -14,43 +14,73 @@ <param name="header_label" value="$LOCALIZE[5]" /> <param name="header_id" value="" /> </include> - <control type="panel" id="5000"> - <include>ButtonMenuList</include> - <content> - <item> + <control type="group"> + <left>0</left> + <top>80</top> + <control type="grouplist" id="5000"> + <width>600</width> + <height>700</height> + <itemgap>0</itemgap> + <onup>5000</onup> + <ondown>5000</ondown> + <orientation>vertical</orientation> + <control type="radiobutton" id="5001"> + <width>600</width> + <include>DialogSettingButton</include> + <label>$LOCALIZE[31163]</label> + <onclick>Skin.ToggleSetting(hide_background_fanart)</onclick> + <selected>!Skin.HasSetting(hide_background_fanart)</selected> + </control> + <control type="button" id="5002"> + <width>600</width> + <include>DialogSettingButton</include> <label>$LOCALIZE[15047]</label> <onclick>ActivateWindow(OSDAudioDSPSettings)</onclick> <visible>system.getbool(audiooutput.dspaddonsenabled)</visible> - </item> - <item> + </control> + <control type="button" id="5003"> + <width>600</width> + <include>DialogSettingButton</include> <label>$LOCALIZE[15020]</label> <onclick>ActivateWindow(AudioDSPManager)</onclick> <visible>system.getbool(audiooutput.dspaddonsenabled)</visible> - </item> - <item> - <label>$LOCALIZE[250]$INFO[Visualisation.Name,: [COLOR button_focus],[/COLOR]]</label> + </control> + <control type="button" id="5004"> + <width>600</width> + <include>DialogSettingButton</include> + <label>$LOCALIZE[250]</label> + <label2>[B]$INFO[Visualisation.Name][/B]</label2> <onclick>Dialog.Close(all)</onclick> <onclick>SendClick(500)</onclick> - </item> - <item> + </control> + <control type="button" id="5005"> + <width>600</width> + <include>DialogSettingButton</include> <label>$LOCALIZE[31084]</label> <onclick>Addon.Default.OpenSettings(xbmc.player.musicviz)</onclick> - </item> - <item> + </control> + <control type="button" id="5006"> + <width>600</width> + <include>DialogSettingButton</include> <label>$LOCALIZE[31068]</label> <onclick>ActivateWindow(visualisationpresetlist)</onclick> <visible>Visualisation.HasPresets</visible> - </item> - <item> - <label>$LOCALIZE[31082]$INFO[Skin.String(LyricScript_Path),: [COLOR button_focus],[/COLOR]]</label> + </control> + <control type="button" id="5007"> + <width>600</width> + <include>DialogSettingButton</include> + <label>$LOCALIZE[31082]</label> + <label2>[B]$INFO[Skin.String(LyricScript_Path)][/B]</label2> <onclick>Skin.SetAddon(LyricScript_Path,xbmc.python.lyrics)</onclick> - </item> - <item> + </control> + <control type="button" id="5008"> + <width>600</width> + <include>DialogSettingButton</include> <label>$LOCALIZE[31083]</label> <onclick>Addon.OpenSettings($INFO[Skin.String(LyricScript_Path)])</onclick> <visible>!String.IsEmpty(Skin.String(LyricScript_Path))</visible> - </item> - </content> + </control> + </control> </control> </control> </controls> diff --git a/addons/skin.estuary/xml/Custom_1107_SearchDialog.xml b/addons/skin.estuary/xml/Custom_1107_SearchDialog.xml index 71f705cbb5..739484332a 100644 --- a/addons/skin.estuary/xml/Custom_1107_SearchDialog.xml +++ b/addons/skin.estuary/xml/Custom_1107_SearchDialog.xml @@ -31,7 +31,7 @@ <item> <label>$LOCALIZE[31114]</label> <onclick>Dialog.Close(all)</onclick> - <onclick condition="System.hasAddon(plugin.video.youtube)">ActivateWindow(videos,plugin://plugin.video.youtube/kodion/search/input/,return)</onclick> + <onclick condition="System.hasAddon(plugin.video.youtube)">ActivateWindow(videos,"plugin://plugin.video.youtube/kodion/search/list/",return)</onclick> <onclick condition="!System.hasAddon(plugin.video.youtube)">InstallAddon(plugin.video.youtube)</onclick> </item> <item> diff --git a/addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml b/addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml index 87060da239..9edd4c00d7 100644 --- a/addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml +++ b/addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml @@ -76,6 +76,7 @@ <height>100</height> <width>auto</width> <visible>!String.isempty(Player.Duration)</visible> + <visible>Player.HasVideo</visible> <visible>!VideoPlayer.Content(LiveTV) | VideoPlayer.HasEpg</visible> </control> <control type="image"> diff --git a/addons/skin.estuary/xml/DialogContextMenu.xml b/addons/skin.estuary/xml/DialogContextMenu.xml index ab08b67f04..32b9f8489b 100644 --- a/addons/skin.estuary/xml/DialogContextMenu.xml +++ b/addons/skin.estuary/xml/DialogContextMenu.xml @@ -5,8 +5,7 @@ <coordinates> <left>0</left> <top>0</top> - <origin x="1055" y="400">Window.IsActive(Home) + String.IsEqual(Skin.AspectRatio,21:9)</origin> - <origin x="735" y="400">Window.IsActive(Home) + !String.IsEqual(Skin.AspectRatio,21:9)</origin> + <origin x="50%" y="400">Window.IsActive(Home)</origin> </coordinates> <controls> <control type="image"> @@ -27,21 +26,30 @@ <texturenofocus /> <onclick>Action(close)</onclick> </control> - <control type="image" id="999"> - <description>background image</description> - <left>0</left> - <top>0</top> - <width>450</width> - <height>780</height> - <texture colordiffuse="dialog_tint">colors/white.png</texture> - </control> - <control type="grouplist" id="996"> - <description>grouplist for context buttons</description> - <left>0</left> - <top>0</top> - <width>450</width> - <height max="780">auto</height> - <usecontrolcoords>true</usecontrolcoords> + <control type="group"> + <animation effect="slide" end="-225" time="0" condition="Window.IsActive(home)">conditional</animation> + <control type="image" id="999"> + <description>background image</description> + <left>0</left> + <top>0</top> + <width>450</width> + <height>780</height> + <texture colordiffuse="dialog_tint">colors/white.png</texture> + </control> + <control type="grouplist" id="996"> + <description>grouplist for context buttons</description> + <left>0</left> + <top>0</top> + <width>450</width> + <height max="780">auto</height> + <usecontrolcoords>true</usecontrolcoords> + </control> + <include content="UpDownArrows"> + <param name="container_id" value="996" /> + <param name="posx" value="201" /> + <param name="up_posy" value="-40" /> + <param name="down_posy" value="798" /> + </include> </control> <control type="button" id="1000"> <description>button template</description> @@ -53,11 +61,5 @@ <texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus> <texturenofocus /> </control> - <include content="UpDownArrows"> - <param name="container_id" value="996" /> - <param name="posx" value="201" /> - <param name="up_posy" value="-40" /> - <param name="down_posy" value="798" /> - </include> </controls> </window> diff --git a/addons/skin.estuary/xml/DialogKeyboard.xml b/addons/skin.estuary/xml/DialogKeyboard.xml index 9c4bbe71f3..90ff52fc2b 100644 --- a/addons/skin.estuary/xml/DialogKeyboard.xml +++ b/addons/skin.estuary/xml/DialogKeyboard.xml @@ -618,7 +618,6 @@ <top>690</top> <width>1480</width> <height>90</height> - <label>$INFO[ListItem.Label]</label> <font>font37</font> <shadowcolor>text_shadow</shadowcolor> <aligny>center</aligny> @@ -644,7 +643,6 @@ <top>770</top> <width>1480</width> <height>90</height> - <label>$INFO[ListItem.Label]</label> <font>font37</font> <shadowcolor>text_shadow</shadowcolor> <aligny>center</aligny> diff --git a/addons/skin.estuary/xml/DialogNumeric.xml b/addons/skin.estuary/xml/DialogNumeric.xml index 6ccffa7360..35b729d245 100644 --- a/addons/skin.estuary/xml/DialogNumeric.xml +++ b/addons/skin.estuary/xml/DialogNumeric.xml @@ -29,7 +29,6 @@ <width>477</width> <height>80</height> <font>font37</font> - <textcolor>button_focus</textcolor> <align>center</align> <aligny>center</aligny> </control> diff --git a/addons/skin.estuary/xml/DialogPVRChannelManager.xml b/addons/skin.estuary/xml/DialogPVRChannelManager.xml index 9d477c461a..d61c727bb2 100644 --- a/addons/skin.estuary/xml/DialogPVRChannelManager.xml +++ b/addons/skin.estuary/xml/DialogPVRChannelManager.xml @@ -11,7 +11,7 @@ <include content="DialogBackgroundCommons"> <param name="width" value="1820" /> <param name="height" value="830" /> - <param name="header_label" value="$VAR[PVRChannelMgrHeader]" /> + <param name="header_label" value="$VAR[PVRChannelMgrHeader]$INFO[Container(20).NumItems, (,)]" /> <param name="header_id" value="2" /> </include> <control type="group"> @@ -45,37 +45,40 @@ <pagecontrol>60</pagecontrol> <scrolltime>200</scrolltime> <itemlayout height="70" width="630"> - <control type="image"> - <left>0</left> - <right>0</right> - <bottom>0</bottom> - <texture colordiffuse="selected">colors/white.png</texture> - <animation effect="fade" end="20" time="0" condition="true">Conditional</animation> - <visible>ListItem.Property(Changed)</visible> - </control> - <control type="image"> - <left>15</left> - <top>10</top> - <width>50</width> - <height>50</height> - <texture>$INFO[ListItem.Property(icon)]</texture> - <aspectratio>keep</aspectratio> - </control> - <control type="image"> - <right>0</right> - <top>10</top> - <width>50</width> - <height>50</height> - <texture>OverlayLocked.png</texture> - <aspectratio>keep</aspectratio> - <visible>ListItem.Property(ParentalLocked)</visible> - </control> - <control type="label"> - <left>85</left> - <right>40</right> - <bottom>0</bottom> - <aligny>center</aligny> - <label>$INFO[ListItem.Property(Number),[B],[/B] - ]$INFO[ListItem.Property(Name)]</label> + <control type="group"> + <animation effect="fade" start="100" end="50" time="0" condition="!ListItem.Property(ActiveChannel)">Conditional</animation> + <control type="image"> + <left>0</left> + <right>0</right> + <bottom>0</bottom> + <texture colordiffuse="selected">colors/white.png</texture> + <animation effect="fade" end="20" time="0" condition="true">Conditional</animation> + <visible>ListItem.Property(Changed)</visible> + </control> + <control type="image"> + <left>15</left> + <top>10</top> + <width>50</width> + <height>50</height> + <texture>$INFO[ListItem.Property(icon)]</texture> + <aspectratio>keep</aspectratio> + </control> + <control type="image"> + <right>0</right> + <top>10</top> + <width>50</width> + <height>50</height> + <texture>OverlayLocked.png</texture> + <aspectratio>keep</aspectratio> + <visible>ListItem.Property(ParentalLocked)</visible> + </control> + <control type="label"> + <left>85</left> + <right>40</right> + <bottom>0</bottom> + <aligny>center</aligny> + <label>$INFO[ListItem.Property(Number),[B],[/B] - ]$INFO[ListItem.Property(Name)]</label> + </control> </control> </itemlayout> <focusedlayout height="70" width="630"> @@ -268,18 +271,6 @@ <param name="label" value="$LOCALIZE[222]" /> </include> </control> - <control type="label"> - <right>40</right> - <top>780</top> - <width>330</width> - <height>35</height> - <font>font12</font> - <textcolor>grey</textcolor> - <align>right</align> - <aligny>center</aligny> - <label>[COLOR=button_focus]$INFO[Container(20).NumItems][/COLOR] $LOCALIZE[19019] - [COLOR=button_focus]$INFO[Container(20).CurrentPage]/$INFO[Container(20).NumPages][/COLOR]</label> - <wrapmultiline>true</wrapmultiline> - </control> </control> </controls> </window> diff --git a/addons/skin.estuary/xml/DialogPVRInfo.xml b/addons/skin.estuary/xml/DialogPVRInfo.xml index 147cbc84c7..e5560578ba 100644 --- a/addons/skin.estuary/xml/DialogPVRInfo.xml +++ b/addons/skin.estuary/xml/DialogPVRInfo.xml @@ -38,7 +38,7 @@ <onleft>61</onleft> <onright>61</onright> <ondown>9000</ondown> - <onup>49</onup> + <onup>9000</onup> <onclick>SetProperty(TextViewer_Header,$LOCALIZE[207],home)</onclick> <onclick>SetProperty(TextViewer_Text,$ESCINFO[ListItem.Plot],home)</onclick> <onclick>ActivateWindow(1102)</onclick> @@ -63,8 +63,8 @@ <defaultcontrol>5</defaultcontrol> <onleft>9000</onleft> <onright>9000</onright> - <onup>49</onup> - <ondown>49</ondown> + <onup>61</onup> + <ondown>61</ondown> <include content="InfoDialogButton"> <param name="id" value="5" /> <param name="icon" value="icons/infodialogs/launch.png" /> diff --git a/addons/skin.estuary/xml/DialogSeekBar.xml b/addons/skin.estuary/xml/DialogSeekBar.xml index b712d68e9d..bad96dac4e 100644 --- a/addons/skin.estuary/xml/DialogSeekBar.xml +++ b/addons/skin.estuary/xml/DialogSeekBar.xml @@ -48,7 +48,7 @@ <visible>player.chaptercount</visible> </control> <control type="group"> - <visible>Player.Recording</visible> + <visible>Player.Recording + !PVR.ChannelPreviewActive</visible> <control type="image"> <top>100</top> <left>20</left> @@ -104,6 +104,50 @@ <label>$VAR[SeekLabel]</label> <shadowcolor>black</shadowcolor> </control> + <control type="group" id="6000"> + <top>-5</top> + <visible>PVR.IsTimeShift + !Player.ChannelPreviewActive</visible> + <animation effect="fade" time="300">VisibleChange</animation> + <control type="label"> + <top>0</top> + <right>20</right> + <width>400</width> + <height>50</height> + <align>right</align> + <aligny>center</aligny> + <font>font30</font> + <label>$INFO[PVR.TimeShiftEnd]</label> + </control> + <control type="label"> + <top>0</top> + <left>20</left> + <width>400</width> + <height>50</height> + <align>left</align> + <aligny>center</aligny> + <font>font30</font> + <label>$INFO[PVR.TimeShiftStart]</label> + </control> + <control type="label"> + <top>0</top> + <left>20</left> + <right>20</right> + <height>50</height> + <align>center</align> + <aligny>center</aligny> + <font>font30</font> + <label>[B]$LOCALIZE[31026][/B] $INFO[PVR.timeshiftcur]</label> + </control> + <control type="progress"> + <left>0</left> + <top>50</top> + <width>100%</width> + <height>15</height> + <info>PVR.timeshiftprogress</info> + <texturebg border="3" colordiffuse="60FFFFFF">colors/white50.png</texturebg> + <midtexture>colors/white50.png</midtexture> + </control> + </control> <control type="progress"> <left>0</left> <top>70</top> @@ -112,6 +156,7 @@ <info>Player.ProgressCache</info> <texturebg border="3" colordiffuse="60FFFFFF">colors/white50.png</texturebg> <midtexture>colors/white50.png</midtexture> + <visible>!Player.ChannelPreviewActive</visible> </control> <control type="progress"> <left>0</left> @@ -134,8 +179,9 @@ </control> </control> <control type="group"> - <visible>Player.ShowInfo + VideoPlayer.Content(LiveTV) + Window.IsActive(fullscreenvideo) + !Window.IsActive(fullscreeninfo)</visible> + <visible>Player.ShowInfo + VideoPlayer.Content(LiveTV) + Window.IsActive(fullscreenvideo)</visible> <animation effect="fade" time="400">VisibleChange</animation> + <animation effect="slide" end="0,-80" time="150" condition="Control.IsVisible(6000)">conditional</animation> <bottom>0</bottom> <height>380</height> <control type="image"> diff --git a/addons/skin.estuary/xml/DialogSelect.xml b/addons/skin.estuary/xml/DialogSelect.xml index 5307ee5e6d..3cd2c53b17 100644 --- a/addons/skin.estuary/xml/DialogSelect.xml +++ b/addons/skin.estuary/xml/DialogSelect.xml @@ -7,11 +7,11 @@ <control type="group"> <centertop>50%</centertop> <centerleft>50%</centerleft> - <height>742</height> + <height>750</height> <width>1220</width> <include content="DialogBackgroundCommons"> <param name="width" value="1220" /> - <param name="height" value="742" /> + <param name="height" value="750" /> <param name="header_label" value="" /> <param name="header_id" value="1" /> </include> @@ -19,14 +19,14 @@ <left>0</left> <top>80</top> <width>920</width> - <height>665</height> + <bottom>2</bottom> <texture border="40">buttons/dialogbutton-nofo.png</texture> </control> <control type="list" id="3"> <left>20</left> <top>100</top> <width>880</width> - <height>625</height> + <bottom>20</bottom> <onup>3</onup> <ondown>3</ondown> <onleft>9001</onleft> @@ -35,7 +35,6 @@ <scrolltime>200</scrolltime> <include content="DefaultSimpleListLayout"> <param name="width" value="880" /> - <param name="height" value="69" /> <param name="list_id" value="3" /> </include> </control> @@ -43,7 +42,7 @@ <left>20</left> <top>100</top> <width>880</width> - <height>625</height> + <bottom>20</bottom> <onup>6</onup> <ondown>6</ondown> <onleft>9001</onleft> @@ -119,7 +118,7 @@ <left>910</left> <top>100</top> <width>12</width> - <height>625</height> + <bottom>20</bottom> <onleft condition="Control.IsVisible(3)">3</onleft> <onleft condition="Control.IsVisible(6)">6</onleft> <onright>9001</onright> @@ -127,12 +126,11 @@ </control> <control type="label"> <left>925</left> - <top>695</top> + <bottom>10</bottom> <width>275</width> <height>35</height> <font>font12</font> <align>right</align> - <aligny>center</aligny> <textcolor>grey</textcolor> <label>$VAR[SelectLabel]</label> </control> diff --git a/addons/skin.estuary/xml/EventLog.xml b/addons/skin.estuary/xml/EventLog.xml index 055b7a264d..5a8e6b3f51 100644 --- a/addons/skin.estuary/xml/EventLog.xml +++ b/addons/skin.estuary/xml/EventLog.xml @@ -24,7 +24,7 @@ <viewtype label="535">list</viewtype> <pagecontrol>60</pagecontrol> <scrolltime tween="cubic" easing="out">500</scrolltime> - <itemlayout height="141" width="eventloglist_width"> + <itemlayout height="141"> <control type="image"> <left>10</left> <top>10</top> @@ -63,7 +63,7 @@ <label>$INFO[ListItem.Label2]</label> </control> </itemlayout> - <focusedlayout height="141" width="eventloglist_width"> + <focusedlayout height="141"> <control type="image"> <left>0</left> <top>0</top> diff --git a/addons/skin.estuary/xml/FileManager.xml b/addons/skin.estuary/xml/FileManager.xml index f9bfc54cc9..315d45d0c9 100644 --- a/addons/skin.estuary/xml/FileManager.xml +++ b/addons/skin.estuary/xml/FileManager.xml @@ -20,7 +20,6 @@ <param name="width" value="872" /> </include> <include content="FileManagerPanel"> - <param name="header_label" value="" /> <param name="list_id" value="20" /> <param name="scrollbar_id" value="60" /> <param name="onleft_id" value="60" /> @@ -49,8 +48,6 @@ <param name="left" value="-20" /> </include> <include content="FileManagerPanel"> - <param name="header_id" value="102" /> - <param name="header_label" value="" /> <param name="list_id" value="21" /> <param name="scrollbar_id" value="61" /> <param name="onleft_id" value="20" /> diff --git a/addons/skin.estuary/xml/Includes_Animations.xml b/addons/skin.estuary/xml/Includes_Animations.xml index ebdad5d516..1b02def93b 100644 --- a/addons/skin.estuary/xml/Includes_Animations.xml +++ b/addons/skin.estuary/xml/Includes_Animations.xml @@ -6,22 +6,22 @@ </include> <include name="Animation_DialogPopupOpenClose"> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="width_center,540" delay="160" tween="back" time="240" /> + <effect type="zoom" start="80" end="100" center="50%,50%" delay="160" tween="back" time="240" /> <effect type="fade" delay="160" end="100" time="240" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="width_center,540" easing="in" tween="back" time="240" /> + <effect type="zoom" start="100" end="80" center="50%,50%" easing="in" tween="back" time="240" /> <effect type="fade" start="100" end="0" time="240" /> </animation> <depth>DepthDialog</depth> </include> <include name="Animation_DialogPopupVisible"> <animation type="Visible" reversible="false"> - <effect type="zoom" start="80" end="100" center="width_center,540" delay="160" tween="back" time="240" /> + <effect type="zoom" start="80" end="100" center="50%,50%" delay="160" tween="back" time="240" /> <effect type="fade" delay="160" end="100" time="240" /> </animation> <animation type="Hidden" reversible="false"> - <effect type="zoom" start="100" end="80" center="width_center,540" easing="in" tween="back" time="240" /> + <effect type="zoom" start="100" end="80" center="50%,50%" easing="in" tween="back" time="240" /> <effect type="fade" start="100" end="0" time="240" /> </animation> </include> diff --git a/addons/skin.estuary/xml/Includes_Home.xml b/addons/skin.estuary/xml/Includes_Home.xml index 6fab18e247..d8d50af843 100644 --- a/addons/skin.estuary/xml/Includes_Home.xml +++ b/addons/skin.estuary/xml/Includes_Home.xml @@ -244,6 +244,7 @@ <include content="BusyListSpinner"> <param name="list_id" value="$PARAM[list_id]"/> <param name="posy" value="220"/> + <param name="visible" value="$PARAM[visible]"/> </include> <control type="panel" id="$PARAM[list_id]"> <left>0</left> @@ -866,7 +867,7 @@ </control> <control type="button" id="700$PARAM[item_id]0"> <left>1000</left> - <top>-0</top> + <top>0</top> <width>340</width> <height>100</height> <align>center</align> @@ -877,7 +878,7 @@ <animation effect="slide" end="0,-90" time="0" condition="true">Conditional</animation> <texturefocus border="21" colordiffuse="button_focus">buttons/button-fo.png</texturefocus> <font>font30_title</font> - <onclick>Weather.LocationNext</onclick> + <onclick>noop</onclick> <label>$INFO[Window(weather).Property(Map.$PARAM[item_id].Heading)]</label> <visible>Weather.IsFetched + !String.IsEmpty(Window(weather).Property(Map.$PARAM[item_id].Area)) + !String.IsEmpty(Window(weather).Property(Map.IsFetched))</visible> </control> @@ -920,4 +921,26 @@ </control> </definition> </include> + <include name="WidgetScrollbar"> + <control type="group"> + <right>0</right> + <top>80</top> + <bottom>80</bottom> + <width>60</width> + <control type="scrollbar" id="$PARAM[scrollbar_id]"> + <right>0</right> + <top>0</top> + <bottom>0</bottom> + <width>13</width> + <onleft>50</onleft> + <onright>50</onright> + <orientation>vertical</orientation> + <texturesliderbackground /> + <hitrect x="0" y="0" w="60" h="100%" /> + <animation effect="fade" start="0" end="100" time="200" delay="300">Visible</animation> + <animation effect="fade" start="100" end="0" time="200">Hidden</animation> + <animation effect="slide" end="6,0" time="300" tween="sine" easing="inout" condition="!Control.HasFocus($PARAM[scrollbar_id])">conditional</animation> + </control> + </control> + </include> </includes> diff --git a/addons/skin.estuary/xml/MusicOSD.xml b/addons/skin.estuary/xml/MusicOSD.xml index 73dee702a8..bf74ff7212 100644 --- a/addons/skin.estuary/xml/MusicOSD.xml +++ b/addons/skin.estuary/xml/MusicOSD.xml @@ -173,7 +173,8 @@ </control> </control> <control type="group"> - <top>960</top> + <bottom>0</bottom> + <height>120</height> <animation effect="fade" start="0" end="100" time="250">WindowOpen</animation> <animation effect="fade" start="100" end="0" time="250">WindowClose</animation> <control type="button" id="87"> diff --git a/addons/skin.estuary/xml/MusicVisualisation.xml b/addons/skin.estuary/xml/MusicVisualisation.xml index a88865aad0..5bf2e21b7a 100644 --- a/addons/skin.estuary/xml/MusicVisualisation.xml +++ b/addons/skin.estuary/xml/MusicVisualisation.xml @@ -17,6 +17,7 @@ <animation effect="fade" start="0" end="100" time="400">WindowOpen</animation> <animation effect="fade" start="100" end="0" time="300">WindowClose</animation> <texture background="true" colordiffuse="88FFFFFF">$INFO[Player.Art(fanart)]</texture> + <visible>!Skin.HasSetting(hide_background_fanart)</visible> </control> <control type="group"> <animation effect="fade" start="100" end="30" time="0" condition="!String.IsEmpty(Player.Art(fanart)) | Visualisation.Enabled">Conditional</animation> diff --git a/addons/skin.estuary/xml/MyMusicPlaylistEditor.xml b/addons/skin.estuary/xml/MyMusicPlaylistEditor.xml index c7c6bcf6df..451060150e 100644 --- a/addons/skin.estuary/xml/MyMusicPlaylistEditor.xml +++ b/addons/skin.estuary/xml/MyMusicPlaylistEditor.xml @@ -8,8 +8,6 @@ <include>OpenClose_Left</include> <left>302</left> <include content="FileManagerPanel"> - <param name="header_id" value="22" /> - <param name="header_label" value="$LOCALIZE[20094]" /> <param name="list_id" value="50" /> <param name="scrollbar_id" value="60" /> <param name="onleft_id" value="9000" /> @@ -61,8 +59,6 @@ <param name="left" value="-21" /> </include> <include content="FileManagerPanel"> - <param name="header_id" value="23" /> - <param name="header_label" value="$LOCALIZE[13350]" /> <param name="list_id" value="100" /> <param name="scrollbar_id" value="61" /> <param name="onleft_id" value="60" /> diff --git a/addons/skin.estuary/xml/MyPVRChannels.xml b/addons/skin.estuary/xml/MyPVRChannels.xml index 6be50f4c68..efc9fc6838 100644 --- a/addons/skin.estuary/xml/MyPVRChannels.xml +++ b/addons/skin.estuary/xml/MyPVRChannels.xml @@ -26,7 +26,7 @@ <viewtype label="List">list</viewtype> <preloaditems>1</preloaditems> <pagecontrol>60</pagecontrol> - <focusedlayout height="90" width="tvchannelslist_width"> + <focusedlayout height="90"> <control type="image"> <left>0</left> <top>0</top> @@ -66,7 +66,7 @@ <right>120</right> <aligny>top</aligny> <font>font14</font> - <animation effect="slide" start="0,0" end="0,18" time="0">Conditional</animation> + <animation effect="slide" start="0,0" end="0,14" time="0" condition="String.IsEmpty(ListItem.Title)">Conditional</animation> <label>$INFO[ListItem.Label]</label> <shadowcolor>text_shadow</shadowcolor> </control> @@ -92,7 +92,7 @@ <shadowcolor>text_shadow</shadowcolor> </control> </focusedlayout> - <itemlayout height="90" width="tvchannelslist_width"> + <itemlayout height="90"> <control type="image"> <right>20</right> <top>10</top> @@ -125,7 +125,7 @@ <aligny>top</aligny> <font>font14</font> <label>$INFO[ListItem.Label]</label> - <animation effect="slide" start="0,0" end="0,18" time="0">Conditional</animation> + <animation effect="slide" start="0,0" end="0,14" time="0" condition="String.IsEmpty(ListItem.Title)">Conditional</animation> <shadowcolor>text_shadow</shadowcolor> </control> <control type="label"> @@ -169,7 +169,7 @@ <viewtype label="List">list</viewtype> <preloaditems>1</preloaditems> <pagecontrol>60</pagecontrol> - <focusedlayout height="70" width="tvchannelslist_width"> + <focusedlayout height="70"> <control type="image"> <left>0</left> <top>0</top> @@ -224,7 +224,7 @@ <shadowcolor>text_shadow</shadowcolor> </control> </focusedlayout> - <itemlayout height="70" width="tvchannelslist_width"> + <itemlayout height="70"> <control type="progress"> <right>10</right> <top>25</top> diff --git a/addons/skin.estuary/xml/MyPVRRecordings.xml b/addons/skin.estuary/xml/MyPVRRecordings.xml index 0b6ed504d8..b7e4a07532 100644 --- a/addons/skin.estuary/xml/MyPVRRecordings.xml +++ b/addons/skin.estuary/xml/MyPVRRecordings.xml @@ -23,7 +23,7 @@ <focusposition>5</focusposition> <pagecontrol>73</pagecontrol> <scrolltime>200</scrolltime> - <focusedlayout height="80" width="tvrecordings_width"> + <focusedlayout height="80"> <control type="image"> <left>0</left> <top>0</top> @@ -58,7 +58,7 @@ <label>$INFO[ListItem.Label2]</label> </control> </focusedlayout> - <itemlayout height="80" width="tvrecordings_width"> + <itemlayout height="80"> <control type="image"> <left>21</left> <top>30</top> diff --git a/addons/skin.estuary/xml/MyPVRSearch.xml b/addons/skin.estuary/xml/MyPVRSearch.xml index 9b86368ad5..cdf314621c 100644 --- a/addons/skin.estuary/xml/MyPVRSearch.xml +++ b/addons/skin.estuary/xml/MyPVRSearch.xml @@ -25,7 +25,7 @@ <focusposition>3</focusposition> <pagecontrol>77</pagecontrol> <scrolltime>200</scrolltime> - <itemlayout height="100" width="tvchannelslist_width"> + <itemlayout height="100"> <control type="label"> <visible>String.IsEmpty(ListItem.Date)</visible> <left>120</left> @@ -66,7 +66,7 @@ </control> </control> </itemlayout> - <focusedlayout height="100" width="tvchannelslist_width"> + <focusedlayout height="100"> <control type="image"> <left>0</left> <top>0</top> diff --git a/addons/skin.estuary/xml/MyPVRTimers.xml b/addons/skin.estuary/xml/MyPVRTimers.xml index b842608142..22e30835aa 100644 --- a/addons/skin.estuary/xml/MyPVRTimers.xml +++ b/addons/skin.estuary/xml/MyPVRTimers.xml @@ -22,7 +22,7 @@ <focusposition>4</focusposition> <pagecontrol>73</pagecontrol> <scrolltime>200</scrolltime> - <itemlayout height="100" width="tvrecordings_width"> + <itemlayout height="100"> <control type="label"> <left>30</left> <top>0</top> @@ -74,7 +74,7 @@ </control> </control> </itemlayout> - <focusedlayout height="100" width="tvrecordings_width"> + <focusedlayout height="100"> <control type="image"> <left>0</left> <top>0</top> diff --git a/addons/skin.estuary/xml/Settings.xml b/addons/skin.estuary/xml/Settings.xml index fa8581d83f..a7b39a9976 100644 --- a/addons/skin.estuary/xml/Settings.xml +++ b/addons/skin.estuary/xml/Settings.xml @@ -15,167 +15,110 @@ <imagepath colordiffuse="35FFFFFF">$INFO[Skin.String(HomeFanart.path)]settings$INFO[Skin.String(HomeFanart.ext)]</imagepath> <visible>!Player.HasMedia + !String.IsEmpty(Skin.String(HomeFanart.path))</visible> </control> - <control type="panel" id="9000"> + <control type="group"> <centerleft>50%</centerleft> - <width>1720</width> - <centertop>50%</centertop> - <height>870</height> - <onleft>9000</onleft> - <onright>9000</onright> - <onup>9000</onup> - <ondown>9000</ondown> + <width>1600</width> + <top>0</top> + <bottom>0</bottom> <include>OpenClose_Right</include> - <itemlayout height="290" width="430"> - <control type="image"> - <width>430</width> - <height>270</height> - <texture>dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="21">overlays/shadow.png</bordertexture> - <bordersize>20</bordersize> - </control> - <control type="image"> - <left>20</left> - <top>180</top> - <width>390</width> - <height>70</height> - <texture colordiffuse="border_alpha">colors/black.png</texture> - </control> - <control type="image"> - <centerleft>50%</centerleft> - <top>20</top> - <width>240</width> - <height>160</height> - <texture>$INFO[ListItem.Icon]</texture> - <align>center</align> - <aspectratio>scale</aspectratio> - </control> - <control type="label"> - <left>30</left> - <top>190</top> - <width>370</width> - <height>400</height> - <label>$INFO[ListItem.Label]</label> - <align>center</align> - </control> - </itemlayout> - <focusedlayout height="290" width="430"> - <control type="group"> - <depth>DepthContentPopout</depth> - <animation type="Focus" reversible="false"> - <effect type="zoom" center="200,125" start="100" end="108" time="250" tween="sine" /> - </animation> - <animation type="UnFocus" reversible="false"> - <effect type="zoom" center="200,125" start="108" end="100" time="250" tween="sine" /> - </animation> - <control type="image"> - <width>430</width> - <height>270</height> - <texture>dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="21">overlays/shadow.png</bordertexture> - <bordersize>20</bordersize> - </control> - <control type="image"> - <width>430</width> - <height>270</height> - <texture colordiffuse="button_focus">colors/grey.png</texture> - <bordersize>20</bordersize> - <include>Animation_FocusTextureFade</include> - </control> - <control type="image"> - <left>20</left> - <top>180</top> - <width>390</width> - <height>70</height> - <texture colordiffuse="border_alpha">colors/black.png</texture> - </control> - <control type="image"> - <centerleft>50%</centerleft> - <top>20</top> - <width>240</width> - <height>160</height> - <texture>$INFO[ListItem.Icon]</texture> - <align>center</align> - <aspectratio>scale</aspectratio> - </control> - <control type="label"> - <left>30</left> - <top>190</top> - <width>370</width> - <height>400</height> - <label>$INFO[ListItem.Label]</label> - <align>center</align> - </control> - </control> - </focusedlayout> - <content> - <item> - <label>$LOCALIZE[14201]</label> - <onclick>ActivateWindow(PlayerSettings)</onclick> - <icon>icons/settings/player.png</icon> - </item> - <item> - <label>$LOCALIZE[14212]</label> - <onclick>ActivateWindow(MediaSettings)</onclick> - <icon>icons/settings/media.png</icon> - </item> - <item> - <label>$LOCALIZE[14205]</label> - <onclick>ActivateWindow(PVRSettings)</onclick> - <icon>icons/settings/livetv.png</icon> - </item> - <item> - <label>$LOCALIZE[14208]</label> - <onclick>ActivateWindow(ServiceSettings)</onclick> - <icon>icons/settings/network.png</icon> - </item> - <item> - <label>$LOCALIZE[15016]</label> - <visible>System.GetBool(gamesgeneral.enable)</visible> - <onclick>ActivateWindow(GameSettings)</onclick> - <icon>icons/settings/games.png</icon> - </item> - <item> - <label>$LOCALIZE[14207]</label> - <onclick>ActivateWindow(InterfaceSettings)</onclick> - <icon>icons/settings/interface.png</icon> - </item> - <item> - <label>$LOCALIZE[14210]</label> - <onclick>ActivateWindow(Profiles)</onclick> - <icon>icons/settings/profiles.png</icon> - </item> - <item> - <label>$LOCALIZE[14209]</label> - <onclick>ActivateWindow(SystemSettings)</onclick> - <icon>icons/settings/system.png</icon> - </item> - <item> - <label>LibreELEC</label> - <onclick>RunAddon(service.libreelec.settings)</onclick> - <icon>icons/settings/libreelec.png</icon> - <visible>System.HasAddon(service.libreelec.settings)</visible> - </item> - <item> - <label>$LOCALIZE[138]</label> - <onclick>ActivateWindow(systeminfo)</onclick> - <icon>icons/settings/sysinfo.png</icon> - </item> - <item> - <label>$LOCALIZE[31067]</label> - <onclick>ActivateWindow(eventlog)</onclick> - <icon>icons/settings/eventlog.png</icon> - </item> - <item> - <label>$LOCALIZE[10003]</label> - <onclick>ActivateWindow(filemanager)</onclick> - <icon>icons/settings/filemanager.png</icon> - </item> - <!-- <item> - <label>$LOCALIZE[24001]</label> - <onclick>ActivateWindow(addonbrowser)</onclick> - <icon>icons/settings/addons.png</icon> - </item> --> - </content> + <control type="label"> + <left>0</left> + <right>0</right> + <top>420</top> + <height>400</height> + <label>$LOCALIZE[5]</label> + <align>center</align> + <font>font37</font> + </control> + <control type="panel" id="9000"> + <left>0</left> + <width>100%</width> + <top>120</top> + <height>300</height> + <onup>noop</onup> + <ondown>Control.SetFocus(9001,$INFO[Container(9000).Position],absolute)</ondown> + <include>SettingsPanel</include> + <content> + <item> + <label>$LOCALIZE[10003]</label> + <onclick>ActivateWindow(filemanager)</onclick> + <icon>icons/settings/filemanager.png</icon> + </item> + <item> + <label>$LOCALIZE[24001]</label> + <onclick>ActivateWindow(addonbrowser)</onclick> + <icon>icons/settings/addons.png</icon> + </item> + <item> + <label>$LOCALIZE[138]</label> + <onclick>ActivateWindow(systeminfo)</onclick> + <icon>icons/settings/sysinfo.png</icon> + </item> + <item> + <label>$LOCALIZE[31067]</label> + <onclick>ActivateWindow(eventlog)</onclick> + <icon>icons/settings/eventlog.png</icon> + </item> + </content> + </control> + <control type="panel" id="9001"> + <left>0</left> + <right>0</right> + <top>470</top> + <bottom>0</bottom> + <onup>Control.SetFocus(9000,$INFO[Container(9001).Position],absolute)</onup> + <ondown>noop</ondown> + <include>SettingsPanel</include> + <content> + <item> + <label>$LOCALIZE[14200]</label> + <onclick>ActivateWindow(PlayerSettings)</onclick> + <icon>icons/settings/player.png</icon> + </item> + <item> + <label>$LOCALIZE[14211]</label> + <onclick>ActivateWindow(MediaSettings)</onclick> + <icon>icons/settings/media.png</icon> + </item> + <item> + <label>$LOCALIZE[14204]</label> + <onclick>ActivateWindow(PVRSettings)</onclick> + <icon>icons/settings/livetv.png</icon> + </item> + <item> + <label>$LOCALIZE[14036]</label> + <onclick>ActivateWindow(ServiceSettings)</onclick> + <icon>icons/settings/network.png</icon> + </item> + <item> + <label>$LOCALIZE[15016]</label> + <visible>System.GetBool(gamesgeneral.enable)</visible> + <onclick>ActivateWindow(GameSettings)</onclick> + <icon>icons/settings/games.png</icon> + </item> + <item> + <label>$LOCALIZE[14206]</label> + <onclick>ActivateWindow(InterfaceSettings)</onclick> + <icon>icons/settings/interface.png</icon> + </item> + <item> + <label>$LOCALIZE[13200]</label> + <onclick>ActivateWindow(Profiles)</onclick> + <icon>icons/settings/profiles.png</icon> + </item> + <item> + <label>$LOCALIZE[13000]</label> + <onclick>ActivateWindow(SystemSettings)</onclick> + <icon>icons/settings/system.png</icon> + </item> + <item> + <label>LibreELEC</label> + <onclick>RunAddon(service.libreelec.settings)</onclick> + <icon>icons/settings/libreelec.png</icon> + <visible>System.HasAddon(service.libreelec.settings)</visible> + </item> + </content> + </control> </control> <include content="TopBar"> <param name="breadcrumbs_label" value="$LOCALIZE[13000]" /> diff --git a/addons/skin.estuary/xml/SettingsProfile.xml b/addons/skin.estuary/xml/SettingsProfile.xml index 725a7157f1..c77fb611de 100644 --- a/addons/skin.estuary/xml/SettingsProfile.xml +++ b/addons/skin.estuary/xml/SettingsProfile.xml @@ -74,7 +74,6 @@ <width>305</width> <height>100</height> <font>font10</font> - <textcolor>grey</textcolor> <align>center</align> <aligny>top</aligny> <label>$LOCALIZE[31029]:</label> @@ -85,7 +84,6 @@ <top>321</top> <width>305</width> <height>100</height> - <textcolor>grey</textcolor> <font>font10</font> <align>center</align> <aligny>top</aligny> diff --git a/addons/skin.estuary/xml/SettingsSystemInfo.xml b/addons/skin.estuary/xml/SettingsSystemInfo.xml index 6ace4b98f5..b11b55c104 100644 --- a/addons/skin.estuary/xml/SettingsSystemInfo.xml +++ b/addons/skin.estuary/xml/SettingsSystemInfo.xml @@ -86,7 +86,7 @@ <top>100</top> <bottom>315</bottom> <pagecontrol>60</pagecontrol> - <autoscroll delay="5000" repeat="7500" time="5000">true</autoscroll> + <autoscroll delay="5000" repeat="7500" time="5000">!Control.HasFocus(60)</autoscroll> </control> <control type="scrollbar" id="60"> <right>0</right> diff --git a/addons/skin.estuary/xml/SlideShow.xml b/addons/skin.estuary/xml/SlideShow.xml index 666f38cbfb..6cc32f41cd 100644 --- a/addons/skin.estuary/xml/SlideShow.xml +++ b/addons/skin.estuary/xml/SlideShow.xml @@ -7,7 +7,8 @@ <width>256</width> <height>256</height> <texture>icons/settings/player.png</texture> - <visible>SlideShow.IsVideo + [![Player.Playing + Player.HasVideo] | SlideShow.IsPaused]</visible> + <visible>SlideShow.IsVideo</visible> + <visible>![Player.Playing + Player.HasVideo] | SlideShow.IsPaused</visible> </control> </controls> </window> diff --git a/addons/skin.estuary/xml/View_502_FanArt.xml b/addons/skin.estuary/xml/View_502_FanArt.xml index 93320ad7ef..4e0703d9b9 100644 --- a/addons/skin.estuary/xml/View_502_FanArt.xml +++ b/addons/skin.estuary/xml/View_502_FanArt.xml @@ -56,6 +56,7 @@ <onright>502</onright> <orientation>vertical</orientation> <animation effect="zoom" end="50,100" time="300" tween="sine" center="20,0" easing="inout" condition="!Control.HasFocus(502600)">conditional</animation> + <hitrect x="-30" y="0" w="120" h="100%" /> </control> <control type="group"> <left>40</left> |
