Filter fixes and new settings dialog

This commit is contained in:
DaVukovic 2019-05-29 15:58:02 +02:00
parent 59b811a9e7
commit 2ffd84b901
2 changed files with 170 additions and 1 deletions

169
720p/DialogSettings.xml Normal file
View File

@ -0,0 +1,169 @@
<?xml version="1.0" encoding="UTF-8"?>
<window>
<defaultcontrol always="true">5</defaultcontrol>
<coordinates>
<left>240</left>
<top>142</top>
</coordinates>
<include>dialogeffect</include>
<controls>
<control type="group">
<animation effect="fade" start="100" end="0" time="150" condition="Window.Is(contentsettings) + Window.IsActive(AddonSettings)">Conditional</animation>
<animation effect="fade" start="100" end="0" time="300" condition="[Window.Is(osdaudiosettings) | Window.Is(osdvideosettings) | Window.Is(osdsubtitlesettings)] + [Window.IsVisible(SliderDialog) | Window.IsVisible(FileBrowser)]">Conditional</animation>
<control type="image">
<left>-10</left>
<top>28</top>
<width>820</width>
<height>350</height>
<texture border="40">DialogBack.png</texture>
</control>
<control type="image">
<left>-10</left>
<top>28</top>
<width>820</width>
<height>350</height>
<texture border="40">DialogFront.png</texture>
</control>
<control type="grouplist" id="5">
<animation effect="slide" start="0,0" end="-10,0" time="0" condition="Control.IsVisible(60)">Conditional</animation>
<description>control area</description>
<left>35</left>
<top>71</top>
<width>600</width>
<height>261</height>
<itemgap>4</itemgap>
<pagecontrol>60</pagecontrol>
<onup>9001</onup>
<ondown>9001</ondown>
<onleft>60</onleft>
<onright>60</onright>
</control>
<control type="scrollbar" id="60">
<left>758</left>
<top>70</top>
<width>25</width>
<height>308</height>
<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
<textureslidernib>ScrollBarNib.png</textureslidernib>
<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
<onleft>5</onleft>
<onright>5</onright>
<ondown>60</ondown>
<onup>60</onup>
<showonepage>false</showonepage>
<orientation>vertical</orientation>
</control>
<control type="button" id="7">
<description>Default Button</description>
<height>40</height>
<font>font13</font>
<texturefocus border="5">button-focus2.png</texturefocus>
</control>
<control type="radiobutton" id="8">
<description>Default RadioButton</description>
<height>40</height>
<font>font13</font>
<texturefocus border="5">button-focus2.png</texturefocus>
</control>
<control type="spincontrolex" id="9">
<description>Default SpinControlex</description>
<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="image" id="11">
<description>separator image</description>
<height>2</height>
<texture>separator2.png</texture>
</control>
<control type="edit" id="12">
<description>Default Edit</description>
<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="sliderex" id="13">
<description>Default Slider</description>
<height>40</height>
<texturenofocus border="5">button-nofocus.png</texturenofocus>
<texturefocus border="5">button-focus2.png</texturefocus>
<font>font13</font>
<textcolor>grey2</textcolor>
<focusedcolor>white</focusedcolor>
</control>
<control type="label" id="14">
<description>Default Heading</description>
<height>34</height>
<font>font12</font>
<align>center</align>
<aligny>center</aligny>
<textcolor>blue</textcolor>
<shadowcolor>black</shadowcolor>
</control>
<control type="grouplist" id="9001">
<left>635</left>
<top>-493</top>
<width>150</width>
<align>center</align>
<itemgap>4</itemgap>
<orientation>vertical</orientation>
<control type="button" id="28">
<description>OK Button</description>
<top>0</top>
<width>130</width>
<height>40</height>
<align>center</align>
<aligny>center</aligny>
<font>font12_title</font>
<texturenofocus border="5">button-nofocus.png</texturenofocus>
<texturefocus border="5">button-focus2.png</texturefocus>
<onleft>5</onleft>
<onright>5</onright>
<onup>30</onup>
<ondown>29</ondown>
</control>
<control type="button" id="29">
<description>Cancel Button</description>
<top>0</top>
<width>130</width>
<height>40</height>
<align>center</align>
<aligny>center</aligny>
<font>font12_title</font>
<texturenofocus border="5">button-nofocus.png</texturenofocus>
<texturefocus border="5">button-focus2.png</texturefocus>
<label/>
<onleft>28</onleft>
<onright>30</onright>
<onup>5</onup>
<ondown>5</ondown>
</control>
<control type="button" id="30">
<description>Settings Button</description>
<top>0</top>
<width>130</width>
<height>40</height>
<align>center</align>
<aligny>center</aligny>
<font>font12_title</font>
<texturenofocus border="5">button-nofocus.png</texturenofocus>
<texturefocus border="5">button-focus2.png</texturefocus>
<onleft>5</onleft>
<onright>5</onright>
<onup>29</onup>
<ondown>28</ondown>
</control>
</control>
</control>
</controls>
</window>

View File

@ -171,7 +171,7 @@
<selected>Container.Filtered</selected>
<visible>!Container.CanFilterAdvanced</visible>
</control>
<control type="radiobutton" id="20">
<control type="radiobutton" id="200">
<description>Advanced Filter</description>
<posx>0</posx>
<posy>180</posy>