diff --git a/720p/Defaults.xml b/720p/Defaults.xml index a622176c..c86d8dc9 100644 --- a/720p/Defaults.xml +++ b/720p/Defaults.xml @@ -31,6 +31,8 @@ DisabledColor ShadowColor 8 + - + - center 50 20 diff --git a/720p/DialogContextMenu.xml b/720p/DialogContextMenu.xml index c69e4517..af55ba79 100644 --- a/720p/DialogContextMenu.xml +++ b/720p/DialogContextMenu.xml @@ -25,7 +25,6 @@ 0 344 auto - 2 gui/context-menu-middle.png diff --git a/720p/DialogFullScreenInfo.xml b/720p/DialogFullScreenInfo.xml index 5c986828..82996d2f 100644 --- a/720p/DialogFullScreenInfo.xml +++ b/720p/DialogFullScreenInfo.xml @@ -211,6 +211,7 @@ MediaFlagFadeAnim PlayerVideoMediaFlags PlayerAudioMediaFlags + PlayerAspectMediaFlags PlayerRatingMediaFlags diff --git a/720p/DialogSeekBar.xml b/720p/DialogSeekBar.xml index 4cc0f120..ac002359 100644 --- a/720p/DialogSeekBar.xml +++ b/720p/DialogSeekBar.xml @@ -73,16 +73,14 @@ !Player.Seeking - Caching - 18 + SeekbarLabels + 5 + auto OSDFont - DisabledColor + SelectedColor2 5 - center - - [Player.Paused + Player.Caching] + !Player.Seeking + - SeekSpeedLabels diff --git a/720p/MusicOSD.xml b/720p/MusicOSD.xml index 4aa419ed..210cedde 100644 --- a/720p/MusicOSD.xml +++ b/720p/MusicOSD.xml @@ -370,16 +370,14 @@ !Player.Seeking - Caching - 18 + SeekbarLabels + 5 + auto OSDFont - DisabledColor + SelectedColor2 5 - center - - [Player.Paused + Player.Caching] + !Player.Seeking + - SeekSpeedLabels diff --git a/720p/MyWeather.xml b/720p/MyWeather.xml index b9e5340d..ed6ef0d8 100644 --- a/720p/MyWeather.xml +++ b/720p/MyWeather.xml @@ -2,7 +2,7 @@ 850 yes - Skin.SetString(WeatherPlus,1) + Skin.SetString(WeatherUnderground,1) RunScript(script.artistslideshow) @@ -45,15 +45,15 @@ IsEmpty(Weather.Plugin) - WeatherStandard - WeatherPlus + WeatherStandard + WeatherUnderground MenuBarOffsetY MenuBarImage MenuBarOpenCloseAnim2 - MyWeatherMenuBar - MyWeatherPlusMenuBar + MyWeatherMenuBar + MyWeatherUndergroundMenuBar !IsEmpty(Weather.Plugin) diff --git a/720p/VideoFullScreen.xml b/720p/VideoFullScreen.xml index ffff8af5..abab3fc2 100644 --- a/720p/VideoFullScreen.xml +++ b/720p/VideoFullScreen.xml @@ -217,6 +217,7 @@ MediaFlagFadeAnim PlayerVideoMediaFlags PlayerAudioMediaFlags + PlayerAspectMediaFlags PlayerRatingMediaFlags diff --git a/720p/VideoOSD.xml b/720p/VideoOSD.xml index 03084ad6..03fa8913 100644 --- a/720p/VideoOSD.xml +++ b/720p/VideoOSD.xml @@ -505,16 +505,14 @@ !Player.Seeking - Caching - 18 + SeekbarLabels + 5 + auto OSDFont - DisabledColor + SelectedColor2 5 - center - - [Player.Paused + Player.Caching] + !Player.Seeking + - SeekSpeedLabels diff --git a/720p/includes.xml b/720p/includes.xml index 4701af35..4a62f9ad 100644 --- a/720p/includes.xml +++ b/720p/includes.xml @@ -86,6 +86,22 @@ $INFO[ListItem.Path,../,logo.png] $INFO[ListItem.Path,,logo.png] + + + [UPPERCASE]$LOCALIZE[112][/UPPERCASE] + $INFO[Player.CacheLevel,,%] + +2X + +4X + +8X + +16X + +32X + -2X + -4X + -8X + -16X + -32X + [UPPERCASE]$INFO[Player.SeekOffset][/UPPERCASE] + ScreenWidth @@ -576,120 +592,6 @@ ShadowColor center - - - - - 2X - 18 - OSDFont - DefaultColor3 - 5 - center - - Player.Forwarding2x + !Player.Seeking - - - - 4X - 18 - OSDFont - DefaultColor3 - 5 - center - - Player.Forwarding4x + !Player.Seeking - - - - 8X - 18 - OSDFont - DefaultColor3 - 5 - center - - Player.Forwarding8x + !Player.Seeking - - - - 16X - 18 - OSDFont - DefaultColor3 - 5 - center - - Player.Forwarding16x + !Player.Seeking - - - - 32X - 18 - OSDFont - DefaultColor3 - 5 - center - - Player.Forwarding32x + !Player.Seeking - - - - - 2X - 18 - OSDFont - DefaultColor3 - 5 - center - - Player.Rewinding2x + !Player.Seeking - - - - 4X - 18 - OSDFont - DefaultColor3 - 5 - center - - Player.Rewinding4x + !Player.Seeking - - - - 8X - 18 - OSDFont - DefaultColor3 - 5 - center - - Player.Rewinding8x + !Player.Seeking - - - - 16X - 18 - OSDFont - DefaultColor3 - 5 - center - - Player.Rewinding16x + !Player.Seeking - - - - 32X - 18 - OSDFont - DefaultColor3 - 5 - center - - Player.Rewinding32x + !Player.Seeking - - diff --git a/720p/includes_Animations.xml b/720p/includes_Animations.xml index a12092e2..4a001e8f 100644 --- a/720p/includes_Animations.xml +++ b/720p/includes_Animations.xml @@ -243,7 +243,7 @@ Conditional - + @@ -251,13 +251,46 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Conditional diff --git a/720p/includes_BreadCrumbs.xml b/720p/includes_BreadCrumbs.xml index b8cc590a..08df9166 100644 --- a/720p/includes_BreadCrumbs.xml +++ b/720p/includes_BreadCrumbs.xml @@ -87,7 +87,7 @@ BreadCrumbSeparator BreadCrumbSlideLvl2Anim - ![Substring(Container.FolderPath,videodb://4/) | Substring(Container.FolderPath,videodb://5/) | Substring(Container.FolderPath,videodb://6/)] + Control.IsVisible(5501) | Control.IsVisible(5502) | Control.IsVisible(5503) | Control.IsVisible(5504) Files @@ -212,9 +212,8 @@ BreadCrumbSeparator BreadCrumbSlideLvl3Anim - [Substring(Container.FolderPath,videodb://1/,Right) | Substring(Container.FolderPath,videodb://2/,Right) | IsEmpty(Container.FolderPath)] | Window.IsActive(videoplaylist) | Substring(Container.FolderPath,.xsp) | Substring(Container.FolderPath,special://videoplaylists/) | Container.Content(Addons) | Substring(Container.FolderPath,plugin:) - | [[StringCompare(Container.FolderPath,videodb://4/) | Substring(Container.FolderPath,videodb://1/) | Substring(Container.FolderPath,videodb://2/) | Substring(Container.FolderPath,videodb://3/)] + ![Substring(Container.FolderPath,videodb://1/2/) | Substring(Container.FolderPath,videodb://2/2/) | Substring(Container.FolderPath,videodb://3/2/)]] - | [[StringCompare(Container.FolderPath,sources://video/) | Container.Content(Videos,Files)] + ![IsEmpty(Container.FolderPath) | Window.IsActive(videoplaylist) | Substring(Container.FolderPath,plugin:)]] + Control.IsVisible(5505) | Control.IsVisible(5506) | Control.IsVisible(5507) | Control.IsVisible(5508) | Control.IsVisible(5509) | Control.IsVisible(5510) | Control.IsVisible(5511) | Control.IsVisible(5512) | Control.IsVisible(5513) | + Control.IsVisible(5514) | Control.IsVisible(5515) | Control.IsVisible(5516) | Control.IsVisible(5517) | Control.IsVisible(5518) | Control.IsVisible(5521) | Control.IsVisible(5523) | Control.IsVisible(5524) Folder @@ -255,7 +254,7 @@ BreadCrumbSeparator - ![!Skin.HasSetting(DisplayMovieTitle) + [Container.Content(Movies) | SubString(ListItem.Path,videodb://1/7/,left)]] + ![!Skin.HasSetting(DisplayTVShowsTitle) + Container.Content(TVShows)] + !IsEmpty(ListItem.Title) + !Substring(Container.FolderPath,videodb://3/) + Control.IsVisible(5519) | Control.IsVisible(5520) BreadCrumbSlideLvl4Anim @@ -1190,42 +1189,42 @@ Today BreadCrumbLabel - StringCompare(Weather.Plugin,weather.weatherplus) + StringCompare(Skin.String(WeatherPlus),1) + StringCompare(Weather.Plugin,weather.wunderground) + StringCompare(Skin.String(WeatherUnderground),1) BreadCrumbSlideLvl3Anim 36 Hour BreadCrumbLabel - StringCompare(Weather.Plugin,weather.weatherplus) + StringCompare(Skin.String(WeatherPlus),2) + StringCompare(Weather.Plugin,weather.wunderground) + StringCompare(Skin.String(WeatherUnderground),2) BreadCrumbSlideLvl3Anim Weekend BreadCrumbLabel - StringCompare(Weather.Plugin,weather.weatherplus) + StringCompare(Skin.String(WeatherPlus),3) + StringCompare(Weather.Plugin,weather.wunderground) + StringCompare(Skin.String(WeatherUnderground),3) BreadCrumbSlideLvl3Anim Hourly BreadCrumbLabel - StringCompare(Weather.Plugin,weather.weatherplus) + StringCompare(Skin.String(WeatherPlus),4) + StringCompare(Weather.Plugin,weather.wunderground) + StringCompare(Skin.String(WeatherUnderground),4) BreadCrumbSlideLvl3Anim 10 Days BreadCrumbLabel - StringCompare(Weather.Plugin,weather.weatherplus) + StringCompare(Skin.String(WeatherPlus),5) + StringCompare(Weather.Plugin,weather.wunderground) + StringCompare(Skin.String(WeatherUnderground),5) BreadCrumbSlideLvl3Anim Maps BreadCrumbLabel - StringCompare(Weather.Plugin,weather.weatherplus) + StringCompare(Skin.String(WeatherPlus),6) + StringCompare(Weather.Plugin,weather.wunderground) + StringCompare(Skin.String(WeatherUnderground),6) BreadCrumbSlideLvl3Anim diff --git a/720p/includes_Home.xml b/720p/includes_Home.xml index a5d0164b..b30f08a8 100644 --- a/720p/includes_Home.xml +++ b/720p/includes_Home.xml @@ -4353,7 +4353,7 @@ 49 $INFO[Window(Home).Property(NextAired.1.Art(clearlogo))] keep - Conditional + NextAiredFadeAnim substring(Window(Home).Property(NextAired.1.Today),true) @@ -4361,9 +4361,17 @@ 49 $INFO[Window(Home).Property(NextAired.7.Art(clearlogo))] keep - Conditional + NextAiredFadeAnim2 substring(Window(Home).Property(NextAired.7.Today),true) + + 146 + 49 + $INFO[Window(Home).Property(NextAired.13.Art(clearlogo))] + keep + NextAiredFadeAnim3 + substring(Window(Home).Property(NextAired.13.Today),true) + 146 @@ -4373,7 +4381,7 @@ 49 $INFO[Window(Home).Property(NextAired.2.Art(clearlogo))] keep - Conditional + NextAiredFadeAnim substring(Window(Home).Property(NextAired.2.Today),true) @@ -4381,9 +4389,17 @@ 49 $INFO[Window(Home).Property(NextAired.8.Art(clearlogo))] keep - Conditional + NextAiredFadeAnim2 substring(Window(Home).Property(NextAired.8.Today),true) + + 146 + 49 + $INFO[Window(Home).Property(NextAired.14.Art(clearlogo))] + keep + NextAiredFadeAnim3 + substring(Window(Home).Property(NextAired.14.Today),true) + 146 @@ -4393,7 +4409,7 @@ 49 $INFO[Window(Home).Property(NextAired.3.Art(clearlogo))] keep - Conditional + NextAiredFadeAnim substring(Window(Home).Property(NextAired.3.Today),true) @@ -4401,9 +4417,17 @@ 49 $INFO[Window(Home).Property(NextAired.9.Art(clearlogo))] keep - Conditional + NextAiredFadeAnim2 substring(Window(Home).Property(NextAired.9.Today),true) + + 146 + 49 + $INFO[Window(Home).Property(NextAired.15.Art(clearlogo))] + keep + NextAiredFadeAnim3 + substring(Window(Home).Property(NextAired.15.Today),true) + @@ -4423,7 +4447,7 @@ 49 $INFO[Window(Home).Property(NextAired.4.Art(clearlogo))] keep - Conditional + NextAiredFadeAnim substring(Window(Home).Property(NextAired.4.Today),true) @@ -4431,8 +4455,16 @@ 49 $INFO[Window(Home).Property(NextAired.10.Art(clearlogo))] keep - Conditional - substring(Window(Home).Property(NextAired.7.Today),true) + NextAiredFadeAnim2 + substring(Window(Home).Property(NextAired.10.Today),true) + + + 146 + 49 + $INFO[Window(Home).Property(NextAired.16.Art(clearlogo))] + keep + NextAiredFadeAnim3 + substring(Window(Home).Property(NextAired.16.Today),true) @@ -4443,7 +4475,7 @@ 49 $INFO[Window(Home).Property(NextAired.5.Art(clearlogo))] keep - Conditional + NextAiredFadeAnim substring(Window(Home).Property(NextAired.5.Today),true) @@ -4451,9 +4483,17 @@ 49 $INFO[Window(Home).Property(NextAired.11.Art(clearlogo))] keep - Conditional + NextAiredFadeAnim2 substring(Window(Home).Property(NextAired.11.Today),true) + + 146 + 49 + $INFO[Window(Home).Property(NextAired.17.Art(clearlogo))] + keep + NextAiredFadeAnim3 + substring(Window(Home).Property(NextAired.17.Today),true) + 146 @@ -4463,7 +4503,7 @@ 49 $INFO[Window(Home).Property(NextAired.6.Art(clearlogo))] keep - Conditional + NextAiredFadeAnim substring(Window(Home).Property(NextAired.6.Today),true) @@ -4471,9 +4511,17 @@ 49 $INFO[Window(Home).Property(NextAired.12.Art(clearlogo))] keep - Conditional + NextAiredFadeAnim2 substring(Window(Home).Property(NextAired.12.Today),true) + + 146 + 49 + $INFO[Window(Home).Property(NextAired.18.Art(clearlogo))] + keep + NextAiredFadeAnim3 + substring(Window(Home).Property(NextAired.18.Today),true) + diff --git a/720p/includes_MediaFlags.xml b/720p/includes_MediaFlags.xml index 5e4900f9..e0126c2c 100644 --- a/720p/includes_MediaFlags.xml +++ b/720p/includes_MediaFlags.xml @@ -7,7 +7,7 @@ hddvd - dvd + dvd @@ -18,7 +18,7 @@ stretch flagging/$VAR[MediaFlagTheme]/video/bluray.png - substring(ListItem.FilenameAndPath,bluray) | substring(ListItem.FilenameAndPath,blu-ray) | substring(ListItem.FilenameAndPath,brrip) + substring(ListItem.FilenameAndPath,bluray) | substring(ListItem.FilenameAndPath,blu-ray) | substring(ListItem.FilenameAndPath,brrip) | substring(ListItem.FilenameAndPath,bd25) | substring(ListItem.FilenameAndPath,bd50) 3D @@ -27,16 +27,16 @@ stretch flagging/$VAR[MediaFlagTheme]/video/3d.png MediaFlagsCrossfadeTime - substring(ListItem.FilenameAndPath,3d) | substring(ListItem.FilenameAndPath,hsbs) | substring(ListItem.FilenameAndPath,sbs) | substring(ListItem.FilenameAndPath,half-sbs) + substring(ListItem.FilenameAndPath,.3d.) | substring(ListItem.FilenameAndPath,hsbs) | substring(ListItem.FilenameAndPath,sbs) | substring(ListItem.FilenameAndPath,half-sbs) - DVD + HDDVD / DVD 82 35 stretch flagging/$VAR[MediaFlagTheme]/video/$VAR[DVDFlagging].png - substring(ListItem.FilenameAndPath,hddvd) | substring(ListItem.FilenameAndPath,hd-dvd) | substring(ListItem.filename,.iso,right) | substring(ListItem.filename,.img,right) | substring(ListItem.FilenameAndPath,dvd) | substring(ListItem.filename,.ifo,right) | substring(ListItem.filename,.vob,right) | substring(ListItem.FilenameAndPath,dvdrip) | substring(ListItem.FilenameAndPath,dvdr5) | substring(ListItem.FilenameAndPath,.r5) | substring(ListItem.FilenameAndPath,dvdscreener) | substring(ListItem.FilenameAndPath,dvdscr) | substring(ListItem.FilenameAndPath,screener) + substring(ListItem.FilenameAndPath,hddvd) | substring(ListItem.FilenameAndPath,hd-dvd) | substring(ListItem.FileExtension,iso) | substring(ListItem.FileExtension,img) | substring(ListItem.FilenameAndPath,dvd) | substring(ListItem.FileExtension,ifo) | substring(ListItem.FileExtension,vob) | substring(ListItem.FilenameAndPath,dvdrip) | substring(ListItem.FilenameAndPath,dvdr5) | substring(ListItem.FilenameAndPath,.r5) | substring(ListItem.FilenameAndPath,dvdscreener) | substring(ListItem.FilenameAndPath,dvdscr) | substring(ListItem.FilenameAndPath,screener) HDTV @@ -54,7 +54,7 @@ stretch flagging/$VAR[MediaFlagTheme]/video/sdtv.png - substring(ListItem.FilenameAndPath,sdtv) + SubString(ListItem.FilenameAndPath,PDTV) | substring(ListItem.FilenameAndPath,sdtv) Telesync @@ -74,6 +74,15 @@ substring(ListItem.FilenameAndPath,.cam) + + VHS + 64 + 35 + stretch + flagging/$VAR[MediaFlagTheme]/video/vhs.png + + substring(ListItem.FilenameAndPath,vhs) + @@ -93,7 +102,7 @@ stretch flagging/$VAR[MediaFlagTheme]/video/divx.png - substring(ListItem.VideoCodec,divx) | substring(ListItem.VideoCodec,div3) | substring(ListItem.VideoCodec,div4) | substring(ListItem.VideoCodec,div5) | substring(ListItem.VideoCodec,dx50) + substring(ListItem.VideoCodec,divx) | substring(ListItem.VideoCodec,div2) | substring(ListItem.VideoCodec,div3) | substring(ListItem.VideoCodec,div4) | substring(ListItem.VideoCodec,divx 4) | substring(ListItem.VideoCodec,div5) | substring(ListItem.VideoCodec,dx50) H264 Codec @@ -102,7 +111,7 @@ stretch flagging/$VAR[MediaFlagTheme]/video/h264.png - substring(ListItem.VideoCodec,h264) | substring(ListItem.VideoCodec,x264) + substring(ListItem.VideoCodec,h264) | substring(ListItem.VideoCodec,x264) | substring(ListItem.VideoCodec,hdmv) AVC1 Codec @@ -115,13 +124,22 @@ WVC1 Codec - 77 + 80 35 stretch flagging/$VAR[MediaFlagTheme]/video/wvc1.png substring(ListItem.VideoCodec,wvc1) | substring(ListItem.VideoCodec,vc-1) + + WMV Codec + 80 + 35 + stretch + flagging/$VAR[MediaFlagTheme]/video/wmv.png + + substring(ListItem.VideoCodec,wmv) | substring(ListItem.VideoCodec,wmv2) | substring(ListItem.VideoCodec,wmv3) + MPEG-1 Codec 57 @@ -147,7 +165,7 @@ stretch flagging/$VAR[MediaFlagTheme]/video/mpeg4video.png - substring(ListItem.VideoCodec,mpeg-4 visual) | substring(ListItem.VideoCodec,mp4v) + substring(ListItem.VideoCodec,mpeg-4 visual) | substring(ListItem.VideoCodec,mpg4) | substring(ListItem.VideoCodec,mp4v) Sorenson Video Codec @@ -156,7 +174,7 @@ stretch flagging/$VAR[MediaFlagTheme]/video/svq3.png - substring(ListItem.VideoCodec,svq3) + substring(ListItem.VideoCodec,svq1) | substring(ListItem.VideoCodec,svq3) Flash Video Codec @@ -238,6 +256,15 @@ substring(ListItem.AudioCodec,dca) + + PCM Codec + 59 + 35 + stretch + flagging/$VAR[MediaFlagTheme]/audio/pcm.png + + substring(ListItem.AudioCodec,pcm_s16be) | substring(ListItem.AudioCodec,pcm_s16le) | substring(ListItem.AudioCodec,pcm_u8) + AAC Codec 40 @@ -256,6 +283,15 @@ substring(ListItem.AudioCodec,ac3) | substring(ListItem.AudioCodec,ac-3) + + EAC3 Codec + 66 + 35 + stretch + flagging/$VAR[MediaFlagTheme]/audio/eac3.png + + substring(ListItem.AudioCodec,eac3) + TrueHD Codec 60 @@ -266,13 +302,22 @@ substring(ListItem.AudioCodec,truehd) - WMA STD V2/WMA Pro Codec - 108 + WMA STD V2/WMA Codec + 95 35 stretch flagging/$VAR[MediaFlagTheme]/audio/wma.png - substring(ListItem.AudioCodec,wmav2) | substring(ListItem.AudioCodec,wmapro) + substring(ListItem.AudioCodec,wmav2) | substring(ListItem.AudioCodec,wma) + + + WMA Pro Codec + 95 + 35 + stretch + flagging/$VAR[MediaFlagTheme]/audio/wmapro.png + + substring(ListItem.AudioCodec,wmapro) FLAC Codec @@ -292,6 +337,15 @@ substring(ListItem.AudioCodec,vorbis) + + OGG Codec + 42 + 35 + stretch + flagging/$VAR[MediaFlagTheme]/audio/ogg.png + + substring(ListItem.AudioCodec,ogg) + DTS-HD Master Audio Codec 108 @@ -401,6 +455,78 @@ + + Blu-ray + 49 + 35 + stretch + flagging/$VAR[MediaFlagTheme]/video/bluray.png + + substring(Player.FilenameAndPath,bluray) | substring(Player.FilenameAndPath,blu-ray) | substring(Player.FilenameAndPath,brrip) | substring(Player.FilenameAndPath,bd25) | substring(Player.FilenameAndPath,bd50) + + + 3D + 65 + 35 + stretch + flagging/$VAR[MediaFlagTheme]/video/3d.png + + substring(Player.FilenameAndPath,.3d.) | substring(Player.FilenameAndPath,hsbs) | substring(Player.FilenameAndPath,sbs) | substring(Player.FilenameAndPath,half-sbs) + + + DVD + 82 + 35 + stretch + flagging/$VAR[MediaFlagTheme]/video/$VAR[DVDFlagging].png + + substring(Player.FilenameAndPath,hddvd) | substring(Player.FilenameAndPath,hd-dvd) | substring(Player.filename,.iso,right) | substring(Player.filename,.img,right) | substring(Player.FilenameAndPath,dvd) | substring(Player.filename,.ifo,right) | substring(Player.filename,.vob,right) | substring(Player.FilenameAndPath,dvdrip) | substring(Player.FilenameAndPath,dvdr5) | substring(Player.FilenameAndPath,.r5) | substring(Player.FilenameAndPath,dvdscreener) | substring(Player.FilenameAndPath,dvdscr) | substring(Player.FilenameAndPath,screener) + + + HDTV + 74 + 35 + stretch + flagging/$VAR[MediaFlagTheme]/video/hdtv.png + + substring(Player.FilenameAndPath,hdtv) | substring(Player.FilenameAndPath,hdrip) + + + SDTV + 74 + 35 + stretch + flagging/$VAR[MediaFlagTheme]/video/sdtv.png + + SubString(Player.FilenameAndPath,PDTV) | substring(Player.FilenameAndPath,sdtv) + + + Telesync + 41 + 35 + stretch + flagging/$VAR[MediaFlagTheme]/video/film.png + + substring(Player.FilenameAndPath,.telesync) | substring(Player.FilenameAndPath,.ts.) + + + Cam + 41 + 35 + stretch + flagging/$VAR[MediaFlagTheme]/video/film.png + + substring(Player.FilenameAndPath,.cam) + + + VHS + 64 + 35 + stretch + flagging/$VAR[MediaFlagTheme]/video/vhs.png + + substring(Player.FilenameAndPath,vhs) + Xvid Codec 57 @@ -417,7 +543,7 @@ stretch flagging/$VAR[MediaFlagTheme]/video/divx.png - substring(VideoPlayer.VideoCodec,divx) | substring(VideoPlayer.VideoCodec,div3) | substring(VideoPlayer.VideoCodec,div4) | substring(VideoPlayer.VideoCodec,div5) | substring(VideoPlayer.VideoCodec,dx50) + substring(VideoPlayer.VideoCodec,divx) | substring(VideoPlayer.VideoCodec,div2) | substring(VideoPlayer.VideoCodec,div3) | substring(VideoPlayer.VideoCodec,div4) | substring(VideoPlayer.VideoCodec,divx 4) | substring(VideoPlayer.VideoCodec,div5) | substring(VideoPlayer.VideoCodec,dx50) H264 Codec @@ -426,7 +552,7 @@ stretch flagging/$VAR[MediaFlagTheme]/video/h264.png - substring(VideoPlayer.VideoCodec,h264) | substring(VideoPlayer.VideoCodec,x264) + substring(VideoPlayer.VideoCodec,h264) | substring(VideoPlayer.VideoCodec,x264) | substring(VideoPlayer.VideoCodec,hdmv) AVC1 Codec @@ -439,13 +565,22 @@ WVC1 Codec - 77 + 80 35 stretch flagging/$VAR[MediaFlagTheme]/video/wvc1.png substring(VideoPlayer.VideoCodec,wvc1) | substring(VideoPlayer.VideoCodec,vc-1) + + WMV Codec + 80 + 35 + stretch + flagging/$VAR[MediaFlagTheme]/video/wmv.png + + substring(VideoPlayer.VideoCodec,wmv) | substring(VideoPlayer.VideoCodec,wmv2) | substring(VideoPlayer.VideoCodec,wmv3) + MPEG-1 Codec 57 @@ -471,7 +606,7 @@ stretch flagging/$VAR[MediaFlagTheme]/video/mpeg4video.png - substring(VideoPlayer.VideoCodec,mpeg-4 visual) | substring(VideoPlayer.VideoCodec,mp4v) + substring(VideoPlayer.VideoCodec,mpeg-4 visual) | substring(VideoPlayer.VideoCodec,mp4v) | substring(VideoPlayer.VideoCodec,mpg4) Sorenson Video Codec @@ -480,7 +615,7 @@ stretch flagging/$VAR[MediaFlagTheme]/video/svq3.png - substring(VideoPlayer.VideoCodec,svq3) + substring(VideoPlayer.VideoCodec,svq1) | substring(VideoPlayer.VideoCodec,svq3) Flash Video Codec @@ -550,6 +685,15 @@ substring(VideoPlayer.AudioCodec,dca) + + PCM Codec + 59 + 35 + stretch + flagging/$VAR[MediaFlagTheme]/audio/pcm.png + + substring(VideoPlayer.AudioCodec,pcm_s16be) | substring(VideoPlayer.AudioCodec,pcm_s16le) | substring(VideoPlayer.AudioCodec,pcm_u8) + AAC Codec 40 @@ -568,6 +712,15 @@ substring(VideoPlayer.AudioCodec,ac3) | substring(VideoPlayer.AudioCodec,ac-3) + + EAC3 Codec + 66 + 35 + stretch + flagging/$VAR[MediaFlagTheme]/audio/eac3.png + + substring(VideoPlayer.AudioCodec,eac3) + TrueHD Codec 60 @@ -578,13 +731,22 @@ substring(VideoPlayer.AudioCodec,truehd) - WMA STD V2/WMA Pro Codec - 108 + WMA STD V2/WMA Codec + 95 35 stretch flagging/$VAR[MediaFlagTheme]/audio/wma.png - substring(VideoPlayer.AudioCodec,wmav2) | substring(VideoPlayer.AudioCodec,wmapro) + substring(VideoPlayer.AudioCodec,wmav2) | substring(VideoPlayer.AudioCodec,wma) + + + WMA Pro Codec + 95 + 35 + stretch + flagging/$VAR[MediaFlagTheme]/audio/wmapro.png + + substring(VideoPlayer.AudioCodec,wmapro) FLAC Codec @@ -604,6 +766,15 @@ substring(VideoPlayer.AudioCodec,vorbis) + + OGG Codec + 42 + 35 + stretch + flagging/$VAR[MediaFlagTheme]/audio/ogg.png + + substring(VideoPlayer.AudioCodec,ogg) + Audio Channels -5 @@ -616,6 +787,18 @@ + + + Aspect Ratio + 50 + 35 + stretch + flagging/$VAR[MediaFlagTheme]/aspectratio/$INFO[VideoPlayer.VideoAspect].png + + !IsEmpty(VideoPlayer.VideoAspect) + !Skin.HasSetting(HideAspectRatioMediaFlag) + + + Rated General diff --git a/720p/includes_MenuBar.xml b/720p/includes_MenuBar.xml index 4ab6e59f..69fc2460 100644 --- a/720p/includes_MenuBar.xml +++ b/720p/includes_MenuBar.xml @@ -219,7 +219,7 @@ MenuBarImage MenuBarOpenCloseAnim DefaultMenuBar - ControlGroup(505).HasFocus | [!Skin.HasSetting(HideMenuBar) + !Window.IsActive(MovieInformation) + !Window.IsActive(AddonInformation) + !Window.IsActive(MusicInformation)] + ControlGroup(505).HasFocus | ![Skin.HasSetting(HideMenuBar) | Window.IsActive(MovieInformation) | Window.IsActive(AddonInformation) | Window.IsActive(MusicInformation)] @@ -836,7 +836,7 @@ - + 2 0 @@ -900,7 +900,7 @@ 138 MenuBarBtn - Skin.SetString(WeatherPlus,1) + Skin.SetString(WeatherUnderground,1) MenuBarSeparator @@ -910,7 +910,7 @@ 138 MenuBarBtn - Skin.SetString(WeatherPlus,2) + Skin.SetString(WeatherUnderground,2) MenuBarSeparator @@ -920,7 +920,7 @@ 138 MenuBarBtn - Skin.SetString(WeatherPlus,3) + Skin.SetString(WeatherUnderground,3) MenuBarSeparator @@ -930,7 +930,7 @@ 138 MenuBarBtn - Skin.SetString(WeatherPlus,4) + Skin.SetString(WeatherUnderground,4) MenuBarSeparator @@ -940,7 +940,7 @@ 138 MenuBarBtn - Skin.SetString(WeatherPlus,5) + Skin.SetString(WeatherUnderground,5) MenuBarSeparator @@ -950,7 +950,7 @@ 138 MenuBarBtn - Skin.SetString(WeatherPlus,6) + Skin.SetString(WeatherUnderground,6) MenuBarSeparator diff --git a/720p/includes_Weather.xml b/720p/includes_Weather.xml index a5a8f4c3..5209717b 100644 --- a/720p/includes_Weather.xml +++ b/720p/includes_Weather.xml @@ -348,12 +348,12 @@ - + Current Weather 55 120 - [Skin.String(WeatherPlus,1) | Skin.String(WeatherPlus,2) | Skin.String(WeatherPlus,3)] + Weather.IsFetched + [Skin.String(WeatherUnderground,1) | Skin.String(WeatherUnderground,2) | Skin.String(WeatherUnderground,3)] + Weather.IsFetched ControlsOpenCloseAnim @@ -378,8 +378,8 @@ center - WeatherPlusCurrentIcon - WeatherPlusAnimCurrentIcon + WeatherUndergroundCurrentIcon + WeatherUndergroundAnimCurrentIcon Current Temp @@ -510,7 +510,7 @@ Column Background 638 110 - [Skin.String(WeatherPlus,1) | Skin.String(WeatherPlus,2) | Skin.String(WeatherPlus,3)] + Weather.IsFetched + [Skin.String(WeatherUnderground,1) | Skin.String(WeatherUnderground,2) | Skin.String(WeatherUnderground,3)] + Weather.IsFetched ControlsOpenCloseAnim @@ -525,7 +525,7 @@ Today 638 110 - Skin.String(WeatherPlus,1) + Weather.IsFetched + Skin.String(WeatherUnderground,1) + Weather.IsFetched ControlsOpenCloseAnim @@ -554,8 +554,8 @@ - WeatherPlusDay1Icon - WeatherPlusAnimDay1Icon + WeatherUndergroundDay1Icon + WeatherUndergroundAnimDay1Icon Condition @@ -571,7 +571,7 @@ WeekDayBorder - WeatherPlusFadeAnim + WeatherUndergroundFadeAnim Day 1 WeatherWeekDayLabel @@ -592,8 +592,8 @@ - WeatherPlusDay2Icon - WeatherPlusAnimDay2Icon + WeatherUndergroundDay2Icon + WeatherUndergroundAnimDay2Icon Condition @@ -603,7 +603,7 @@ - WeatherPlusFadeAnim2 + WeatherUndergroundFadeAnim2 Day 4 WeatherWeekDayLabel @@ -624,8 +624,8 @@ - WeatherPlusDay5Icon - WeatherPlusAnimDay5Icon + WeatherUndergroundDay5Icon + WeatherUndergroundAnimDay5Icon Condition @@ -642,7 +642,7 @@ WeekDayBorder - WeatherPlusFadeAnim + WeatherUndergroundFadeAnim Day 2 WeatherWeekDayLabel @@ -663,8 +663,8 @@ - WeatherPlusDay3Icon - WeatherPlusAnimDay3Icon + WeatherUndergroundDay3Icon + WeatherUndergroundAnimDay3Icon Condition @@ -674,7 +674,7 @@ - WeatherPlusFadeAnim2 + WeatherUndergroundFadeAnim2 Day 5 WeatherWeekDayLabel @@ -695,8 +695,8 @@ - WeatherPlusDay6Icon - WeatherPlusAnimDay6Icon + WeatherUndergroundDay6Icon + WeatherUndergroundAnimDay6Icon Condition @@ -713,7 +713,7 @@ WeekDayBorder - WeatherPlusFadeAnim + WeatherUndergroundFadeAnim Day 3 WeatherWeekDayLabel @@ -734,8 +734,8 @@ - WeatherPlusDay4Icon - WeatherPlusAnimDay4Icon + WeatherUndergroundDay4Icon + WeatherUndergroundAnimDay4Icon Condition @@ -745,7 +745,7 @@ - WeatherPlusFadeAnim2 + WeatherUndergroundFadeAnim2 Day 6 WeatherWeekDayLabel @@ -766,8 +766,8 @@ - WeatherPlusDay7Icon - WeatherPlusAnimDay7Icon + WeatherUndergroundDay7Icon + WeatherUndergroundAnimDay7Icon Condition @@ -782,7 +782,7 @@ 36Hour 638 110 - Skin.String(WeatherPlus,2) + Weather.IsFetched + Skin.String(WeatherUnderground,2) + Weather.IsFetched ControlsOpenCloseAnim @@ -820,8 +820,8 @@ - WeatherPlus36Hour1Icon - WeatherPlusAnim36Hour1Icon + WeatherUnderground36Hour1Icon + WeatherUndergroundAnim36Hour1Icon Condition @@ -864,8 +864,8 @@ - WeatherPlus36Hour2Icon - WeatherPlusAnim36Hour2Icon + WeatherUnderground36Hour2Icon + WeatherUndergroundAnim36Hour2Icon Condition @@ -908,8 +908,8 @@ - WeatherPlus36Hour3Icon - WeatherPlusAnim36Hour3Icon + WeatherUnderground36Hour3Icon + WeatherUndergroundAnim36Hour3Icon Condition @@ -924,7 +924,7 @@ Weekend 638 110 - Skin.String(WeatherPlus,3) + Weather.IsFetched + Skin.String(WeatherUnderground,3) + Weather.IsFetched ControlsOpenCloseAnim @@ -939,8 +939,8 @@ - WeatherPlusWeekend1Icon - WeatherPlusAnimWeekend1Icon + WeatherUndergroundWeekend1Icon + WeatherUndergroundAnimWeekend1Icon !IsEmpty(Window.Property(Weekend.1.Observed)) | IsEmpty(Window.Property(Weekend.1.Date)) @@ -993,7 +993,7 @@ - WeatherPlusFadeAnim + WeatherUndergroundFadeAnim Sunrise 84 @@ -1010,7 +1010,7 @@ - WeatherPlusFadeAnim2 + WeatherUndergroundFadeAnim2 Sunset 84 @@ -1047,8 +1047,8 @@ - WeatherPlusWeekend2Icon - WeatherPlusAnimWeekend2Icon + WeatherUndergroundWeekend2Icon + WeatherUndergroundAnimWeekend2Icon !IsEmpty(Window.Property(Weekend.2.Observed)) | IsEmpty(Window.Property(Weekend.2.Date)) @@ -1101,7 +1101,7 @@ - WeatherPlusFadeAnim + WeatherUndergroundFadeAnim Sunrise 84 @@ -1118,7 +1118,7 @@ - WeatherPlusFadeAnim2 + WeatherUndergroundFadeAnim2 Sunset 84 @@ -1155,8 +1155,8 @@ - WeatherPlusWeekend3Icon - WeatherPlusAnimWeekend3Icon + WeatherUndergroundWeekend3Icon + WeatherUndergroundAnimWeekend3Icon !IsEmpty(Window.Property(Weekend.3.Observed)) | IsEmpty(Window.Property(Weekend.3.Date)) @@ -1209,7 +1209,7 @@ - WeatherPlusFadeAnim + WeatherUndergroundFadeAnim Sunrise 84 @@ -1226,7 +1226,7 @@ - WeatherPlusFadeAnim2 + WeatherUndergroundFadeAnim2 Sunset 84 @@ -1254,7 +1254,7 @@ Hourly - Skin.String(WeatherPlus,4) + Weather.IsFetched + Skin.String(WeatherUnderground,4) + Weather.IsFetched ControlsOpenCloseAnim @@ -1391,8 +1391,8 @@ yes - WeatherPlusHourlyIcon - WeatherPlusAnimHourlyIcon + WeatherUndergroundHourlyIcon + WeatherUndergroundAnimHourlyIcon Condition 214 @@ -1477,8 +1477,8 @@ yes - WeatherPlusHourlyIcon - WeatherPlusAnimHourlyIcon + WeatherUndergroundHourlyIcon + WeatherUndergroundAnimHourlyIcon Condition 214 @@ -1550,7 +1550,7 @@ $INFO[Window.Property(Hourly.1.Humidity),,%] $INFO[Window.Property(Hourly.1.Precipitation),,%] $INFO[Window.Property(Hourly.1.WindSpeed)] $INFO[Window.Property(Hourly.1.WindDirection)] - $VAR[WeatherPlusHourly1Icon] + $VAR[WeatherUndergroundHourly1Icon] noop !IsEmpty(Window.Property(Hourly.IsFetched)) @@ -1561,7 +1561,7 @@ $INFO[Window.Property(Hourly.2.Humidity),,%] $INFO[Window.Property(Hourly.2.Precipitation),,%] $INFO[Window.Property(Hourly.2.WindSpeed)] $INFO[Window.Property(Hourly.2.WindDirection)] - $VAR[WeatherPlusHourly2Icon] + $VAR[WeatherUndergroundHourly2Icon] noop !IsEmpty(Window.Property(Hourly.IsFetched)) @@ -1572,7 +1572,7 @@ $INFO[Window.Property(Hourly.3.Humidity),,%] $INFO[Window.Property(Hourly.3.Precipitation),,%] $INFO[Window.Property(Hourly.3.WindSpeed)] $INFO[Window.Property(Hourly.3.WindDirection)] - $VAR[WeatherPlusHourly3Icon] + $VAR[WeatherUndergroundHourly3Icon] noop !IsEmpty(Window.Property(Hourly.IsFetched)) @@ -1583,7 +1583,7 @@ $INFO[Window.Property(Hourly.4.Humidity),,%] $INFO[Window.Property(Hourly.4.Precipitation),,%] $INFO[Window.Property(Hourly.4.WindSpeed)] $INFO[Window.Property(Hourly.4.WindDirection)] - $VAR[WeatherPlusHourly4Icon] + $VAR[WeatherUndergroundHourly4Icon] noop !IsEmpty(Window.Property(Hourly.IsFetched)) @@ -1594,7 +1594,7 @@ $INFO[Window.Property(Hourly.5.Humidity),,%] $INFO[Window.Property(Hourly.5.Precipitation),,%] $INFO[Window.Property(Hourly.5.WindSpeed)] $INFO[Window.Property(Hourly.5.WindDirection)] - $VAR[WeatherPlusHourly5Icon] + $VAR[WeatherUndergroundHourly5Icon] noop !IsEmpty(Window.Property(Hourly.IsFetched)) @@ -1605,7 +1605,7 @@ $INFO[Window.Property(Hourly.6.Humidity),,%] $INFO[Window.Property(Hourly.6.Precipitation),,%] $INFO[Window.Property(Hourly.6.WindSpeed)] $INFO[Window.Property(Hourly.6.WindDirection)] - $VAR[WeatherPlusHourly6Icon] + $VAR[WeatherUndergroundHourly6Icon] noop !IsEmpty(Window.Property(Hourly.IsFetched)) @@ -1616,7 +1616,7 @@ $INFO[Window.Property(Hourly.7.Humidity),,%] $INFO[Window.Property(Hourly.7.Precipitation),,%] $INFO[Window.Property(Hourly.7.WindSpeed)] $INFO[Window.Property(Hourly.7.WindDirection)] - $VAR[WeatherPlusHourly7Icon] + $VAR[WeatherUndergroundHourly7Icon] noop !IsEmpty(Window.Property(Hourly.IsFetched)) @@ -1627,7 +1627,7 @@ $INFO[Window.Property(Hourly.8.Humidity),,%] $INFO[Window.Property(Hourly.8.Precipitation),,%] $INFO[Window.Property(Hourly.8.WindSpeed)] $INFO[Window.Property(Hourly.8.WindDirection)] - $VAR[WeatherPlusHourly8Icon] + $VAR[WeatherUndergroundHourly8Icon] noop !IsEmpty(Window.Property(Hourly.IsFetched)) @@ -1638,7 +1638,7 @@ $INFO[Window.Property(Hourly.9.Humidity),,%] $INFO[Window.Property(Hourly.9.Precipitation),,%] $INFO[Window.Property(Hourly.9.WindSpeed)] $INFO[Window.Property(Hourly.9.WindDirection)] - $VAR[WeatherPlusHourly9Icon] + $VAR[WeatherUndergroundHourly9Icon] noop !IsEmpty(Window.Property(Hourly.IsFetched)) @@ -1649,7 +1649,7 @@ $INFO[Window.Property(Hourly.10.Humidity),,%] $INFO[Window.Property(Hourly.10.Precipitation),,%] $INFO[Window.Property(Hourly.10.WindSpeed)] $INFO[Window.Property(Hourly.10.WindDirection)] - $VAR[WeatherPlusHourly10Icon] + $VAR[WeatherUndergroundHourly10Icon] noop !IsEmpty(Window.Property(Hourly.IsFetched)) @@ -1659,7 +1659,7 @@ Daily - Skin.String(WeatherPlus,5) + Weather.IsFetched + Skin.String(WeatherUnderground,5) + Weather.IsFetched ControlsOpenCloseAnim @@ -1796,8 +1796,8 @@ yes - WeatherPlusDailyIcon - WeatherPlusAnimDailyIcon + WeatherUndergroundDailyIcon + WeatherUndergroundAnimDailyIcon Condition 214 @@ -1882,8 +1882,8 @@ yes - WeatherPlusDailyIcon - WeatherPlusAnimDailyIcon + WeatherUndergroundDailyIcon + WeatherUndergroundAnimDailyIcon Condition 214 @@ -1955,7 +1955,7 @@ $INFO[Window.Property(Daily.1.LowTemperature)]$INFO[System.TemperatureUnits] $INFO[Window.Property(Daily.1.Precipitation),,%] $INFO[Window.Property(Daily.1.WindSpeed)] $INFO[Window.Property(Daily.1.WindDirection)] - $VAR[WeatherPlusDaily1Icon] + $VAR[WeatherUndergroundDaily1Icon] noop !IsEmpty(Window.Property(Daily.IsFetched)) @@ -1966,7 +1966,7 @@ $INFO[Window.Property(Daily.2.LowTemperature)]$INFO[System.TemperatureUnits] $INFO[Window.Property(Daily.2.Precipitation),,%] $INFO[Window.Property(Daily.2.WindSpeed)] $INFO[Window.Property(Daily.2.WindDirection)] - $VAR[WeatherPlusDaily2Icon] + $VAR[WeatherUndergroundDaily2Icon] noop !IsEmpty(Window.Property(Daily.IsFetched)) @@ -1977,7 +1977,7 @@ $INFO[Window.Property(Daily.3.LowTemperature)]$INFO[System.TemperatureUnits] $INFO[Window.Property(Daily.3.Precipitation),,%] $INFO[Window.Property(Daily.3.WindSpeed)] $INFO[Window.Property(Daily.3.WindDirection)] - $VAR[WeatherPlusDaily3Icon] + $VAR[WeatherUndergroundDaily3Icon] noop !IsEmpty(Window.Property(Daily.IsFetched)) @@ -1988,7 +1988,7 @@ $INFO[Window.Property(Daily.4.LowTemperature)]$INFO[System.TemperatureUnits] $INFO[Window.Property(Daily.4.Precipitation),,%] $INFO[Window.Property(Daily.4.WindSpeed)] $INFO[Window.Property(Daily.4.WindDirection)] - $VAR[WeatherPlusDaily4Icon] + $VAR[WeatherUndergroundDaily4Icon] noop !IsEmpty(Window.Property(Daily.IsFetched)) @@ -1999,7 +1999,7 @@ $INFO[Window.Property(Daily.5.LowTemperature)]$INFO[System.TemperatureUnits] $INFO[Window.Property(Daily.5.Precipitation),,%] $INFO[Window.Property(Daily.5.WindSpeed)] $INFO[Window.Property(Daily.5.WindDirection)] - $VAR[WeatherPlusDaily5Icon] + $VAR[WeatherUndergroundDaily5Icon] noop !IsEmpty(Window.Property(Daily.IsFetched)) @@ -2010,7 +2010,7 @@ $INFO[Window.Property(Daily.6.LowTemperature)]$INFO[System.TemperatureUnits] $INFO[Window.Property(Daily.6.Precipitation),,%] $INFO[Window.Property(Daily.6.WindSpeed)] $INFO[Window.Property(Daily.6.WindDirection)] - $VAR[WeatherPlusDaily6Icon] + $VAR[WeatherUndergroundDaily6Icon] noop !IsEmpty(Window.Property(Daily.IsFetched)) @@ -2021,7 +2021,7 @@ $INFO[Window.Property(Daily.7.LowTemperature)]$INFO[System.TemperatureUnits] $INFO[Window.Property(Daily.7.Precipitation),,%] $INFO[Window.Property(Daily.7.WindSpeed)] $INFO[Window.Property(Daily.7.WindDirection)] - $VAR[WeatherPlusDaily7Icon] + $VAR[WeatherUndergroundDaily7Icon] noop !IsEmpty(Window.Property(Daily.IsFetched)) @@ -2032,7 +2032,7 @@ $INFO[Window.Property(Daily.8.LowTemperature)]$INFO[System.TemperatureUnits] $INFO[Window.Property(Daily.8.Precipitation),,%] $INFO[Window.Property(Daily.8.WindSpeed)] $INFO[Window.Property(Daily.8.WindDirection)] - $VAR[WeatherPlusDaily8Icon] + $VAR[WeatherUndergroundDaily8Icon] noop !IsEmpty(Window.Property(Daily.IsFetched)) @@ -2043,7 +2043,7 @@ $INFO[Window.Property(Daily.9.LowTemperature)]$INFO[System.TemperatureUnits] $INFO[Window.Property(Daily.9.Precipitation),,%] $INFO[Window.Property(Daily.9.WindSpeed)] $INFO[Window.Property(Daily.9.WindDirection)] - $VAR[WeatherPlusDaily9Icon] + $VAR[WeatherUndergroundDaily9Icon] noop !IsEmpty(Window.Property(Daily.IsFetched)) @@ -2054,7 +2054,7 @@ $INFO[Window.Property(Daily.10.LowTemperature)]$INFO[System.TemperatureUnits] $INFO[Window.Property(Daily.10.Precipitation),,%] $INFO[Window.Property(Daily.10.WindSpeed)] $INFO[Window.Property(Daily.10.WindDirection)] - $VAR[WeatherPlusDaily10Icon] + $VAR[WeatherUndergroundDaily10Icon] noop !IsEmpty(Window.Property(Daily.IsFetched)) @@ -2064,7 +2064,7 @@ Maps - Skin.String(WeatherPlus,6) + Weather.IsFetched + Skin.String(WeatherUnderground,6) + Weather.IsFetched Settings Area @@ -3119,7 +3119,7 @@ - + 35 80 @@ -3130,7 +3130,7 @@ - + 35 80 @@ -3143,7 +3143,7 @@ - + 213 41 161 @@ -3151,7 +3151,7 @@ keep - + 254 41 79 @@ -3161,105 +3161,105 @@ 0 - + - WeatherPlusDayIcon + WeatherUndergroundDayIcon $INFO[Window.Property(Daily.1.OutlookIcon)] - + - WeatherPlusAnimDayIcon + WeatherUndergroundAnimDayIcon icons/weather/$INFO[Window.Property(Daily.1.FanartCode)] - + - WeatherPlusDayIcon + WeatherUndergroundDayIcon $INFO[Window.Property(Daily.2.OutlookIcon)] - + - WeatherPlusAnimDayIcon + WeatherUndergroundAnimDayIcon icons/weather/$INFO[Window.Property(Daily.2.FanartCode)] - + - WeatherPlusDayIcon + WeatherUndergroundDayIcon $INFO[Window.Property(Daily.3.OutlookIcon)] - + - WeatherPlusAnimDayIcon + WeatherUndergroundAnimDayIcon icons/weather/$INFO[Window.Property(Daily.3.FanartCode)] - + - WeatherPlusDayIcon + WeatherUndergroundDayIcon $INFO[Window.Property(Daily.4.OutlookIcon)] - + - WeatherPlusAnimDayIcon + WeatherUndergroundAnimDayIcon icons/weather/$INFO[Window.Property(Daily.4.FanartCode)] - + - WeatherPlusDayIcon + WeatherUndergroundDayIcon $INFO[Window.Property(Daily.5.OutlookIcon)] - + - WeatherPlusAnimDayIcon + WeatherUndergroundAnimDayIcon icons/weather/$INFO[Window.Property(Daily.5.FanartCode)] - + - WeatherPlusDayIcon + WeatherUndergroundDayIcon $INFO[Window.Property(Daily.6.OutlookIcon)] - + - WeatherPlusAnimDayIcon + WeatherUndergroundAnimDayIcon icons/weather/$INFO[Window.Property(Daily.6.FanartCode)] - + - WeatherPlusDayIcon + WeatherUndergroundDayIcon $INFO[Window.Property(Daily.7.OutlookIcon)] - + - WeatherPlusAnimDayIcon + WeatherUndergroundAnimDayIcon icons/weather/$INFO[Window.Property(Daily.7.FanartCode)] - + 213 62 161 @@ -3267,7 +3267,7 @@ keep - + 254 62 79 @@ -3277,49 +3277,49 @@ 0 - + - WeatherPlus36HourIcon + WeatherUnderground36HourIcon $INFO[Window.Property(36Hour.1.OutlookIcon)] - + - WeatherPlusAnim36HourIcon + WeatherUndergroundAnim36HourIcon icons/weather/$INFO[Window.Property(36Hour.1.FanartCode)] - + - WeatherPlus36HourIcon + WeatherUnderground36HourIcon $INFO[Window.Property(36Hour.2.OutlookIcon)] - + - WeatherPlusAnim36HourIcon + WeatherUndergroundAnim36HourIcon icons/weather/$INFO[Window.Property(36Hour.2.FanartCode)] - + - WeatherPlus36HourIcon + WeatherUnderground36HourIcon $INFO[Window.Property(36Hour.3.OutlookIcon)] - + - WeatherPlusAnim36HourIcon + WeatherUndergroundAnim36HourIcon icons/weather/$INFO[Window.Property(36Hour.3.FanartCode)] - + 213 62 161 @@ -3327,7 +3327,7 @@ keep - + 254 62 79 @@ -3337,99 +3337,99 @@ 0 - + - WeatherPlusWeekendIcon + WeatherUndergroundWeekendIcon $INFO[Window.Property(Weekend.1.OutlookIcon)] - + - WeatherPlusAnimWeekendIcon + WeatherUndergroundAnimWeekendIcon icons/weather/$INFO[Window.Property(Weekend.1.FanartCode)] - + - WeatherPlusWeekendIcon + WeatherUndergroundWeekendIcon $INFO[Window.Property(Weekend.2.OutlookIcon)] - + - WeatherPlusAnimWeekendIcon + WeatherUndergroundAnimWeekendIcon icons/weather/$INFO[Window.Property(Weekend.2.FanartCode)] - + - WeatherPlusWeekendIcon + WeatherUndergroundWeekendIcon $INFO[Window.Property(Weekend.3.OutlookIcon)] - + - WeatherPlusAnimWeekendIcon + WeatherUndergroundAnimWeekendIcon icons/weather/$INFO[Window.Property(Weekend.3.FanartCode)] - + $INFO[Window.Property(Hourly.1.OutlookIcon)] icons/weather/$INFO[Window.Property(Hourly.1.FanartCode)] - + $INFO[Window.Property(Hourly.2.OutlookIcon)] icons/weather/$INFO[Window.Property(Hourly.2.FanartCode)] - + $INFO[Window.Property(Hourly.3.OutlookIcon)] icons/weather/$INFO[Window.Property(Hourly.3.FanartCode)] - + $INFO[Window.Property(Hourly.4.OutlookIcon)] icons/weather/$INFO[Window.Property(Hourly.4.FanartCode)] - + $INFO[Window.Property(Hourly.5.OutlookIcon)] icons/weather/$INFO[Window.Property(Hourly.5.FanartCode)] - + $INFO[Window.Property(Hourly.6.OutlookIcon)] icons/weather/$INFO[Window.Property(Hourly.6.FanartCode)] - + $INFO[Window.Property(Hourly.7.OutlookIcon)] icons/weather/$INFO[Window.Property(Hourly.7.FanartCode)] - + $INFO[Window.Property(Hourly.8.OutlookIcon)] icons/weather/$INFO[Window.Property(Hourly.8.FanartCode)] - + $INFO[Window.Property(Hourly.9.OutlookIcon)] icons/weather/$INFO[Window.Property(Hourly.9.FanartCode)] - + $INFO[Window.Property(Hourly.10.OutlookIcon)] icons/weather/$INFO[Window.Property(Hourly.10.FanartCode)] - + 169 12 @@ -3441,7 +3441,7 @@ - + 169 12 @@ -3456,57 +3456,57 @@ - + $INFO[Window.Property(Daily.1.OutlookIcon)] icons/weather/$INFO[Window.Property(Daily.1.FanartCode)] - + $INFO[Window.Property(Daily.2.OutlookIcon)] icons/weather/$INFO[Window.Property(Daily.2.FanartCode)] - + $INFO[Window.Property(Daily.3.OutlookIcon)] icons/weather/$INFO[Window.Property(Daily.3.FanartCode)] - + $INFO[Window.Property(Daily.4.OutlookIcon)] icons/weather/$INFO[Window.Property(Daily.4.FanartCode)] - + $INFO[Window.Property(Daily.5.OutlookIcon)] icons/weather/$INFO[Window.Property(Daily.5.FanartCode)] - + $INFO[Window.Property(Daily.6.OutlookIcon)] icons/weather/$INFO[Window.Property(Daily.6.FanartCode)] - + $INFO[Window.Property(Daily.7.OutlookIcon)] icons/weather/$INFO[Window.Property(Daily.7.FanartCode)] - + $INFO[Window.Property(Daily.8.OutlookIcon)] icons/weather/$INFO[Window.Property(Daily.8.FanartCode)] - + $INFO[Window.Property(Daily.9.OutlookIcon)] icons/weather/$INFO[Window.Property(Daily.9.FanartCode)] - + $INFO[Window.Property(Daily.10.OutlookIcon)] icons/weather/$INFO[Window.Property(Daily.10.FanartCode)] - + 169 12 @@ -3518,7 +3518,7 @@ - + 169 12 diff --git a/720p/script-videoextras-main.xml b/720p/script-videoextras-main.xml index 01f30873..8f5b91a6 100644 --- a/720p/script-videoextras-main.xml +++ b/720p/script-videoextras-main.xml @@ -65,7 +65,7 @@ 110 720 518 - 987 + 987 903 987 51 @@ -375,7 +375,7 @@ 110 517 - - 51 + 51 51 987 diff --git a/720p/script.pseudotv.TVOverlay.xml b/720p/script.pseudotv.TVOverlay.xml index 9b3a688c..58ae7f62 100644 --- a/720p/script.pseudotv.TVOverlay.xml +++ b/720p/script.pseudotv.TVOverlay.xml @@ -138,6 +138,7 @@ MediaFlagFadeAnim PlayerVideoMediaFlags PlayerAudioMediaFlags + PlayerAspectMediaFlags PlayerRatingMediaFlags diff --git a/addon.xml b/addon.xml index 7a4f252f..2a88b2c7 100644 --- a/addon.xml +++ b/addon.xml @@ -1,7 +1,7 @@ @@ -19,8 +19,9 @@ point="xbmc.gui.skin" defaultthemename="Textures.xbt" effectslowdown="0.75" - debugging="false"/> - + debugging="false"> + + Rapier skin by Scarfa, Gade. Rapier autorstwa Scarfa, Gade. diff --git a/changelog.txt b/changelog.txt index 9ae19a82..44337659 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,19 @@ +------------------------ +Rapier v5.7.4 (changes by Gade) (02-Oct-14) +------------------------ +- Fixed animation for the home screen next aired widget and added support for up to 18 shows. +- Replaced support for WeatherPlus weather add-on with Weather Underground add-on. + +------------------------ +Rapier v5.7.3 (changes by Gade) (01-Oct-14) +------------------------ +- General bugfixing. +- Bugfixing of breadcrumbs. +- Updating and bugfixing of OSD seekbar labels. +- Added additional video source, video codec and audio media flags. +- Added Spotify and TV Guide home menu images to the extras folder. +- Bugfixing of the menubar in add-on information dialog for touch devices. + ------------------------ Rapier v5.7.2 (changes by Gade) (25-Aug-14) ------------------------ diff --git a/extras/spotify-text-focus.png b/extras/spotify-text-focus.png new file mode 100644 index 00000000..0fa264af Binary files /dev/null and b/extras/spotify-text-focus.png differ diff --git a/extras/spotify-text-nofocus.png b/extras/spotify-text-nofocus.png new file mode 100644 index 00000000..39c60263 Binary files /dev/null and b/extras/spotify-text-nofocus.png differ diff --git a/extras/tv-guide-text-focus.png b/extras/tv-guide-text-focus.png new file mode 100644 index 00000000..a22c3d3a Binary files /dev/null and b/extras/tv-guide-text-focus.png differ diff --git a/extras/tv-guide-text-nofocus.png b/extras/tv-guide-text-nofocus.png new file mode 100644 index 00000000..cf2be0e8 Binary files /dev/null and b/extras/tv-guide-text-nofocus.png differ diff --git a/media/flagging/default/aspectratio/1.37.png b/media/flagging/default/aspectratio/1.37.png new file mode 100644 index 00000000..5da3378f Binary files /dev/null and b/media/flagging/default/aspectratio/1.37.png differ diff --git a/media/flagging/default/aspectratio/2.40.png b/media/flagging/default/aspectratio/2.40.png new file mode 100644 index 00000000..0690e557 Binary files /dev/null and b/media/flagging/default/aspectratio/2.40.png differ diff --git a/media/flagging/default/aspectratio/2.55.png b/media/flagging/default/aspectratio/2.55.png new file mode 100644 index 00000000..29bc5e7d Binary files /dev/null and b/media/flagging/default/aspectratio/2.55.png differ diff --git a/media/flagging/default/aspectratio/2.76.png b/media/flagging/default/aspectratio/2.76.png new file mode 100644 index 00000000..c72c6d97 Binary files /dev/null and b/media/flagging/default/aspectratio/2.76.png differ diff --git a/media/flagging/default/audio/10.png b/media/flagging/default/audio/10.png new file mode 100644 index 00000000..08eb49f8 Binary files /dev/null and b/media/flagging/default/audio/10.png differ diff --git a/media/flagging/default/audio/cdda.png b/media/flagging/default/audio/cdda.png new file mode 100644 index 00000000..dc75e639 Binary files /dev/null and b/media/flagging/default/audio/cdda.png differ diff --git a/media/flagging/default/audio/eac3.png b/media/flagging/default/audio/eac3.png new file mode 100644 index 00000000..004ef9b4 Binary files /dev/null and b/media/flagging/default/audio/eac3.png differ diff --git a/media/flagging/default/audio/ogg.png b/media/flagging/default/audio/ogg.png new file mode 100644 index 00000000..f55de144 Binary files /dev/null and b/media/flagging/default/audio/ogg.png differ diff --git a/media/flagging/default/audio/pcm.png b/media/flagging/default/audio/pcm.png new file mode 100644 index 00000000..d63306a4 Binary files /dev/null and b/media/flagging/default/audio/pcm.png differ diff --git a/media/flagging/default/audio/wmapro.png b/media/flagging/default/audio/wmapro.png new file mode 100644 index 00000000..5f310cff Binary files /dev/null and b/media/flagging/default/audio/wmapro.png differ diff --git a/media/flagging/default/audio/wmv.png b/media/flagging/default/audio/wmv.png new file mode 100644 index 00000000..4d6e81a4 Binary files /dev/null and b/media/flagging/default/audio/wmv.png differ diff --git a/media/flagging/default/video/iso.png b/media/flagging/default/video/iso.png new file mode 100644 index 00000000..dd25a200 Binary files /dev/null and b/media/flagging/default/video/iso.png differ diff --git a/media/flagging/default/video/m2ts.png b/media/flagging/default/video/m2ts.png new file mode 100644 index 00000000..73a2a062 Binary files /dev/null and b/media/flagging/default/video/m2ts.png differ diff --git a/media/flagging/default/video/mkv.png b/media/flagging/default/video/mkv.png new file mode 100644 index 00000000..60a2a225 Binary files /dev/null and b/media/flagging/default/video/mkv.png differ diff --git a/media/flagging/default/video/vc-1.png b/media/flagging/default/video/vc-1.png new file mode 100644 index 00000000..6b4069cb Binary files /dev/null and b/media/flagging/default/video/vc-1.png differ diff --git a/media/flagging/default/video/vhs.png b/media/flagging/default/video/vhs.png new file mode 100644 index 00000000..8d9c8a19 Binary files /dev/null and b/media/flagging/default/video/vhs.png differ diff --git a/media/flagging/default/video/vorbis.png b/media/flagging/default/video/vorbis.png new file mode 100644 index 00000000..a40e1f32 Binary files /dev/null and b/media/flagging/default/video/vorbis.png differ diff --git a/media/flagging/default/video/wmv.png b/media/flagging/default/video/wmv.png new file mode 100644 index 00000000..4d6e81a4 Binary files /dev/null and b/media/flagging/default/video/wmv.png differ diff --git a/media/flagging/white/aspectratio/1.37.png b/media/flagging/white/aspectratio/1.37.png new file mode 100644 index 00000000..5ad14fd1 Binary files /dev/null and b/media/flagging/white/aspectratio/1.37.png differ diff --git a/media/flagging/white/aspectratio/2.40.png b/media/flagging/white/aspectratio/2.40.png new file mode 100644 index 00000000..84a4bb1e Binary files /dev/null and b/media/flagging/white/aspectratio/2.40.png differ diff --git a/media/flagging/white/aspectratio/2.55.png b/media/flagging/white/aspectratio/2.55.png new file mode 100644 index 00000000..08eb688b Binary files /dev/null and b/media/flagging/white/aspectratio/2.55.png differ diff --git a/media/flagging/white/aspectratio/2.76.png b/media/flagging/white/aspectratio/2.76.png new file mode 100644 index 00000000..2499d3aa Binary files /dev/null and b/media/flagging/white/aspectratio/2.76.png differ diff --git a/media/flagging/white/audio/10.png b/media/flagging/white/audio/10.png new file mode 100644 index 00000000..7aa503eb Binary files /dev/null and b/media/flagging/white/audio/10.png differ diff --git a/media/flagging/white/audio/cdda.png b/media/flagging/white/audio/cdda.png new file mode 100644 index 00000000..ec5b69a8 Binary files /dev/null and b/media/flagging/white/audio/cdda.png differ diff --git a/media/flagging/white/audio/eac3.png b/media/flagging/white/audio/eac3.png new file mode 100644 index 00000000..0b2d4e17 Binary files /dev/null and b/media/flagging/white/audio/eac3.png differ diff --git a/media/flagging/white/audio/ogg.png b/media/flagging/white/audio/ogg.png new file mode 100644 index 00000000..3d5a1507 Binary files /dev/null and b/media/flagging/white/audio/ogg.png differ diff --git a/media/flagging/white/audio/pcm.png b/media/flagging/white/audio/pcm.png new file mode 100644 index 00000000..0288ee11 Binary files /dev/null and b/media/flagging/white/audio/pcm.png differ diff --git a/media/flagging/white/audio/wmapro.png b/media/flagging/white/audio/wmapro.png new file mode 100644 index 00000000..44224a06 Binary files /dev/null and b/media/flagging/white/audio/wmapro.png differ diff --git a/media/flagging/white/audio/wmv.png b/media/flagging/white/audio/wmv.png new file mode 100644 index 00000000..92292634 Binary files /dev/null and b/media/flagging/white/audio/wmv.png differ diff --git a/media/flagging/white/video/iso.png b/media/flagging/white/video/iso.png new file mode 100644 index 00000000..98138e11 Binary files /dev/null and b/media/flagging/white/video/iso.png differ diff --git a/media/flagging/white/video/m2ts.png b/media/flagging/white/video/m2ts.png new file mode 100644 index 00000000..c3f5fe2a Binary files /dev/null and b/media/flagging/white/video/m2ts.png differ diff --git a/media/flagging/white/video/mkv.png b/media/flagging/white/video/mkv.png new file mode 100644 index 00000000..1811e213 Binary files /dev/null and b/media/flagging/white/video/mkv.png differ diff --git a/media/flagging/white/video/vc-1.png b/media/flagging/white/video/vc-1.png new file mode 100644 index 00000000..32189254 Binary files /dev/null and b/media/flagging/white/video/vc-1.png differ diff --git a/media/flagging/white/video/vhs.png b/media/flagging/white/video/vhs.png new file mode 100644 index 00000000..9cc1b01b Binary files /dev/null and b/media/flagging/white/video/vhs.png differ diff --git a/media/flagging/white/video/vorbis.png b/media/flagging/white/video/vorbis.png new file mode 100644 index 00000000..8d6afb53 Binary files /dev/null and b/media/flagging/white/video/vorbis.png differ diff --git a/media/flagging/white/video/wmv.png b/media/flagging/white/video/wmv.png new file mode 100644 index 00000000..92292634 Binary files /dev/null and b/media/flagging/white/video/wmv.png differ