Skip to content

Commit

Permalink
Changed: [Confluence] Various Alignment stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
@JezzX
JezzX committed Apr 24, 2012
1 parent 9f82add commit f8b6d1d
Show file tree
Hide file tree
Showing 2 changed files with 96 additions and 84 deletions.
142 changes: 84 additions & 58 deletions addons/skin.confluence/720p/Home.xml
View file
Expand Up @@ -6,6 +6,15 @@
<controls>
<include>CommonBackground</include>
<include>CommonMediaPlayingBackground</include>
<control type="image">
<posx>0</posx>
<posy>-40</posy>
<width>1280</width>
<height>120</height>
<texture flipy="true">HomeNowPlayingBack.png</texture>
<visible>[Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)] | [Player.HasAudio + !Skin.HasSetting(ShowBackgroundVis)]</visible>
<visible>!SubString(Window(videolibrary).Property(TvTunesIsAlive),True)</visible>
</control>
<control type="image">
<posx>0</posx>
<posy>90r</posy>
Expand Down Expand Up @@ -98,7 +107,7 @@
<description>Cover image</description>
<posx>20</posx>
<posy>45</posy>
<width>150</width>
<width>120</width>
<height>300</height>
<aspectratio aligny="bottom">keep</aspectratio>
<texture>$INFO[VideoPlayer.Cover]</texture>
Expand All @@ -107,7 +116,7 @@
</control>
<control type="label">
<description>Title label</description>
<posx>190</posx>
<posx>160</posx>
<posy>285</posy>
<height>30</height>
<width>1000</width>
Expand All @@ -120,7 +129,7 @@
</control>
<control type="label">
<description>Time Label</description>
<posx>190</posx>
<posx>160</posx>
<posy>310</posy>
<height>30</height>
<width>300</width>
Expand Down Expand Up @@ -190,17 +199,17 @@
<control type="image">
<description>Cover image</description>
<posx>20</posx>
<posy>45</posy>
<width>200</width>
<height>300</height>
<aspectratio aligny="bottom">keep</aspectratio>
<posy>225</posy>
<width>180</width>
<height>120</height>
<aspectratio>scale</aspectratio>
<texture>$INFO[VideoPlayer.Cover]</texture>
<bordertexture border="8">ThumbBorder.png</bordertexture>
<bordersize>5</bordersize>
</control>
<control type="label">
<description>TV Show Season Ep Label</description>
<posx>240</posx>
<posx>210</posx>
<posy>265</posy>
<height>25</height>
<width>1000</width>
Expand All @@ -213,7 +222,7 @@
</control>
<control type="label">
<description>Title label</description>
<posx>240</posx>
<posx>210</posx>
<posy>285</posy>
<height>30</height>
<width>1000</width>
Expand All @@ -226,7 +235,7 @@
</control>
<control type="label">
<description>Time Label</description>
<posx>240</posx>
<posx>210</posx>
<posy>310</posy>
<height>30</height>
<width>300</width>
Expand Down Expand Up @@ -972,70 +981,87 @@
</control>
</control>
<control type="group">
<posx>520r</posx>
<posx>20</posx>
<posy>0</posy>
<animation effect="slide" start="0,0" end="-60,0" delay="0" time="300" condition="Window.IsVisible(MuteBug)">conditional</animation>
<animation effect="slide" start="0,0" end="550,0" delay="0" time="300">WindowClose</animation>
<animation effect="slide" start="550,0" end="0,0" delay="0" time="300">WindowOpen</animation>
<visible>!Skin.HasSetting(homepageWeatherinfo) + Weather.IsFetched</visible>
<control type="image">
<description>time background</description>
<posx>0</posx>
<posy>0</posy>
<width>180</width>
<height>35</height>
<texture flipx="true" border="32,0,0,0">header.png</texture>
</control>
<include>Window_OpenClose_Animation</include>
<control type="image">
<description>Weather image</description>
<posx>25</posx>
<posx>0</posx>
<posy>0</posy>
<width>30</width>
<height>30</height>
<width>60</width>
<height>60</height>
<aspectratio>keep</aspectratio>
<texture>$INFO[Window(Weather).Property(Current.ConditionIcon)]</texture>
</control>
<control type="label">
<description>time label</description>
<posx>60</posx>
<posy>0</posy>
<width>100</width>
<height>28</height>
<description>Location label</description>
<posx>70</posx>
<posy>5</posy>
<width>500</width>
<height>15</height>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<font>font10</font>
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
<label>[B]$INFO[Weather.Temperature][/B]</label>
</control>
</control>
<control type="group">
<posx>390r</posx>
<posy>0</posy>
<animation effect="slide" start="0,0" end="-60,0" delay="0" time="300" condition="Window.IsVisible(MuteBug)">conditional</animation>
<animation effect="slide" start="0,0" end="420,0" delay="0" time="300">WindowClose</animation>
<animation effect="slide" start="420,0" end="0,0" delay="0" time="300">WindowOpen</animation>
<control type="image">
<description>time background</description>
<posx>0</posx>
<posy>0</posy>
<width>440</width>
<height>35</height>
<texture flipx="true" border="32,0,0,0">header.png</texture>
<label>$INFO[Window(Weather).Property(Location)]</label>
</control>
<control type="label">
<description>time label</description>
<posx>30</posx>
<posy>0</posy>
<width>400</width>
<height>28</height>
<control type="grouplist">
<posx>70</posx>
<posy>20</posy>
<width>1000</width>
<height>30</height>
<orientation>horizontal</orientation>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
<label>[COLOR=grey]$INFO[System.Date][/COLOR] | $INFO[System.Time]</label>
<itemgap>5</itemgap>
<control type="label">
<description>Temp label</description>
<width min="0" max="300">auto</width>
<height>30</height>
<align>left</align>
<aligny>center</aligny>
<font>font28_title</font>
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
<label>[B]$INFO[Window(Weather).Property(Current.Temperature)][/B]</label>
</control>
<control type="label">
<description>Temp Units</description>
<width min="0" max="100">auto</width>
<height>22</height>
<font>font10</font>
<aligny>center</aligny>
<label>$INFO[System.TemperatureUnits]</label>
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
</control>
<control type="label">
<description>Temp Units</description>
<width>500</width>
<height>30</height>
<font>font10</font>
<aligny>center</aligny>
<label> $INFO[Window(Weather).Property(Current.Condition)]</label>
<textcolor>grey2</textcolor>
<shadowcolor>black</shadowcolor>
</control>
</control>
</control>
<include>Clock</include>
<control type="label">
<description>Date label</description>
<posx>20r</posx>
<posy>35</posy>
<width>200</width>
<height>15</height>
<align>right</align>
<aligny>center</aligny>
<font>font10</font>
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
<label>$INFO[System.Date]</label>
<include>Window_OpenClose_Animation</include>
</control>
</controls>
</window>
38 changes: 12 additions & 26 deletions addons/skin.confluence/720p/includes.xml
View file
Expand Up @@ -748,32 +748,18 @@
</control>
</include>
<include name="Clock">
<control type="group">
<posx>140r</posx>
<posy>0</posy>
<animation effect="slide" start="0,0" end="-60,0" delay="0" time="300" condition="Window.IsVisible(MuteBug)">conditional</animation>
<animation effect="slide" start="0,0" end="210,0" delay="0" time="300" condition="Window.Next(Home) + ![Window.IsVisible(MovieInformation) | Window.IsVisible(MusicInformation)]">WindowClose</animation>
<animation effect="slide" start="210,0" end="0,0" delay="0" time="300" condition="Window.Previous(Home) + ![Window.IsVisible(MovieInformation) | Window.IsVisible(MusicInformation)]">WindowOpen</animation>
<control type="image">
<description>time background</description>
<posx>0</posx>
<posy>0</posy>
<width>150</width>
<height>35</height>
<texture flipx="true" border="32,0,0,0">header.png</texture>
</control>
<control type="label">
<description>time label</description>
<posx>30</posx>
<posy>0</posy>
<width>400</width>
<height>28</height>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
<label>$INFO[System.Time]</label>
</control>
<control type="label">
<description>time label</description>
<posx>20r</posx>
<posy>5</posy>
<width>200</width>
<height>30</height>
<align>right</align>
<aligny>center</aligny>
<font>font28_title</font>
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
<label>$INFO[System.Time]</label>
</control>
</include>
<include name="backgroundfade">
Expand Down

0 comments on commit f8b6d1d

Please sign in to comment.