Permalink
Browse files

Merge pull request #1399 from Montellese/gsoc_advanced_filter

[GSoC] Advanced Library Filtering
  • Loading branch information...
2 parents 13c4fa3 + 7c46f10 commit 39ab944a45b51499854516a3efbdc623211fa998 @Montellese Montellese committed Oct 9, 2012
Showing with 2,564 additions and 286 deletions.
  1. +6 −0 XBMC-ATV2.xcodeproj/project.pbxproj
  2. +6 −0 XBMC-IOS.xcodeproj/project.pbxproj
  3. +6 −0 XBMC.xcodeproj/project.pbxproj
  4. +184 −0 addons/skin.confluence/720p/DialogMediaFilter.xml
  5. +9 −0 addons/skin.confluence/720p/MyMusicNav.xml
  6. +9 −0 addons/skin.confluence/720p/MyMusicSongs.xml
  7. +8 −0 addons/skin.confluence/720p/MyPics.xml
  8. +8 −0 addons/skin.confluence/720p/MyPrograms.xml
  9. +9 −0 addons/skin.confluence/720p/MyVideoNav.xml
  10. +1 −1 addons/skin.confluence/720p/includes.xml
  11. +23 −1 language/English/strings.po
  12. +2 −0 project/VS2010Express/XBMC.vcxproj
  13. +6 −0 project/VS2010Express/XBMC.vcxproj.filters
  14. +4 −0 xbmc/Application.cpp
  15. +1 −0 xbmc/DbUrl.h
  16. +22 −1 xbmc/GUIInfoManager.cpp
  17. +4 −0 xbmc/GUIInfoManager.h
  18. +5 −0 xbmc/dbwrappers/Database.cpp
  19. +2 −1 xbmc/dbwrappers/Database.h
  20. +913 −0 xbmc/dialogs/GUIDialogMediaFilter.cpp
  21. +82 −0 xbmc/dialogs/GUIDialogMediaFilter.h
  22. +1 −0 xbmc/dialogs/Makefile
  23. +63 −34 xbmc/filesystem/SmartPlaylistDirectory.cpp
  24. +1 −1 xbmc/filesystem/SmartPlaylistDirectory.h
  25. +267 −80 xbmc/guilib/GUISliderControl.cpp
  26. +26 −12 xbmc/guilib/GUISliderControl.h
  27. +3 −0 xbmc/guilib/Key.h
  28. +3 −1 xbmc/input/ButtonTranslator.cpp
  29. +2 −2 xbmc/interfaces/json-rpc/AudioLibrary.cpp
  30. +197 −26 xbmc/music/MusicDatabase.cpp
  31. +9 −6 xbmc/music/MusicDatabase.h
  32. +37 −1 xbmc/music/windows/GUIWindowMusicBase.cpp
  33. +2 −0 xbmc/music/windows/GUIWindowMusicBase.h
  34. +1 −1 xbmc/music/windows/GUIWindowMusicNav.cpp
  35. +36 −6 xbmc/playlists/SmartPlayList.cpp
  36. +6 −0 xbmc/playlists/SmartPlayList.h
  37. +90 −17 xbmc/settings/GUIDialogSettings.cpp
  38. +10 −3 xbmc/settings/GUIDialogSettings.h
  39. +16 −0 xbmc/utils/URIUtils.cpp
  40. +39 −0 xbmc/utils/UrlOptions.cpp
  41. +6 −0 xbmc/utils/UrlOptions.h
  42. +157 −37 xbmc/video/VideoDatabase.cpp
  43. +11 −11 xbmc/video/VideoDatabase.h
  44. +38 −2 xbmc/video/windows/GUIWindowVideoBase.cpp
  45. +2 −0 xbmc/video/windows/GUIWindowVideoBase.h
  46. +17 −1 xbmc/video/windows/GUIWindowVideoNav.cpp
  47. +196 −41 xbmc/windows/GUIMediaWindow.cpp
  48. +18 −0 xbmc/windows/GUIMediaWindow.h
@@ -26,6 +26,7 @@
36A9468815CF214300727135 /* VideoDbUrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36A9468615CF214300727135 /* VideoDbUrl.cpp */; };
36A9468B15CF215300727135 /* UrlOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36A9468915CF215300727135 /* UrlOptions.cpp */; };
36A9468E15CF217400727135 /* MusicDbUrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36A9468C15CF217400727135 /* MusicDbUrl.cpp */; };
+ 36A95DB41624898700727135 /* GUIDialogMediaFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36A95DB21624898700727135 /* GUIDialogMediaFilter.cpp */; };
4D5D2E131301753F006ABC13 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D5D2E121301753F006ABC13 /* CFNetwork.framework */; };
7C0A7ECD13A5DBF900AFC2BD /* AppParamParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7ECB13A5DBF900AFC2BD /* AppParamParser.cpp */; };
7C0A7FC813A9E75400AFC2BD /* DirtyRegionSolvers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7FC413A9E75400AFC2BD /* DirtyRegionSolvers.cpp */; };
@@ -1031,6 +1032,8 @@
36A9468A15CF215300727135 /* UrlOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UrlOptions.h; sourceTree = "<group>"; };
36A9468C15CF217400727135 /* MusicDbUrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MusicDbUrl.cpp; sourceTree = "<group>"; };
36A9468D15CF217400727135 /* MusicDbUrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicDbUrl.h; sourceTree = "<group>"; };
+ 36A95DB21624898700727135 /* GUIDialogMediaFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogMediaFilter.cpp; sourceTree = "<group>"; };
+ 36A95DB31624898700727135 /* GUIDialogMediaFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogMediaFilter.h; sourceTree = "<group>"; };
4D5D2E121301753F006ABC13 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
7C0A7ECB13A5DBF900AFC2BD /* AppParamParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppParamParser.cpp; sourceTree = "<group>"; };
7C0A7ECC13A5DBF900AFC2BD /* AppParamParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppParamParser.h; sourceTree = "<group>"; };
@@ -4601,6 +4604,8 @@
F56C7374131EC151000AD0F6 /* GUIDialogKaiToast.h */,
DF830D4915BB2D2300602BE6 /* GUIDialogKeyboardGeneric.cpp */,
DF830D4A15BB2D2300602BE6 /* GUIDialogKeyboardGeneric.h */,
+ 36A95DB21624898700727135 /* GUIDialogMediaFilter.cpp */,
+ 36A95DB31624898700727135 /* GUIDialogMediaFilter.h */,
F56C7377131EC151000AD0F6 /* GUIDialogMediaSource.cpp */,
F56C7378131EC151000AD0F6 /* GUIDialogMediaSource.h */,
F56C7379131EC151000AD0F6 /* GUIDialogMuteBug.cpp */,
@@ -7568,6 +7573,7 @@
7C4458DB161E209100A905F6 /* Screenshot.cpp in Sources */,
1D638118161E20AC003603ED /* PeripheralImon.cpp in Sources */,
DF24EAC71621E58D00034265 /* DVDDemuxBXA.cpp in Sources */,
+ 36A95DB41624898700727135 /* GUIDialogMediaFilter.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -27,6 +27,7 @@
36A9467815CF20A500727135 /* UrlOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36A9467615CF20A500727135 /* UrlOptions.cpp */; };
36A9467B15CF20BD00727135 /* VideoDbUrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36A9467915CF20BD00727135 /* VideoDbUrl.cpp */; };
36A9467E15CF20E100727135 /* DbUrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36A9467C15CF20E100727135 /* DbUrl.cpp */; };
+ 36A95DAD1624896C00727135 /* GUIDialogMediaFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36A95DAB1624896C00727135 /* GUIDialogMediaFilter.cpp */; };
4D5D2E1E1301758F006ABC13 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D5D2E1D1301758F006ABC13 /* CFNetwork.framework */; };
7C0A7EDE13A5DC2800AFC2BD /* AppParamParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7EDC13A5DC2800AFC2BD /* AppParamParser.cpp */; };
7C0A7F9D13A9E70800AFC2BD /* GUIWindowDebugInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7F9B13A9E70800AFC2BD /* GUIWindowDebugInfo.cpp */; };
@@ -1035,6 +1036,8 @@
36A9467A15CF20BD00727135 /* VideoDbUrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoDbUrl.h; sourceTree = "<group>"; };
36A9467C15CF20E100727135 /* DbUrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DbUrl.cpp; sourceTree = "<group>"; };
36A9467D15CF20E100727135 /* DbUrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DbUrl.h; sourceTree = "<group>"; };
+ 36A95DAB1624896C00727135 /* GUIDialogMediaFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogMediaFilter.cpp; sourceTree = "<group>"; };
+ 36A95DAC1624896C00727135 /* GUIDialogMediaFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogMediaFilter.h; sourceTree = "<group>"; };
4D5D2E1D1301758F006ABC13 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
7C0A7EDC13A5DC2800AFC2BD /* AppParamParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppParamParser.cpp; sourceTree = "<group>"; };
7C0A7EDD13A5DC2800AFC2BD /* AppParamParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppParamParser.h; sourceTree = "<group>"; };
@@ -4962,6 +4965,8 @@
F56C8357131F42E8000AD0F6 /* GUIDialogKaiToast.h */,
DF830C9315BB20FC00602BE6 /* GUIDialogKeyboardGeneric.cpp */,
DF830C9415BB20FC00602BE6 /* GUIDialogKeyboardGeneric.h */,
+ 36A95DAB1624896C00727135 /* GUIDialogMediaFilter.cpp */,
+ 36A95DAC1624896C00727135 /* GUIDialogMediaFilter.h */,
F56C835A131F42E8000AD0F6 /* GUIDialogMediaSource.cpp */,
F56C835B131F42E8000AD0F6 /* GUIDialogMediaSource.h */,
F56C835C131F42E8000AD0F6 /* GUIDialogMuteBug.cpp */,
@@ -7603,6 +7608,7 @@
7C4458C8161E206100A905F6 /* Screenshot.cpp in Sources */,
1D638120161E20F2003603ED /* PeripheralImon.cpp in Sources */,
DF24EADE1621E67200034265 /* DVDDemuxBXA.cpp in Sources */,
+ 36A95DAD1624896C00727135 /* GUIDialogMediaFilter.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -183,6 +183,7 @@
36A9466715CF1FD200727135 /* MusicDbUrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36A9466515CF1FD200727135 /* MusicDbUrl.cpp */; };
36A9466A15CF1FED00727135 /* UrlOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36A9466815CF1FED00727135 /* UrlOptions.cpp */; };
36A9466D15CF201F00727135 /* VideoDbUrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36A9466B15CF201F00727135 /* VideoDbUrl.cpp */; };
+ 36A95DA51624894400727135 /* GUIDialogMediaFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36A95DA31624894400727135 /* GUIDialogMediaFilter.cpp */; };
3802709A13D5A653009493DD /* SystemClock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3802709813D5A653009493DD /* SystemClock.cpp */; };
384718D81325BA04000486D6 /* XBDateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 384718D61325BA04000486D6 /* XBDateTime.cpp */; };
38F4E57013CCCB3B00664821 /* Implementation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38F4E56C13CCCB3B00664821 /* Implementation.cpp */; };
@@ -1361,6 +1362,8 @@
36A9466915CF1FED00727135 /* UrlOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UrlOptions.h; sourceTree = "<group>"; };
36A9466B15CF201F00727135 /* VideoDbUrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VideoDbUrl.cpp; sourceTree = "<group>"; };
36A9466C15CF201F00727135 /* VideoDbUrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoDbUrl.h; sourceTree = "<group>"; };
+ 36A95DA31624894400727135 /* GUIDialogMediaFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogMediaFilter.cpp; sourceTree = "<group>"; };
+ 36A95DA41624894400727135 /* GUIDialogMediaFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogMediaFilter.h; sourceTree = "<group>"; };
3802709713D5A62D009493DD /* ThreadLocal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadLocal.h; sourceTree = "<group>"; };
3802709813D5A653009493DD /* SystemClock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SystemClock.cpp; sourceTree = "<group>"; };
3802709913D5A653009493DD /* SystemClock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemClock.h; sourceTree = "<group>"; };
@@ -3865,6 +3868,8 @@
E38A06CD0D95AA5500FF8227 /* GUIDialogKaiToast.h */,
DF830D0A15BB260C00602BE6 /* GUIDialogKeyboardGeneric.cpp */,
DF830D0B15BB260C00602BE6 /* GUIDialogKeyboardGeneric.h */,
+ 36A95DA31624894400727135 /* GUIDialogMediaFilter.cpp */,
+ 36A95DA41624894400727135 /* GUIDialogMediaFilter.h */,
E38E17B80D25F9FA00618676 /* GUIDialogMediaSource.cpp */,
E38E17B90D25F9FA00618676 /* GUIDialogMediaSource.h */,
E38E17BE0D25F9FA00618676 /* GUIDialogMuteBug.cpp */,
@@ -7636,6 +7641,7 @@
7C4458BD161E203800A905F6 /* Screenshot.cpp in Sources */,
1D638128161E211E003603ED /* PeripheralImon.cpp in Sources */,
AE89ACA61621DAB800E17DBC /* DVDDemuxBXA.cpp in Sources */,
+ 36A95DA51624894400727135 /* GUIDialogMediaFilter.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -0,0 +1,184 @@
+<window id="151">
+ <defaultcontrol always="true">5</defaultcontrol>
+ <coordinates>
+ <system>1</system>
+ <posx>240</posx>
+ <posy>100</posy>
+ </coordinates>
+ <include>dialogeffect</include>
+ <controls>
+ <control type="image">
+ <description>background image</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>800</width>
+ <height>500</height>
+ <texture border="40">DialogBack.png</texture>
+ </control>
+ <control type="image">
+ <description>Dialog Header image</description>
+ <posx>40</posx>
+ <posy>16</posy>
+ <width>720</width>
+ <height>40</height>
+ <texture>dialogheader.png</texture>
+ </control>
+ <control type="label" id="2">
+ <description>header label</description>
+ <posx>40</posx>
+ <posy>20</posy>
+ <width>720</width>
+ <height>30</height>
+ <font>font13_title</font>
+ <label>587</label>
+ <align>center</align>
+ <aligny>center</aligny>
+ <textcolor>selected</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="button">
+ <description>Close Window button</description>
+ <posx>710</posx>
+ <posy>15</posy>
+ <width>64</width>
+ <height>32</height>
+ <label>-</label>
+ <font>-</font>
+ <onclick>PreviousMenu</onclick>
+ <texturefocus>DialogCloseButton-focus.png</texturefocus>
+ <texturenofocus>DialogCloseButton.png</texturenofocus>
+ <onleft>10</onleft>
+ <onright>10</onright>
+ <onup>10</onup>
+ <ondown>10</ondown>
+ <visible>system.getbool(input.enablemouse)</visible>
+ </control>
+
+ <control type="grouplist" id="5">
+ <description>control area</description>
+ <posx>30</posx>
+ <posy>70</posy>
+ <width>720</width>
+ <height>350</height>
+ <itemgap>4</itemgap>
+ <pagecontrol>6</pagecontrol>
+ <onup>9001</onup>
+ <ondown>9001</ondown>
+ <onleft>9001</onleft>
+ <onright>6</onright>
+ </control>
+ <control type="scrollbar" id="6">
+ <posx>755</posx>
+ <posy>70</posy>
+ <width>25</width>
+ <height>350</height>
+ <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
+ <texturesliderbar border="2,16,2,16">ScrollBarV_bar.png</texturesliderbar>
+ <texturesliderbarfocus border="2,16,2,16">ScrollBarV_bar_focus.png</texturesliderbarfocus>
+ <textureslidernib>ScrollBarNib.png</textureslidernib>
+ <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
+ <onleft>5</onleft>
+ <onright>9001</onright>
+ <showonepage>false</showonepage>
+ <orientation>vertical</orientation>
+ </control>
+
+ <control type="button" id="7">
+ <description>Default Button</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <height>40</height>
+ <font>font13</font>
+ <textcolor>grey2</textcolor>
+ <focusedcolor>white</focusedcolor>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
+ <texturefocus border="5">button-focus2.png</texturefocus>
+ </control>
+ <control type="radiobutton" id="8">
+ <description>Default RadioButton</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <height>40</height>
+ <font>font13</font>
+ <textcolor>grey2</textcolor>
+ <focusedcolor>white</focusedcolor>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
+ <texturefocus border="5">button-focus2.png</texturefocus>
+ </control>
+ <control type="spincontrolex" id="9">
+ <description>Default SpinControlex</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <height>40</height>
+ <font>font13</font>
+ <textcolor>grey2</textcolor>
+ <focusedcolor>white</focusedcolor>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
+ <texturefocus border="5">button-focus2.png</texturefocus>
+ <aligny>center</aligny>
+ <reverse>yes</reverse>
+ </control>
+ <control type="sliderex" id="10">
+ <description>Default Slider</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <height>40</height>
+ <font>font13</font>
+ <textcolor>grey2</textcolor>
+ <focusedcolor>white</focusedcolor>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
+ <texturefocus border="5">button-focus2.png</texturefocus>
+ <aligny>center</aligny>
+ </control>
+ <control type="edit" id="12">
+ <description>Default Edit</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <height>40</height>
+ <font>font13</font>
+ <textcolor>grey2</textcolor>
+ <focusedcolor>white</focusedcolor>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
+ <texturefocus border="5">button-focus2.png</texturefocus>
+ </control>
+
+ <control type="group" id="9001">
+ <posx>190</posx>
+ <posy>435</posy>
+ <control type="button" id="28">
+ <description>Ok Button</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>200</width>
+ <height>40</height>
+ <align>center</align>
+ <aligny>center</aligny>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
+ <texturefocus border="5">button-focus.png</texturefocus>
+ <label>186</label>
+ <font>font12_title</font>
+ <onup>5</onup>
+ <onleft>27</onleft>
+ <onright>27</onright>
+ <ondown>5</ondown>
+ </control>
+ <control type="button" id="27">
+ <description>Clear Button</description>
+ <posx>210</posx>
+ <posy>0</posy>
+ <width>200</width>
+ <height>40</height>
+ <align>center</align>
+ <aligny>center</aligny>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
+ <texturefocus border="5">button-focus.png</texturefocus>
+ <label>192</label>
+ <font>font12_title</font>
+ <onup>5</onup>
+ <onleft>28</onleft>
+ <onright>28</onright>
+ <ondown>5</ondown>
+ </control>
+ </control>
+ </controls>
+</window>
@@ -101,11 +101,20 @@
<include>ButtonCommonValues</include>
</control>
<control type="edit" id="19">
+ <visible>Container.CanFilter + !Container.CanFilterAdvanced</visible>
<description>Filter</description>
<textwidth>230</textwidth>
<include>ButtonCommonValues</include>
<label>587</label>
</control>
+ <control type="radiobutton" id="20">
+ <visible>Container.CanFilterAdvanced</visible>
+ <description>Filter</description>
+ <include>ButtonCommonValues</include>
+ <label>587</label>
+ <selected>Container.Filtered</selected>
+ <onclick>Filter</onclick>
+ </control>
<control type="radiobutton" id="100">
<description>Show Info Toggle</description>
<textwidth>170</textwidth>
@@ -98,11 +98,20 @@
<enable>Library.HasContent(Music)</enable>
</control>
<control type="edit" id="19">
+ <visible>Container.CanFilter + !Container.CanFilterAdvanced</visible>
<description>Filter</description>
<textwidth>230</textwidth>
<include>ButtonCommonValues</include>
<label>587</label>
</control>
+ <control type="radiobutton" id="20">
+ <visible>Container.CanFilterAdvanced</visible>
+ <description>Filter</description>
+ <include>ButtonCommonValues</include>
+ <label>587</label>
+ <selected>Container.Filtered</selected>
+ <onclick>Filter</onclick>
+ </control>
<include>CommonNowPlaying_Controls</include>
</control>
</control>
@@ -103,11 +103,19 @@
<usealttexture>Container.SortDirection(Ascending)</usealttexture>
</control>
<control type="edit" id="19">
+ <visible>Container.CanFilter + !Container.CanFilterAdvanced</visible>
<description>Filter</description>
<textwidth>230</textwidth>
<include>ButtonCommonValues</include>
<label>587</label>
</control>
+ <control type="radiobutton" id="20">
+ <visible>Container.CanFilterAdvanced</visible>
+ <description>Filter</description>
+ <include>ButtonCommonValues</include>
+ <label>587</label>
+ <onclick>Filter</onclick>
+ </control>
<control type="label" id="201">
<width>250</width>
<height>35</height>
@@ -89,11 +89,19 @@
<usealttexture>Container.SortDirection(Ascending)</usealttexture>
</control>
<control type="edit" id="19">
+ <visible>Container.CanFilter + !Container.CanFilterAdvanced</visible>
<description>Filter</description>
<textwidth>230</textwidth>
<include>ButtonCommonValues</include>
<label>587</label>
</control>
+ <control type="radiobutton" id="20">
+ <visible>Container.CanFilterAdvanced</visible>
+ <description>Filter</description>
+ <include>ButtonCommonValues</include>
+ <label>587</label>
+ <onclick>Filter</onclick>
+ </control>
<include>CommonNowPlaying_Controls</include>
</control>
</control>
@@ -98,11 +98,20 @@
<usealttexture>Container.SortDirection(Ascending)</usealttexture>
</control>
<control type="edit" id="19">
+ <visible>Container.CanFilter + !Container.CanFilterAdvanced</visible>
<description>Filter</description>
<textwidth>230</textwidth>
<include>ButtonCommonValues</include>
<label>587</label>
</control>
+ <control type="radiobutton" id="20">
+ <visible>Container.CanFilterAdvanced</visible>
+ <description>Filter</description>
+ <include>ButtonCommonValues</include>
+ <label>587</label>
+ <selected>Container.Filtered</selected>
+ <onclick>Filter</onclick>
+ </control>
<control type="radiobutton" id="99">
<description>Show Info Toggle</description>
<textwidth>170</textwidth>
@@ -332,7 +332,7 @@
<scroll>false</scroll>
<align>right</align>
<aligny>center</aligny>
- <label>$INFO[Window.Property(filter),$LOCALIZE[587] ([COLOR=blue],[/COLOR]) - ]$INFO[Container.NumItems,([COLOR=blue],[/COLOR]) $LOCALIZE[31025]]$INFO[Container.CurrentPage, - $LOCALIZE[31024] ([COLOR=blue]]$INFO[Container.NumPages,/,[/COLOR])]</label>
+ <label>$INFO[Container.NumItems,([COLOR=blue],[/COLOR]) $LOCALIZE[31025]]$INFO[Container.CurrentPage, - $LOCALIZE[31024] ([COLOR=blue]]$INFO[Container.NumPages,/,[/COLOR])]</label>
<include>Window_OpenClose_Animation</include>
</control>
<control type="label">
Oops, something went wrong.

0 comments on commit 39ab944

Please sign in to comment.