From 04d15f2f97a276dbf8c1906802721bd1dd4a0000 Mon Sep 17 00:00:00 2001 From: JezzX Date: Sat, 2 Feb 2013 16:57:19 +1100 Subject: [PATCH] Added: Stuff needed for the new way to do media filtering in Frodo --- 720p/DialogMediaFilter.xml | 164 +++++++++++++++++++++++++++++++++++++ 720p/MyMusicNav.xml | 18 +++- 720p/MyMusicSongs.xml | 33 +++++++- 720p/MyPics.xml | 39 +++++++-- 720p/MyPrograms.xml | 33 +++++++- 720p/MyVideoNav.xml | 16 ++++ 720p/includes.xml | 2 +- 7 files changed, 291 insertions(+), 14 deletions(-) create mode 100644 720p/DialogMediaFilter.xml diff --git a/720p/DialogMediaFilter.xml b/720p/DialogMediaFilter.xml new file mode 100644 index 0000000..4029fb5 --- /dev/null +++ b/720p/DialogMediaFilter.xml @@ -0,0 +1,164 @@ + + 5 + + 1 + 240 + 45 + + dialogeffect + + + background image + 0 + 0 + 800 + 610 + DialogBack.png + + + background image + 0 + 0 + 800 + 610 + DialogFront.png + + + heading label + 40 + 40 + 720 + 30 + center + center + font18 + + dialogheader + + + Close Window button + 730 + 35 + WindowCloseButtonCommons + + + 40 + 78 + 720 + 2 + separator.png + + + + control area + 40 + 85 + 720 + 440 + 4 + - + 9001 + 9001 + 9001 + 9001 + + + + Default Button + 0 + 0 + 35 + font12 + grey2 + white + button-focus.png + button-nofocus.png + + + Default RadioButton + 0 + 0 + 35 + font12 + grey2 + white + button-focus.png + button-nofocus.png + + + Default SpinControlex + 0 + 0 + 35 + font12 + grey2 + white + button-focus.png + button-nofocus.png + center + yes + + + Default Slider + 0 + 0 + 35 + font12 + grey2 + white + button-focus.png + button-nofocus.png + center + + + Default Edit + 0 + 0 + 35 + font12 + grey2 + white + button-focus.png + button-nofocus.png + + + + 195 + 530 + + Ok Button + 0 + 0 + 200 + 35 + center + center + button-nofocus.png + button-focus2.png + + font12_title + 5 + 27 + 27 + 5 + + + Clear Button + 210 + 0 + 200 + 35 + center + center + button-nofocus.png + button-focus2.png + + font12_title + 5 + 28 + 28 + 5 + + + + diff --git a/720p/MyMusicNav.xml b/720p/MyMusicNav.xml index bd6f196..08b732d 100644 --- a/720p/MyMusicNav.xml +++ b/720p/MyMusicNav.xml @@ -137,7 +137,23 @@ 50 50 8 + 20 + Container.Filtered + !Container.CanFilterAdvanced + + + Advanced Filter + 0 + 180 + ButtonCommonValues + + Filter + 50 + 50 + 19 16 + Container.Filtered + Container.CanFilterAdvanced PartyMode @@ -147,7 +163,7 @@ 50 50 - 19 + 20 610 diff --git a/720p/MyMusicSongs.xml b/720p/MyMusicSongs.xml index 47714d5..b47fb64 100644 --- a/720p/MyMusicSongs.xml +++ b/720p/MyMusicSongs.xml @@ -81,18 +81,45 @@ 50 50 3 - 610 + 19 Library.HasContent(Music) + + Filter + 0 + 135 + ButtonCommonValues + + 50 + 50 + 99 + 20 + Container.Filtered + !Container.CanFilterAdvanced + + + Advanced Filter + 0 + 135 + ButtonCommonValues + + Filter + 50 + 50 + 19 + 610 + Container.Filtered + Container.CanFilterAdvanced + Fake Button to fix Player Controls Navigation - 99 + 20 603 false 0 - 135 + 180 CommonNowPlaying_Controls diff --git a/720p/MyPics.xml b/720p/MyPics.xml index bb4d0ea..8567a76 100644 --- a/720p/MyPics.xml +++ b/720p/MyPics.xml @@ -42,7 +42,7 @@ 50 4 2 - 6 + 19 Sort asc @@ -52,23 +52,50 @@ 3 50 2 + 19 + + + Filter + 0 + 90 + ButtonCommonValues + + 50 + 50 + 3 + 20 + Container.Filtered + !Container.CanFilterAdvanced + + + Advanced Filter + 0 + 90 + ButtonCommonValues + + Filter + 50 + 50 + 19 6 + Container.Filtered + Container.CanFilterAdvanced Slideshow 0 - 90 + 135 ButtonCommonValues 50 50 - 3 + 20 7 Recersive Slideshow 0 - 135 + 180 ButtonCommonValues 50 @@ -79,7 +106,7 @@ Randomize Toggle 0 - 180 + 225 ButtonCommonValues 50 @@ -95,7 +122,7 @@ 0 - 225 + 270 CommonNowPlaying_Controls diff --git a/720p/MyPrograms.xml b/720p/MyPrograms.xml index 4f8f5a2..344d970 100644 --- a/720p/MyPrograms.xml +++ b/720p/MyPrograms.xml @@ -42,7 +42,7 @@ 50 4 2 - 610 + 19 Sort asc @@ -52,17 +52,44 @@ 3 50 2 + 19 + + + Filter + 0 + 90 + ButtonCommonValues + + 50 + 50 + 3 + 20 + Container.Filtered + !Container.CanFilterAdvanced + + + Advanced Filter + 0 + 90 + ButtonCommonValues + + Filter + 50 + 50 + 19 610 + Container.Filtered + Container.CanFilterAdvanced Fake Button to fix Player Controls Navigation - 3 + 20 603 false 0 - 90 + 135 CommonNowPlaying_Controls diff --git a/720p/MyVideoNav.xml b/720p/MyVideoNav.xml index 0401bd1..db63aa5 100644 --- a/720p/MyVideoNav.xml +++ b/720p/MyVideoNav.xml @@ -163,7 +163,23 @@ 50 50 8 + 20 + Container.Filtered + !Container.CanFilterAdvanced + + + Advanced Filter + 0 + 180 + ButtonCommonValues + + Filter + 50 + 50 + 19 16 + Container.Filtered + Container.CanFilterAdvanced PartyMode diff --git a/720p/includes.xml b/720p/includes.xml index be5bca2..822a13d 100644 --- a/720p/includes.xml +++ b/720p/includes.xml @@ -101,7 +101,7 @@ black-back.png Visible Hidden - Window.IsActive(MovieInformation) | Window.IsActive(MusicInformation) | Window.IsActive(SongInformation) | Window.IsActive(Favourites) | Window.IsActive(ShutdownMenu) | Window.IsActive(FileBrowser) | Window.IsActive(TextViewer) | Window.IsActive(AddonSettings) | Window.IsActive(ContentSettings) | Window.IsActive(SelectDialog) | Window.IsActive(FileStackingDialog) | Window.IsActive(MediaSource) | Window.IsActive(PictureInfo) | Window.IsActive(PlayerControls) | Window.IsActive(VirtualKeyboard) | Window.IsActive(NumericInput) | Window.IsActive(ProfileSettings) | Window.IsActive(LockSettings) | Window.IsActive(SmartPlaylistEditor) | Window.IsActive(SmartPlaylistRule) | Window.IsActive(script-XBMC_Lyrics-settings.xml) | Window.IsActive(script-RSS_Editor-rssEditor.xml) | Window.IsActive(script-RSS_Editor-setEditor.xml) | Window.IsActive(AddonInformation) | Window.IsActive(Peripherals) | Window.IsActive(PeripheralSettings) + Window.IsActive(MovieInformation) | Window.IsActive(MusicInformation) | Window.IsActive(SongInformation) | Window.IsActive(FileBrowser) | Window.IsActive(TextViewer) | Window.IsActive(AddonSettings) | Window.IsActive(ContentSettings) | Window.IsActive(SelectDialog) | Window.IsActive(FileStackingDialog) | Window.IsActive(MediaSource) | Window.IsActive(PictureInfo) | Window.IsActive(PlayerControls) | Window.IsActive(VirtualKeyboard) | Window.IsActive(NumericInput) | Window.IsActive(ProfileSettings) | Window.IsActive(LockSettings) | Window.IsActive(SmartPlaylistEditor) | Window.IsActive(SmartPlaylistRule) | Window.IsActive(script-RSS_Editor-rssEditor.xml) | Window.IsActive(script-RSS_Editor-setEditor.xml) | Window.IsActive(AddonInformation) | Window.IsActive(Peripherals) | Window.IsActive(PeripheralSettings) | Window.IsActive(script-XBMC_Lyrics-main.xml) | Window.IsActive(PVRChannelManager) | Window.IsActive(MediaFilter)