Multiple fixes for weather, playlist and dialogs

This commit is contained in:
DaVukovic 2019-06-20 22:33:52 +02:00
parent b30d3a1616
commit 8d481e9da0
7 changed files with 55 additions and 45 deletions

View File

@ -69,7 +69,7 @@
<onleft>9000</onleft> <onleft>9000</onleft>
<onright>9000</onright> <onright>9000</onright>
<ondown>12</ondown> <ondown>12</ondown>
<pagecontrol>-</pagecontrol> <pagecontrol></pagecontrol>
<scrolltime>200</scrolltime> <scrolltime>200</scrolltime>
<itemlayout height="40"> <itemlayout height="40">
<control type="image"> <control type="image">
@ -193,7 +193,7 @@
<label>1022</label> <label>1022</label>
<textcolor>grey2</textcolor> <textcolor>grey2</textcolor>
</control> </control>
<control type="button" id="12"> <control type="edit" id="12">
<description>Name Button</description> <description>Name Button</description>
<posx>40</posx> <posx>40</posx>
<posy>370</posy> <posy>370</posy>
@ -201,7 +201,7 @@
<height>35</height> <height>35</height>
<align>center</align> <align>center</align>
<aligny>center</aligny> <aligny>center</aligny>
<label>-</label> <label></label>
<font>font12</font> <font>font12</font>
<texturefocus border="3">button-focus.png</texturefocus> <texturefocus border="3">button-focus.png</texturefocus>
<texturenofocus border="3">button-nofocus.png</texturenofocus> <texturenofocus border="3">button-nofocus.png</texturenofocus>

View File

@ -506,7 +506,7 @@
<onright>22</onright> <onright>22</onright>
<onup>9000</onup> <onup>9000</onup>
<ondown>9000</ondown> <ondown>9000</ondown>
<pagecontrol>-</pagecontrol> <pagecontrol></pagecontrol>
<scrolltime>200</scrolltime> <scrolltime>200</scrolltime>
<itemlayout height="57" width="345"> <itemlayout height="57" width="345">
<control type="image"> <control type="image">
@ -636,7 +636,8 @@
</item> </item>
<item id="7"> <item id="7">
<label>8</label> <label>8</label>
<onclick>ActivateWindow(Weather)</onclick> <onclick condition="!String.IsEmpty(Weather.Plugin)">ActivateWindow(Weather)</onclick>
<onclick condition="String.IsEmpty(Weather.Plugin)">ActivateWindow(servicesettings,weather)</onclick>
<icon>special://skin/backgrounds/weather.jpg</icon> <icon>special://skin/backgrounds/weather.jpg</icon>
<thumb>$INFO[Skin.String(Home_Custom_Back_Weather_Folder)]</thumb> <thumb>$INFO[Skin.String(Home_Custom_Back_Weather_Folder)]</thumb>
<visible>!Skin.HasSetting(homepageHideWeatherButton) + !IsEmpty(Weather.Plugin)</visible> <visible>!Skin.HasSetting(homepageHideWeatherButton) + !IsEmpty(Weather.Plugin)</visible>
@ -705,9 +706,9 @@
<posy>0</posy> <posy>0</posy>
<width>50</width> <width>50</width>
<height>50</height> <height>50</height>
<label>-</label> <label></label>
<font>-</font> <font></font>
<aligny>-</aligny> <aligny></aligny>
<onclick>XBMC.PlayDVD()</onclick> <onclick>XBMC.PlayDVD()</onclick>
<texturefocus>home-playmedia.png</texturefocus> <texturefocus>home-playmedia.png</texturefocus>
<texturenofocus>home-playmedia.png</texturenofocus> <texturenofocus>home-playmedia.png</texturenofocus>
@ -732,9 +733,9 @@
<posy>0</posy> <posy>0</posy>
<width>50</width> <width>50</width>
<height>50</height> <height>50</height>
<label>-</label> <label></label>
<font>-</font> <font></font>
<aligny>-</aligny> <aligny></aligny>
<onclick>ActivateWindow(Favourites)</onclick> <onclick>ActivateWindow(Favourites)</onclick>
<texturefocus>home-favourites.png</texturefocus> <texturefocus>home-favourites.png</texturefocus>
<texturenofocus>home-favourites.png</texturenofocus> <texturenofocus>home-favourites.png</texturenofocus>
@ -757,9 +758,9 @@
<posy>0</posy> <posy>0</posy>
<width>50</width> <width>50</width>
<height>50</height> <height>50</height>
<label>-</label> <label></label>
<font>-</font> <font></font>
<aligny>-</aligny> <aligny></aligny>
<onclick>ActivateWindow(ShutdownMenu)</onclick> <onclick>ActivateWindow(ShutdownMenu)</onclick>
<texturefocus>home-power.png</texturefocus> <texturefocus>home-power.png</texturefocus>
<texturenofocus>home-power.png</texturenofocus> <texturenofocus>home-power.png</texturenofocus>

View File

@ -7,7 +7,7 @@
<include>Window_OpenClose_Right_Panel_Animation</include> <include>Window_OpenClose_Right_Panel_Animation</include>
<include>ContentPanel</include> <include>ContentPanel</include>
<control type="group"> <control type="group">
<posx>317</posx> <posx>350</posx>
<posy>135</posy> <posy>135</posy>
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
@ -64,7 +64,7 @@
<control type="label"> <control type="label">
<description>current temp Value</description> <description>current temp Value</description>
<posx>20</posx> <posx>20</posx>
<posy>60</posy> <posy>110</posy>
<width>210</width> <width>210</width>
<height>180</height> <height>180</height>
<font>font35b</font> <font>font35b</font>
@ -77,7 +77,7 @@
<control type="image"> <control type="image">
<description>current weather icon</description> <description>current weather icon</description>
<posx>230</posx> <posx>230</posx>
<posy>60</posy> <posy>110</posy>
<width>210</width> <width>210</width>
<height>180</height> <height>180</height>
<info>Window.Property(Current.ConditionIcon)</info> <info>Window.Property(Current.ConditionIcon)</info>
@ -226,7 +226,7 @@
</control> </control>
<control type="group"> <control type="group">
<description>day 0</description> <description>day 0</description>
<posx>780</posx> <posx>810</posx>
<posy>135</posy> <posy>135</posy>
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
@ -325,7 +325,7 @@
</control> </control>
<control type="group"> <control type="group">
<description>day 0</description> <description>day 0</description>
<posx>780</posx> <posx>810</posx>
<posy>263</posy> <posy>263</posy>
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
@ -424,7 +424,7 @@
</control> </control>
<control type="group"> <control type="group">
<description>day 0</description> <description>day 0</description>
<posx>780</posx> <posx>810</posx>
<posy>391</posy> <posy>391</posy>
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
@ -523,7 +523,7 @@
</control> </control>
<control type="group"> <control type="group">
<description>day 3</description> <description>day 3</description>
<posx>780</posx> <posx>810</posx>
<posy>519</posy> <posy>519</posy>
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
@ -631,7 +631,7 @@
<description>change location button</description> <description>change location button</description>
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>0</posy>
<font>-</font> <font></font>
<textoffsetx>15</textoffsetx> <textoffsetx>15</textoffsetx>
<include>ButtonCommonValues</include> <include>ButtonCommonValues</include>
<onleft>99</onleft> <onleft>99</onleft>
@ -681,7 +681,7 @@
<posx>0</posx> <posx>0</posx>
<posy>135</posy> <posy>135</posy>
<label>5</label> <label>5</label>
<onclick>ActivateWindow(MyWeatherSettings)</onclick> <onclick>ActivateWindow(servicesettings,weather)</onclick>
<include>ButtonCommonValues</include> <include>ButtonCommonValues</include>
<onleft>50</onleft> <onleft>50</onleft>
<onright>50</onright> <onright>50</onright>
@ -722,14 +722,14 @@
</control> </control>
<control type="label" id="1"> <control type="label" id="1">
<description>weather location label</description> <description>weather location label</description>
<posx>50r</posx> <posx>350</posx>
<posy>50</posy> <posy>210</posy>
<width>1060</width> <width>460</width>
<height>30</height> <height>30</height>
<font>font18</font> <font>font18</font>
<textcolor>white</textcolor> <textcolor>white</textcolor>
<scroll>false</scroll> <scroll>false</scroll>
<align>right</align> <align>center</align>
<aligny>center</aligny> <aligny>center</aligny>
<label>$INFO[Window(Weather).Property(Location)]</label> <label>$INFO[Window(Weather).Property(Location)]</label>
<include>Window_OpenClose_Animation</include> <include>Window_OpenClose_Animation</include>

View File

@ -3,6 +3,20 @@
<allowoverlay>no</allowoverlay> <allowoverlay>no</allowoverlay>
<controls> <controls>
<include>CommonBackground</include> <include>CommonBackground</include>
<control type="image">
<left>40</left>left>
<top>135</top>top>
<width>1223</width>
<height>500</height>height>
<texture border="40">DialogBack.png</texture>
</control>
<control type="image">
<left>40</left>
<top>135</top>
<width>1223</width>
<height>500</height>
<texture border="40">DialogFront.png</texture>
</control>
<control type="group"> <control type="group">
<control type="panel" id="50"> <control type="panel" id="50">
<posx>80</posx> <posx>80</posx>

View File

@ -2,7 +2,6 @@
<defaultcontrol always="true">22</defaultcontrol> <defaultcontrol always="true">22</defaultcontrol>
<allowoverlay>no</allowoverlay> <allowoverlay>no</allowoverlay>
<coordinates> <coordinates>
<system>1</system>
<posx>240</posx> <posx>240</posx>
<posy>70</posy> <posy>70</posy>
</coordinates> </coordinates>
@ -52,7 +51,7 @@
<height>2</height> <height>2</height>
<texture>separator.png</texture> <texture>separator.png</texture>
</control> </control>
<control type="spincontrolex" id="22"> <control type="button" id="22">
<description>Set Playlist type</description> <description>Set Playlist type</description>
<posx>40</posx> <posx>40</posx>
<posy>85</posy> <posy>85</posy>
@ -88,7 +87,7 @@
<aligny>center</aligny> <aligny>center</aligny>
<texturefocus border="3">button-focus.png</texturefocus> <texturefocus border="3">button-focus.png</texturefocus>
<texturenofocus border="3">button-nofocus.png</texturenofocus> <texturenofocus border="3">button-nofocus.png</texturenofocus>
<label>-</label> <label></label>
<colordiffuse>FFFFFFFF</colordiffuse> <colordiffuse>FFFFFFFF</colordiffuse>
<onup>22</onup> <onup>22</onup>
<onleft>12</onleft> <onleft>12</onleft>
@ -213,8 +212,7 @@
<ondown>16</ondown> <ondown>16</ondown>
</control> </control>
</control> </control>
<control type="button" id="16">
<control type="spincontrolex" id="16">
<posx>40</posx> <posx>40</posx>
<posy>365</posy> <posy>365</posy>
<width>720</width> <width>720</width>
@ -228,8 +226,7 @@
<onup>10</onup> <onup>10</onup>
<ondown>17</ondown> <ondown>17</ondown>
</control> </control>
<control type="button" id="17">
<control type="spincontrolex" id="17">
<posx>40</posx> <posx>40</posx>
<posy>405</posy> <posy>405</posy>
<width>720</width> <width>720</width>
@ -243,8 +240,7 @@
<onup>16</onup> <onup>16</onup>
<ondown>18</ondown> <ondown>18</ondown>
</control> </control>
<control type="button" id="18">
<control type="spincontrolex" id="18">
<posx>40</posx> <posx>40</posx>
<posy>445</posy> <posy>445</posy>
<width>565</width> <width>565</width>
@ -258,8 +254,7 @@
<onup>17</onup> <onup>17</onup>
<ondown>9001</ondown> <ondown>9001</ondown>
</control> </control>
<control type="button" id="19">
<control type="togglebutton" id="19">
<posx>610</posx> <posx>610</posx>
<posy>445</posy> <posy>445</posy>
<width>150</width> <width>150</width>
@ -269,10 +264,10 @@
<aligny>center</aligny> <aligny>center</aligny>
<texturefocus border="3">button-focus.png</texturefocus> <texturefocus border="3">button-focus.png</texturefocus>
<texturenofocus border="3">button-nofocus.png</texturenofocus> <texturenofocus border="3">button-nofocus.png</texturenofocus>
<alttexturefocus>button-focus.png</alttexturefocus> <!--alttexturefocus>button-focus.png</alttexturefocus>
<alttexturenofocus>button-nofocus.png</alttexturenofocus> <alttexturenofocus>button-nofocus.png</alttexturenofocus>
<label>21431</label> <label>21431</label>
<altlabel>21430</altlabel> <altlabel>21430</altlabel -->
<onright>18</onright> <onright>18</onright>
<onleft>18</onleft> <onleft>18</onleft>
<onup>17</onup> <onup>17</onup>

View File

@ -61,7 +61,7 @@
<label>21422</label> <label>21422</label>
</control> </control>
<control type="group" id="9001"> <control type="group" id="9001">
<control type="spincontrolex" id="15"> <control type="button" id="15">
<description>Rule Field</description> <description>Rule Field</description>
<posx>40</posx> <posx>40</posx>
<posy>125</posy> <posy>125</posy>
@ -75,7 +75,7 @@
<onup>9000</onup> <onup>9000</onup>
<ondown>17</ondown> <ondown>17</ondown>
</control> </control>
<control type="spincontrolex" id="16"> <control type="button" id="16">
<description>Rule operator</description> <description>Rule operator</description>
<posx>405</posx> <posx>405</posx>
<posy>125</posy> <posy>125</posy>
@ -102,7 +102,7 @@
<aligny>center</aligny> <aligny>center</aligny>
<texturefocus border="3">button-focus.png</texturefocus> <texturefocus border="3">button-focus.png</texturefocus>
<texturenofocus border="3">button-nofocus.png</texturenofocus> <texturenofocus border="3">button-nofocus.png</texturenofocus>
<label>-</label> <label></label>
<onup>9001</onup> <onup>9001</onup>
<onleft>20</onleft> <onleft>20</onleft>
<onright>20</onright> <onright>20</onright>

View File

@ -105,8 +105,8 @@
<include name="WindowCloseButtonCommons"> <include name="WindowCloseButtonCommons">
<width>30</width> <width>30</width>
<height>30</height> <height>30</height>
<label>-</label> <label></label>
<font>-</font> <font></font>
<onclick>PreviousMenu</onclick> <onclick>PreviousMenu</onclick>
<texturefocus>close-windowFO.png</texturefocus> <texturefocus>close-windowFO.png</texturefocus>
<texturenofocus>close-window.png</texturenofocus> <texturenofocus>close-window.png</texturenofocus>