From 265eb8c6ca84bc5a71ea461fecbd44a83bdacfcf Mon Sep 17 00:00:00 2001 From: JezzX2 Date: Mon, 9 May 2011 05:40:05 +0000 Subject: [PATCH] Removed: [PM3.HD] references to the old "Video Files" no longer used in eden xbmc git-svn-id: http://jezzxbmc.googlecode.com/svn/trunk/skin.pm3-hd@330 0c45cd24-f56c-ec91-222f-6e3ca35936fa --- 720p/Home.xml | 10 +-- 720p/MyVideo.xml | 132 ------------------------------------- 720p/MyVideoNav.xml | 41 ++++++------ 720p/ViewsFileMode.xml | 21 +++--- 720p/ViewsVideoLibrary.xml | 2 +- 720p/includes.xml | 27 ++++---- 6 files changed, 47 insertions(+), 186 deletions(-) delete mode 100644 720p/MyVideo.xml diff --git a/720p/Home.xml b/720p/Home.xml index 75549d6..1f5826d 100644 --- a/720p/Home.xml +++ b/720p/Home.xml @@ -419,20 +419,20 @@ ActivateWindow(Videos) special://skin/backgrounds/videos.jpg $INFO[Skin.String(Home_Custom_Back_Video_Folder)] - Library.HasContent(Video) + !Skin.HasSetting(homepageVideoButtonAlwaysFilemode) + !Skin.HasSetting(homepageVideoButtonAlwaysFilemode) !Skin.HasSetting(homepageHideVideoButton) - ActivateWindow(VideoFiles) + ActivateWindow(Videos,Files) special://skin/backgrounds/videos.jpg $INFO[Skin.String(Home_Custom_Back_Video_Folder)] - !Library.HasContent(Video) | Skin.HasSetting(homepageVideoButtonAlwaysFilemode) + Skin.HasSetting(homepageVideoButtonAlwaysFilemode) !Skin.HasSetting(homepageHideVideoButton) - ActivateWindow(VideoLibrary,MovieTitles,return) + ActivateWindow(Videos,MovieTitles,return) special://skin/backgrounds/movies.jpg $INFO[Skin.String(Home_Custom_Back_Movies_Folder)] Library.HasContent(Movies) @@ -440,7 +440,7 @@ - ActivateWindow(VideoLibrary,TVShowTitles,return) + ActivateWindow(Videos,TVShowTitles,return) special://skin/backgrounds/tvshow.jpg $INFO[Skin.String(Home_Custom_Back_TVShow_Folder)] Library.HasContent(TVShows) diff --git a/720p/MyVideo.xml b/720p/MyVideo.xml deleted file mode 100644 index 993981e..0000000 --- a/720p/MyVideo.xml +++ /dev/null @@ -1,132 +0,0 @@ - - 50 - no - 50,51,550,53,54,57,500 - - CommonBackground - 3d_CoverView - - Window_OpenClose_Right_Panel_Animation - - Conditional - Conditional - ContentPanel - CommonRootView - CommonListView - VideoThumbnailView - WideIconView - MovieDVDView - AddonInfoView - - AllViewCommonPageControls - CommonFileCount - ScrollOffsetLabel - - - Window_OpenClose_Left_Panel_Animation - CommonNowPlaying - - 0 - 130 - Conditional - Conditional - - 0 - -30 - 320 - 470 - Panel2.png - Control.IsVisible(500) - VisibleFadeEffect - - - View As button - 0 - 0 - ButtonCommonValues - - 50 - 50 - 611 - 3 - - - Sort by button - 0 - 45 - ButtonCommonValues - - 50 - 4 - 2 - 99 - - - Sort asc - 250 - 58 - - 3 - 50 - 2 - 99 - - - Library button - 0 - 90 - - ReplaceWindow(myvideolibrary) - Window.IsVisible(myvideolibrary) - ButtonCommonValues - 50 - 50 - 3 - 7 - Library.HasContent(Video) - - - Stack Toggle - 0 - 135 - ButtonCommonValues - - 50 - 50 - 99 - 610 - - - Fake Button to fix Player Controls Navigation - 7 - 603 - false - - - 0 - 180 - CommonNowPlaying_Controls - - - Fake Button to fix Player Controls Navigation - 607 - 2 - false - - - - - 0 - 0 - 1280 - 128 - Header.png - - - WindowTitleCommons - - - WindowTitleButtonsMedia - BehindDialogFadeOut - - \ No newline at end of file diff --git a/720p/MyVideoNav.xml b/720p/MyVideoNav.xml index bc75de6..8e194a3 100644 --- a/720p/MyVideoNav.xml +++ b/720p/MyVideoNav.xml @@ -120,7 +120,7 @@ 50 4 2 - 99 + 14 Sort asc @@ -130,36 +130,23 @@ 3 50 2 - 99 - - - Library button - 0 - 90 - - ReplaceWindow(myvideofiles) - Window.IsVisible(myvideolibrary) - ButtonCommonValues - 50 - 50 - 3 14 Watched Toggle 0 - 135 + 90 ButtonCommonValues 50 50 - 99 + 3 8 Search 0 - 180 + 135 ButtonCommonValues 50 @@ -170,7 +157,7 @@ Filter 0 - 225 + 180 ButtonCommonValues 50 @@ -181,7 +168,7 @@ PartyMode 0 - 270 + 225 ButtonCommonValues 50 @@ -192,12 +179,23 @@ Flatten 0 - 315 + 270 ButtonCommonValues 50 50 16 + 7 + + + Stack button + 0 + 315 + + ButtonCommonValues + 50 + 50 + 17 11 @@ -208,7 +206,7 @@ 50 50 - 17 + 7 610 no xbmc.mastermode @@ -224,7 +222,6 @@ 0 405 - conditional conditional CommonNowPlaying_Controls diff --git a/720p/ViewsFileMode.xml b/720p/ViewsFileMode.xml index b2e1796..f558ccd 100644 --- a/720p/ViewsFileMode.xml +++ b/720p/ViewsFileMode.xml @@ -1,7 +1,6 @@ - ![Container.Content(TVShows) + !Window.IsVisible(VideoFiles)] + ![Container.Content(Movies) + !Window.IsVisible(VideoFiles)] + !Container.Content(Seasons) 300 130 950 @@ -44,7 +43,7 @@ right center - ![Window.IsVisible(VideoFiles) | Window.IsVisible(VideoLibrary)] + !Window.IsVisible(Videos) 920 @@ -57,7 +56,7 @@ right center - Window.IsVisible(VideoFiles) | Window.IsVisible(VideoLibrary) + Window.IsVisible(Videos) 920 @@ -65,7 +64,7 @@ 30 22 $INFO[ListItem.Overlay,List] - Window.IsVisible(VideoFiles) | Window.IsVisible(VideoLibrary) + Window.IsVisible(Videos) @@ -108,7 +107,7 @@ right center - ![Window.IsVisible(VideoFiles) | Window.IsVisible(VideoLibrary)] + !Window.IsVisible(Videos) 920 @@ -121,7 +120,7 @@ right center - Window.IsVisible(VideoFiles) | Window.IsVisible(VideoLibrary) + Window.IsVisible(Videos) 920 @@ -129,14 +128,14 @@ 30 22 $INFO[ListItem.Overlay,List] - Window.IsVisible(VideoFiles) | Window.IsVisible(VideoLibrary) + Window.IsVisible(Videos) - ![Container.Content(TVShows) + !Window.IsVisible(VideoFiles)] + !Container.Content(Episodes) + !Container.Content(Episodes) 300 130 540 @@ -967,7 +966,7 @@ - ![Container.Content(TVShows) + !Window.IsVisible(VideoFiles)] + !Container.Content(Movies) + !Container.Content(Songs) + !Container.Content(TVShows) + !Container.Content(Movies) + !Container.Content(Songs) 300 130 950 @@ -1058,7 +1057,7 @@ - ![Container.Content(TVShows) + !Window.IsVisible(VideoFiles)] + !Container.Content(TVShows) 300 130 950 @@ -1223,7 +1222,7 @@ - Container.Content(TVShows) | Window.IsVisible(VideoFiles) | Window.IsVisible(Programs) + Container.Content(TVShows) | Window.IsVisible(Programs) 300 130 950 diff --git a/720p/ViewsVideoLibrary.xml b/720p/ViewsVideoLibrary.xml index ee6bb27..e7d0ef8 100644 --- a/720p/ViewsVideoLibrary.xml +++ b/720p/ViewsVideoLibrary.xml @@ -192,7 +192,7 @@ 61 true - Container.Content(Movies) | Container.Content(Seasons) | Window.IsVisible(VideoFiles) + !Container.Content(Episodes) + !Container.Content(MusicVideos) + !Container.Content(TVShows) -60 0 1090 diff --git a/720p/includes.xml b/720p/includes.xml index 426f6aa..05c651c 100644 --- a/720p/includes.xml +++ b/720p/includes.xml @@ -348,9 +348,8 @@ 10 450 Player.HasAudio - ![Window.IsVisible(VideoLibrary) + Control.IsVisible(56)] - ![Window.IsVisible(VideoLibrary) + Control.IsVisible(500)] - ![Window.IsVisible(VideoFiles) + Control.IsVisible(500)] + ![Window.IsVisible(Videos) + Control.IsVisible(56)] + ![Window.IsVisible(Videos) + Control.IsVisible(500)] ![Window.IsVisible(MusicLibrary) + Control.IsVisible(500)] ![Window.IsVisible(MusicLibrary) + Control.IsVisible(56)] ![Window.IsVisible(MusicFiles) + Control.IsVisible(500)] @@ -365,7 +364,7 @@ 5 keep !Window.IsVisible(MusicLibrary) - !Window.IsVisible(VideoLibrary) + !Window.IsVisible(Videos) 0 @@ -435,9 +434,8 @@ 10 450 Player.HasVideo - ![Window.IsVisible(VideoLibrary) + Control.IsVisible(56)] - ![Window.IsVisible(VideoLibrary) + Control.IsVisible(500)] - ![Window.IsVisible(VideoFiles) + Control.IsVisible(500)] + ![Window.IsVisible(Videos) + Control.IsVisible(56)] + ![Window.IsVisible(Videos) + Control.IsVisible(500)] ![Window.IsVisible(MusicLibrary) + Control.IsVisible(500)] ![Window.IsVisible(MusicLibrary) + Control.IsVisible(56)] ![Window.IsVisible(MusicFiles) + Control.IsVisible(500)] @@ -449,14 +447,14 @@ 165 AAFFFFFF black-back.png - !Window.IsVisible(VideoLibrary) + !Window.IsVisible(Videos) 5 15 250 155 - !Window.IsVisible(VideoLibrary) + !Window.IsVisible(Videos) 5 @@ -563,7 +561,7 @@ 9000 false vertical - [Control.IsVisible(59) + Window.IsVisible(MusicFiles)] | [Control.IsVisible(59) + Window.IsVisible(MusicLibrary)] | [Control.IsVisible(59) + Window.IsVisible(MusicPlaylist)] | [Control.IsVisible(58) + Window.IsVisible(VideoLibrary)] | Control.IsVisible(550) + [Control.IsVisible(59) + Window.IsVisible(MusicFiles)] | [Control.IsVisible(59) + Window.IsVisible(MusicLibrary)] | [Control.IsVisible(59) + Window.IsVisible(MusicPlaylist)] | [Control.IsVisible(58) + Window.IsVisible(Videos)] | Control.IsVisible(550) 1255 @@ -584,7 +582,7 @@ ![Control.IsVisible(59) + Window.IsVisible(MusicFiles)] ![Control.IsVisible(59) + Window.IsVisible(MusicLibrary)] ![Control.IsVisible(59) + Window.IsVisible(MusicPlaylist)] - ![Control.IsVisible(58) + Window.IsVisible(VideoLibrary)] + ![Control.IsVisible(58) + Window.IsVisible(Videos)] !Control.IsVisible(550) Conditional @@ -596,10 +594,9 @@ Hidden Conditional Conditional - Conditional - Conditional - Conditional - Conditional + Conditional + Conditional + Conditional Conditional Conditional 740