Skip to content

Commit

Permalink
[Confluence] cosmetics after PR7857
Browse files Browse the repository at this point in the history
  • Loading branch information
@ronie
ronie committed Sep 2, 2015
1 parent fd93e04 commit 8081e1c
Show file tree
Hide file tree
Showing 2 changed files with 103 additions and 134 deletions.
146 changes: 12 additions & 134 deletions addons/skin.confluence/720p/DialogAlbumInfo.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -491,140 +491,18 @@
<aspectratio>keep</aspectratio>
<visible>Control.IsVisible(50) + Container.Content(Artists)</visible>
</control>
<control type="panel" id="50">
<left>380</left>
<top>520</top>
<width>860</width>
<height>120</height>
<onleft>9000</onleft>
<onright>61</onright>
<onup>61</onup>
<ondown>9000</ondown>
<viewtype label="">list</viewtype>
<pagecontrol>61</pagecontrol>
<scrolltime>200</scrolltime>
<orientation>vertical</orientation>
<itemlayout condition="Container.Content(Albums)" height="40" width="430">
<control type="image">
<left>0</left>
<top>0</top>
<width>430</width>
<height>40</height>
<texture border="5">button-nofocus.png</texture>
</control>
<control type="label">
<left>10</left>
<top>0</top>
<width>410</width>
<height>40</height>
<font>font12</font>
<align>left</align>
<aligny>center</aligny>
<selectedcolor>selected</selectedcolor>
<label>([COLOR=selected][B]$INFO[ListItem.TrackNumber][/B][/COLOR]) - $INFO[ListItem.Label]</label>
</control>
<control type="label">
<left>220</left>
<top>0</top>
<width>200</width>
<height>40</height>
<font>font12</font>
<align>right</align>
<aligny>center</aligny>
<selectedcolor>selected</selectedcolor>
<label>$INFO[ListItem.Duration]</label>
</control>
</itemlayout>
<focusedlayout condition="Container.Content(Albums)" height="40" width="430">
<control type="image">
<left>0</left>
<top>0</top>
<width>430</width>
<height>40</height>
<visible>!Control.HasFocus(50)</visible>
<texture border="5">button-nofocus.png</texture>
</control>
<control type="image">
<left>0</left>
<top>0</top>
<width>430</width>
<height>40</height>
<visible>Control.HasFocus(50)</visible>
<texture border="5">button-focus2.png</texture>
</control>
<control type="label">
<left>10</left>
<top>0</top>
<width>410</width>
<height>40</height>
<font>font12</font>
<align>left</align>
<aligny>center</aligny>
<selectedcolor>selected</selectedcolor>
<label>([COLOR=selected][B]$INFO[ListItem.TrackNumber][/B][/COLOR]) - $INFO[ListItem.Label]</label>
</control>
<control type="label">
<left>220</left>
<top>0</top>
<width>200</width>
<height>40</height>
<font>font12</font>
<align>right</align>
<aligny>center</aligny>
<selectedcolor>selected</selectedcolor>
<label>$INFO[ListItem.Duration]</label>
</control>
</focusedlayout>
<itemlayout condition="Container.Content(Artists)" height="40" width="430">
<control type="image">
<left>0</left>
<top>0</top>
<width>430</width>
<height>40</height>
<texture border="5">button-nofocus.png</texture>
</control>
<control type="label">
<left>10</left>
<top>0</top>
<width>410</width>
<height>40</height>
<font>font12</font>
<align>left</align>
<aligny>center</aligny>
<selectedcolor>selected</selectedcolor>
<label>$INFO[ListItem.Label]</label>
</control>
</itemlayout>
<focusedlayout condition="Container.Content(Artists)" height="40" width="430">
<control type="image">
<left>0</left>
<top>0</top>
<width>430</width>
<height>40</height>
<visible>!Control.HasFocus(50)</visible>
<texture border="5">button-nofocus.png</texture>
</control>
<control type="image">
<left>0</left>
<top>0</top>
<width>430</width>
<height>40</height>
<visible>Control.HasFocus(50)</visible>
<texture border="5">button-focus2.png</texture>
</control>
<control type="label">
<left>10</left>
<top>0</top>
<width>410</width>
<height>40</height>
<font>font12</font>
<align>left</align>
<aligny>center</aligny>
<selectedcolor>selected</selectedcolor>
<label>$INFO[ListItem.Label]</label>
</control>
</focusedlayout>
</control>
<include name="AlbumInfoPanel" condition="Container.Content(Artists)">

This comment has been minimized.

Sign in to view

Copy link
@phil65

phil65 Sep 2, 2015

Contributor

hmm container.content(xxx) as an include condition? does that work?
<param name="panel-left" value="380"/>
<param name="panel-width" value="860"/>
<param name="item-width" value="430"/>
<param name="label-width" value="410"/>
</include>
<include name="AlbumInfoPanel" condition="Container.Content(Albums)">
<param name="panel-left" value="210"/>
<param name="panel-width" value="1030"/>
<param name="item-width" value="515"/>
<param name="label-width" value="495"/>
</include>
<control type="grouplist" id="9000">
<left>210</left>
<top>660</top>
Expand Down
91 changes: 91 additions & 0 deletions addons/skin.confluence/720p/includes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
<value condition="!IsEmpty(ListItem.Art(poster))">$INFO[ListItem.Art(poster)]</value>
<value>$INFO[ListItem.Icon]</value>
</variable>
<variable name="AlbumInfoPanelLabel">
<value condition="Container.Content(Artists)">$INFO[ListItem.Label]</value>
<value>$INFO[ListItem.TrackNumber,([COLOR=selected][B],[/B][/COLOR]) - ]$INFO[ListItem.Label]</value>
</variable>
<variable name="PlayList">
<value condition="Window.IsActive(videolibrary) + !StringCompare(Playlist.Length(video),0)">ActivateWindow(videoplaylist)</value>
<value>ActivateWindow(musicplaylist)</value>
Expand Down Expand Up @@ -82,6 +86,93 @@
<value condition="!IsEmpty(Window.Property(IsRadio))">$LOCALIZE[19199] - $LOCALIZE[19024]</value>
<value>$LOCALIZE[19199] - $LOCALIZE[19023]</value>
</variable>
<include name="AlbumInfoPanel">
<control type="panel" id="50">
<left>$PARAM[panel-left]</left>
<top>520</top>
<width>$PARAM[panel-width]</width>
<height>120</height>
<onleft>9000</onleft>
<onright>61</onright>
<onup>61</onup>
<ondown>9000</ondown>
<viewtype label="">list</viewtype>
<pagecontrol>61</pagecontrol>
<scrolltime>200</scrolltime>
<orientation>vertical</orientation>
<itemlayout height="40" width="$PARAM[item-width]">
<control type="image">
<left>0</left>
<top>0</top>
<width>$PARAM[item-width]</width>
<height>40</height>
<texture border="5">button-nofocus.png</texture>
</control>
<control type="label">
<left>10</left>
<top>0</top>
<width>$PARAM[label-width]</width>
<height>40</height>
<font>font12</font>
<align>left</align>
<aligny>center</aligny>
<selectedcolor>selected</selectedcolor>
<label>$VAR[AlbumInfoPanelLabel]</label>
</control>
<control type="label">
<left>10</left>
<top>0</top>
<width>$PARAM[label-width]</width>
<height>40</height>
<font>font12</font>
<align>right</align>
<aligny>center</aligny>
<selectedcolor>selected</selectedcolor>
<label>$INFO[ListItem.Duration]</label>
</control>
</itemlayout>
<focusedlayout height="40" width="$PARAM[item-width]">
<control type="image">
<left>0</left>
<top>0</top>
<width>$PARAM[item-width]</width>
<height>40</height>
<visible>!Control.HasFocus(50)</visible>
<texture border="5">button-nofocus.png</texture>
</control>
<control type="image">
<left>0</left>
<top>0</top>
<width>$PARAM[item-width]</width>
<height>40</height>
<visible>Control.HasFocus(50)</visible>
<texture border="5">button-focus2.png</texture>
</control>
<control type="label">
<left>10</left>
<top>0</top>
<width>$PARAM[label-width]</width>
<height>40</height>
<font>font12</font>
<align>left</align>
<aligny>center</aligny>
<selectedcolor>selected</selectedcolor>
<label>$VAR[AlbumInfoPanelLabel]</label>
</control>
<control type="label">
<left>10</left>
<top>0</top>
<width>$PARAM[label-width]</width>
<height>40</height>
<font>font12</font>
<align>right</align>
<aligny>center</aligny>
<selectedcolor>selected</selectedcolor>
<label>$INFO[ListItem.Duration]</label>
</control>
</focusedlayout>
</control>
</include>
<include name="DialogBackgroundCommons">
<control type="image">
<description>background image</description>
Expand Down

0 comments on commit 8081e1c

Please sign in to comment.