From 10c3773028c171830fc75f2b9774dc3b70f67782 Mon Sep 17 00:00:00 2001 From: phil65 Date: Mon, 28 Nov 2016 04:07:29 +0100 Subject: [estuary] sync --- .../language/resource.language.en_gb/strings.po | 160 +----- .../skin.estuary/media/dialogs/dialog-bg-solid.png | Bin 1028 -> 0 bytes addons/skin.estuary/media/dialogs/separator.png | Bin 181 -> 0 bytes addons/skin.estuary/media/frame/menu-fo.png | Bin 1544 -> 0 bytes .../media/icons/infodialogs/changelog.png | Bin 718 -> 0 bytes .../skin.estuary/media/icons/infodialogs/list.png | Bin 732 -> 0 bytes .../skin.estuary/media/icons/settings/addons.png | Bin 5123 -> 5633 bytes .../skin.estuary/media/icons/settings/android.png | Bin 2538 -> 0 bytes .../media/icons/settings/appearance.png | Bin 4307 -> 0 bytes .../skin.estuary/media/icons/settings/eventlog.png | Bin 4099 -> 4024 bytes .../media/icons/settings/filemanager.png | Bin 2467 -> 2415 bytes .../media/icons/settings/interface.png | Bin 0 -> 7236 bytes .../skin.estuary/media/icons/settings/library.png | Bin 3671 -> 0 bytes .../media/icons/settings/libreelec.png | Bin 0 -> 3362 bytes .../skin.estuary/media/icons/settings/livetv.png | Bin 2703 -> 2615 bytes addons/skin.estuary/media/icons/settings/media.png | Bin 3523 -> 3430 bytes .../skin.estuary/media/icons/settings/network.png | Bin 6561 -> 6052 bytes .../skin.estuary/media/icons/settings/pictures.png | Bin 3784 -> 0 bytes .../skin.estuary/media/icons/settings/player.png | Bin 0 -> 2604 bytes .../skin.estuary/media/icons/settings/profiles.png | Bin 2978 -> 3572 bytes addons/skin.estuary/media/icons/settings/skin.png | Bin 3454 -> 4234 bytes .../skin.estuary/media/icons/settings/sysinfo.png | Bin 3346 -> 4408 bytes .../skin.estuary/media/icons/settings/system.png | Bin 7631 -> 7336 bytes addons/skin.estuary/media/icons/settings/video.png | Bin 2709 -> 0 bytes addons/skin.estuary/media/lists/totaltv.png | Bin 1139 -> 0 bytes addons/skin.estuary/media/submneu/add-ons.png | Bin 1817 -> 0 bytes addons/skin.estuary/media/submneu/videos.png | Bin 1175 -> 0 bytes .../playlists/inprogress_musicvideos.xsp | 8 - addons/skin.estuary/resources/fanart.jpg | Bin 57484 -> 49140 bytes addons/skin.estuary/resources/icon.png | Bin 1899 -> 52433 bytes .../skin.estuary/xml/Custom_1100_AddonLauncher.xml | 4 +- .../skin.estuary/xml/Custom_1101_SettingsList.xml | 8 +- addons/skin.estuary/xml/Custom_1102_TextViewer.xml | 8 +- .../skin.estuary/xml/Custom_1103_VolumeSlider.xml | 72 +++ .../xml/Custom_1105_MusicOSDSettings.xml | 27 +- .../skin.estuary/xml/Custom_1107_SearchDialog.xml | 8 +- addons/skin.estuary/xml/Custom_1108_PVROverlay.xml | 91 ---- .../skin.estuary/xml/Custom_1109_TopBarOverlay.xml | 35 +- addons/skin.estuary/xml/DialogAddonInfo.xml | 2 - addons/skin.estuary/xml/DialogAddonSettings.xml | 27 +- addons/skin.estuary/xml/DialogAudioDSPManager.xml | 15 +- addons/skin.estuary/xml/DialogButtonMenu.xml | 8 +- addons/skin.estuary/xml/DialogConfirm.xml | 8 +- addons/skin.estuary/xml/DialogContextMenu.xml | 20 +- addons/skin.estuary/xml/DialogFavourites.xml | 18 +- addons/skin.estuary/xml/DialogFullScreenInfo.xml | 4 +- addons/skin.estuary/xml/DialogGameControllers.xml | 147 +++--- addons/skin.estuary/xml/DialogKeyboard.xml | 35 +- addons/skin.estuary/xml/DialogMediaSource.xml | 23 +- addons/skin.estuary/xml/DialogNotification.xml | 2 - addons/skin.estuary/xml/DialogNumeric.xml | 12 +- .../skin.estuary/xml/DialogPVRChannelManager.xml | 12 +- addons/skin.estuary/xml/DialogPVRChannelsOSD.xml | 8 +- addons/skin.estuary/xml/DialogPVRGroupManager.xml | 8 +- addons/skin.estuary/xml/DialogPVRGuideOSD.xml | 2 +- addons/skin.estuary/xml/DialogPVRGuideSearch.xml | 8 +- addons/skin.estuary/xml/DialogPVRInfo.xml | 14 +- addons/skin.estuary/xml/DialogPVRRadioRDSInfo.xml | 8 +- addons/skin.estuary/xml/DialogSeekBar.xml | 94 +++- addons/skin.estuary/xml/DialogSelect.xml | 10 +- addons/skin.estuary/xml/DialogSettings.xml | 8 +- addons/skin.estuary/xml/DialogSubtitles.xml | 8 +- addons/skin.estuary/xml/DialogTextViewer.xml | 8 +- addons/skin.estuary/xml/DialogVideoInfo.xml | 2 +- addons/skin.estuary/xml/DialogVolumeBar.xml | 13 +- addons/skin.estuary/xml/EventLog.xml | 176 +++---- addons/skin.estuary/xml/FileBrowser.xml | 25 +- addons/skin.estuary/xml/FileManager.xml | 4 +- addons/skin.estuary/xml/Font.xml | 16 +- addons/skin.estuary/xml/Home.xml | 353 ++++++------- addons/skin.estuary/xml/Includes.xml | 260 ++++++---- addons/skin.estuary/xml/Includes_Animations.xml | 4 +- addons/skin.estuary/xml/Includes_Buttons.xml | 23 +- addons/skin.estuary/xml/Includes_Home.xml | 558 ++++----------------- addons/skin.estuary/xml/Includes_MediaMenu.xml | 9 +- addons/skin.estuary/xml/Includes_PVR.xml | 1 - addons/skin.estuary/xml/MusicOSD.xml | 10 +- addons/skin.estuary/xml/MusicVisualisation.xml | 2 - addons/skin.estuary/xml/MyMusicPlaylistEditor.xml | 2 +- addons/skin.estuary/xml/MyPVRChannels.xml | 451 ++++++++--------- addons/skin.estuary/xml/MyPVRGuide.xml | 17 +- addons/skin.estuary/xml/MyPVRRecordings.xml | 15 +- addons/skin.estuary/xml/MyPVRSearch.xml | 172 +++---- addons/skin.estuary/xml/MyPVRTimers.xml | 202 ++++---- addons/skin.estuary/xml/MyPics.xml | 8 +- addons/skin.estuary/xml/MyPlaylist.xml | 119 ++--- addons/skin.estuary/xml/MyWeather.xml | 43 +- addons/skin.estuary/xml/PlayerControls.xml | 18 +- addons/skin.estuary/xml/Settings.xml | 34 +- addons/skin.estuary/xml/SettingsCategory.xml | 8 +- addons/skin.estuary/xml/SettingsProfile.xml | 1 - addons/skin.estuary/xml/SettingsSystemInfo.xml | 3 +- addons/skin.estuary/xml/SkinSettings.xml | 7 +- addons/skin.estuary/xml/SmartPlaylistEditor.xml | 9 +- addons/skin.estuary/xml/SmartPlaylistRule.xml | 8 +- addons/skin.estuary/xml/Variables.xml | 30 +- addons/skin.estuary/xml/VideoFullScreen.xml | 1 - addons/skin.estuary/xml/VideoOSD.xml | 9 +- addons/skin.estuary/xml/VideoOSDBookmarks.xml | 8 +- addons/skin.estuary/xml/View_500_Wall.xml | 45 +- addons/skin.estuary/xml/View_501_Banner.xml | 2 - addons/skin.estuary/xml/View_502_FanArt.xml | 4 +- addons/skin.estuary/xml/View_50_List.xml | 172 +++---- addons/skin.estuary/xml/View_52_IconWall.xml | 1 - addons/skin.estuary/xml/View_53_Shift.xml | 57 +-- addons/skin.estuary/xml/View_54_InfoWall.xml | 278 ++++++++-- addons/skin.estuary/xml/View_55_WideList.xml | 404 +++++++-------- 107 files changed, 2097 insertions(+), 2417 deletions(-) delete mode 100644 addons/skin.estuary/media/dialogs/dialog-bg-solid.png delete mode 100644 addons/skin.estuary/media/dialogs/separator.png delete mode 100644 addons/skin.estuary/media/frame/menu-fo.png delete mode 100644 addons/skin.estuary/media/icons/infodialogs/changelog.png delete mode 100644 addons/skin.estuary/media/icons/infodialogs/list.png delete mode 100644 addons/skin.estuary/media/icons/settings/android.png delete mode 100644 addons/skin.estuary/media/icons/settings/appearance.png create mode 100644 addons/skin.estuary/media/icons/settings/interface.png delete mode 100644 addons/skin.estuary/media/icons/settings/library.png create mode 100644 addons/skin.estuary/media/icons/settings/libreelec.png delete mode 100644 addons/skin.estuary/media/icons/settings/pictures.png create mode 100644 addons/skin.estuary/media/icons/settings/player.png delete mode 100644 addons/skin.estuary/media/icons/settings/video.png delete mode 100644 addons/skin.estuary/media/lists/totaltv.png delete mode 100644 addons/skin.estuary/media/submneu/add-ons.png delete mode 100644 addons/skin.estuary/media/submneu/videos.png delete mode 100644 addons/skin.estuary/playlists/inprogress_musicvideos.xsp create mode 100644 addons/skin.estuary/xml/Custom_1103_VolumeSlider.xml delete mode 100644 addons/skin.estuary/xml/Custom_1108_PVROverlay.xml (limited to 'addons') 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 3182e971d5..da1756d8e6 100644 --- a/addons/skin.estuary/language/resource.language.en_gb/strings.po +++ b/addons/skin.estuary/language/resource.language.en_gb/strings.po @@ -56,11 +56,6 @@ msgctxt "#31007" msgid "Unwatched movies" msgstr "" -#: /1080i/DialogAddonInfo.xml -msgctxt "#31008" -msgid "No disclaimer" -msgstr "" - #: /1080i/MyVideoNav.xml msgctxt "#31009" msgid "Download icons" @@ -139,26 +134,11 @@ msgctxt "#31023" msgid "Viewtype" msgstr "" -#: /1080i/MusicVisualisation.xml -msgctxt "#31024" -msgid "Next tracks" -msgstr "" - #: /1080i/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 "" -#: /1080i/DialogAlbumInfo.xml -msgctxt "#31026" -msgid "Go to albums" -msgstr "" - -#: /1080i/DialogAlbumInfo.xml -msgctxt "#31027" -msgid "Go to songs" -msgstr "" - #: /1080i/DialogAlbumInfo.xml /1080i/DialogVideoInfo.xml msgctxt "#31028" msgid "Show fanart" @@ -204,11 +184,6 @@ msgctxt "#31036" msgid "items" msgstr "" -#: /1080i/Variables.xml -msgctxt "#31037" -msgid "Tracklist" -msgstr "" - #: /1080i/Variables.xml msgctxt "#31038" msgid "Rewind" @@ -219,11 +194,6 @@ msgctxt "#31039" msgid "Fast forward" msgstr "" -#: /1080i/Variables.xml -msgctxt "#31040" -msgid "Cancel update" -msgstr "" - #: /1080i/Variables.xml /1080i/MyPics.xml msgctxt "#31041" msgid "Camera manufacturer" @@ -254,21 +224,11 @@ msgctxt "#31046" msgid "Delete group" msgstr "" -#: /1080i/View_50_List.xml -msgctxt "#31047" -msgid "Read more..." -msgstr "" - #: /1080i/DialogVideoInfo.xml msgctxt "#31048" msgid "Available" msgstr "" -#: /1080i/Variables.xml -msgctxt "#31049" -msgid "Press [B]Up[/B] to rewind or fast-forward" -msgstr "" - #: /1080i/Variables.xml msgctxt "#31050" msgid "Press [B]OK[/B] to stop" @@ -294,11 +254,6 @@ msgctxt "#31054" msgid "Press [B]Left[/B] to rewind, or [B]Right[/B] to fast-forward" msgstr "" -#: /1080i/Variables.xml -msgctxt "#31055" -msgid "Subtitle download" -msgstr "" - #: /1080i/MyMusicNav.xml /1080i/MyVideoNav.xml msgctxt "#31056" msgid "Go to playlist" @@ -314,16 +269,6 @@ msgctxt "#31058" msgid "Automatic Login on startup" msgstr "" -#: /1080i/Includes.xml -msgctxt "#31059" -msgid "Updates available" -msgstr "" - -#: /1080i/Variables.xml /1080i/DialogVideoInfo.xml -msgctxt "#31060" -msgid "minutes" -msgstr "" - #: /1080i/SkinSettings.xml msgctxt "#31061" msgid "Main menu items" @@ -339,11 +284,6 @@ msgctxt "#31063" msgid "Sections" msgstr "" -#: /1080i/Variables.xml -msgctxt "#31064" -msgid "unwatched" -msgstr "" - #: /1080i/MyVideoPlaylist.xml msgctxt "#31065" msgid "Video playlist" @@ -369,11 +309,6 @@ msgctxt "#31069" msgid "Last Updated" msgstr "" -#: /1080i/Custom_1103_SourcesDialog.xml -msgctxt "#31070" -msgid "Add media sources" -msgstr "" - #: /1080i/DialogAddonInfo.xml msgctxt "#31071" msgid "by" @@ -384,36 +319,11 @@ msgctxt "#31072" msgid "Power Options" msgstr "" -#: /1080i/Home.xml -msgctxt "#31073" -msgid "Titles" -msgstr "" - -#: /1080i/Home.xml -msgctxt "#31074" -msgid "Library root" -msgstr "" - #: /1080i/Home.xml msgctxt "#31075" msgid "Movie sets" msgstr "" -#: /1080i/Home.xml -msgctxt "#31076" -msgid "Play optical disc" -msgstr "" - -#: /1080i/Home.xml -msgctxt "#31077" -msgid "Previous location" -msgstr "" - -#: /1080i/Home.xml -msgctxt "#31078" -msgid "Next location" -msgstr "" - #: /1080i/DialogVideoInfo.xml msgctxt "#31079" msgid "Cast not available" @@ -424,11 +334,6 @@ msgctxt "#31080" msgid "Ends at" msgstr "" -#: /1080i/DialogSongInfo.xml -msgctxt "#31081" -msgid "Album info" -msgstr "" - #: /1080i/Custom_1105_MusicOSDSettings.xml msgctxt "#31082" msgid "Lyrics add-on" @@ -444,26 +349,6 @@ msgctxt "#31084" msgid "Visualisation settings" msgstr "" -#: /1080i/DialogFullScreenInfo.xml -msgctxt "#31085" -msgid "Channel Group" -msgstr "" - -#: /1080i/DialogFullScreenInfo.xml -msgctxt "#31086" -msgid "Metadata" -msgstr "" - -#: /1080i/DialogContentSettings.xml -msgctxt "#31087" -msgid "Provider settings" -msgstr "" - -#: /1080i/DialogContentSettings.xml -msgctxt "#31088" -msgid "Content scanning options" -msgstr "" - #: /1080i/DialogPVRGroupManager.xml msgctxt "#31089" msgid "Available groups" @@ -474,11 +359,6 @@ msgctxt "#31090" msgid "Search trailer" msgstr "" -#: /1080i/VideoOSD.xml -msgctxt "#31091" -msgid "Download subtitles" -msgstr "" - #: /1080i/VideoOSD.xml /1080i/Variables.xml msgctxt "#31092" msgid "Video menu" @@ -489,11 +369,6 @@ msgctxt "#31093" msgid "Show weather info in top bar" msgstr "" -#: /1080i/SkinSettings.xml -msgctxt "#31094" -msgid "Show media flags for movies / episodes / music videos" -msgstr "" - #: /1080i/SkinSettings.xml msgctxt "#31095" msgid "Use slide animations" @@ -559,16 +434,6 @@ msgctxt "#31107" msgid "WideList" msgstr "" -#: /1080i/SkinSettings.xml -msgctxt "#31108" -msgid "Use custom global background" -msgstr "" - -#: /1080i/SkinSettings.xml -msgctxt "#31109" -msgid "Choose image path" -msgstr "" - #: /1080i/Home.xml msgctxt "#31110" msgid "Enter files section" @@ -684,21 +549,11 @@ msgctxt "#31132" msgid "min" msgstr "" -#: /1080i/DialogKeyboard.xml -msgctxt "#31133" -msgid "Hide" -msgstr "" - #: /1080i/DialogSeekBar.xml msgctxt "#31134" msgid "Remaining" msgstr "" -#: /1080i/DialogAddonInfo.xml -msgctxt "#31135" -msgid "Installed from" -msgstr "" - #: /1080i/DialogAddonInfo.xml msgctxt "#31136" msgid "Click here to see latest changes..." @@ -749,16 +604,6 @@ msgctxt "#31145" msgid "Search add-ons" msgstr "" -#: /1080i/Home.xml -msgctxt "#31146" -msgid "Manage add-ons" -msgstr "" - -#: /1080i/Home.xml -msgctxt "#31147" -msgid "Download add-ons" -msgstr "" - #: /1080i/Home.xml msgctxt "#31148" msgid "Categories" @@ -823,3 +668,8 @@ msgstr "" msgctxt "#31160" msgid "Show media flags" msgstr "" + +#: /xml/DialogNumeric.xml +msgctxt "#31161" +msgid "Numeric pad" +msgstr "" diff --git a/addons/skin.estuary/media/dialogs/dialog-bg-solid.png b/addons/skin.estuary/media/dialogs/dialog-bg-solid.png deleted file mode 100644 index c080a0fbd6..0000000000 Binary files a/addons/skin.estuary/media/dialogs/dialog-bg-solid.png and /dev/null differ diff --git a/addons/skin.estuary/media/dialogs/separator.png b/addons/skin.estuary/media/dialogs/separator.png deleted file mode 100644 index 1583fc7dd1..0000000000 Binary files a/addons/skin.estuary/media/dialogs/separator.png and /dev/null differ diff --git a/addons/skin.estuary/media/frame/menu-fo.png b/addons/skin.estuary/media/frame/menu-fo.png deleted file mode 100644 index e7048b03ec..0000000000 Binary files a/addons/skin.estuary/media/frame/menu-fo.png and /dev/null differ diff --git a/addons/skin.estuary/media/icons/infodialogs/changelog.png b/addons/skin.estuary/media/icons/infodialogs/changelog.png deleted file mode 100644 index acb2aef84e..0000000000 Binary files a/addons/skin.estuary/media/icons/infodialogs/changelog.png and /dev/null differ diff --git a/addons/skin.estuary/media/icons/infodialogs/list.png b/addons/skin.estuary/media/icons/infodialogs/list.png deleted file mode 100644 index 703e7e2354..0000000000 Binary files a/addons/skin.estuary/media/icons/infodialogs/list.png and /dev/null differ diff --git a/addons/skin.estuary/media/icons/settings/addons.png b/addons/skin.estuary/media/icons/settings/addons.png index 59c01f7d12..585d9dc92c 100644 Binary files a/addons/skin.estuary/media/icons/settings/addons.png and b/addons/skin.estuary/media/icons/settings/addons.png differ diff --git a/addons/skin.estuary/media/icons/settings/android.png b/addons/skin.estuary/media/icons/settings/android.png deleted file mode 100644 index 6fe042d643..0000000000 Binary files a/addons/skin.estuary/media/icons/settings/android.png and /dev/null differ diff --git a/addons/skin.estuary/media/icons/settings/appearance.png b/addons/skin.estuary/media/icons/settings/appearance.png deleted file mode 100644 index 30eda07400..0000000000 Binary files a/addons/skin.estuary/media/icons/settings/appearance.png and /dev/null differ diff --git a/addons/skin.estuary/media/icons/settings/eventlog.png b/addons/skin.estuary/media/icons/settings/eventlog.png index f4d113022a..24c098f05c 100644 Binary files a/addons/skin.estuary/media/icons/settings/eventlog.png and b/addons/skin.estuary/media/icons/settings/eventlog.png differ diff --git a/addons/skin.estuary/media/icons/settings/filemanager.png b/addons/skin.estuary/media/icons/settings/filemanager.png index 20762adb70..edfd6c2b4c 100644 Binary files a/addons/skin.estuary/media/icons/settings/filemanager.png and b/addons/skin.estuary/media/icons/settings/filemanager.png differ diff --git a/addons/skin.estuary/media/icons/settings/interface.png b/addons/skin.estuary/media/icons/settings/interface.png new file mode 100644 index 0000000000..7a1d50903d Binary files /dev/null and b/addons/skin.estuary/media/icons/settings/interface.png differ diff --git a/addons/skin.estuary/media/icons/settings/library.png b/addons/skin.estuary/media/icons/settings/library.png deleted file mode 100644 index df293c67fb..0000000000 Binary files a/addons/skin.estuary/media/icons/settings/library.png and /dev/null differ diff --git a/addons/skin.estuary/media/icons/settings/libreelec.png b/addons/skin.estuary/media/icons/settings/libreelec.png new file mode 100644 index 0000000000..b442f2a36d Binary files /dev/null and b/addons/skin.estuary/media/icons/settings/libreelec.png differ diff --git a/addons/skin.estuary/media/icons/settings/livetv.png b/addons/skin.estuary/media/icons/settings/livetv.png index 8408ea6f2a..236094b2d0 100644 Binary files a/addons/skin.estuary/media/icons/settings/livetv.png and b/addons/skin.estuary/media/icons/settings/livetv.png differ diff --git a/addons/skin.estuary/media/icons/settings/media.png b/addons/skin.estuary/media/icons/settings/media.png index 5ed85493da..0894295d86 100644 Binary files a/addons/skin.estuary/media/icons/settings/media.png and b/addons/skin.estuary/media/icons/settings/media.png differ diff --git a/addons/skin.estuary/media/icons/settings/network.png b/addons/skin.estuary/media/icons/settings/network.png index a22e80fdd7..e64f3455cd 100644 Binary files a/addons/skin.estuary/media/icons/settings/network.png and b/addons/skin.estuary/media/icons/settings/network.png differ diff --git a/addons/skin.estuary/media/icons/settings/pictures.png b/addons/skin.estuary/media/icons/settings/pictures.png deleted file mode 100644 index 91f516a5cc..0000000000 Binary files a/addons/skin.estuary/media/icons/settings/pictures.png and /dev/null differ diff --git a/addons/skin.estuary/media/icons/settings/player.png b/addons/skin.estuary/media/icons/settings/player.png new file mode 100644 index 0000000000..1546e39d23 Binary files /dev/null and b/addons/skin.estuary/media/icons/settings/player.png differ diff --git a/addons/skin.estuary/media/icons/settings/profiles.png b/addons/skin.estuary/media/icons/settings/profiles.png index 065441038c..c13a26664d 100644 Binary files a/addons/skin.estuary/media/icons/settings/profiles.png and b/addons/skin.estuary/media/icons/settings/profiles.png differ diff --git a/addons/skin.estuary/media/icons/settings/skin.png b/addons/skin.estuary/media/icons/settings/skin.png index 862bbc1043..2a959aa497 100644 Binary files a/addons/skin.estuary/media/icons/settings/skin.png and b/addons/skin.estuary/media/icons/settings/skin.png differ diff --git a/addons/skin.estuary/media/icons/settings/sysinfo.png b/addons/skin.estuary/media/icons/settings/sysinfo.png index 992f4a0f7a..9e5bbf679b 100644 Binary files a/addons/skin.estuary/media/icons/settings/sysinfo.png and b/addons/skin.estuary/media/icons/settings/sysinfo.png differ diff --git a/addons/skin.estuary/media/icons/settings/system.png b/addons/skin.estuary/media/icons/settings/system.png index 8097e78f2b..756bf19027 100644 Binary files a/addons/skin.estuary/media/icons/settings/system.png and b/addons/skin.estuary/media/icons/settings/system.png differ diff --git a/addons/skin.estuary/media/icons/settings/video.png b/addons/skin.estuary/media/icons/settings/video.png deleted file mode 100644 index 4e0fb1d192..0000000000 Binary files a/addons/skin.estuary/media/icons/settings/video.png and /dev/null differ diff --git a/addons/skin.estuary/media/lists/totaltv.png b/addons/skin.estuary/media/lists/totaltv.png deleted file mode 100644 index f529c8ed1b..0000000000 Binary files a/addons/skin.estuary/media/lists/totaltv.png and /dev/null differ diff --git a/addons/skin.estuary/media/submneu/add-ons.png b/addons/skin.estuary/media/submneu/add-ons.png deleted file mode 100644 index 95fe52bb57..0000000000 Binary files a/addons/skin.estuary/media/submneu/add-ons.png and /dev/null differ diff --git a/addons/skin.estuary/media/submneu/videos.png b/addons/skin.estuary/media/submneu/videos.png deleted file mode 100644 index 54653dfb29..0000000000 Binary files a/addons/skin.estuary/media/submneu/videos.png and /dev/null differ diff --git a/addons/skin.estuary/playlists/inprogress_musicvideos.xsp b/addons/skin.estuary/playlists/inprogress_musicvideos.xsp deleted file mode 100644 index dd9a16e02b..0000000000 --- a/addons/skin.estuary/playlists/inprogress_musicvideos.xsp +++ /dev/null @@ -1,8 +0,0 @@ - - - In-progress music videos - all - - 15 - lastplayed - diff --git a/addons/skin.estuary/resources/fanart.jpg b/addons/skin.estuary/resources/fanart.jpg index 85cac3a0f4..45952a1745 100644 Binary files a/addons/skin.estuary/resources/fanart.jpg and b/addons/skin.estuary/resources/fanart.jpg differ diff --git a/addons/skin.estuary/resources/icon.png b/addons/skin.estuary/resources/icon.png index dc320fec76..c438524a91 100644 Binary files a/addons/skin.estuary/resources/icon.png and b/addons/skin.estuary/resources/icon.png differ diff --git a/addons/skin.estuary/xml/Custom_1100_AddonLauncher.xml b/addons/skin.estuary/xml/Custom_1100_AddonLauncher.xml index 6fa14554d1..2d1c7918e9 100644 --- a/addons/skin.estuary/xml/Custom_1100_AddonLauncher.xml +++ b/addons/skin.estuary/xml/Custom_1100_AddonLauncher.xml @@ -94,7 +94,7 @@ 462 95 lists/focus.png - Conditional + Conditional -3 @@ -109,7 +109,7 @@ 95 95 colors/black.png - Conditional + Conditional diff --git a/addons/skin.estuary/xml/Custom_1101_SettingsList.xml b/addons/skin.estuary/xml/Custom_1101_SettingsList.xml index 8a830ac0f4..c767bb4e6b 100644 --- a/addons/skin.estuary/xml/Custom_1101_SettingsList.xml +++ b/addons/skin.estuary/xml/Custom_1101_SettingsList.xml @@ -11,10 +11,10 @@ !Window.IsActive(DialogSettings.xml) + !Window.IsActive(DialogSlider.xml) VisibleChange - - - - + + + + 0 diff --git a/addons/skin.estuary/xml/Custom_1102_TextViewer.xml b/addons/skin.estuary/xml/Custom_1102_TextViewer.xml index def58819ad..164919b75d 100644 --- a/addons/skin.estuary/xml/Custom_1102_TextViewer.xml +++ b/addons/skin.estuary/xml/Custom_1102_TextViewer.xml @@ -8,10 +8,10 @@ 50% 770 - - - - + + + + 1% diff --git a/addons/skin.estuary/xml/Custom_1103_VolumeSlider.xml b/addons/skin.estuary/xml/Custom_1103_VolumeSlider.xml new file mode 100644 index 0000000000..72aece4efa --- /dev/null +++ b/addons/skin.estuary/xml/Custom_1103_VolumeSlider.xml @@ -0,0 +1,72 @@ + + + 11 + Animation_DialogPopupOpenClose + DepthOSD+ + + + background close area + 0 + 0 + 100% + 0 + + + Action(close) + + + 0 + 250 + 30 + 840 + + -20 + 0 + 525 + 152 + dialogs/dialog-bg-nobo.png + overlays/shadow.png + 20 + + + 40 + 20 + 400 + 112 + colors/white50.png + colors/white.png + Player.Volume + + + Slider + 40 + 55 + 400 + 40 + + + colors/white.png + Player.Volume + Volume + + + 0 + 65 + 28 + 28 + overlays/arrowright.png + WindowOpen + WindowClose + + + 455 + 65 + 28 + 28 + overlays/arrowright.png + WindowOpen + WindowClose + + + + diff --git a/addons/skin.estuary/xml/Custom_1105_MusicOSDSettings.xml b/addons/skin.estuary/xml/Custom_1105_MusicOSDSettings.xml index 0ce3c31133..9956e2865f 100644 --- a/addons/skin.estuary/xml/Custom_1105_MusicOSDSettings.xml +++ b/addons/skin.estuary/xml/Custom_1105_MusicOSDSettings.xml @@ -4,29 +4,18 @@ Animation_DialogPopupOpenClose - 220 50% 600 + 50% + 700 - - - - + + + + - - 2 - 107 - 596 - 660 - 5000 - 5000 - 99 - 61 - - - - - + + ButtonMenuList diff --git a/addons/skin.estuary/xml/Custom_1107_SearchDialog.xml b/addons/skin.estuary/xml/Custom_1107_SearchDialog.xml index 8594a01077..71f705cbb5 100644 --- a/addons/skin.estuary/xml/Custom_1107_SearchDialog.xml +++ b/addons/skin.estuary/xml/Custom_1107_SearchDialog.xml @@ -9,10 +9,10 @@ 60% 700 - - - - + + + + ButtonMenuList diff --git a/addons/skin.estuary/xml/Custom_1108_PVROverlay.xml b/addons/skin.estuary/xml/Custom_1108_PVROverlay.xml deleted file mode 100644 index 89f11700b0..0000000000 --- a/addons/skin.estuary/xml/Custom_1108_PVROverlay.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - Player.ShowInfo + !System.HasModalDialog + VideoPlayer.Content(LiveTV) + Window.IsActive(fullscreenvideo) - - WindowOpen - WindowClose - DepthOSD - - - 0 - 250 - - 0 - 100% - 240 - dialogs/dialog-bg-nobo.png - - - 30 - 20 - 200 - 200 - keep - $INFO[Player.Art(thumb)] - - - 260 - 40 - 100 - 25 - - center - font45 - - - WindowClose - 260 - 92 - 0 - 15 - Player.ProgressCache - colors/white50.png - colors/white50.png - Conditional - !Player.ChannelPreviewActive - - - WindowClose - 260 - 92 - 0 - 15 - Player.Progress - colors/white50.png - colors/white50.png - !Player.ChannelPreviewActive | VideoPlayer.HasEpg - - - 260 - 125 - 20 - 25 - - center - VideoPlayer.HasEpg - - - 1260 - 160 - 600 - 100 - right - horizontal - 10 - !Player.ChannelPreviewActive - - - - - - - - - - - - - - - - diff --git a/addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml b/addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml index 0bdb5af660..d8612c4893 100644 --- a/addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml +++ b/addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml @@ -1,7 +1,7 @@ Window.IsActive(fullscreenvideo) | Window.IsActive(visualisation) - Window.IsActive(seekbar) | [Player.ShowInfo + !System.HasModalDialog + VideoPlayer.Content(LiveTV)] | Window.IsActive(pvrosdchannels) | Window.IsActive(pvrosdguide) + Window.IsActive(seekbar) | Window.IsActive(pvrosdchannels) | Window.IsActive(pvrosdguide) DepthOSD Animation_TopSlide 0 @@ -52,16 +52,33 @@ right - - 80 - - 22 - text_shadow + + 24 + 74 + 800 100 - 500 right - !String.isempty(Player.Duration) - !VideoPlayer.Content(LiveTV) | VideoPlayer.HasEpg + 5 + horizontal + true + + + text_shadow + 100 + auto + !String.isempty(Player.Duration) + !VideoPlayer.Content(LiveTV) | VideoPlayer.HasEpg + + + 2 + 0 + 60 + 40 + 300 + keep + dialogs/volume/mute.png + Player.Muted + diff --git a/addons/skin.estuary/xml/DialogAddonInfo.xml b/addons/skin.estuary/xml/DialogAddonInfo.xml index ffd9261a99..f46f8f4000 100644 --- a/addons/skin.estuary/xml/DialogAddonInfo.xml +++ b/addons/skin.estuary/xml/DialogAddonInfo.xml @@ -243,14 +243,12 @@ 470 40 - white !String.IsEmpty(ListItem.AddonSize) 470 40 - white !String.IsEmpty(ListItem.AddonOrigin) diff --git a/addons/skin.estuary/xml/DialogAddonSettings.xml b/addons/skin.estuary/xml/DialogAddonSettings.xml index 874f9da0bd..9147c8a5f6 100644 --- a/addons/skin.estuary/xml/DialogAddonSettings.xml +++ b/addons/skin.estuary/xml/DialogAddonSettings.xml @@ -7,18 +7,18 @@ 50% 800 50% - 1720 + 1820 - - - - + + + + button area 20 70 - 330 + 400 700 -25 vertical @@ -34,7 +34,7 @@ - 330 + 400 70 1100 722 @@ -42,7 +42,7 @@ control area - 350 + 420 90 1060 680 @@ -52,12 +52,12 @@ 9001 - 1410 - -160 + 20 + 70 300 700 - -15 - center + dialogbuttons_itemgap + left vertical 9001 9001 @@ -79,7 +79,8 @@ Default Category Button 120 - 320 + 390 + 20 center center font25_title diff --git a/addons/skin.estuary/xml/DialogAudioDSPManager.xml b/addons/skin.estuary/xml/DialogAudioDSPManager.xml index 0eb74f636d..eaeeeaf2c1 100644 --- a/addons/skin.estuary/xml/DialogAudioDSPManager.xml +++ b/addons/skin.estuary/xml/DialogAudioDSPManager.xml @@ -9,10 +9,10 @@ 50% 1780 - - - - + + + + processing mode selection list @@ -72,7 +72,7 @@ 90 320 - available modes group + available modes @@ -82,7 +82,7 @@ - active modes group + active modes 810 0 @@ -96,8 +96,9 @@ 1300 + 470 105 - -20 + dialogbuttons_itemgap 61 9000 diff --git a/addons/skin.estuary/xml/DialogButtonMenu.xml b/addons/skin.estuary/xml/DialogButtonMenu.xml index 6728f77c0b..9d29e01a5c 100644 --- a/addons/skin.estuary/xml/DialogButtonMenu.xml +++ b/addons/skin.estuary/xml/DialogButtonMenu.xml @@ -9,10 +9,10 @@ 50% 700 - - - - + + + + ButtonMenuList diff --git a/addons/skin.estuary/xml/DialogConfirm.xml b/addons/skin.estuary/xml/DialogConfirm.xml index c4be80a45c..cff7192ad5 100644 --- a/addons/skin.estuary/xml/DialogConfirm.xml +++ b/addons/skin.estuary/xml/DialogConfirm.xml @@ -9,10 +9,10 @@ 50% 915 - - - - + + + + 30 diff --git a/addons/skin.estuary/xml/DialogContextMenu.xml b/addons/skin.estuary/xml/DialogContextMenu.xml index a170746c7a..5db627ddec 100644 --- a/addons/skin.estuary/xml/DialogContextMenu.xml +++ b/addons/skin.estuary/xml/DialogContextMenu.xml @@ -22,41 +22,41 @@ -1080 5760 3240 - - + + Action(close) background image 0 - 10 + 0 450 - 820 + 780 colors/white.png grouplist for context buttons 0 - 30 + 0 450 auto true button template - 2 + 0 - 446 + 450 65 center lists/focus.png - + - - + + diff --git a/addons/skin.estuary/xml/DialogFavourites.xml b/addons/skin.estuary/xml/DialogFavourites.xml index b01e2829fd..73b6309421 100644 --- a/addons/skin.estuary/xml/DialogFavourites.xml +++ b/addons/skin.estuary/xml/DialogFavourites.xml @@ -7,12 +7,12 @@ 50% 50% 1540 - 838 + 858 - - - - + + + + @@ -24,7 +24,7 @@ 0 70 12 - 788 + 0 450 450 vertical @@ -33,7 +33,7 @@ 10 70 1600 - 788 + 0 60 60 450 @@ -62,9 +62,9 @@ 300 - 200 + 90 900 - 300 + 0 center center diff --git a/addons/skin.estuary/xml/DialogFullScreenInfo.xml b/addons/skin.estuary/xml/DialogFullScreenInfo.xml index c5fee6b896..429e3b07ee 100644 --- a/addons/skin.estuary/xml/DialogFullScreenInfo.xml +++ b/addons/skin.estuary/xml/DialogFullScreenInfo.xml @@ -9,8 +9,8 @@ 0 100% 280 - - + + Action(close) diff --git a/addons/skin.estuary/xml/DialogGameControllers.xml b/addons/skin.estuary/xml/DialogGameControllers.xml index 75dc5b924a..18cb7892b9 100644 --- a/addons/skin.estuary/xml/DialogGameControllers.xml +++ b/addons/skin.estuary/xml/DialogGameControllers.xml @@ -6,13 +6,13 @@ 50% 50% - 1720 + 1820 690 - - - - + + + + Controller profiles grouplist heading @@ -24,8 +24,7 @@ center center - blue - black + button_focus -5 @@ -53,75 +52,80 @@ center font25_title lists/focus.png - + - 390 + 400 210 547 343 - - Feature list heading + + 1000 + 410 90 - 995 - 330 - 25 - font12 - - center - center - blue - black - - - 975 - 110 - 370 - 582 - buttons/dialogbutton-nofo.png - - - Features grouplist - 995 - 130 - 330 - 540 - 3 - 61 - 5 - 5 - 61 - - - 1330 - 130 - 12 - 540 - 5 - 9001 - vertical - - - Default feature button - 60 - 330 - center - center - font27 - lists/focus.png - - - - Feature group title - 330 - center - 0 - 40 - center - font20_title - grey - black + 602 + + Feature list heading + 20 + 20 + 25 + font12 + + center + center + button_focus + + + 20 + 0 + 0 + buttons/dialogbutton-nofo.png + + + Features grouplist + 20 + 20 + 40 + 20 + 3 + 61 + 5 + 5 + 61 + + + 0 + 40 + 12 + 20 + 5 + 9001 + vertical + + + Default feature button + 60 + 20 + 20 + center + center + font27 + lists/focus.png + + + + Feature group title + 20 + 20 + center + 0 + 40 + center + font20_title + grey + black + Feature separator image @@ -129,11 +133,12 @@ dialogs/separator-grey.png - 1360 + 20 110 5 3 - -20 + 350 + dialogbuttons_itemgap diff --git a/addons/skin.estuary/xml/DialogKeyboard.xml b/addons/skin.estuary/xml/DialogKeyboard.xml index ddceb2df9f..2d3a7f7183 100644 --- a/addons/skin.estuary/xml/DialogKeyboard.xml +++ b/addons/skin.estuary/xml/DialogKeyboard.xml @@ -32,7 +32,7 @@ 1542 100 font45 - + center center black @@ -62,9 +62,8 @@ font37 center center - button_focus - - + + 59% @@ -418,7 +417,7 @@ 160 100 buttons/roundbutton-fo.png - + icons/keyboard/letters.png icons/keyboard/letters.png icons/keyboard/symbols.png @@ -434,7 +433,7 @@ 161 101 buttons/roundbutton-fo.png - + icons/keyboard/capslock.png icons/keyboard/capslock.png icons/keyboard/capslock.png @@ -451,7 +450,7 @@ 162 102 buttons/roundbutton-fo.png - + icons/keyboard/shift.png icons/keyboard/shift.png icons/keyboard/shift.png @@ -466,8 +465,8 @@ 120 164 104 - - + + icons/keyboard/spacebar.png icons/keyboard/spacebar.png icons/keyboard/spacebar.png @@ -483,7 +482,7 @@ 107 167 buttons/roundbutton-fo.png - + icons/keyboard/arrowleft.png icons/keyboard/arrowleft.png icons/keyboard/arrowleft.png @@ -499,7 +498,7 @@ 108 168 buttons/roundbutton-fo.png - + icons/keyboard/arrowright.png icons/keyboard/arrowright.png icons/keyboard/arrowright.png @@ -515,7 +514,7 @@ 169 109 buttons/roundbutton-fo.png - + icons/keyboard/backspace.png icons/keyboard/backspace.png icons/keyboard/backspace.png @@ -528,9 +527,9 @@ 0 - 450 + 460 86% - -10 + dialogbuttons_itemgap 95200 95200 78500 @@ -579,9 +578,9 @@ colors/white.png - 30 + 30 0 - 480 + 500 50 font12 @@ -606,9 +605,9 @@ Animation_FocusTextureFade - 30 + 30 0 - 480 + 500 50 font12 diff --git a/addons/skin.estuary/xml/DialogMediaSource.xml b/addons/skin.estuary/xml/DialogMediaSource.xml index 99dd8c6534..50ab3fc473 100644 --- a/addons/skin.estuary/xml/DialogMediaSource.xml +++ b/addons/skin.estuary/xml/DialogMediaSource.xml @@ -9,10 +9,10 @@ 50% 1200 - - - - + + + + path label @@ -24,8 +24,6 @@ center font12 - button_focus - black 25 @@ -38,7 +36,7 @@ 45 165 820 - 225 + 245 9001 9000 60 @@ -77,9 +75,9 @@ 870 - 165 + 166 12 - 240 + 243 10 9000 vertical @@ -91,7 +89,7 @@ 10 10 12 - 7 + -7 @@ -115,8 +113,6 @@ center font12 - button_focus - black Name Button @@ -132,7 +128,8 @@ 0 - 600 + 40 + 100 1200 center horizontal diff --git a/addons/skin.estuary/xml/DialogNotification.xml b/addons/skin.estuary/xml/DialogNotification.xml index 280ffc852f..fb0211dd1a 100644 --- a/addons/skin.estuary/xml/DialogNotification.xml +++ b/addons/skin.estuary/xml/DialogNotification.xml @@ -45,8 +45,6 @@ 60 font27_narrow center - false - 2000 diff --git a/addons/skin.estuary/xml/DialogNumeric.xml b/addons/skin.estuary/xml/DialogNumeric.xml index b9416349f8..6ccffa7360 100644 --- a/addons/skin.estuary/xml/DialogNumeric.xml +++ b/addons/skin.estuary/xml/DialogNumeric.xml @@ -10,10 +10,10 @@ 50% 545 - - - - + + + + 44 @@ -170,7 +170,7 @@ 125 125 buttons/roundbutton-fo.png - + icons/keyboard/arrowleft.png icons/keyboard/arrowleft.png icons/keyboard/arrowleft.png @@ -193,7 +193,7 @@ 125 125 buttons/roundbutton-fo.png - + icons/keyboard/arrowright.png icons/keyboard/arrowright.png icons/keyboard/arrowright.png diff --git a/addons/skin.estuary/xml/DialogPVRChannelManager.xml b/addons/skin.estuary/xml/DialogPVRChannelManager.xml index 1cb9293b0f..c0aa0ff456 100644 --- a/addons/skin.estuary/xml/DialogPVRChannelManager.xml +++ b/addons/skin.estuary/xml/DialogPVRChannelManager.xml @@ -9,10 +9,10 @@ 50% 1720 - - - - + + + + 10 @@ -236,7 +236,7 @@ 90 9002 20 - -20 + dialogbuttons_itemgap @@ -262,7 +262,7 @@ grey right center - + true diff --git a/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml b/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml index 0ecefa5c5b..ee338ad485 100644 --- a/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml +++ b/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml @@ -78,7 +78,7 @@ 12 90 - 70 + 75 center center font32_title @@ -131,12 +131,12 @@ font12 text_shadow - button_focus + grey 12 90 - 70 + 75 center center font32_title @@ -151,7 +151,7 @@ 12 100% 11 - + NextChannelGroup 61 61 diff --git a/addons/skin.estuary/xml/DialogPVRGroupManager.xml b/addons/skin.estuary/xml/DialogPVRGroupManager.xml index 2f02363076..53ae5a1429 100644 --- a/addons/skin.estuary/xml/DialogPVRGroupManager.xml +++ b/addons/skin.estuary/xml/DialogPVRGroupManager.xml @@ -9,10 +9,10 @@ 50% 1720 - - - - + + + + 0 diff --git a/addons/skin.estuary/xml/DialogPVRGuideOSD.xml b/addons/skin.estuary/xml/DialogPVRGuideOSD.xml index c023c2ec5d..68cfb2bdae 100644 --- a/addons/skin.estuary/xml/DialogPVRGuideOSD.xml +++ b/addons/skin.estuary/xml/DialogPVRGuideOSD.xml @@ -103,7 +103,7 @@ 12 100% 11 - + NextChannelGroup 61 61 diff --git a/addons/skin.estuary/xml/DialogPVRGuideSearch.xml b/addons/skin.estuary/xml/DialogPVRGuideSearch.xml index f6e006d9fe..b41af78361 100644 --- a/addons/skin.estuary/xml/DialogPVRGuideSearch.xml +++ b/addons/skin.estuary/xml/DialogPVRGuideSearch.xml @@ -9,10 +9,10 @@ 50% 1780 - - - - + + + + 10 diff --git a/addons/skin.estuary/xml/DialogPVRInfo.xml b/addons/skin.estuary/xml/DialogPVRInfo.xml index b26280c4ba..147cbc84c7 100644 --- a/addons/skin.estuary/xml/DialogPVRInfo.xml +++ b/addons/skin.estuary/xml/DialogPVRInfo.xml @@ -23,19 +23,7 @@ 461 461 keep - dialogs/dialog-bg-nobo.png - overlays/shadow.png - 20 - - - OpenClose_Left - 114 - 236 - 461 - 461 - keep - $INFO[ListItem.Icon] - 20 + $INFO[ListItem.Icon] 230 diff --git a/addons/skin.estuary/xml/DialogPVRRadioRDSInfo.xml b/addons/skin.estuary/xml/DialogPVRRadioRDSInfo.xml index 70fac45f96..ad26ae49c5 100644 --- a/addons/skin.estuary/xml/DialogPVRRadioRDSInfo.xml +++ b/addons/skin.estuary/xml/DialogPVRRadioRDSInfo.xml @@ -9,10 +9,10 @@ 50% 920 - - - - + + + + Normal song info group diff --git a/addons/skin.estuary/xml/DialogSeekBar.xml b/addons/skin.estuary/xml/DialogSeekBar.xml index d1b4bef3af..f134404896 100644 --- a/addons/skin.estuary/xml/DialogSeekBar.xml +++ b/addons/skin.estuary/xml/DialogSeekBar.xml @@ -1,7 +1,7 @@ - [[Player.Seeking | Player.DisplayAfterSeek | [Player.Paused + !Player.Caching] | Player.Forwarding | Player.Rewinding | Window.IsActive(fullscreeninfo) | Window.IsActive(videoosd) | Window.IsActive(playerprocessinfo)] + Window.IsActive(fullscreenvideo)] | Window.IsActive(visualisation) | !IsEmpty(Player.SeekNumeric) - ![Player.ShowInfo + VideoPlayer.Content(LiveTV) + Window.IsActive(fullscreenvideo)] + [[Player.Seeking | Player.DisplayAfterSeek | [Player.Paused + !Player.Caching] | Player.Forwarding | Player.Rewinding | Player.ShowInfo | Window.IsActive(fullscreeninfo) | Window.IsActive(videoosd) | Window.IsActive(playerprocessinfo)] + Window.IsActive(fullscreenvideo)] | Window.IsActive(visualisation) | !IsEmpty(Player.SeekNumeric) + !Window.IsActive(sliderdialog) Animation_BottomSlide DepthOSD 0 @@ -71,6 +71,8 @@ font45 black + !Player.ChannelPreviewActive + Visible 50% @@ -108,6 +110,94 @@ osd/progress/nub_bar.png osd/progress/nub_bar.png colors/white.png + !VideoPlayer.Content(livetv) + + + + Player.ShowInfo + VideoPlayer.Content(LiveTV) + Window.IsActive(fullscreenvideo) + !Window.IsActive(fullscreeninfo) + VisibleChange + 0 + 380 + + 0 + 100% + 240 + dialogs/dialog-bg-nobo.png + + + 30 + 20 + 200 + 200 + keep + $INFO[Player.Art(thumb)] + + + 20 + 220 + -80 + 25 + + black + center + WeatherTemp + center + + + 20 + 800 + 190 + 25 + + right + center + VideoPlayer.HasEpg + + + 260 + 50 + 20 + 25 + + left + font36_title + center + + + 260 + 55 + 50 + 120 + + justify + + + + 260 + 175 + 600 + 100 + left + horizontal + 10 + !Player.ChannelPreviewActive + Visible + + + + + + + + + + + + + + + + diff --git a/addons/skin.estuary/xml/DialogSelect.xml b/addons/skin.estuary/xml/DialogSelect.xml index ff5a09bb78..326f4f74b2 100644 --- a/addons/skin.estuary/xml/DialogSelect.xml +++ b/addons/skin.estuary/xml/DialogSelect.xml @@ -10,10 +10,10 @@ 742 1220 - - - - + + + + 0 @@ -140,7 +140,7 @@ 920 80 61 - -20 + dialogbuttons_itemgap 3 diff --git a/addons/skin.estuary/xml/DialogSettings.xml b/addons/skin.estuary/xml/DialogSettings.xml index c035adc3f8..5aa2972e18 100644 --- a/addons/skin.estuary/xml/DialogSettings.xml +++ b/addons/skin.estuary/xml/DialogSettings.xml @@ -11,10 +11,10 @@ !Window.IsVisible(sliderdialog) ![Window.IsActive(osdaudiodspsettings) + Window.Is(osdaudiosettings)] - - - - + + + + 10 diff --git a/addons/skin.estuary/xml/DialogSubtitles.xml b/addons/skin.estuary/xml/DialogSubtitles.xml index a329f38f3e..ba9a12e458 100644 --- a/addons/skin.estuary/xml/DialogSubtitles.xml +++ b/addons/skin.estuary/xml/DialogSubtitles.xml @@ -9,10 +9,10 @@ 1720 - - - - + + + + 1320 diff --git a/addons/skin.estuary/xml/DialogTextViewer.xml b/addons/skin.estuary/xml/DialogTextViewer.xml index 20aa38e10f..c16f959ff2 100644 --- a/addons/skin.estuary/xml/DialogTextViewer.xml +++ b/addons/skin.estuary/xml/DialogTextViewer.xml @@ -8,10 +8,10 @@ 50% 770 - - - - + + + + 1% diff --git a/addons/skin.estuary/xml/DialogVideoInfo.xml b/addons/skin.estuary/xml/DialogVideoInfo.xml index bcf2852e8f..467df2b99c 100644 --- a/addons/skin.estuary/xml/DialogVideoInfo.xml +++ b/addons/skin.estuary/xml/DialogVideoInfo.xml @@ -417,7 +417,7 @@ - 440 + 441 101 140 String.IsEmpty(Container.PluginName) diff --git a/addons/skin.estuary/xml/DialogVolumeBar.xml b/addons/skin.estuary/xml/DialogVolumeBar.xml index 077377e1b8..749ee3d340 100644 --- a/addons/skin.estuary/xml/DialogVolumeBar.xml +++ b/addons/skin.estuary/xml/DialogVolumeBar.xml @@ -2,18 +2,19 @@ 4 - - HiddenObject - Player.Volume - !Window.IsActive(startup) 50% 112 0 + Conditional WindowOpen WindowClose - + + HiddenObject + Player.Volume + + 12 5 88 @@ -34,7 +35,7 @@ -11 120 120 - $INFO[Control.GetLabel(20),dialogs/volume/progress/p,.png] + $INFO[Control.GetLabel(29999),dialogs/volume/progress/p,.png] Conditional diff --git a/addons/skin.estuary/xml/EventLog.xml b/addons/skin.estuary/xml/EventLog.xml index a686904b6b..ee2a127f12 100644 --- a/addons/skin.estuary/xml/EventLog.xml +++ b/addons/skin.estuary/xml/EventLog.xml @@ -12,9 +12,9 @@ OpenClose_Right 490 - 0 + list_y_offset 0 - 100% + list_y_offset 9000 60 50 @@ -25,97 +25,87 @@ 60 200 - - eventloglist_width - - 10 - 10 - 120 - 120 - $INFO[Listitem.Icon] - scale - colors/black.png - 4 - - - 160 - 400 - 10 - 35 - center - font37 - - - - 160 - 45 - 20 - 60 - white - top - - - - 0 - 30 - 10 - 35 - white - right - center - - + + 10 + 10 + 120 + 120 + $INFO[Listitem.Icon] + scale + colors/black.png + 4 + + + 160 + 400 + 10 + 35 + center + font37 + + + + 160 + 45 + 20 + 60 + top + + + + 0 + 30 + 10 + 35 + right + center + - - eventloglist_width - - 0 - 0 - eventloglist_width - 141 - lists/focus.png - Control.HasFocus(50) - - - 10 - 10 - 120 - 120 - $INFO[Listitem.Icon] - scale - colors/black.png - 4 - - - 160 - 400 - 10 - 35 - center - font37 - - - - 160 - 45 - 20 - 60 - white - top - - - - 0 - 30 - 10 - 35 - white - right - center - - + + 0 + 0 + 0 + 141 + lists/focus.png + Control.HasFocus(50) + + + 10 + 10 + 120 + 120 + $INFO[Listitem.Icon] + scale + colors/black.png + 4 + + + 160 + 400 + 10 + 35 + center + font37 + + + + 160 + 45 + 20 + 60 + top + + + + 0 + 30 + 10 + 35 + right + center + @@ -136,12 +126,13 @@ 50 50 true + 487 487 110 top 40 - + lists/focus.png lists/focus.png @@ -159,11 +150,10 @@ 487 110 top - + lists/focus.png 40 35 - 300 diff --git a/addons/skin.estuary/xml/FileBrowser.xml b/addons/skin.estuary/xml/FileBrowser.xml index 91cf41f9fc..0d378b111b 100644 --- a/addons/skin.estuary/xml/FileBrowser.xml +++ b/addons/skin.estuary/xml/FileBrowser.xml @@ -7,19 +7,19 @@ 50% 50% 1300 - 880 + 850 - - - - + + + + 990 85 400 400 - -15 + dialogbuttons_itemgap vertical 450 450 @@ -189,27 +189,24 @@ Path label 25 - 810 + 10 595 30 true font12 - center - button_focus - black + bottom + grey 0 - 810 + 10 1270 30 right - center + bottom grey font12 - true - !Control.IsVisible(451) diff --git a/addons/skin.estuary/xml/FileManager.xml b/addons/skin.estuary/xml/FileManager.xml index 181a70e73c..f9bfc54cc9 100644 --- a/addons/skin.estuary/xml/FileManager.xml +++ b/addons/skin.estuary/xml/FileManager.xml @@ -36,7 +36,7 @@ 20 vertical conditional - + @@ -66,7 +66,7 @@ 21 21 conditional - + vertical diff --git a/addons/skin.estuary/xml/Font.xml b/addons/skin.estuary/xml/Font.xml index 594e17a399..4b18591ba6 100644 --- a/addons/skin.estuary/xml/Font.xml +++ b/addons/skin.estuary/xml/Font.xml @@ -5,7 +5,7 @@ font10 NotoSans-Regular.ttf - 24 + 23 @@ -26,6 +26,13 @@ 33 + + font25_narrow + NotoSans-Regular.ttf + 25 + + 0.8 + font27 NotoSans-Regular.ttf @@ -110,6 +117,7 @@ WeatherTemp + 0.85 NotoSans-Bold.ttf 120 @@ -141,6 +149,12 @@ arial.ttf 30 + + font25_narrow + arial.ttf + 25 + 0.8 + font27 arial.ttf diff --git a/addons/skin.estuary/xml/Home.xml b/addons/skin.estuary/xml/Home.xml index 611a91bfae..30757bcfb4 100644 --- a/addons/skin.estuary/xml/Home.xml +++ b/addons/skin.estuary/xml/Home.xml @@ -37,6 +37,7 @@ Conditional + 462 @@ -45,8 +46,6 @@ - 0 - 20 OpenClose_Right String.IsEqual(Container(9000).ListItem.Property(id),movies) @@ -62,25 +61,25 @@ - + - + - + - + @@ -92,15 +91,13 @@ - + - + - - @@ -129,35 +126,24 @@ - + - - - - - - - + - - - - - @@ -166,7 +152,7 @@ - + @@ -175,19 +161,19 @@ - + - - - - - - - - - + + + + + + + + + String.IsEqual(Container(9000).ListItem.Property(id),music) @@ -209,7 +195,6 @@ - @@ -217,7 +202,6 @@ - @@ -225,7 +209,6 @@ - @@ -233,9 +216,6 @@ - - - @@ -243,7 +223,6 @@ - @@ -251,20 +230,19 @@ - - - - - - - - - - + + + + + + + + + String.IsEqual(Container(9000).ListItem.Property(id),addons) @@ -288,9 +266,6 @@ - - - @@ -300,9 +275,6 @@ - - - @@ -312,9 +284,6 @@ - - - @@ -324,9 +293,6 @@ - - - @@ -335,20 +301,17 @@ - - - - - - - - - - - - + + + + + + + + + String.IsEqual(Container(9000).ListItem.Property(id),video) @@ -376,16 +339,16 @@ - - - - - - - - - + + + + + + + + + String.IsEqual(Container(9000).ListItem.Property(id),livetv) @@ -396,14 +359,14 @@ WidgetGroupListCommon 390 - 465 + 25 36 horizontal PVR.IsRecordingTV | PVR.HasNonRecordingTVTimer right - 1360 + 1280 - 660 + 620 PVR.IsRecordingTV @@ -414,7 +377,7 @@ PVR.HasNonRecordingTVTimer - 670 + 620 @@ -423,12 +386,11 @@ - + - @@ -449,13 +411,12 @@ - + - @@ -468,7 +429,7 @@ WidgetGroupListCommon 390 - 538 + 25 36 horizontal right @@ -495,12 +456,11 @@ - + - @@ -521,13 +481,12 @@ - + - @@ -536,60 +495,53 @@ - + + 65 0 + 0 0 - - Integer.IsGreater(Container(14100).NumItems,0) | Container(14100).IsUpdating - 100% - - 520 - 0 - 80% - 0 - 9000 - 9000 - 14100 - 14100 - $INFO[ListItem.FileNameAndPath] - 2 - 200 - vertical - - - 130 - - - - - - - - - DepthContentPopout - 130 - Focus - UnFocus - - - - - - - favourites:// + 9000 + 9000 + 14100 + 14100 + $INFO[ListItem.FileNameAndPath] + 2 + 500 + vertical + Integer.IsGreater(Container(14100).NumItems,0) | Container(14100).IsUpdating + + + 130 + + + + - - - - - - - - - - - + + + + DepthContentPopout + 130 + Focus + UnFocus + + + + + + + favourites:// + + + + + + + + + + String.IsEqual(Container(9000).ListItem.Property(id),weather) @@ -600,49 +552,43 @@ WidgetGroupListCommon Weather info - 560 + 68 + 70 + 102 + 300 !String.IsEmpty(Weather.plugin) - 102 - 510 - 50 - 380 + 90 + 100% dialogs/dialog-bg.png - - 120 - 560 - 150 - 150 - $INFO[Weather.conditions] - - 1020 - 210 + 300 + 60 center 24 - 100 + 60 right - font14 - + font30_title + - 1020 - 150 + 300 + 120 center 24 - 100 + 60 right - font52_title - + font14 + - 315 - 570 + 50 + 50 20 horizontal - justify - -50 + left + -110 @@ -701,61 +647,53 @@ WidgetGroupListCommon - + - - - - - - - - - - - - - - - - - - - - + + + - - + + + + + + + + + + - - + + + - + - + @@ -801,7 +739,7 @@ ClearProperty(listposition,home) SetFocus($INFO[Container(9000).ListItem.Property(menu_id)]) 700 - noop + 700 500 @@ -812,7 +750,7 @@ 462 95 lists/focus.png - Conditional + Conditional -3 @@ -828,7 +766,7 @@ 95 95 colors/black.png - Conditional + Conditional @@ -969,8 +907,12 @@ 480 110 100 - noop - 9000 + SetFocus(9000) + PageDown + PageDown + SetFocus(9000) + PageUp + PageUp 2000 justify @@ -1041,7 +983,6 @@ button_focus text_shadow FFC0C0C0 - white !Player.hasMedia diff --git a/addons/skin.estuary/xml/Includes.xml b/addons/skin.estuary/xml/Includes.xml index 0d48332070..29ba0b9686 100644 --- a/addons/skin.estuary/xml/Includes.xml +++ b/addons/skin.estuary/xml/Includes.xml @@ -30,6 +30,9 @@ -0.80 0.10 79 + -20 + 0 + 80 Window.IsActive(musicinformation) | Window.IsActive(songinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo) | Window.IsVisible(script-script.extendedinfo-DialogVideoInfo.xml) | Window.IsVisible(script-script.extendedinfo-DialogInfo.xml) | Window.IsVisible(script-script.extendedinfo-VideoList.xml) ControlGroup(9000).HasFocus | Control.HasFocus(6130) @@ -45,7 +48,7 @@ 50 50 vertical - + Visible Hidden conditional @@ -56,7 +59,7 @@ 0 100% 12 - + 50 50 horizontal @@ -73,8 +76,8 @@ -3000 1 1 - - + + @@ -100,7 +103,6 @@ 44 44 font20_title - white @@ -336,8 +338,9 @@ 50 180 - 32 + 35 center + font12 @@ -369,14 +372,9 @@ true 10 - 160 - - - - - + 200 - + @@ -399,7 +397,6 @@ center font_flag - white @@ -414,8 +411,8 @@ + + --> @@ -447,9 +444,9 @@ 0 - 0 + list_y_offset + list_y_offset $PARAM[width] - 100% 4 3 $PARAM[onleft_id] @@ -458,12 +455,12 @@ $PARAM[list_id] $PARAM[scrollbar_id] 200 - + 0 0 - $PARAM[width] - 75 + 0 + 0 lists/focus.png Conditional @@ -471,8 +468,8 @@ 20 15 0 - 75 - $PARAM[width] + 0 + 0 center true @@ -482,21 +479,21 @@ 0 30 0 - 75 - $PARAM[width] + 0 + 0 right center text_shadow - + 20 15 0 - 75 - $PARAM[width] + 0 + 0 center text_shadow @@ -505,8 +502,8 @@ 0 30 0 - 75 - $PARAM[width] + 0 + 0 right center @@ -566,15 +563,14 @@ 12 920 vertical - + conditional $PARAM[group_id]50 noop - colors/white.png - 20 + 462 @@ -728,8 +724,8 @@ $PARAM[posy] 28 28 - - + + Control.Move($PARAM[list_id],-1) Container($PARAM[list_id]).HasPrevious + [Control.HasFocus($PARAM[list_id]) | Control.HasFocus($PARAM[list_id]500)] @@ -738,8 +734,8 @@ $PARAM[posy] 28 28 - - + + Control.Move($PARAM[list_id],1) Container($PARAM[list_id]).HasNext + [Control.HasFocus($PARAM[list_id]) | Control.HasFocus($PARAM[list_id]501)] @@ -762,17 +758,17 @@ -2000 6000 6000 - - + + Action(close) - $PARAM[DialogBackgroundWidth] + $PARAM[width] 0 0 0 - $PARAM[DialogBackgroundHeight] + $PARAM[height] colors/white.png @@ -782,13 +778,13 @@ 70 colors/white70.png - + 40 0 100 70 font32_title - + center black @@ -797,9 +793,9 @@ 0 0 0 - $PARAM[DialogBackgroundHeight] - - + $PARAM[height] + + noop @@ -809,8 +805,8 @@ 48 48 48 - - + + dialogs/close.png icons/logo.png @@ -872,6 +868,7 @@ !String.IsEqual(Control.GetLabel(10),$LOCALIZE[16100]) + Window.IsActive(videos) + 10 BreadcrumbsLabel Container.Filtered @@ -879,12 +876,12 @@ 0 - 500 + 200 100 Action(Back) - - + + 50 @@ -920,9 +917,9 @@ 5 true - 8 - 28 - 26 + 4 + 32 + 32 keep $VAR[NowPlayingIconVar] @@ -955,15 +952,58 @@ - - 77 - - 22 - text_shadow + + 10 + 70 + 800 100 - 500 right - System.HasAlarm(shutdowntimer) + 5 + horizontal + true + + 50 + auto + center + -8 + + System.HasAlarm(shutdowntimer) + + + 16 + 40 + 22 + 300 + keep + icons/power.png + System.HasAlarm(shutdowntimer) + + + 50 + auto + center + + Skin.HasSetting(show_weatherinfo) + Weather.IsFetched + ![String.IsEqual(Weather.FanartCode,na)] + + + 1 + 50 + 50 + 300 + keep + $INFO[Weather.FanartCode,weather/small/,.png] + Skin.HasSetting(show_weatherinfo) + Weather.IsFetched + ![String.IsEqual(Weather.FanartCode,na)] + + + 8 + -20 + 74 + 40 + 300 + keep + dialogs/volume/mute.png + Player.Muted + 0 @@ -973,7 +1013,6 @@ 100% 80 center - white !System.HasModalDialog Container.Scrolling !Container.Content(seasons) @@ -1110,44 +1149,11 @@ text_shadow SetFocus(9000) - - + + - - horizontal - Skin.HasSetting(touchmode) - !Window.IsActive(home) - WindowOpen - WindowClose - 0 - -8 - 480 - 110 - 0 - noop - 9000 - 2000 - justify - - - - - - - - - - - - - - - - - - - + TouchButtons @@ -1287,4 +1293,62 @@ + + + horizontal + Skin.HasSetting(touchmode) + !Window.IsActive(home) + !Window.IsActive(filemanager) + WindowOpen + WindowClose + 0 + -8 + 480 + 110 + 0 + noop + 9000 + 2000 + justify + true + + 120 + + 0 + 120 + 120 + + ActivateWindow(1103) + buttons/roundbutton-fo.png + + + + 34 + 34 + 52 + 52 + $VAR[VolumeIconVar] + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/skin.estuary/xml/Includes_Animations.xml b/addons/skin.estuary/xml/Includes_Animations.xml index 033498dba4..ebdad5d516 100644 --- a/addons/skin.estuary/xml/Includes_Animations.xml +++ b/addons/skin.estuary/xml/Includes_Animations.xml @@ -41,8 +41,8 @@ - - + + diff --git a/addons/skin.estuary/xml/Includes_Buttons.xml b/addons/skin.estuary/xml/Includes_Buttons.xml index 38df530869..05945ad3e2 100644 --- a/addons/skin.estuary/xml/Includes_Buttons.xml +++ b/addons/skin.estuary/xml/Includes_Buttons.xml @@ -14,7 +14,7 @@ 74 74 - + 1 0 @@ -25,8 +25,8 @@ 40 center font12 - - + + noop $PARAM[visible] @@ -40,11 +40,10 @@ 0 $PARAM[height] center - white invalid selected lists/focus.png - + @@ -55,7 +54,6 @@ 0 $PARAM[height] center - white invalid selected lists/focus.png @@ -71,7 +69,6 @@ center font25_title grey - black buttons/dialogbutton-nofo.png @@ -88,11 +85,10 @@ 30 10 button_focus - black 300 - 90 + 100 false font25_title @@ -103,7 +99,6 @@ $PARAM[height] $PARAM[font] - white 20 $PARAM[onclick] $PARAM[wrapmultiline] @@ -119,7 +114,7 @@ 120 27 buttons/roundbutton-fo.png - + center top font45 @@ -133,7 +128,7 @@ left top lists/focus.png - + 40 300 35 @@ -156,7 +151,7 @@ buttons/roundbutton-fo.png - + 40 0 40 @@ -181,7 +176,7 @@ buttons/roundbutton-fo.png - + 40 0 40 diff --git a/addons/skin.estuary/xml/Includes_Home.xml b/addons/skin.estuary/xml/Includes_Home.xml index 826e3a1079..d367203c82 100644 --- a/addons/skin.estuary/xml/Includes_Home.xml +++ b/addons/skin.estuary/xml/Includes_Home.xml @@ -10,17 +10,14 @@ true - 442 true - $PARAM[left] - 58 + 55 80 900 90 - white text_shadow $PARAM[visible] Integer.IsGreater(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating @@ -63,218 +60,44 @@ black - - lists/rating.png - lists/duration.png - $INFO[ListItem.Rating] - $INFO[ListItem.Duration,, $LOCALIZE[31132]] - DefaultMovies.png + $PARAM[widget_header] - - 442 + + 0 120 Integer.IsGreater(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating 0 - 560 + 500 - + 70 - - String.IsEmpty(ListItem.Art(poster)) - - 10 - 0 - 312 - 448 - dialogs/dialog-bg-nobo.png - overlays/shadow.png - 20 - - - 40 - 30 - 252 - 250 - keep - $INFO[ListItem.Art(poster)] - - - 46 - 272 - 240 - 120 - - font27 - text_shadow - center - center - String.IsEmpty(ListItem.Art(poster)) - - - - 10 - 0 - 312 - 448 - scale - $INFO[ListItem.Art(poster)] - dialogs/dialog-bg-nobo.png - overlays/shadow.png - 20 - + 10 + + + - + DepthContentPopout 70 + 10 - + - + - - String.IsEmpty(ListItem.Art(poster)) - - 10 - 0 - 312 - 448 - dialogs/dialog-bg-nobo.png - overlays/shadow.png - 20 - - - 10 - 0 - 312 - 448 - colors/grey.png - 20 - Animation_FocusTextureFade - Control.HasFocus($PARAM[list_id]) - - - 40 - 30 - 252 - 250 - keep - $INFO[ListItem.Art(poster)] - - - 46 - 272 - 240 - 120 - - font27 - text_shadow - center - center - String.IsEmpty(ListItem.Art(poster)) - - - - 10 - 0 - 312 - 448 - scale - $INFO[ListItem.Art(poster)] - dialogs/dialog-bg-nobo.png - overlays/shadow.png - 20 - - - 30 - 20 - Focus - Unfocus - Control.HasFocus($PARAM[list_id]) - - 0 - 0 - 80 - 80 - overlays/overlay-bg.png - Listitem.IsCollection | ListItem.IsResumable | ListItem.IsPlaying | Integer.IsGreater(ListItem.Playcount,0) - - - 4 - 4 - 32 - 32 - $VAR[WallWatchedIconVar] - - - 0 - 72 - 272 - 80 - overlays/overlayfade.png - Focus - - - 38 - 370 - 200 - - font10 - white - text_shadow - - - -4 - 370 - 200 - - font10 - white - text_shadow - right - - - 8 - 376 - 24 - 24 - $PARAM[left_icon] - - - 240 - 376 - 24 - 24 - $PARAM[right_icon] - - - 0 - 390 - 272 - 1 - - progress/texturebg_alt_white.png - ListItem.PercentPlayed - !Integer.IsEqual(ListItem.PercentPlayed,0) - - - 0 - 0 - 272 - 408 - buttons/thumbnail_focused.png - !String.IsEmpty(ListItem.Art(poster)) - - + + + $PARAM[content_path] @@ -282,6 +105,7 @@ + true true true true @@ -290,7 +114,7 @@ $PARAM[visible] 0 - 442 + 0 0 100% scale @@ -299,9 +123,10 @@ vertical - 420 - 700 - 1000 + 0 + 0 + 50 + 50 center 100% @@ -346,134 +171,57 @@ + $INFO[ListItem.Title] + $INFO[ListItem.TVShowTitle] + True ascending - $INFO[ListItem.TVShowTitle] - $INFO[ListItem.Art(thumb)] + 15 $PARAM[widget_header] - 442 + 0 120 0 - 450 + 410 + $PARAM[visible] Integer.IsGreater(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating - + 70 - - 0 - 0 - 344 - 340 - dialogs/dialog-bg-nobo.png - overlays/shadow.png - 20 - - - 20 - 20 - 304 - 228 - scale - $PARAM[item_image] - - - 30 - 250 - 288 - - font12 - text_shadow - center - - - 30 - 282 - 288 - - font10 - text_shadow - center - + 5 + + + + + - + - 70 DepthContentPopout + 70 + 5 - + - + - - 0 - 0 - 344 - 340 - dialogs/dialog-bg-nobo.png - overlays/shadow.png - 20 - - - Animation_FocusTextureFade - - -4 - -4 - 352 - 348 - colors/grey.png - overlays/shadow.png - 20 - - - 20 - 302 - 306 - 1 - - progress/texturebg_alt_white.png - ListItem.PercentPlayed - !Integer.IsEqual(ListItem.PercentPlayed,0) - - - - 20 - 20 - 304 - 228 - scale - $PARAM[item_image] - - - 30 - 250 - 288 - - font12 - text_shadow - center - - - 30 - 282 - 288 - - font10 - text_shadow - center - + + + + + - $PARAM[content_path] + $PARAM[content_path] @@ -484,14 +232,13 @@ ascending 15 DefaultAudio.png - $INFO[ListItem.Year,[COLOR button_focus], - [/COLOR]]$INFO[ListItem.Artist] $PARAM[widget_header] - 442 + 0 120 0 500 @@ -500,59 +247,18 @@ $PARAM[visible] Integer.IsGreater(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating - + 70 - - 0 - 0 - 340 - 400 - scale - dialogs/dialog-bg-nobo.png - overlays/shadow.png - 20 - - - 20 - 20 - 300 - 300 - scale - $INFO[ListItem.Art(thumb)] - - - 40 - 318 - 260 - - font12 - text_shadow - center - - - 40 - 346 - 260 - - font12 - text_shadow - center - - - 30 - 318 - 280 - 60 - center - - font12 - text_shadow - center - + + + + + + - + DepthContentPopout 70 @@ -562,70 +268,12 @@ - - 0 - 0 - 340 - 400 - scale - dialogs/dialog-bg-nobo.png - overlays/shadow.png - 20 - - - -4 - -4 - 348 - 408 - scale - colors/grey.png - overlays/shadow.png - 20 - Animation_FocusTextureFade - - - 20 - 20 - 300 - 300 - scale - $INFO[ListItem.Art(thumb)] - - - 20 - 20 - - 10 - 298 - 280 - - font12 - true - text_shadow - center - - - 10 - 326 - 280 - font12 - true - - text_shadow - center - - - 10 - 298 - 280 - 60 - center - - font12 - text_shadow - center - - + + + + + + $PARAM[content_path] @@ -635,7 +283,7 @@ 20 $INFO[ListItem.Icon] - 130 + 120 false TV true @@ -646,47 +294,47 @@ - 442 + 0 120 0 - 300 + 290 $PARAM[visible] Integer.IsGreater(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating - + 70 - 336 - 210 + 316 + 200 dialogs/dialog-bg-nobo.png overlays/shadow.png 20 - 83 + 74 62 - 220 + 200 $PARAM[icon_height] $PARAM[icon] keep - + 42 - 125 - 260 + 106 + 240 70 - font12 + font25_narrow text_shadow center center - + DepthContentPopout 70 @@ -697,38 +345,37 @@ - 336 - 210 + 316 + 200 dialogs/dialog-bg-nobo.png overlays/shadow.png 20 - 336 - 210 + 316 + 200 colors/grey.png 20 Animation_FocusTextureFade - 83 + 74 62 - 220 + 200 $PARAM[icon_height] $PARAM[icon] keep - + 42 - 125 - 260 + 106 + 240 70 - font12 + font25_narrow text_shadow center center - true @@ -791,7 +438,7 @@ - 442 + 0 120 0 430 @@ -799,11 +446,11 @@ Integer.IsGreater(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating - + 70 - 334 + 319 340 dialogs/dialog-bg-nobo.png overlays/shadow.png @@ -812,7 +459,7 @@ 43 38 - 260 + 245 200 $PARAM[icon] keep @@ -820,7 +467,7 @@ 42 247 - 260 + 245 70 font12 @@ -831,7 +478,7 @@ 42 277 - 260 + 245 65 font12 @@ -848,7 +495,7 @@ - + DepthContentPopout 70 @@ -859,14 +506,14 @@ - 334 + 319 340 dialogs/dialog-bg-nobo.png overlays/shadow.png 20 - 334 + 319 340 colors/grey.png 20 @@ -875,7 +522,7 @@ 43 38 - 260 + 245 200 $PARAM[icon] keep @@ -883,7 +530,7 @@ 42 247 - 260 + 245 70 font12 @@ -895,7 +542,7 @@ 42 277 - 260 + 245 65 font12 @@ -918,16 +565,15 @@ - 442 + 266 $PARAM[widget_header] - - $PARAM[left] + 0 100 0 480 @@ -935,7 +581,7 @@ $PARAM[visible] - + 70 @@ -979,7 +625,7 @@ - + 70 DepthContentPopout diff --git a/addons/skin.estuary/xml/Includes_MediaMenu.xml b/addons/skin.estuary/xml/Includes_MediaMenu.xml index 6109b33448..c17b2353c9 100644 --- a/addons/skin.estuary/xml/Includes_MediaMenu.xml +++ b/addons/skin.estuary/xml/Includes_MediaMenu.xml @@ -8,10 +8,9 @@ 370 320 center - white invalid lists/focus.png - + lists/focus.png @@ -25,7 +24,7 @@ center buttons/roundbutton-fo.png - + 26 0 40 @@ -373,8 +372,8 @@ 50 -50 0 - - + + diff --git a/addons/skin.estuary/xml/Includes_PVR.xml b/addons/skin.estuary/xml/Includes_PVR.xml index 8efbbd2432..ecaacd6633 100644 --- a/addons/skin.estuary/xml/Includes_PVR.xml +++ b/addons/skin.estuary/xml/Includes_PVR.xml @@ -106,7 +106,6 @@ 120 540 262 - white font45 diff --git a/addons/skin.estuary/xml/MusicOSD.xml b/addons/skin.estuary/xml/MusicOSD.xml index 9bb3e67a58..73dee702a8 100644 --- a/addons/skin.estuary/xml/MusicOSD.xml +++ b/addons/skin.estuary/xml/MusicOSD.xml @@ -9,8 +9,8 @@ 0 100% 180 - - + + Action(close) @@ -56,7 +56,7 @@ 74 74 - + 1 0 Player.Paused @@ -107,7 +107,7 @@ osd/fullscreen/buttons/button-fo.png - + 620 607 87 @@ -137,7 +137,7 @@ 74 74 - + 1 0 Playlist.IsRandom diff --git a/addons/skin.estuary/xml/MusicVisualisation.xml b/addons/skin.estuary/xml/MusicVisualisation.xml index cadfacfbab..942a3e4826 100644 --- a/addons/skin.estuary/xml/MusicVisualisation.xml +++ b/addons/skin.estuary/xml/MusicVisualisation.xml @@ -54,7 +54,6 @@ font60 black - white true @@ -64,7 +63,6 @@ font37 black - white true diff --git a/addons/skin.estuary/xml/MyMusicPlaylistEditor.xml b/addons/skin.estuary/xml/MyMusicPlaylistEditor.xml index 365a87feb4..c7c6bcf6df 100644 --- a/addons/skin.estuary/xml/MyMusicPlaylistEditor.xml +++ b/addons/skin.estuary/xml/MyMusicPlaylistEditor.xml @@ -76,7 +76,7 @@ 80 50 100 - + conditional vertical diff --git a/addons/skin.estuary/xml/MyPVRChannels.xml b/addons/skin.estuary/xml/MyPVRChannels.xml index 0bea213b8a..f14beca053 100644 --- a/addons/skin.estuary/xml/MyPVRChannels.xml +++ b/addons/skin.estuary/xml/MyPVRChannels.xml @@ -27,135 +27,129 @@ 1 60 - - tvchannelslist_width - - 0 - 0 - 0 - 90 - lists/focus.png - Control.hasFocus(50) - - - 20 - 10 - 80 - 70 - keep - $INFO[listitem.icon] - - - 105 - 58 - 50 - 12 - progress/texturebg_white.png - ListItem.HasEpg - ListItem.Progress - - - 110 - 25 - 40 - 40 - $VAR[PVRStatusImageVar] - - - 105 - 8 - 90 - 120 - top - font14 - Conditional - - text_shadow - - - 165 - 46 - 90 - 120 - top - font12 - - text_shadow - - - 12 - 0 - 90 - 70 - center - center - font32_title - - text_shadow - + + 0 + 0 + 0 + 90 + lists/focus.png + Control.hasFocus(50) + + + 20 + 10 + 80 + 70 + keep + $INFO[listitem.icon] + + + 105 + 58 + 50 + 12 + progress/texturebg_white.png + ListItem.HasEpg + ListItem.Progress + + + 110 + 25 + 40 + 40 + $VAR[PVRStatusImageVar] + + + 105 + 8 + 90 + 120 + top + font14 + Conditional + + text_shadow + + + 165 + 46 + 90 + 120 + top + font12 + + text_shadow + + + 12 + 0 + 90 + 75 + center + center + font32_title + + text_shadow - - tvchannelslist_width - - 20 - 10 - 80 - 70 - keep - $INFO[listitem.icon] - - - 105 - 58 - 50 - 12 - 88FFFFFF - ListItem.HasEpg - ListItem.Progress - - - 110 - 25 - 40 - 40 - $VAR[PVRStatusImageVar] - - - 105 - 8 - 90 - 120 - top - font14 - - Conditional - text_shadow - - - 165 - 46 - 90 - 120 - top - font12 - - text_shadow - grey - - - 12 - 0 - 90 - 70 - center - center - font32_title - - grey - text_shadow - + + 20 + 10 + 80 + 70 + keep + $INFO[listitem.icon] + + + 105 + 58 + 50 + 12 + 88FFFFFF + ListItem.HasEpg + ListItem.Progress + + + 110 + 25 + 40 + 40 + $VAR[PVRStatusImageVar] + + + 105 + 8 + 90 + 120 + top + font14 + + Conditional + text_shadow + + + 165 + 46 + 90 + 120 + top + font12 + + text_shadow + grey + + + 12 + 0 + 90 + 75 + center + center + font32_title + + grey + text_shadow @@ -176,114 +170,108 @@ 1 60 - - tvchannelslist_width - - 0 - 0 - 0 - 70 - lists/focus.png - Control.hasFocus(51) - - - 10 - 25 - 50 - 12 - 88FFFFFF - progress/texturebg_white.png - ListItem.HasEpg + !ListItem.IsRecording - ListItem.Progress - - - 15 - 9 - 40 - 40 - $VAR[PVRStatusImageVar] - - - 105 - 0 - 70 - 90 - center - - - - 320 - 0 - 70 - 90 - center - right - - - - 12 - 0 - 70 - 70 - center - center - font32_title - - text_shadow - + + 0 + 0 + 0 + 70 + lists/focus.png + Control.hasFocus(51) + + + 10 + 25 + 50 + 12 + 88FFFFFF + progress/texturebg_white.png + ListItem.HasEpg + !ListItem.IsRecording + ListItem.Progress + + + 15 + 9 + 40 + 40 + $VAR[PVRStatusImageVar] + + + 105 + 0 + 70 + 90 + center + + + + 320 + 0 + 70 + 90 + center + right + + + + 12 + 0 + 70 + 75 + center + center + font32_title + + text_shadow - - tvchannelslist_width - - 10 - 25 - 50 - 12 - 88FFFFFF - ListItem.HasEpg + !ListItem.IsRecording - ListItem.Progress - - - 15 - 9 - 40 - 40 - $VAR[PVRStatusImageVar] - - - 105 - 0 - 70 - 90 - center - - text_shadow - - - 320 - 0 - 70 - 90 - center - right - - text_shadow - grey - - - 12 - 0 - 70 - 70 - center - center - font32_title - - grey - text_shadow - + + 10 + 25 + 50 + 12 + 88FFFFFF + ListItem.HasEpg + !ListItem.IsRecording + ListItem.Progress + + + 15 + 9 + 40 + 40 + $VAR[PVRStatusImageVar] + + + 105 + 0 + 70 + 90 + center + + text_shadow + + + 320 + 0 + 70 + 90 + center + right + + text_shadow + grey + + + 12 + 0 + 70 + 75 + center + center + font32_title + + grey + text_shadow @@ -339,7 +327,6 @@ -80 540 262 - white font45 diff --git a/addons/skin.estuary/xml/MyPVRGuide.xml b/addons/skin.estuary/xml/MyPVRGuide.xml index 1034ac295e..174f9a5231 100644 --- a/addons/skin.estuary/xml/MyPVRGuide.xml +++ b/addons/skin.estuary/xml/MyPVRGuide.xml @@ -52,15 +52,15 @@ 2 -2 - 70 + 75 60 - font36_title - + font32_title + center center - 65 + 68 -2 350 60 @@ -74,16 +74,16 @@ 2 -2 - 70 + 75 60 - font36_title - + font32_title + button_focus center center - 65 + 68 -2 350 60 @@ -208,6 +208,7 @@ + diff --git a/addons/skin.estuary/xml/MyPVRRecordings.xml b/addons/skin.estuary/xml/MyPVRRecordings.xml index 5ad74f039c..0fb40f6560 100644 --- a/addons/skin.estuary/xml/MyPVRRecordings.xml +++ b/addons/skin.estuary/xml/MyPVRRecordings.xml @@ -23,9 +23,7 @@ 5 73 200 - - - tvrecordings_width + 0 0 @@ -59,13 +57,9 @@ right center - white - - - - tvrecordings_width + 21 30 @@ -92,7 +86,6 @@ grey text_shadow - @@ -108,14 +101,14 @@ - -30 + -40 0 12 100% 50 50 vertical - conditional + conditional !ListItem.IsFolder diff --git a/addons/skin.estuary/xml/MyPVRSearch.xml b/addons/skin.estuary/xml/MyPVRSearch.xml index 6849d7a88c..cdd3563479 100644 --- a/addons/skin.estuary/xml/MyPVRSearch.xml +++ b/addons/skin.estuary/xml/MyPVRSearch.xml @@ -25,113 +25,107 @@ 3 77 200 - + + + String.IsEmpty(ListItem.Date) + 120 + 0 + 30 + 100 + font36_title + center + + - tvchannelslist_width + !String.IsEmpty(ListItem.Date) + + 25 + 10 + 80 + 80 + $INFO[Listitem.ActualIcon] + keep + !String.IsEmpty(ListItem.ActualIcon) + - String.IsEmpty(ListItem.Date) 120 - 0 + 10 30 100 - font36_title + top + + + + 120 + 20 + 350 + 100 + font12 center - + - - !String.IsEmpty(ListItem.Date) - - 25 - 10 - 80 - 80 - $INFO[Listitem.ActualIcon] - keep - !String.IsEmpty(ListItem.ActualIcon) - - - 120 - 10 - 30 - 100 - top - - - - 120 - 20 - 350 - 100 - font12 - center - - - - 980 - 50 - 50 - 50 - $VAR[PVRStatusImageVar] - + + 980 + 50 + 50 + 50 + $VAR[PVRStatusImageVar] - + + + 0 + 0 + 0 + 101 + lists/focus.png + Control.HasFocus(50) + + + String.IsEmpty(ListItem.Date) + 120 + 0 + 30 + 100 + font36_title + center + + - tvchannelslist_width + !String.IsEmpty(ListItem.Date) - 0 - 0 - 0 - 101 - lists/focus.png - Control.HasFocus(50) + 25 + 10 + 80 + 80 + $INFO[Listitem.ActualIcon] + keep + !String.IsEmpty(ListItem.ActualIcon) + + + 120 + 10 + 30 + 100 + top + - String.IsEmpty(ListItem.Date) 120 - 0 - 30 + 20 + 350 100 - font36_title + font12 center - + - - !String.IsEmpty(ListItem.Date) - - 25 - 10 - 80 - 80 - $INFO[Listitem.ActualIcon] - keep - !String.IsEmpty(ListItem.ActualIcon) - - - 120 - 10 - 30 - 100 - top - - - - 120 - 20 - 350 - 100 - font12 - center - - - - 980 - 50 - 50 - 50 - $VAR[PVRStatusImageVar] - + + 980 + 50 + 50 + 50 + $VAR[PVRStatusImageVar] diff --git a/addons/skin.estuary/xml/MyPVRTimers.xml b/addons/skin.estuary/xml/MyPVRTimers.xml index f6785a27b2..a76f35f8ea 100644 --- a/addons/skin.estuary/xml/MyPVRTimers.xml +++ b/addons/skin.estuary/xml/MyPVRTimers.xml @@ -18,125 +18,119 @@ 50 9000 73 - 4 - 5 + 3 + 4 73 200 - + + + 30 + 0 + 500 + 100 + font36_title + center + String.IsEmpty(ListItem.Date) + + - tvrecordings_width + !String.IsEmpty(ListItem.Date) 30 - 0 - 500 - 100 - font36_title - center - String.IsEmpty(ListItem.Date) - + 10 + 30 + 30 + top + + + + 30 + 53 + 680 + 30 + font12 + top + + + + 20 + 13 + 900 + 70 + font12 + right + top + - - !String.IsEmpty(ListItem.Date) - - 30 - 10 - 30 - 30 - top - - - - 30 - 53 - 680 - 30 - font12 - top - - - - 20 - 13 - 900 - 70 - font12 - right - top - - - - 20 - 53 - 900 - 75 - font12 - right - top - - + + 20 + 53 + 900 + 75 + font12 + right + top + - + + + 0 + 0 + 0 + 101 + lists/focus.png + Control.HasFocus(50) + + + 30 + 0 + 250 + 100 + font36_title + center + + String.IsEmpty(ListItem.Date) + - tvrecordings_width - - 0 - 0 - 0 - 101 - lists/focus.png - Control.HasFocus(50) + !String.IsEmpty(ListItem.Date) + + 30 + 10 + 30 + 100 + top + 30 - 0 - 250 + 53 + 680 100 - font36_title - center - - String.IsEmpty(ListItem.Date) + font12 + top + + + + 20 + 13 + 900 + 70 + font12 + right + top + - - !String.IsEmpty(ListItem.Date) - - 30 - 10 - 30 - 100 - top - - - - 30 - 53 - 680 - 100 - font12 - top - - - - 20 - 13 - 900 - 70 - font12 - right - top - - - - 20 - 53 - 900 - 75 - font12 - right - top - - + + 20 + 53 + 900 + 75 + font12 + right + top + diff --git a/addons/skin.estuary/xml/MyPics.xml b/addons/skin.estuary/xml/MyPics.xml index 00bacbd9b0..f5edb426d6 100644 --- a/addons/skin.estuary/xml/MyPics.xml +++ b/addons/skin.estuary/xml/MyPics.xml @@ -21,15 +21,15 @@ OpenClose_Left Control.Isvisible(54) - Visible_Right + Visible_Left Container.Content(images) - + 40 360 - 429 + 529 413 center center @@ -41,7 +41,7 @@ 20 152 - 480 + 570 760 vertical diff --git a/addons/skin.estuary/xml/MyPlaylist.xml b/addons/skin.estuary/xml/MyPlaylist.xml index f78d9b7d23..fd8b3ac1f6 100644 --- a/addons/skin.estuary/xml/MyPlaylist.xml +++ b/addons/skin.estuary/xml/MyPlaylist.xml @@ -25,61 +25,54 @@ 60 list 1 - - - playlistlist_width - - 0 - 0 - 80 - lists/focus.png - Control.HasFocus(50) - - - 30 - 80 - 30 - center - font12 - - text_shadow - - - 30 - 80 - 30 - right - center - font12 - - white - text_shadow - + + + 0 + 0 + 80 + lists/focus.png + Control.HasFocus(50) + + + 30 + 80 + 30 + center + font12 + + text_shadow + + + 30 + 80 + 30 + right + center + font12 + + text_shadow - - - playlistlist_width - - 30 - 80 - 30 - center - font12 - - text_shadow - - - 30 - 80 - 30 - right - center - font12 - - grey - text_shadow - + + + 30 + 80 + 30 + center + font12 + + text_shadow + + + 30 + 80 + 30 + right + center + font12 + + grey + text_shadow @@ -97,11 +90,19 @@ 700 50 50 - - - - - + 400 + + 467 + 110 + left + top + lists/focus.png + + 300 + 40 + 35 + + @@ -134,7 +135,7 @@ 12 80 50 - + 700 conditional vertical diff --git a/addons/skin.estuary/xml/MyWeather.xml b/addons/skin.estuary/xml/MyWeather.xml index f5683cdc6c..3abdb7e774 100644 --- a/addons/skin.estuary/xml/MyWeather.xml +++ b/addons/skin.estuary/xml/MyWeather.xml @@ -67,30 +67,29 @@ 500 OpenClose_Right - -130 + -160 Weather info - 380 + 410 + 22 2.5% 100 95% 220 - dialogs/dialog-bg-nobo.png - overlays/shadow.png - 20 + dialogs/dialog-bg.png + + + 310 + 10% + 80% + center + 44 + text_shadow + + Control.HasFocus(20) + VisibleChange - - 310 - 10% - 80% - center - 44 - text_shadow - - Control.HasFocus(20) - VisibleChange - 2.5% 100 @@ -101,7 +100,7 @@ 40 0 buttons/button-fo.png - + 20000 15100 font12 @@ -110,7 +109,7 @@ 100 - 190 + 194 center 24 500 @@ -120,14 +119,14 @@ 400 - 160 + 164 right font14 630 - 150 + 154 90 800 justify @@ -160,18 +159,18 @@ - + - + diff --git a/addons/skin.estuary/xml/PlayerControls.xml b/addons/skin.estuary/xml/PlayerControls.xml index aa3da46905..674cca84a2 100644 --- a/addons/skin.estuary/xml/PlayerControls.xml +++ b/addons/skin.estuary/xml/PlayerControls.xml @@ -9,10 +9,10 @@ 50% 1115 - - - - + + + + 20 @@ -94,7 +94,7 @@ 74 74 - + 1 0 Player.Paused @@ -125,8 +125,8 @@ 74 - - + + 605 607 1000 @@ -149,13 +149,13 @@ osd/fullscreen/buttons/random-off.png osd/fullscreen/buttons/random-on.png osd/fullscreen/buttons/random-off.png - + 125 123 74 74 - + 0 0 diff --git a/addons/skin.estuary/xml/Settings.xml b/addons/skin.estuary/xml/Settings.xml index e7f74cf64c..675f1a8aaf 100644 --- a/addons/skin.estuary/xml/Settings.xml +++ b/addons/skin.estuary/xml/Settings.xml @@ -41,12 +41,13 @@ colors/black.png - 95 - 10 + 50% + 20 240 - 240 + 160 $INFO[ListItem.Icon] center + scale 30 @@ -88,12 +89,13 @@ colors/black.png - 95 - 10 + 50% + 20 240 - 240 + 160 $INFO[ListItem.Icon] center + scale 30 @@ -109,7 +111,7 @@ ActivateWindow(PlayerSettings) - icons/settings/video.png + icons/settings/player.png @@ -129,7 +131,7 @@ ActivateWindow(InterfaceSettings) - icons/settings/appearance.png + icons/settings/interface.png @@ -146,6 +148,12 @@ ActivateWindow(SystemSettings) icons/settings/system.png + + + RunAddon(service.libreelec.settings) + icons/settings/libreelec.png + System.HasAddon(service.libreelec.settings) + ActivateWindow(systeminfo) @@ -161,11 +169,11 @@ ActivateWindow(filemanager) icons/settings/filemanager.png - + diff --git a/addons/skin.estuary/xml/SettingsCategory.xml b/addons/skin.estuary/xml/SettingsCategory.xml index eecf0ba1d1..a2af3a5798 100644 --- a/addons/skin.estuary/xml/SettingsCategory.xml +++ b/addons/skin.estuary/xml/SettingsCategory.xml @@ -106,9 +106,8 @@ 40 center font37 - white lists/focus.png - + 400 @@ -120,7 +119,7 @@ 100 0 buttons/button-fo.png - + 40 0 40 @@ -141,11 +140,10 @@ 12 137 vertical - + conditional 5 5 - colors/white.png Visible Hidden WindowOpen diff --git a/addons/skin.estuary/xml/SettingsProfile.xml b/addons/skin.estuary/xml/SettingsProfile.xml index 9dd9551c0e..1d038082e0 100644 --- a/addons/skin.estuary/xml/SettingsProfile.xml +++ b/addons/skin.estuary/xml/SettingsProfile.xml @@ -200,7 +200,6 @@ font37 center - white diff --git a/addons/skin.estuary/xml/SettingsSystemInfo.xml b/addons/skin.estuary/xml/SettingsSystemInfo.xml index 778ffa8e68..6ace4b98f5 100644 --- a/addons/skin.estuary/xml/SettingsSystemInfo.xml +++ b/addons/skin.estuary/xml/SettingsSystemInfo.xml @@ -94,12 +94,11 @@ 12 312 vertical - + conditional 9000 9000 Control.IsVisible(30) - colors/white.png Visible Hidden WindowOpen diff --git a/addons/skin.estuary/xml/SkinSettings.xml b/addons/skin.estuary/xml/SkinSettings.xml index 7d76a57cb6..e79bf8430c 100644 --- a/addons/skin.estuary/xml/SkinSettings.xml +++ b/addons/skin.estuary/xml/SkinSettings.xml @@ -49,6 +49,12 @@ Skin.HasSetting(touchmode) + + DefaultSettingButton + Skin.ToggleSetting(show_weatherinfo) + Skin.HasSetting(show_weatherinfo) + + DefaultSettingButton Skin.ToggleSetting(hide_mediaflags) @@ -247,7 +253,6 @@ font37 center - white diff --git a/addons/skin.estuary/xml/SmartPlaylistEditor.xml b/addons/skin.estuary/xml/SmartPlaylistEditor.xml index 4ec1e75cfe..2be5a43200 100644 --- a/addons/skin.estuary/xml/SmartPlaylistEditor.xml +++ b/addons/skin.estuary/xml/SmartPlaylistEditor.xml @@ -8,10 +8,10 @@ 50% 1700 - - - - + + + + vertical @@ -104,6 +104,7 @@ vertical 1380 1300 + dialogbuttons_itemgap 100 10 500 diff --git a/addons/skin.estuary/xml/SmartPlaylistRule.xml b/addons/skin.estuary/xml/SmartPlaylistRule.xml index 284abcc428..e5acd008a2 100644 --- a/addons/skin.estuary/xml/SmartPlaylistRule.xml +++ b/addons/skin.estuary/xml/SmartPlaylistRule.xml @@ -8,10 +8,10 @@ 960 330 - - - - + + + + Rule match label diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml index e6b460ce29..600fef7f78 100644 --- a/addons/skin.estuary/xml/Variables.xml +++ b/addons/skin.estuary/xml/Variables.xml @@ -26,10 +26,6 @@ 1 [COLOR grey]0[/COLOR] - - $LOCALIZE[38026]: $INFO[ListItem.Appearances] - $INFO[ListItem.Label2] - $INFO[ListItem.ContributorAndRole,[B]$LOCALIZE[31128][/B][CR][COLOR=white],[/COLOR]] $INFO[ListItem.Property(Album_Description),[COLOR=white],[/COLOR]] @@ -72,7 +68,9 @@ $INFO[ListItem.Icon] + $INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,] $INFO[ListItem.Year] + $LOCALIZE[38026]: $INFO[ListItem.Appearances] $INFO[ListItem.Label2] @@ -89,12 +87,12 @@ $INFO[ListItem.Plot] - [COLOR=button_focus]$INFO[Container(3).NumItems][/COLOR] $LOCALIZE[31036] - $LOCALIZE[31035] [COLOR=button_focus]$INFO[Container(3).CurrentPage]/$INFO[Container(3).NumPages][/COLOR] - [COLOR=button_focus]$INFO[Container(6).NumItems][/COLOR] $LOCALIZE[31036] - $LOCALIZE[31035] [COLOR=button_focus]$INFO[Container(6).CurrentPage]/$INFO[Container(6).NumPages][/COLOR] + [COLOR=button_focus]$INFO[Container(3).NumItems][/COLOR] $LOCALIZE[31036] - [COLOR=button_focus]$INFO[Container(3).CurrentPage]/$INFO[Container(3).NumPages][/COLOR] + [COLOR=button_focus]$INFO[Container(6).NumItems][/COLOR] $LOCALIZE[31036] - [COLOR=button_focus]$INFO[Container(6).CurrentPage]/$INFO[Container(6).NumPages][/COLOR] - [COLOR=button_focus]$INFO[Container(450).NumItems][/COLOR] $LOCALIZE[31036] - $LOCALIZE[31035] [COLOR=button_focus]$INFO[Container(450).CurrentPage]/$INFO[Container(450).NumPages][/COLOR] - [COLOR=button_focus]$INFO[Container(451).NumItems][/COLOR] $LOCALIZE[31036] - $LOCALIZE[31035] [COLOR=button_focus]$INFO[Container(451).CurrentPage]/$INFO[Container(451).NumPages][/COLOR] + [COLOR=button_focus]$INFO[Container(450).NumItems][/COLOR] $LOCALIZE[31036] - [COLOR=button_focus]$INFO[Container(450).CurrentPage]/$INFO[Container(450).NumPages][/COLOR] + [COLOR=button_focus]$INFO[Container(451).NumItems][/COLOR] $LOCALIZE[31036] - [COLOR=button_focus]$INFO[Container(451).CurrentPage]/$INFO[Container(451).NumPages][/COLOR] DefaultBackBanner.png @@ -219,8 +217,8 @@ dialogs/volume/mute.png - dialogs/volume/volume.png - dialogs/volume/volume2.png + dialogs/volume/volume.png + dialogs/volume/volume2.png dialogs/volume/volume.png dialogs/volume/volume1.png @@ -238,6 +236,7 @@ $INFO[ListItem.Genre] + $INFO[VideoPlayer.Title] $INFO[VideoPlayer.Title]$INFO[VideoPlayer.Year, ([COLOR button_focus],[/COLOR])] $LOCALIZE[589] $LOCALIZE[31000]... @@ -246,7 +245,7 @@ $LOCALIZE[554] $INFO[Playlist.Position] / $INFO[Playlist.Length] $INFO[VideoPlayer.Artist]$INFO[VideoPlayer.Album, - ] $INFO[VideoPlayer.Season,[COLOR button_focus]S,[/COLOR]]$INFO[VideoPlayer.Episode,[COLOR button_focus]E,: [/COLOR]]$INFO[VideoPlayer.TVShowTitle] - $INFO[VideoPlayer.ChannelNumberLabel,([COLOR=blue],[/COLOR]) ]$INFO[VideoPlayer.ChannelName]$INFO[VideoPlayer.EpisodeName, (,)] + $INFO[VideoPlayer.ChannelNumberLabel,([COLOR=blue],[/COLOR]) ]$INFO[VideoPlayer.ChannelName] $INFO[VideoPlayer.Genre] @@ -256,8 +255,6 @@ $INFO[Container(50150).ListItem.Art(fanart)] $INFO[Container(50250).ListItem.Art(fanart)] $INFO[Container(50350).ListItem.Art(fanart)] - $INFO[Container(50450).ListItem.Art(fanart)] - $INFO[Container(50550).ListItem.Art(fanart)] $INFO[Skin.String(HomeFanart.path)]$INFO[Container(9000).ListItem.Property(id)]$INFO[Skin.String(HomeFanart.ext)] @@ -286,8 +283,7 @@ $INFO[Skin.String(HomeFanart.path)]power$INFO[Skin.String(HomeFanart.ext)] $INFO[Skin.String(HomeFanart.path)]settings$INFO[Skin.String(HomeFanart.ext)] $INFO[Skin.String(HomeFanart.path)]favorites$INFO[Skin.String(HomeFanart.ext)] - $INFO[Skin.String(HomeFanart.path)]filemanager$INFO[Skin.String(HomeFanart.ext)] - $INFO[Skin.String(HomeFanart.path)]search$INFO[Skin.String(HomeFanart.ext)] + $INFO[Skin.String(HomeFanart.path)]search$INFO[Skin.String(HomeFanart.ext)] $INFO[Skin.String(HomeFanart.path)]$INFO[Container(9000).ListItem.Property(id)]$INFO[Skin.String(HomeFanart.ext)] @@ -405,4 +401,8 @@ $LOCALIZE[31136] + + $INFO[ListItem.Timertype] + $INFO[ListItem.EpisodeName] + diff --git a/addons/skin.estuary/xml/VideoFullScreen.xml b/addons/skin.estuary/xml/VideoFullScreen.xml index e47bbc8a72..cc5b4edd56 100644 --- a/addons/skin.estuary/xml/VideoFullScreen.xml +++ b/addons/skin.estuary/xml/VideoFullScreen.xml @@ -71,7 +71,6 @@ center center font11 - white diff --git a/addons/skin.estuary/xml/VideoOSD.xml b/addons/skin.estuary/xml/VideoOSD.xml index e0ca8fc3c8..4cd9052067 100644 --- a/addons/skin.estuary/xml/VideoOSD.xml +++ b/addons/skin.estuary/xml/VideoOSD.xml @@ -12,8 +12,8 @@ 0 100% 280 - - + + Action(close) @@ -33,6 +33,7 @@ 1000 60 + !Player.ShowInfo @@ -66,7 +67,7 @@ 74 74 - + 1 0 Player.Paused @@ -105,7 +106,7 @@ 74 74 - + 1 0 !Player.Recording diff --git a/addons/skin.estuary/xml/VideoOSDBookmarks.xml b/addons/skin.estuary/xml/VideoOSDBookmarks.xml index 607d20ad4b..57996e7ac4 100644 --- a/addons/skin.estuary/xml/VideoOSDBookmarks.xml +++ b/addons/skin.estuary/xml/VideoOSDBookmarks.xml @@ -9,13 +9,13 @@ 0 100% 546 - - + + Action(close) 0 - 546 + 550 0 100% @@ -38,7 +38,7 @@ horizontal 0 - -4 + -10 100% center 100 diff --git a/addons/skin.estuary/xml/View_500_Wall.xml b/addons/skin.estuary/xml/View_500_Wall.xml index 36bbcc2335..ba72632e05 100644 --- a/addons/skin.estuary/xml/View_500_Wall.xml +++ b/addons/skin.estuary/xml/View_500_Wall.xml @@ -27,11 +27,6 @@ 120 InfoWallMovieLayout - - 135 - 108 - UserRatingCircle - @@ -42,46 +37,26 @@ - - 135 - -12 - UserRatingCircle - - - - 144 - 516 - 32 - 32 - $VAR[WallWatchedIconVar] - + - 150 - + 110 + + - - - 144 - 516 - 32 - 32 - $VAR[WallWatchedIconVar] - Focus - UnFocus - + DepthContentPopout - Focus - UnFocus - 150 - - + Focus + UnFocus + 110 + + diff --git a/addons/skin.estuary/xml/View_501_Banner.xml b/addons/skin.estuary/xml/View_501_Banner.xml index 15007e119b..2931610a0b 100644 --- a/addons/skin.estuary/xml/View_501_Banner.xml +++ b/addons/skin.estuary/xml/View_501_Banner.xml @@ -131,7 +131,6 @@ 800 20 font12 - button_focus right center @@ -151,7 +150,6 @@ 800 20 font12 - button_focus right center diff --git a/addons/skin.estuary/xml/View_502_FanArt.xml b/addons/skin.estuary/xml/View_502_FanArt.xml index 6f3e4071ed..ecbc503645 100644 --- a/addons/skin.estuary/xml/View_502_FanArt.xml +++ b/addons/skin.estuary/xml/View_502_FanArt.xml @@ -28,8 +28,8 @@ 38 36 - 104 - 650 + 115 + 644 300 $VAR[FanartImageVar] scale diff --git a/addons/skin.estuary/xml/View_50_List.xml b/addons/skin.estuary/xml/View_50_List.xml index 80b450a4f0..b3c064972f 100644 --- a/addons/skin.estuary/xml/View_50_List.xml +++ b/addons/skin.estuary/xml/View_50_List.xml @@ -56,9 +56,10 @@ 0 list_width - 100% + list_y_offset + list_y_offset 5 - 7 + 6 500 vertical $PARAM[list_id]600 @@ -68,92 +69,86 @@ $PARAM[list_id] list Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Window.IsActive(MyPlaylist.xml) - - - list_width - - 0 - 0 - 0 - 69 - lists/focus.png - Control.HasFocus($PARAM[list_id]) - - - 70 - 70 - 0 - 70 - center - true - font27 - - text_shadow - - - 100 - 0 - 70 - 20 - right - center - font12 - - Focus - text_shadow - - - 21 - 20 - 32 - 32 - $VAR[ListWatchedIconVar] - Focus - - - 21 - 20 - 32 - 32 - $VAR[ListWatchedIconVar] - Focus - VisibleChange - !Control.HasFocus($PARAM[list_id]) - + + + 0 + 0 + 0 + 0 + lists/focus.png + Control.HasFocus($PARAM[list_id]) + + + 70 + 70 + 0 + 0 + center + true + font27 + + text_shadow + + + 0 + 0 + 100 + 20 + right + center + font12 + + Focus + text_shadow + + + 21 + 50% + 32 + 32 + $VAR[ListWatchedIconVar] + Focus + + + 21 + 50% + 32 + 32 + $VAR[ListWatchedIconVar] + Focus + VisibleChange + !Control.HasFocus($PARAM[list_id]) - - - list_width - - 70 - 70 - 0 - 70 - center - font27 - - text_shadow - - - 20 - 20 - 0 - 70 - right - center - font12 - - grey - text_shadow - - - 21 - 20 - 32 - 32 - $VAR[ListWatchedIconVar] - + + + 70 + 70 + 0 + 0 + center + font27 + + text_shadow + + + 20 + 20 + 0 + 0 + right + center + font12 + + grey + text_shadow + + + 21 + 50% + 32 + 32 + $VAR[ListWatchedIconVar] @@ -176,6 +171,11 @@ 300 $VAR[IconWallThumbVar] + + 273 + 590 + UserRatingCircle + 30 640 diff --git a/addons/skin.estuary/xml/View_52_IconWall.xml b/addons/skin.estuary/xml/View_52_IconWall.xml index 0367ecb25f..0f38a2990e 100644 --- a/addons/skin.estuary/xml/View_52_IconWall.xml +++ b/addons/skin.estuary/xml/View_52_IconWall.xml @@ -145,7 +145,6 @@ center center - white diff --git a/addons/skin.estuary/xml/View_53_Shift.xml b/addons/skin.estuary/xml/View_53_Shift.xml index 7b18cfbb27..954ffbe4f2 100644 --- a/addons/skin.estuary/xml/View_53_Shift.xml +++ b/addons/skin.estuary/xml/View_53_Shift.xml @@ -54,7 +54,7 @@ 5199 500 horizontal - Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(musicvideos) | Container.Content(episodes) | Container.Content(artists) | Container.Content(albums) | Container.Content(mixed) | Container.Content(images) | Container.Content(videos) + Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(musicvideos) | Container.Content(artists) | Container.Content(albums) | Container.Content(mixed) | Container.Content(images) | Container.Content(videos) 53 9000 5199 @@ -91,36 +91,33 @@ - + + DepthContentPopout 0 - - DepthContentPopout - 0 - 90 - 370 - 480 - keep - $VAR[ShiftThumbVar] - overlays/shadow.png - 20 - - - 20 - 603 - 330 - 105 - center - center - - True - - - 169 - 560 - 32 - 32 - $VAR[WallWatchedIconVar] - + 90 + 370 + 480 + keep + $VAR[ShiftThumbVar] + overlays/shadow.png + 20 + + + 20 + 603 + 330 + 105 + center + center + + True + + + 169 + 560 + 32 + 32 + $VAR[WallWatchedIconVar] diff --git a/addons/skin.estuary/xml/View_54_InfoWall.xml b/addons/skin.estuary/xml/View_54_InfoWall.xml index cc4f0cd3d2..ae6272f3e1 100644 --- a/addons/skin.estuary/xml/View_54_InfoWall.xml +++ b/addons/skin.estuary/xml/View_54_InfoWall.xml @@ -5,7 +5,7 @@ -10 - 396 + 376 380 dialogs/dialog-bg-nobo.png overlays/shadow.png @@ -14,18 +14,18 @@ -14 -4 - 404 + 384 388 colors/grey.png overlays/shadow.png 20 $PARAM[focused] - Animation_FocusTextureFade + Animation_FocusTextureFade 20 10 - 356 + 336 300 $VAR[InfoWallThumbVar] keep @@ -33,18 +33,21 @@ 20 318 - 358 + 338 20 20 center center + font12 DefaultFolder.png - $INFO[ListItem.Year,[B], - [/B]]$INFO[ListItem.Label] + $INFO[ListItem.Artist] + $INFO[ListItem.Year,[B],[/B]] + $INFO[ListItem.Label] false @@ -64,7 +67,7 @@ overlays/shadow.png 20 $PARAM[focused] - Animation_FocusTextureFade + Animation_FocusTextureFade 0 @@ -83,12 +86,150 @@ font12 center center - + + !String.IsEqual(ListItem.DBType,album) + + + String.IsEqual(ListItem.DBType,album) + + 29 + 300 + 260 + + font10 + text_shadow + $PARAM[focused] + center + + + 29 + 328 + 260 + + font12 + text_shadow + $PARAM[focused] + center + + + + 145 + 2 + UserRatingCircle + + + + + $INFO[ListItem.Title] + $INFO[ListItem.TVShowTitle] + $INFO[ListItem.Season,,x]$INFO[ListItem.Episode] + DefaultTVShows.png + false + + + 10 + 316 + 288 + dialogs/dialog-bg-nobo.png + overlays/shadow.png + 20 + + + 6 + -4 + 324 + 296 + colors/grey.png + overlays/shadow.png + 20 + $PARAM[focused] + Animation_FocusTextureFade + + + 0 + 10 + 316 + 218 + $VAR[InfoWallThumbVar] + scale + 20 + + + 136 + 138 + 160 + 70 + overlays/overlay-bg.png + String.IsEqual(ListItem.DBtype,episode) + + + 31 + 178 + 260 + + font20_title + text_shadow + right + + + 20 + 175 + 32 + 32 + $VAR[WallWatchedIconVar] + + + 28 + 202 + 262 + 80 + font12 + center + center + + Window.IsActive(videos) + + + !Window.IsActive(videos) + + 29 + 210 + 260 + + font12 + text_shadow + $PARAM[focused] + center + + + 29 + 240 + 260 + + font10 + text_shadow + $PARAM[focused] + center + + + + 20 + 258 + 276 + 1 + + progress/texturebg_alt_white.png + ListItem.PercentPlayed + !Integer.IsEqual(ListItem.PercentPlayed,0) + + + 134 + 8 + UserRatingCircle - DefaultVideo.png false @@ -110,20 +251,20 @@ colors/grey.png 20 $PARAM[focused] - Animation_FocusTextureFade + Animation_FocusTextureFade 26 0 270 290 - $INFO[ListItem.Icon] + $INFO[ListItem.Icon] keep 20 40 - 270 + 240 242 90 font27 @@ -142,14 +283,14 @@ overlays/shadow.png 20 $PARAM[focused] + !String.IsEmpty(ListItem.Art(poster)) - Animation_FocusTextureFade + Animation_FocusTextureFade 15 -10 290 400 - $INFO[ListItem.Art(poster)] + $INFO[ListItem.Art(poster)] scale overlays/shadow.png 20 @@ -163,6 +304,33 @@ overlays/overlay-bg.png Listitem.IsCollection | ListItem.IsResumable | ListItem.IsPlaying | Integer.IsGreater(ListItem.Playcount,0) + + String.IsEqual(ListItem.DBtype,tvshow) + 320 + + 35 + 0 + 250 + 50 + overlays/overlayfade.png + + + 0 + 20 + 244 + + font20_title + text_shadow + right + + + 254 + 23 + 24 + 24 + lists/played-total.png + + 35 338 @@ -170,6 +338,21 @@ 32 $VAR[WallWatchedIconVar] + + 135 + -8 + UserRatingCircle + + + 35 + 350 + 250 + 1 + + progress/texturebg_alt_white.png + ListItem.PercentPlayed + !Integer.IsEqual(ListItem.PercentPlayed,0) + @@ -180,9 +363,9 @@ Control.IsVisible(54) Visible_Right - 440 + 490 0 - 80% + 15 100% 9000 531 @@ -193,40 +376,53 @@ 2 531 500 - Container.Content(artists) | Container.Content(albums) | Container.Content(sets) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(musicvideos) | Container.Content(images) + Container.Content(artists) | Container.Content(albums) | Container.Content(sets) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(musicvideos) | Container.Content(images) - 80 + 30 120 InfoWallMovieLayout - - 215 - 108 - UserRatingCircle - DepthContentPopout - 80 - Focus - UnFocus + 30 + Focus + UnFocus 120 - - 135 - -12 - UserRatingCircle - + + + + + 40 + 110 + + + + + + + + + DepthContentPopout + Focus + UnFocus + 40 + 110 + + + + 150 - 90 + 40 InfoWallMusicLayout 133 @@ -238,10 +434,10 @@ DepthContentPopout - Focus - UnFocus + Focus + UnFocus 150 - 90 + 40 @@ -252,20 +448,20 @@ - + - 30 + 0 150 InfoWallPictureLayout - + DepthContentPopout - 30 + 0 150 - Focus - UnFocus + Focus + UnFocus diff --git a/addons/skin.estuary/xml/View_55_WideList.xml b/addons/skin.estuary/xml/View_55_WideList.xml index 89427f0aaa..6652a00893 100644 --- a/addons/skin.estuary/xml/View_55_WideList.xml +++ b/addons/skin.estuary/xml/View_55_WideList.xml @@ -7,115 +7,113 @@ Visible_Right 594 - 3 + list_y_offset + list_y_offset 0 - 100% 500 vertical 531 - 3 - 5 + 5 + 6 9000 531 55 55 list Container.Content(artists) | Container.Content(albums) | Container.Content(songs) | Container.Content(addons) | Container.Content(actors) | Container.Content(directors) | Container.Content(files) | Container.Content(mixed) | Container.Content(musicvideos) | Container.Content(videos) | Container.Content() | Container.Content(episodes) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) - - - widelist_width - - 0 - 0 - 80 - lists/focus.png - Control.HasFocus(55) - - - 18 - 2 - 80 - 80 - center - - text_shadow - !Container.Content(tvshows) + !Container.Content(seasons) + !Container.Content(episodes) + !Container.Content(movies) - - - 35 - 25 - 32 - 32 - $VAR[ListWatchedIconVar] - Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(movies) | String.IsEmpty(ListItem.Year) - - - 105 - 80 - 100 - center - true - - text_shadow - - - 40 - 80 - 40 - right - center - - text_shadow - + + + 0 + 0 + 0 + lists/focus.png + Control.HasFocus(55) + + + 18 + 0 + 0 + 80 + center + + text_shadow + !Container.Content(tvshows) + !Container.Content(seasons) + !Container.Content(episodes) + !Container.Content(movies) + + + 35 + 50% + 32 + 32 + $VAR[ListWatchedIconVar] + Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(movies) | String.IsEmpty(ListItem.Year) + + + 105 + 0 + 0 + 100 + center + true + + text_shadow + + + 40 + 0 + 0 + 40 + right + center + + text_shadow - - - widelist_width - - 18 - 2 - 80 - 80 - center - - button_focus - text_shadow - !Container.Content(tvshows) + !Container.Content(seasons) + !Container.Content(episodes) + !Container.Content(movies) - - - 35 - 25 - 32 - 32 - $VAR[ListWatchedIconVar] - Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(movies) | String.IsEmpty(ListItem.Year) - - - 105 - 80 - 100 - center - - text_shadow - - - 40 - 80 - 40 - right - center - - text_shadow - - - 35 - 25 - String.IsEmpty(ListItem.Year) + String.IsEmpty(ListItem.AddonVersion) - 32 - 32 - $VAR[ListWatchedIconVar] - + + + 18 + 0 + 0 + 80 + center + + button_focus + text_shadow + !Container.Content(tvshows) + !Container.Content(seasons) + !Container.Content(episodes) + !Container.Content(movies) + + + 35 + 50% + 32 + 32 + $VAR[ListWatchedIconVar] + Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(movies) | String.IsEmpty(ListItem.Year) + + + 105 + 0 + 0 + 100 + center + + text_shadow + + + 40 + 0 + 0 + 40 + right + center + + text_shadow + + + 35 + 50% + String.IsEmpty(ListItem.Year) + String.IsEmpty(ListItem.AddonVersion) + 32 + 32 + $VAR[ListWatchedIconVar] SongsListLayout @@ -124,126 +122,114 @@ - - - widelist_width - - 0 - 0 - 80 - lists/focus.png - Control.hasFocus(55) - - - 35 - 80 - 90 - center - true - - text_shadow - - - 40 - 80 - 40 - right - center - - text_shadow - + + + 0 + 0 + 80 + lists/focus.png + Control.hasFocus(55) + + + 35 + 80 + 90 + center + true + + text_shadow + + + 40 + 80 + 40 + right + center + + text_shadow - - - widelist_width - - 35 - 80 - 90 - center - - text_shadow - - - 40 - 80 - 40 - right - center - - grey - text_shadow - + + + 35 + 80 + 90 + center + + text_shadow + + + 40 + 80 + 40 + right + center + + grey + text_shadow - - - widelist_width - - 0 - 0 - 80 - lists/focus.png - Control.hasFocus(55) - - - 20 - 25 - 32 - 32 - $VAR[AddonsListIconVar] - - - 75 - 80 - 100 - center - true - - - - 40 - 80 - 40 - right - center - font27 - - + + + 0 + 0 + 80 + lists/focus.png + Control.hasFocus(55) + + + 20 + 25 + 32 + 32 + $VAR[AddonsListIconVar] + + + 75 + 80 + 100 + center + true + + + + 40 + 80 + 40 + right + center + font27 + - - - widelist_width - - 20 - 25 - 32 - 32 - $VAR[AddonsListIconVar] - - - 75 - 80 - 100 - center - true - - - - 40 - 80 - 40 - right - center - font27 - - grey - text_shadow - + + + 20 + 25 + 32 + 32 + $VAR[AddonsListIconVar] + + + 75 + 80 + 100 + center + true + + + + 40 + 80 + 40 + right + center + font27 + + grey + text_shadow -- cgit v1.2.3