Skip to content

Commit

Permalink
First batch of label alignment fixes after xbmc/xbmc@8a73336
Browse files Browse the repository at this point in the history 
See http://forum.xbmc.org/showthread.php?tid=194515&pid=1718582#pid1718582
  • Loading branch information
@kib
kib committed May 26, 2014
1 parent 9d3ee73 commit 1c14ccc
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 43 deletions.
8 changes: 4 additions & 4 deletions 720p/Includes_Home_Horizontal.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<control type="label">
<width>320</width>
<height>61</height>
<left>200</left>
<left>120</left>
<top>6</top>
<align>center</align>
<font>Font_Neon_45</font>
Expand All @@ -33,11 +33,11 @@
<animation effect="fade" start="20" end="100" time="1000" condition="!ControlGroup(9001).HasFocus()">conditional&gt;</animation>
</control>
</itemlayout>
<focusedlayout width="560" height="61">
<focusedlayout width="400" height="61">
<control type="label">
<width>320</width>
<width>400</width>
<height>61</height>
<left>320</left>
<left>120</left>
<top>0</top>
<align>center</align>
<font>Font_Neon_45_Focus</font>
Expand Down
2 changes: 1 addition & 1 deletion 720p/MyVideoNav.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
<include>Viewtype_Episode</include> <!-- view id 51 -->
<include>Viewtype_Newest_Episodes</include> <!-- view id 596 -->
<include>Viewtype_Landscape</include> <!-- view id 52 -->
<include>Viewtype_Landscape_Fanart</include> <!-- view id 633 -->
<include>Viewtype_Landscape_Fanart</include> <!-- view id 633, "Logo Fanart" -->
<include>Viewtype_Logo</include> <!-- view id 594 -->
<include>Viewtype_List</include> <!-- view id 53 Media View -->
<include>MediaListView3</include> <!-- view id 503 -->
Expand Down
4 changes: 2 additions & 2 deletions 720p/Settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<texture>MenuItemNF.png</texture>
</control>
<control type="label">
<left>130</left>
<left>0</left>
<top>0</top>
<width>260</width>
<height>45</height>
Expand All @@ -93,7 +93,7 @@
<texture>mainmenu/home_bottom_white.png</texture>
</control>
<control type="label">
<left>130</left>
<left>0</left>
<top>0</top>
<width>260</width>
<height>45</height>
Expand Down
8 changes: 4 additions & 4 deletions 720p/Viewtype_Files.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,9 @@
<visible>Container.Content(Episodes)</visible>
</control>
<control type="label">
<left>108</left>
<left>3</left>
<top>160</top>
<width>200</width>
<width>208</width>
<height>25</height>
<font>Font_Neon_20</font>
<textcolor>grey2</textcolor>
Expand Down Expand Up @@ -318,9 +318,9 @@
<visible>Container.Content(Episodes)</visible>
</control>
<control type="label">
<left>108</left>
<left>3</left>
<top>160</top>
<width>200</width>
<width>208</width>
<height>25</height>
<font>Font_Neon_20</font>
<textcolor>white</textcolor>
Expand Down
20 changes: 10 additions & 10 deletions 720p/Viewtype_Landscape_Fanart.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</control>
<control type="label">
<visible>[Container.Content(episodes) | Container.Content(artists)] + !IsEmpty(ListItem.Title)</visible>
<left>115</left>
<left>0</left>
<top>100</top>
<width>230</width>
<height>89</height>
Expand All @@ -83,7 +83,7 @@
<label>$INFO[ListItem.Label]</label>
</control>
<control type="label">
<left>115</left>
<left>0</left>
<top>139</top>
<width>230</width>
<height>89</height>
Expand All @@ -94,9 +94,9 @@
<visible>!Skin.HasSetting(DisableTvOverlays) + Container.Content(tvshows) + stringcompare(ListItem.Overlay,OverlayWatched.png)</visible>
</control>
<control type="image">
<left>-8</left>
<top>120</top>
<width>240</width>
<left>15</left>
<top>127</top>
<width>200</width>
<height>4</height>
<info>ListItem.Overlay</info>
<colordiffuse>ListTrackF</colordiffuse>
Expand Down Expand Up @@ -126,7 +126,7 @@
</control>
<control type="label">
<visible>[Container.Content(episodes) | Container.Content(artists)] + !IsEmpty(ListItem.Title)</visible>
<left>135</left>
<left>0</left>
<top>100</top>
<width>230</width>
<height>89</height>
Expand Down Expand Up @@ -161,7 +161,7 @@
<label>[B]$INFO[ListItem.Label][/B]</label>
</control>
<control type="label">
<left>130</left>
<left>0</left>
<top>139</top>
<width>230</width>
<height>89</height>
Expand All @@ -172,9 +172,9 @@
<visible>!Skin.HasSetting(DisableTvOverlays) + Container.Content(tvshows) + stringcompare(ListItem.Overlay,OverlayWatched.png)</visible>
</control>
<control type="image">
<left>10</left>
<top>120</top>
<width>250</width>
<left>15</left>
<top>127</top>
<width>200</width>
<height>4</height>
<info>ListItem.Overlay</info>
<aspectratio scalediffuse="false">stretch</aspectratio>
Expand Down
14 changes: 7 additions & 7 deletions 720p/Viewtype_List.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@
</control>
<control type="label">
<description>Episodes Value</description>
<left>0</left>
<left>150</left>
<top>220</top>
<width>440</width>
<height>25</height>
Expand Down Expand Up @@ -877,9 +877,9 @@
</control>
<control type="label">
<description>Aired txt</description>
<left>200</left>
<left>100</left>
<top>210</top>
<width>160</width>
<width>200</width>
<height>25</height>
<label>$LOCALIZE[31230]:</label>
<align>right</align>
Expand All @@ -889,7 +889,7 @@
</control>
<control type="label">
<description>Aired Value</description>
<left>210</left>
<left>310</left>
<top>210</top>
<width>440</width>
<height>25</height>
Expand All @@ -901,9 +901,9 @@
</control>
<control type="label">
<description>Episode txt</description>
<left>200</left>
<left>100</left>
<top>235</top>
<width>140</width>
<width>200</width>
<height>25</height>
<label>$LOCALIZE[20359]:</label>
<align>right</align>
Expand All @@ -913,7 +913,7 @@
</control>
<control type="label">
<description>Genre Value</description>
<left>210</left>
<left>310</left>
<top>235</top>
<width>440</width>
<height>25</height>
Expand Down
27 changes: 12 additions & 15 deletions 720p/Viewtype_addons.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@
<!-- <include>Animation_HiddenByInfo</include> -->
<!-- <include>Animation_Viewtype_Files_LeftArea</include> -->
<include>Animation_CommonFade</include>
<itemlayout width="500" height="36">
<itemlayout width="615" height="36">
<control type="label">
<left>480</left>
<right>0</right>
<top>0</top>
<width>200</width>
<width>300</width>
<height>46</height>
<align>left</align>
<align>right</align>
<aligny>center</aligny>
<font>Font_Bartowski_Movies</font>
<textcolor>Text-Filemode</textcolor>
Expand All @@ -75,29 +75,28 @@
<control type="image">
<left>0</left>
<top>38</top>
<width>650</width>
<width>615</width>
<height>4</height>
<aspectratio>stretch</aspectratio>
<texture>common/separator.png</texture>
</control>
<control type="label">
<left>5</left>
<top>0</top>
<width>720</width>
<width>615</width>
<height>46</height>
<aligny>center</aligny>
<font>Font_Bartowski_Movies</font>
<textoffsetx>20</textoffsetx>
<textcolor>Text-Filemode</textcolor>
<label>$INFO[ListItem.Label]</label>
<visible></visible>
</control>
</itemlayout>
<focusedlayout width="600" height="36">
<focusedlayout width="610" height="36">
<control type="image">
<left>10</left>
<top>5</top>
<width>620</width>
<width>615</width>
<height>37</height>
<colordiffuse>mainblue</colordiffuse>
<texture>MenuItemFOR.png</texture>
Expand All @@ -108,26 +107,24 @@
<control type="label">
<left>5</left>
<top>0</top>
<width>700</width>
<width>615</width>
<height>46</height>
<aligny>center</aligny>
<font>Font_Bartowski_Movies</font>
<textoffsetx>20</textoffsetx>
<textcolor>ffffffff</textcolor>
<label>$INFO[ListItem.Label]</label>
<visible></visible>
</control>
<control type="label">
<left>480</left>
<right>0</right>
<top>0</top>
<width>200</width>
<width>300</width>
<height>46</height>
<align>left</align>
<align>right</align>
<aligny>center</aligny>
<font>Font_Bartowski_Movies</font>
<textcolor>white</textcolor>
<label>$INFO[ListItem.Label2]</label>
<visible></visible>
</control>
</focusedlayout>
</control>
Expand Down

0 comments on commit 1c14ccc

Please sign in to comment.