diff options
| author | ronie <ronie@users.noreply.github.com> | 2016-10-02 05:05:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-02 05:05:08 +0200 |
| commit | c6e07b7e2a3467f99f6ecf493b9609caefbd14e5 (patch) | |
| tree | 2f017dbc7f6a83f9effa8300a12e6db04ee575d2 | |
| parent | 952cf8c22ab83a87d61b093861065ab549ec7e46 (diff) | |
| parent | efd200d514d84eea257e7ab5d6450af33ce7047b (diff) | |
Merge pull request #10607 from ronie/estuary-fixes2
[skin.estuary] fixes
| -rw-r--r-- | addons/skin.estuary/1080i/DialogMusicInfo.xml | 2 | ||||
| -rw-r--r-- | addons/skin.estuary/1080i/Includes_Buttons.xml | 25 | ||||
| -rw-r--r-- | addons/skin.estuary/1080i/Includes_MediaMenu.xml | 16 | ||||
| -rw-r--r-- | addons/skin.estuary/1080i/Variables.xml | 4 |
4 files changed, 38 insertions, 9 deletions
diff --git a/addons/skin.estuary/1080i/DialogMusicInfo.xml b/addons/skin.estuary/1080i/DialogMusicInfo.xml index 20605c1859..9192683167 100644 --- a/addons/skin.estuary/1080i/DialogMusicInfo.xml +++ b/addons/skin.estuary/1080i/DialogMusicInfo.xml @@ -76,7 +76,7 @@ <control type="group"> <visible>!Integer.IsEqual(Container(50).NumItems,0) | !String.IsEmpty(Control.GetLabel(400))</visible> <top>454</top> - <control type="button" id="130"> + <control type="button"> <onup>50</onup> <ondown>9000</ondown> <left>586</left> diff --git a/addons/skin.estuary/1080i/Includes_Buttons.xml b/addons/skin.estuary/1080i/Includes_Buttons.xml index ccf929c77a..93b4b78ad5 100644 --- a/addons/skin.estuary/1080i/Includes_Buttons.xml +++ b/addons/skin.estuary/1080i/Includes_Buttons.xml @@ -207,6 +207,31 @@ </control> </definition> </include> + <include name="BottomMainMenuToggleItem"> + <param name="height">110</param> + <definition> + <control type="radiobutton" id="$PARAM[control_id]"> + <width>118</width> + <height>$PARAM[height]</height> + <align>center</align> + <aligny>center</aligny> + <onclick>$PARAM[onclick]</onclick> + <font></font> + <label>$PARAM[label]</label> + <texturefocus border="40" colordiffuse="button_focus">buttons/button-fo.png</texturefocus> + <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> + <radioposx>38</radioposx> + <radioposy>0</radioposy> + <radiowidth>40</radiowidth> + <radioheight>40</radioheight> + <textureradioonfocus>$PARAM[icon_on]</textureradioonfocus> + <textureradioonnofocus>$PARAM[icon_on]</textureradioonnofocus> + <textureradioofffocus>$PARAM[icon_off]</textureradioofffocus> + <textureradiooffnofocus>$PARAM[icon_off]</textureradiooffnofocus> + <selected>$PARAM[selected]</selected> + </control> + </definition> + </include> <include name="VideoInfoButtonsCommon"> <param name="width">262</param> <definition> diff --git a/addons/skin.estuary/1080i/Includes_MediaMenu.xml b/addons/skin.estuary/1080i/Includes_MediaMenu.xml index c911762b94..8b85fa9e5a 100644 --- a/addons/skin.estuary/1080i/Includes_MediaMenu.xml +++ b/addons/skin.estuary/1080i/Includes_MediaMenu.xml @@ -211,11 +211,13 @@ <ondown>6056</ondown> <visible>Player.HasMedia + [$EXP[sidebar_focused]]</visible> <visible>!System.HasModalDialog</visible> - <include content="BottomMainMenuItem"> + <include content="BottomMainMenuToggleItem"> <param name="control_id" value="14101" /> <param name="height" value="95" /> - <param name="onclick" value="Pause" /> - <param name="icon" value="icons/now-playing/pause.png" /> + <param name="onclick" value="PlayerControl(Play)" /> + <param name="icon_on" value="icons/now-playing/play.png" /> + <param name="icon_off" value="icons/now-playing/pause.png" /> + <param name="selected" value="Player.Paused" /> </include> <include content="BottomMainMenuItem"> <param name="control_id" value="14102" /> @@ -286,11 +288,13 @@ <onleft>14100</onleft> <visible>Player.HasMedia + [$EXP[sidebar_focused]]</visible> <visible>!System.HasModalDialog</visible> - <include content="BottomMainMenuItem"> + <include content="BottomMainMenuToggleItem"> <param name="control_id" value="14101" /> <param name="height" value="95" /> - <param name="onclick" value="Pause" /> - <param name="icon" value="icons/now-playing/pause.png" /> + <param name="onclick" value="PlayerControl(Play)" /> + <param name="icon_on" value="icons/now-playing/play.png" /> + <param name="icon_off" value="icons/now-playing/pause.png" /> + <param name="selected" value="Player.Paused" /> </include> <include content="BottomMainMenuItem"> <param name="control_id" value="14102" /> diff --git a/addons/skin.estuary/1080i/Variables.xml b/addons/skin.estuary/1080i/Variables.xml index f51ce97202..3d8a5b235b 100644 --- a/addons/skin.estuary/1080i/Variables.xml +++ b/addons/skin.estuary/1080i/Variables.xml @@ -300,8 +300,8 @@ <value condition="Window.IsActive(pictures) + String.IsEmpty(ListItem.Art(fanart))">$INFO[ListItem.FolderPath]</value> <value condition="!String.IsEmpty(Container.Art(tvshow.fanart))">$INFO[Container.Art(tvshow.fanart)]</value> <value condition="!String.IsEmpty(Container.Art(artist.fanart))">$INFO[Container.Art(artist.fanart)]</value> - <value condition="!String.IsEmpty(Container.Art(fanart))">$INFO[Container.Art(fanart)]</value> - <value>$INFO[ListItem.Art(fanart)]</value> + <value condition="!String.IsEmpty(ListItem.Art(fanart))">$INFO[ListItem.Art(fanart)]</value> + <value>$INFO[Container.Art(fanart)]</value> </variable> <variable name="WeatherFanartVar"> <value condition="!String.IsEmpty(Window(weather).Property(current.fanartcode)) + !String.IsEmpty(Skin.String(weatherfanart.path))">$INFO[Skin.String(weatherfanart.path)]$INFO[Window(Weather).Property(Current.FanartCode)]$INFO[Skin.String(weatherfanart.ext)]</value> |