diff options
Diffstat (limited to 'addons')
-rw-r--r-- | addons/skin.confluence/720p/DialogFullScreenInfo.xml | 254 | ||||
-rw-r--r-- | addons/skin.confluence/720p/MusicOSD.xml | 870 | ||||
-rw-r--r-- | addons/skin.confluence/720p/MusicVisualisation.xml | 384 | ||||
-rw-r--r-- | addons/skin.confluence/720p/VideoFullScreen.xml | 291 | ||||
-rw-r--r-- | addons/skin.confluence/720p/VideoOSD.xml | 852 | ||||
-rw-r--r-- | addons/skin.confluence/media/flagging/audio/ac3.png | bin | 2923 -> 9611 bytes |
6 files changed, 1122 insertions, 1529 deletions
diff --git a/addons/skin.confluence/720p/DialogFullScreenInfo.xml b/addons/skin.confluence/720p/DialogFullScreenInfo.xml deleted file mode 100644 index 1bea90fead..0000000000 --- a/addons/skin.confluence/720p/DialogFullScreenInfo.xml +++ /dev/null @@ -1,254 +0,0 @@ -<window type="dialog" id="142"> - <defaultcontrol always="true">603</defaultcontrol> - <controls> - <control type="group"> - <animation effect="fade" start="0" end="100" time="300" tween="quadratic" easing="out">WindowOpen</animation> - <animation effect="fade" start="100" end="0" time="300" delay="150" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="fade" start="100" end="0" time="300" tween="quadratic" easing="out" condition="Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(VideoOSD)">Conditional</animation> - <control type="image"> - <description>media info background image</description> - <posx>0</posx> - <posy>270r</posy> - <width>1280</width> - <height>270</height> - <texture>HomeNowPlayingBack.png</texture> - </control> - <control type="image"> - <description>media info background image</description> - <posx>0</posx> - <posy>270r</posy> - <width>1280</width> - <height>270</height> - <colordiffuse>88FFFFFF</colordiffuse> - <texture>HomeNowPlayingBack.png</texture> - </control> - <control type="image"> - <description>Non Movie cover image</description> - <posx>10</posx> - <posy>290r</posy> - <width>340</width> - <height>260</height> - <fadetime>200</fadetime> - <texture background="true">$INFO[VideoPlayer.Cover]</texture> - <aspectratio aligny="bottom">keep</aspectratio> - <bordertexture border="8">ThumbShadow.png</bordertexture> - <bordersize>8</bordersize> - <visible>!VideoPlayer.Content(Movies)</visible> - </control> - <control type="image"> - <description>Movie cover image</description> - <posx>10</posx> - <posy>350r</posy> - <width>340</width> - <height>320</height> - <fadetime>200</fadetime> - <texture background="true">$INFO[VideoPlayer.Cover]</texture> - <aspectratio aligny="bottom">keep</aspectratio> - <bordertexture border="8">ThumbShadow.png</bordertexture> - <bordersize>8</bordersize> - <visible>VideoPlayer.Content(Movies)</visible> - </control> - <control type="progress"> - <description>ProgressbarCache</description> - <posx>10</posx> - <posy>30r</posy> - <width>340</width> - <height>14</height> - <info>Player.ProgressCache</info> - <midtexture border="6,0,6,0">OSDProgressMidLight.png</midtexture> - </control> - <control type="progress"> - <description>Progressbar</description> - <posx>10</posx> - <posy>30r</posy> - <width>340</width> - <height>14</height> - <info>Player.Progress</info> - </control> - <control type="group"> - <posx>370</posx> - <posy>180r</posy> - <control type="grouplist"> - <description>Media Codec Flagging Images</description> - <posx>340</posx> - <posy>0</posy> - <width>550</width> - <align>right</align> - <itemgap>0</itemgap> - <orientation>horizontal</orientation> - <control type="image"> - <description>Video rez Image</description> - <width>80</width> - <height>40</height> - <aspectratio>keep</aspectratio> - <texture>$INFO[VideoPlayer.VideoResolution,flagging/video/,.png]</texture> - </control> - - <control type="image"> - <description>Common Codec Image</description> - <width>80</width> - <height>40</height> - <aspectratio>keep</aspectratio> - <texture>$INFO[VideoPlayer.VideoCodec,flagging/video/,.png]</texture> - <!-- Don't show if its one of the 500 divx codecs --> - <visible>![substring(VideoPlayer.VideoCodec,div,left) | stringcompare(VideoPlayer.VideoCodec,dx50)]</visible> - </control> - <control type="image"> - <description>Divx Codec Image</description> - <width>80</width> - <height>40</height> - <aspectratio>keep</aspectratio> - <texture>flagging/video/divx.png</texture> - <visible>[substring(VideoPlayer.VideoCodec,div,left) | stringcompare(VideoPlayer.VideoCodec,dx50)]</visible> - </control> - - <control type="image"> - <description>Dolby Digital Image</description> - <width>80</width> - <height>40</height> - <aspectratio>keep</aspectratio> - <texture>flagging/audio/dolbydigital.png</texture> - <visible>[stringcompare(VideoPlayer.AudioCodec,ac3) + stringcompare(VideoPlayer.AudioChannels,6)]</visible> - </control> - <control type="image"> - <description>Audio Codec Image</description> - <width>80</width> - <height>40</height> - <aspectratio>keep</aspectratio> - <texture>$INFO[VideoPlayer.AudioCodec,flagging/audio/,.png]</texture> - <!-- Don't show if I want the Dolby Digital Logo --> - <visible>![stringcompare(VideoPlayer.AudioCodec,ac3) + stringcompare(VideoPlayer.AudioChannels,6)]</visible> - </control> - - <control type="image"> - <description>Audio Channels Image</description> - <width>60</width> - <height>40</height> - <aspectratio>keep</aspectratio> - <texture>$INFO[VideoPlayer.AudioChannels,flagging/audio/,.png]</texture> - </control> - </control> - <control type="label"> - <description>Playing Label</description> - <posx>0</posx> - <posy>0</posy> - <width>500</width> - <height>25</height> - <align>left</align> - <aligny>center</aligny> - <font>font13_title</font> - <textcolor>blue</textcolor> - <shadowcolor>black</shadowcolor> - <label>31040</label> - </control> - <control type="label"> - <posx>10</posx> - <posy>35</posy> - <width>880</width> - <height>30</height> - <label>$INFO[VideoPlayer.Studio]</label> - <align>left</align> - <aligny>center</aligny> - <font>font13</font> - <textcolor>grey</textcolor> - <shadowcolor>black</shadowcolor> - <visible>VideoPlayer.Content(Movies)</visible> - </control> - <control type="label"> - <posx>10</posx> - <posy>35</posy> - <width>880</width> - <height>30</height> - <label>$INFO[VideoPlayer.TVShowTitle] - ($INFO[VideoPlayer.Season]$INFO[VideoPlayer.Episode,x])</label> - <align>left</align> - <aligny>center</aligny> - <font>font13</font> - <textcolor>grey</textcolor> - <shadowcolor>black</shadowcolor> - <visible>VideoPlayer.Content(Episodes)</visible> - </control> - <control type="label"> - <posx>10</posx> - <posy>35</posy> - <width>880</width> - <height>30</height> - <label>$INFO[VideoPlayer.Artist]$INFO[VideoPlayer.Album, - ]</label> - <align>left</align> - <aligny>center</aligny> - <font>font13</font> - <textcolor>grey</textcolor> - <shadowcolor>black</shadowcolor> - <visible>VideoPlayer.Content(MusicVideos)</visible> - </control> - <control type="label"> - <posx>10</posx> - <posy>65</posy> - <width>880</width> - <height>30</height> - <label>$INFO[VideoPlayer.Title]</label> - <scroll>true</scroll> - <align>left</align> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <shadowcolor>black</shadowcolor> - </control> - - <control type="label"> - <description>Chapter Count</description> - <posx>0</posx> - <posy>110</posy> - <width>300</width> - <height>20</height> - <label>$INFO[Player.Chapter,[COLOR=blue]$LOCALIZE[21396]:[/COLOR] ]$INFO[Player.ChapterCount, / ]</label> - <align>left</align> - <aligny>center</aligny> - <font>font12_title</font> - <textcolor>grey2</textcolor> - <shadowcolor>black</shadowcolor> - <visible>Player.ChapterCount</visible> - </control> - <control type="label"> - <description>Chapter Name</description> - <posx>0</posx> - <posy>130</posy> - <width>300</width> - <height>20</height> - <label>$INFO[Player.ChapterName]</label> - <align>left</align> - <aligny>center</aligny> - <font>font12_title</font> - <textcolor>grey2</textcolor> - <shadowcolor>black</shadowcolor> - </control> - <control type="label"> - <description>Player Times</description> - <posx>890</posx> - <posy>115</posy> - <width>500</width> - <height>25</height> - <label>$INFO[Player.Time]$INFO[Player.Duration, / ]</label> - <align>right</align> - <aligny>center</aligny> - <font>font30_title</font> - <textcolor>grey</textcolor> - <shadowcolor>black</shadowcolor> - </control> - <control type="label"> - <description>Current Video End Time</description> - <posx>890</posx> - <posy>150</posy> - <width>890</width> - <height>20</height> - <label>[COLOR=blue]$LOCALIZE[31049][/COLOR] : $INFO[Player.FinishTime]</label> - <align>right</align> - <aligny>center</aligny> - <font>font12_title</font> - <textcolor>grey2</textcolor> - <shadowcolor>black</shadowcolor> - </control> - </control> - </control> - <include>Clock</include> - </controls> -</window>
\ No newline at end of file diff --git a/addons/skin.confluence/720p/MusicOSD.xml b/addons/skin.confluence/720p/MusicOSD.xml index 612083b48f..7ed544cb8e 100644 --- a/addons/skin.confluence/720p/MusicOSD.xml +++ b/addons/skin.confluence/720p/MusicOSD.xml @@ -1,618 +1,302 @@ -<window type="dialog" id="120"> +<window id="120"> <defaultcontrol always="true">602</defaultcontrol> + <include>dialogeffect</include> + <coordinates> + <system>1</system> + <posx>0</posx> + <posy>0</posy> + </coordinates> <controls> - <control type="group"> - <animation effect="fade" start="0" end="100" time="300" tween="quadratic" easing="out">WindowOpen</animation> - <animation effect="fade" start="100" end="0" time="300" delay="150" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="fade" start="100" end="0" time="300" tween="quadratic" easing="out" condition="Window.IsVisible(VisualisationSettings) | Window.IsVisible(VisualisationPresetList)">Conditional</animation> - <control type="image"> - <description>media info background image</description> + <control type="slider" id="87"> + <description>Seek Slider</description> + <posx>430</posx> + <posy>72r</posy> + <width>720</width> + <height>16</height> + <onup>702</onup> + <ondown>26</ondown> + <action>seek</action> + <texturesliderbar>seekslider2.png</texturesliderbar> + <textureslidernib>osd_slider_nibNF.png</textureslidernib> + <textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus> + <animation effect="fade" time="200">VisibleChange</animation> + <visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList)]</visible> + </control> + <control type="group" id="100"> + <posx>325</posx> + <posy>50r</posy> + <animation effect="fade" time="200">VisibleChange</animation> + <visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList)]</visible> + <control type="button" id="600"> <posx>0</posx> - <posy>-20</posy> - <width>1280</width> - <height>160</height> - <texture flipy="true">HomeNowPlayingBack.png</texture> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>210</label> + <font>-</font> + <texturefocus>OSDPrevTrackFO.png</texturefocus> + <texturenofocus>OSDPrevTrackNF.png</texturenofocus> + <onleft>704</onleft> + <onright>601</onright> + <onup>600</onup> + <ondown>600</ondown> + <onclick>PlayerControl(Previous)</onclick> </control> - <control type="image"> - <description>media info background image</description> - <posx>0</posx> - <posy>-20</posy> - <width>1280</width> - <height>160</height> - <colordiffuse>88FFFFFF</colordiffuse> - <texture flipy="true">HomeNowPlayingBack.png</texture> + <control type="button" id="601"> + <posx>45</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>31354</label> + <font>-</font> + <texturefocus>OSDRewindFO.png</texturefocus> + <texturenofocus>OSDRewindNF.png</texturenofocus> + <onleft>600</onleft> + <onright>602</onright> + <onup>601</onup> + <ondown>601</ondown> + <onclick>PlayerControl(Rewind)</onclick> </control> - <control type="group" id="200"> - <posx>367</posx> - <posy>4</posy> - <control type="button" id="700"> - <posx>0</posx> - <posy>0</posy> - <width>45</width> - <height>45</height> - <label>10517</label> - <font>-</font> - <texturefocus>OSDPlaylistFO.png</texturefocus> - <texturenofocus>OSDPlaylistNF.png</texturenofocus> - <onleft>706</onleft> - <onright>500</onright> - <onup>600</onup> - <ondown>600</ondown> - <onclick>ActivateWindow(MusicPlaylist)</onclick> - </control> - <control type="button" id="500"> - <posx>50</posx> - <posy>0</posy> - <width>45</width> - <height>45</height> - <label>12006</label> - <font>-</font> - <texturefocus>OSDVizFO.png</texturefocus> - <texturenofocus>OSDVizNF.png</texturenofocus> - <onleft>700</onleft> - <onright>701</onright> - <onup>600</onup> - <ondown>600</ondown> - </control> - <control type="button" id="701"> - <posx>100</posx> - <posy>0</posy> - <width>45</width> - <height>45</height> - <label>$LOCALIZE[250] $LOCALIZE[21417]</label> - <font>-</font> - <texturefocus>OSDPresetSettingsFO.png</texturefocus> - <texturenofocus>OSDPresetSettingsNF.png</texturenofocus> - <onleft>500</onleft> - <onright>702</onright> - <onup>600</onup> - <ondown>600</ondown> - <onclick>Addon.Default.OpenSettings(xbmc.player.musicviz)</onclick> - </control> - <control type="button" id="702"> - <posx>150</posx> - <posy>0</posy> - <width>45</width> - <height>45</height> - <label>31048</label> - <font>-</font> - <texturefocus>OSDPreFO.png</texturefocus> - <texturenofocus>OSDPreNF.png</texturenofocus> - <onleft>701</onleft> - <onright>800</onright> - <onup>601</onup> - <ondown>601</ondown> - <onclick>ActivateWindow(122)</onclick> - </control> + <control type="togglebutton" id="602"> + <posx>90</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>31351</label> + <altlabel>208</altlabel> + <font>-</font> + <texturefocus>OSDPauseFO.png</texturefocus> + <texturenofocus>OSDPauseNF.png</texturenofocus> + <usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture> + <alttexturefocus>OSDPlayFO.png</alttexturefocus> + <alttexturenofocus>OSDPlayNF.png</alttexturenofocus> + <onleft>601</onleft> + <onright>603</onright> + <onup>602</onup> + <ondown>602</ondown> + <onclick>PlayerControl(Play)</onclick> </control> - <control type="image" id="11"> - <description>separator image</description> - <posx>567</posx> - <posy>25</posy> - <width>150</width> - <height>1</height> - <colordiffuse>66FFFFFF</colordiffuse> - <texture>separator2.png</texture> - <visible>!LastFM.RadioPlaying</visible> + <control type="button" id="603"> + <posx>135</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>31352</label> + <font>-</font> + <texturefocus>OSDStopFO.png</texturefocus> + <texturenofocus>OSDStopNF.png</texturenofocus> + <onleft>602</onleft> + <onright>604</onright> + <onup>603</onup> + <ondown>603</ondown> + <onclick>PlayerControl(Stop)</onclick> </control> - <control type="group" id="202"> - <posx>607</posx> - <posy>10</posy> - <visible>LastFM.RadioPlaying</visible> - <control type="button" id="800"> - <posx>0</posx> - <posy>0</posy> - <width>30</width> - <height>30</height> - <label>$LOCALIZE[15200] $LOCALIZE[31001]</label> - <align>right</align> - <font>-</font> - <textoffsetx>35</textoffsetx> - <textcolor>grey2</textcolor> - <shadowcolor>black</shadowcolor> - <texturefocus>lastfm-love-focus.png</texturefocus> - <texturenofocus>lastfm-love-nofocus.png</texturenofocus> - <onleft>702</onleft> - <onright>801</onright> - <onup>602</onup> - <ondown>602</ondown> - <onclick>XBMC.LastFM.Love</onclick> - </control> - <control type="button" id="801"> - <posx>36</posx> - <posy>0</posy> - <width>30</width> - <width>30</width> - <height>30</height> - <label>$LOCALIZE[15200] $LOCALIZE[31002]</label> - <align>left</align> - <font>-</font> - <textoffsetx>35</textoffsetx> - <textcolor>grey2</textcolor> - <shadowcolor>black</shadowcolor> - <texturefocus>lastfm-hate-focus.png</texturefocus> - <texturenofocus>lastfm-hate-nofocus.png</texturenofocus> - <onleft>800</onleft> - <onright>703</onright> - <onup>603</onup> - <ondown>603</ondown> - <onclick>XBMC.LastFM.Ban</onclick> - </control> + <control type="button" id="604"> + <posx>180</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>31353</label> + <font>-</font> + <texturefocus>OSDForwardFO.png</texturefocus> + <texturenofocus>OSDForwardNF.png</texturenofocus> + <onleft>603</onleft> + <onright>605</onright> + <onup>604</onup> + <ondown>604</ondown> + <onclick>PlayerControl(Forward)</onclick> </control> - <control type="group" id="201"> - <posx>718</posx> - <posy>4</posy> - <control type="togglebutton" id="703"> - <posx>0</posx> - <posy>0</posy> - <width>45</width> - <height>45</height> - <label>31128</label> - <font>-</font> - <texturefocus>OSDLyricsFO.png</texturefocus> - <texturenofocus>OSDLyricsNF.png</texturenofocus> - <alttexturefocus>OSDLyricsFO.png</alttexturefocus> - <alttexturenofocus>OSDLyricsNF.png</alttexturenofocus> - <onleft>801</onleft> - <onright>704</onright> - <onup>604</onup> - <ondown>604</ondown> - <onclick>Close</onclick> - <onclick>XBMC.RunScript($INFO[Skin.String(LyricScript_Path)])</onclick> - <altclick>Skin.SetAddon(LyricScript_Path,xbmc.python.lyrics)</altclick> - <altclick>Close</altclick> - <altclick>XBMC.RunScript($INFO[Skin.String(LyricScript_Path)])</altclick> - <usealttexture>IsEmpty(Skin.String(LyricScript_Path))</usealttexture> - </control> - <control type="button" id="704"> - <posx>50</posx> - <posy>0</posy> - <width>45</width> - <height>45</height> - <label>$LOCALIZE[486]$INFO[Playlist.Repeat, : ]</label> - <font>-</font> - <texturefocus>-</texturefocus> - <texturenofocus>-</texturenofocus> - <onclick>XBMC.PlayerControl(Repeat)</onclick> - <onleft>703</onleft> - <onright>705</onright> - <onup>605</onup> - <ondown>605</ondown> - </control> - <control type="image"> - <posx>50</posx> - <posy>0</posy> - <width>45</width> - <height>45</height> - <texture>OSDRepeatNF.png</texture> - <visible>!Playlist.IsRepeat + !Playlist.IsRepeatOne</visible> - <visible>!Control.HasFocus(704)</visible> - </control> - <control type="image"> - <posx>50</posx> - <posy>0</posy> - <width>45</width> - <height>45</height> - <texture>OSDRepeatFO.png</texture> - <visible>!Playlist.IsRepeat + !Playlist.IsRepeatOne</visible> - <visible>Control.HasFocus(704)</visible> - </control> - <control type="image"> - <posx>50</posx> - <posy>0</posy> - <width>45</width> - <height>45</height> - <texture>OSDRepeatOneNF.png</texture> - <visible>Playlist.IsRepeatOne</visible> - <visible>!Control.HasFocus(704)</visible> - </control> - <control type="image"> - <posx>50</posx> - <posy>0</posy> - <width>45</width> - <height>45</height> - <texture>OSDRepeatOneFO.png</texture> - <visible>Playlist.IsRepeatOne</visible> - <visible>Control.HasFocus(704)</visible> - </control> - <control type="image"> - <posx>50</posx> - <posy>0</posy> - <width>45</width> - <height>45</height> - <texture>OSDRepeatAllNF.png</texture> - <visible>Playlist.IsRepeat</visible> - <visible>!Control.HasFocus(704)</visible> - </control> - <control type="image"> - <posx>50</posx> - <posy>0</posy> - <width>45</width> - <height>45</height> - <texture>OSDRepeatAllFO.png</texture> - <visible>Playlist.IsRepeat</visible> - <visible>Control.HasFocus(704)</visible> - </control> - <control type="togglebutton" id="705"> - <posx>100</posx> - <posy>0</posy> - <width>45</width> - <height>45</height> - <label>$LOCALIZE[590]$INFO[Playlist.Random, : ]</label> - <font>-</font> - <texturefocus>OSDRandomOffFO.png</texturefocus> - <texturenofocus>OSDRandomOffNF.png</texturenofocus> - <usealttexture>Playlist.IsRandom</usealttexture> - <alttexturefocus>OSDRandomOnFO.png</alttexturefocus> - <alttexturenofocus>OSDRandomOnNF.png</alttexturenofocus> - <onclick>XBMC.PlayerControl(Random)</onclick> - <onleft>704</onleft> - <onright>706</onright> - <onup>605</onup> - <ondown>605</ondown> - </control> - <control type="button" id="706"> - <posx>150</posx> - <posy>0</posy> - <width>45</width> - <height>45</height> - <label>264</label> - <font>-</font> - <texturefocus>OSDRecordFO.png</texturefocus> - <texturenofocus>OSDRecordNF.png</texturenofocus> - <onleft>705</onleft> - <onright>700</onright> - <onup>605</onup> - <ondown>605</ondown> - <onclick>XBMC.PlayerControl(record)</onclick> - <enable>Player.CanRecord</enable> - <animation effect="fade" start="100" end="50" time="100" condition="!Player.CanRecord">Conditional</animation> - </control> + <control type="button" id="605"> + <posx>225</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>209</label> + <font>-</font> + <texturefocus>OSDNextTrackFO.png</texturefocus> + <texturenofocus>OSDNextTrackNF.png</texturenofocus> + <onleft>604</onleft> + <onright>606</onright> + <onup>605</onup> + <ondown>605</ondown> + <onclick>PlayerControl(Next)</onclick> </control> - <control type="group" id="100"> - <posx>490</posx> - <posy>40</posy> - <control type="button" id="600"> - <posx>0</posx> - <posy>0</posy> - <width>50</width> - <height>50</height> - <label>210</label> - <font>-</font> - <texturefocus>OSDPrevTrackFO.png</texturefocus> - <texturenofocus>OSDPrevTrackNF.png</texturenofocus> - <onleft>605</onleft> - <onright>601</onright> - <onup>701</onup> - <ondown>701</ondown> - <onclick>PlayerControl(Previous)</onclick> - </control> - <control type="button" id="601"> - <posx>50</posx> - <posy>0</posy> - <width>50</width> - <height>50</height> - <label>31354</label> - <font>-</font> - <texturefocus>OSDRewindFO.png</texturefocus> - <texturenofocus>OSDRewindNF.png</texturenofocus> - <onleft>600</onleft> - <onright>602</onright> - <onup>702</onup> - <ondown>702</ondown> - <onclick>PlayerControl(Rewind)</onclick> - </control> - <control type="togglebutton" id="602"> - <posx>100</posx> - <posy>0</posy> - <width>50</width> - <height>50</height> - <label>31351</label> - <altlabel>208</altlabel> - <font>-</font> - <texturefocus>OSDPauseFO.png</texturefocus> - <texturenofocus>OSDPauseNF.png</texturenofocus> - <usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture> - <alttexturefocus>OSDPlayFO.png</alttexturefocus> - <alttexturenofocus>OSDPlayNF.png</alttexturenofocus> - <onleft>601</onleft> - <onright>603</onright> - <onup>800</onup> - <ondown>800</ondown> - <onclick>PlayerControl(Play)</onclick> - <visible>LastFM.RadioPlaying</visible> - </control> - <control type="button" id="603"> - <posx>150</posx> - <posy>0</posy> - <width>50</width> - <height>50</height> - <label>31352</label> - <font>-</font> - <texturefocus>OSDStopFO.png</texturefocus> - <texturenofocus>OSDStopNF.png</texturenofocus> - <onleft>602</onleft> - <onright>604</onright> - <onup>801</onup> - <ondown>801</ondown> - <onclick>PlayerControl(Stop)</onclick> - <visible>LastFM.RadioPlaying</visible> - </control> - <control type="togglebutton" id="602"> - <posx>100</posx> - <posy>0</posy> - <width>50</width> - <height>50</height> - <label>31351</label> - <altlabel>208</altlabel> - <font>-</font> - <texturefocus>OSDPauseFO.png</texturefocus> - <texturenofocus>OSDPauseNF.png</texturenofocus> - <usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture> - <alttexturefocus>OSDPlayFO.png</alttexturefocus> - <alttexturenofocus>OSDPlayNF.png</alttexturenofocus> - <onleft>601</onleft> - <onright>603</onright> - <onup>702</onup> - <ondown>702</ondown> - <onclick>PlayerControl(Play)</onclick> - <visible>!LastFM.RadioPlaying</visible> - </control> - <control type="button" id="603"> - <posx>150</posx> - <posy>0</posy> - <width>50</width> - <height>50</height> - <label>31352</label> - <font>-</font> - <texturefocus>OSDStopFO.png</texturefocus> - <texturenofocus>OSDStopNF.png</texturenofocus> - <onleft>602</onleft> - <onright>604</onright> - <onup>703</onup> - <ondown>703</ondown> - <onclick>down</onclick> - <onclick>PlayerControl(Stop)</onclick> - <visible>!LastFM.RadioPlaying</visible> - </control> - <control type="button" id="604"> - <posx>200</posx> - <posy>0</posy> - <width>50</width> - <height>50</height> - <label>31353</label> - <font>-</font> - <texturefocus>OSDForwardFO.png</texturefocus> - <texturenofocus>OSDForwardNF.png</texturenofocus> - <onleft>603</onleft> - <onright>605</onright> - <onup>703</onup> - <ondown>703</ondown> - <onclick>PlayerControl(Forward)</onclick> - </control> - <control type="button" id="605"> - <posx>250</posx> - <posy>0</posy> - <width>50</width> - <height>50</height> - <label>209</label> - <font>-</font> - <texturefocus>OSDNextTrackFO.png</texturefocus> - <texturenofocus>OSDNextTrackNF.png</texturenofocus> - <onleft>604</onleft> - <onright>600</onright> - <onup>704</onup> - <ondown>704</ondown> - <onclick>PlayerControl(Next)</onclick> - </control> + <control type="button" id="606"> + <posx>270</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>$LOCALIZE[486]$INFO[Playlist.Repeat, : ]</label> + <font>-</font> + <texturefocus>-</texturefocus> + <texturenofocus>-</texturenofocus> + <onclick>XBMC.PlayerControl(Repeat)</onclick> + <onleft>605</onleft> + <onright>607</onright> + <onup>606</onup> + <ondown>606</ondown> </control> - <control type="label"> - <posx>20</posx> - <posy>60</posy> - <width>460</width> - <height>25</height> - <label>$INFO[System.CurrentControl]</label> - <scroll>true</scroll> - <align>left</align> - <aligny>center</aligny> - <font>font12_title</font> - <textcolor>grey</textcolor> - <shadowcolor>black</shadowcolor> - <visible>Window.IsTopmost(MusicOSD)</visible> + <control type="image"> + <posx>270</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <texture>OSDRepeatNF.png</texture> + <visible>!Playlist.IsRepeat + !Playlist.IsRepeatOne</visible> + <visible>!Control.HasFocus(606)</visible> </control> - <control type="group"> - <posx>120r</posx> - <posy>40</posy> - <control type="image"> - <posx>10</posx> - <posy>0</posy> - <width>80</width> - <height>50</height> - <texture>OSDSeekFrame.png</texture> - <visible>Player.Rewinding | Player.Forwarding</visible> - </control> - <control type="image"> - <posx>0</posx> - <posy>3</posy> - <width>20</width> - <height>44</height> - <texture>OSDSeekRewind.png</texture> - <visible>Player.Rewinding</visible> - </control> - <control type="image"> - <posx>80</posx> - <posy>3</posy> - <width>20</width> - <height>44</height> - <texture>OSDSeekForward.png</texture> - <visible>Player.Forwarding</visible> - </control> - - <control type="image"> - <posx>28</posx> - <posy>4</posy> - <width>40</width> - <height>40</height> - <texture>OSD2x.png</texture> - <visible>Player.Rewinding2x</visible> - </control> - <control type="image"> - <posx>25</posx> - <posy>4</posy> - <width>40</width> - <height>40</height> - <texture>OSD4x.png</texture> - <visible>Player.Rewinding4x</visible> - </control> - <control type="image"> - <posx>22</posx> - <posy>4</posy> - <width>40</width> - <height>40</height> - <texture>OSD8x.png</texture> - <visible>Player.Rewinding8x</visible> - </control> - <control type="image"> - <posx>19</posx> - <posy>4</posy> - <width>40</width> - <height>40</height> - <texture>OSD16x.png</texture> - <visible>Player.Rewinding16x</visible> - </control> - <control type="image"> - <posx>17</posx> - <posy>4</posy> - <width>40</width> - <height>40</height> - <texture>OSD32x.png</texture> - <visible>Player.Rewinding32x</visible> - </control> - - <control type="image"> - <posx>34</posx> - <posy>4</posy> - <width>40</width> - <height>40</height> - <texture>OSD2x.png</texture> - <visible>Player.Forwarding2x</visible> - </control> - <control type="image"> - <posx>37</posx> - <posy>4</posy> - <width>40</width> - <height>40</height> - <texture>OSD4x.png</texture> - <visible>Player.Forwarding4x</visible> - </control> - <control type="image"> - <posx>40</posx> - <posy>4</posy> - <width>40</width> - <height>40</height> - <texture>OSD8x.png</texture> - <visible>Player.Forwarding8x</visible> - </control> - <control type="image"> - <posx>43</posx> - <posy>4</posy> - <width>40</width> - <height>40</height> - <texture>OSD16x.png</texture> - <visible>Player.Forwarding16x</visible> - </control> - <control type="image"> - <posx>45</posx> - <posy>4</posy> - <width>40</width> - <height>40</height> - <texture>OSD32x.png</texture> - <visible>Player.Forwarding32x</visible> - </control> + <control type="image"> + <posx>270</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <texture>OSDRepeatFO.png</texture> + <visible>!Playlist.IsRepeat + !Playlist.IsRepeatOne</visible> + <visible>Control.HasFocus(606)</visible> </control> - <control type="group"> - <posx>0</posx> + <control type="image"> + <posx>270</posx> <posy>0</posy> - <animation effect="slide" end="-200,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-200,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>170</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <include>WindowTitleCommons</include> - <posx>140</posx> - <label>31140</label> - </control> + <width>45</width> + <height>45</height> + <texture>OSDRepeatOneNF.png</texture> + <visible>Playlist.IsRepeatOne</visible> + <visible>!Control.HasFocus(606)</visible> </control> - <include>Clock</include> <control type="image"> - <description>media info background image</description> - <posx>0</posx> - <posy>100r</posy> - <width>1280</width> - <height>150</height> - <texture>HomeNowPlayingBack.png</texture> + <posx>270</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <texture>OSDRepeatOneFO.png</texture> + <visible>Playlist.IsRepeatOne</visible> + <visible>Control.HasFocus(606)</visible> </control> <control type="image"> - <description>media info background image</description> - <posx>0</posx> - <posy>100r</posy> - <width>1280</width> - <height>150</height> - <colordiffuse>88FFFFFF</colordiffuse> - <texture>HomeNowPlayingBack.png</texture> + <posx>270</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <texture>OSDRepeatAllNF.png</texture> + <visible>Playlist.IsRepeat</visible> + <visible>!Control.HasFocus(606)</visible> + </control> + <control type="image"> + <posx>270</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <texture>OSDRepeatAllFO.png</texture> + <visible>Playlist.IsRepeat</visible> + <visible>Control.HasFocus(606)</visible> + </control> + <control type="togglebutton" id="607"> + <posx>315</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>$LOCALIZE[590]$INFO[Playlist.Random, : ]</label> + <font>-</font> + <texturefocus>OSDRandomOffFO.png</texturefocus> + <texturenofocus>OSDRandomOffNF.png</texturenofocus> + <usealttexture>Playlist.IsRandom</usealttexture> + <alttexturefocus>OSDRandomOnFO.png</alttexturefocus> + <alttexturenofocus>OSDRandomOnNF.png</alttexturenofocus> + <onclick>XBMC.PlayerControl(Random)</onclick> + <onleft>606</onleft> + <onright>701</onright> + <onup>607</onup> + <ondown>607</ondown> </control> - <control type="label"> - <posx>220</posx> - <posy>50r</posy> - <width>200</width> - <height>25</height> - <label>$INFO[Player.Time]</label> - <scroll>true</scroll> - <align>right</align> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>grey</textcolor> - <shadowcolor>black</shadowcolor> + </control> + <control type="group"> + <posx>250r</posx> + <posy>50r</posy> + <animation effect="fade" time="200">VisibleChange</animation> + <visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList)]</visible> + <control type="togglebutton" id="701"> + <posx>0</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>31128</label> + <font>-</font> + <texturefocus>OSDLyricsFO.png</texturefocus> + <texturenofocus>OSDLyricsNF.png</texturenofocus> + <alttexturefocus>OSDLyricsFO.png</alttexturefocus> + <alttexturenofocus>OSDLyricsNF.png</alttexturenofocus> + <onleft>607</onleft> + <onright>500</onright> + <onup>701</onup> + <ondown>701</ondown> + <onclick>Close</onclick> + <onclick>XBMC.RunScript($INFO[Skin.String(LyricScript_Path)])</onclick> + <altclick>Skin.SetAddon(LyricScript_Path,xbmc.python.lyrics)</altclick> + <altclick>Close</altclick> + <altclick>XBMC.RunScript($INFO[Skin.String(LyricScript_Path)])</altclick> + <usealttexture>IsEmpty(Skin.String(LyricScript_Path))</usealttexture> </control> - <control type="progress"> - <description>Progressbar</description> - <posx>230</posx> - <posy>40r</posy> - <width>820</width> - <height>14</height> - <info>Player.Progress</info> + <control type="button" id="500"> + <posx>45</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>12006</label> + <font>-</font> + <texturefocus>OSDVizFO.png</texturefocus> + <texturenofocus>OSDVizNF.png</texturenofocus> + <onleft>701</onleft> + <onright>702</onright> + <onup>500</onup> + <ondown>500</ondown> </control> - <control type="slider" id="87"> - <description>Seek Slider</description> - <posx>230</posx> - <posy>44r</posy> - <width>820</width> - <height>17</height> + <control type="button" id="702"> + <posx>90</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>$LOCALIZE[250] $LOCALIZE[21417]</label> + <font>-</font> + <texturefocus>OSDPresetSettingsFO.png</texturefocus> + <texturenofocus>OSDPresetSettingsNF.png</texturenofocus> + <onleft>500</onleft> + <onright>703</onright> <onup>702</onup> - <ondown>26</ondown> - <action>seek</action> - <texturesliderbar>seekslider2.png</texturesliderbar> - <textureslidernib>osd_slider_nibNF.png</textureslidernib> - <textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus> + <ondown>702</ondown> + <onclick>Addon.Default.OpenSettings(xbmc.player.musicviz)</onclick> + </control> + <control type="button" id="703"> + <posx>135</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>31048</label> + <font>-</font> + <texturefocus>OSDPreFO.png</texturefocus> + <texturenofocus>OSDPreNF.png</texturenofocus> + <onleft>702</onleft> + <onright>704</onright> + <onup>703</onup> + <ondown>703</ondown> + <onclick>ActivateWindow(122)</onclick> </control> - <control type="label"> - <posx>220r</posx> - <posy>50r</posy> - <width>200</width> - <height>25</height> - <label>$INFO[Player.Duration]</label> - <scroll>true</scroll> - <align>left</align> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>grey</textcolor> - <shadowcolor>black</shadowcolor> + <control type="button" id="704"> + <posx>180</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>264</label> + <font>-</font> + <texturefocus>OSDRecordFO.png</texturefocus> + <texturenofocus>OSDRecordNF.png</texturenofocus> + <onleft>703</onleft> + <onright>600</onright> + <onup>704</onup> + <ondown>704</ondown> + <onclick>XBMC.PlayerControl(record)</onclick> + <enable>Player.CanRecord</enable> + <animation effect="fade" start="100" end="50" time="100" condition="!Player.CanRecord">Conditional</animation> </control> </control> </controls> -</window> + </window>
\ No newline at end of file diff --git a/addons/skin.confluence/720p/MusicVisualisation.xml b/addons/skin.confluence/720p/MusicVisualisation.xml index 648e0de7c0..a647d31c91 100644 --- a/addons/skin.confluence/720p/MusicVisualisation.xml +++ b/addons/skin.confluence/720p/MusicVisualisation.xml @@ -1,284 +1,244 @@ -<window id="2006"> +<window id="2006"> <defaultcontrol>-</defaultcontrol> <allowoverlay>no</allowoverlay> <controls> - <control type="visualisation" id="2"> + <control type="visualisation"> <description>visualisation</description> <posx>0</posx> <posy>0</posy> <width>1280</width> <height>720</height> -<!-- <visible>IsEmpty(MusicPlayer.Property(Fanart_Image)</visible> </control> - <control type="image"> - <description>Fanart image</description> - <posx>0</posx> - <posy>0</posy> - <width>1280</width> - <height>720</height> - <texture>$INFO[MusicPlayer.Property(Fanart_Image)]</texture> - <visible>!IsEmpty(MusicPlayer.Property(Fanart_Image))</visible> ---> </control> - + <!-- media infos --> <control type="group"> - <visible>Player.ShowInfo + ![Window.IsVisible(VisualisationSettings) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(MusicOSD)]</visible> - <animation effect="fade" start="0" end="100" time="300" tween="quadratic" easing="out">WindowOpen</animation> - <animation effect="fade" start="100" end="0" time="300" delay="150" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="fade" start="0" end="100" time="300" tween="quadratic" easing="out">visible</animation> - <animation effect="fade" start="100" end="0" time="300" delay="150" tween="quadratic" easing="out">hidden</animation> + <animation effect="fade" time="200">VisibleChange</animation> + <visible>[Player.ShowInfo | Window.IsActive(MusicOSD)] + ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList)]</visible> <control type="image"> - <description>media info background image</description> <posx>0</posx> - <posy>270r</posy> + <posy>-150</posy> <width>1280</width> - <height>270</height> - <texture>HomeNowPlayingBack.png</texture> + <height>256</height> + <texture flipy="true">HomeNowPlayingBack.png</texture> + </control> + <control type="label"> + <description>Partymode Header label</description> + <posx>30</posx> + <posy>5</posy> + <width>800</width> + <height>25</height> + <align>left</align> + <aligny>center</aligny> + <font>font13</font> + <textcolor>white</textcolor> + <shadowcolor>black</shadowcolor> + <label>$LOCALIZE[589]</label> + <visible>MusicPartyMode.Enabled</visible> + </control> + <control type="label"> + <description>Normal Header label</description> + <posx>30</posx> + <posy>5</posy> + <width>800</width> + <height>25</height> + <align>left</align> + <aligny>center</aligny> + <font>font13</font> + <textcolor>white</textcolor> + <shadowcolor>black</shadowcolor> + <label>$INFO[musicplayer.Playlistposition,$LOCALIZE[554]: ]$INFO[musicplayer.Playlistlength, / ]</label> + <visible>!MusicPartyMode.Enabled</visible> + </control> + <control type="label"> + <description>Clock label</description> + <posx>1250</posx> + <posy>5</posy> + <width>800</width> + <height>25</height> + <align>right</align> + <aligny>center</aligny> + <font>font13</font> + <textcolor>white</textcolor> + <shadowcolor>black</shadowcolor> + <label>$INFO[System.Time]</label> </control> <control type="image"> - <description>media info background image</description> <posx>0</posx> - <posy>270r</posy> + <posy>230r</posy> <width>1280</width> - <height>270</height> - <colordiffuse>88FFFFFF</colordiffuse> + <height>230</height> <texture>HomeNowPlayingBack.png</texture> </control> <control type="image"> <description>cover image</description> - <posx>10</posx> - <posy>290r</posy> - <width>340</width> - <height>260</height> - <fadetime>200</fadetime> - <texture background="true">$INFO[MusicPlayer.cover]</texture> + <posx>20</posx> + <posy>250r</posy> + <width>300</width> + <height>230</height> + <info>MusicPlayer.Cover</info> <aspectratio aligny="bottom">keep</aspectratio> - <bordertexture border="8">ThumbShadow.png</bordertexture> - <bordersize>8</bordersize> - </control> - <control type="progress"> - <description>Progressbar</description> - <posx>10</posx> - <posy>30r</posy> - <width>340</width> - <height>14</height> - <info>Player.Progress</info> + <bordertexture border="19,3,19,3">thumb-border.png</bordertexture> + <bordersize>17,1,17,1</bordersize> </control> <control type="group"> - <posx>370</posx> - <posy>180r</posy> - <control type="grouplist"> - <description>Media Codec Flagging Images</description> - <posx>340</posx> + <posx>330</posx> + <posy>175r</posy> + <control type="label" id="1"> + <description>Heading label</description> + <posx>0</posx> <posy>0</posy> - <width>550</width> - <align>right</align> - <itemgap>0</itemgap> + <width>910</width> + <height>25</height> + <align>left</align> + <font>font13</font> + <label>$LOCALIZE[31040]</label> + <textcolor>white</textcolor> + <shadowcolor>black</shadowcolor> + </control> + <control type="label" id="1"> + <description>Artist label</description> + <posx>20</posx> + <posy>30</posy> + <width>910</width> + <height>25</height> + <align>left</align> + <font>font12</font> + <label>$INFO[MusicPlayer.Artist]$INFO[MusicPlayer.Album, - ]</label> + <textcolor>grey2</textcolor> + <shadowcolor>black</shadowcolor> + </control> + <control type="grouplist"> + <posx>20</posx> + <posy>60</posy> + <width>910</width> + <height>35</height> + <itemgap>5</itemgap> <orientation>horizontal</orientation> - <control type="image"> - <description>Rating image</description> - <width>120</width> - <height>40</height> - <aspectratio align="right">keep</aspectratio> - <texture>LeftRating/$INFO[Player.StarRating]</texture> + <control type="label"> + <width min="10" max="710">auto</width> + <height>30</height> + <font>font30</font> + <align>left</align> + <aligny>center</aligny> + <label>$INFO[MusicPlayer.Title]</label> + <textcolor>orange</textcolor> + <scroll>true</scroll> </control> <control type="image"> - <description>Codec Image</description> - <width>80</width> - <height>40</height> - <aspectratio>keep</aspectratio> + <description>Audio Codec Image</description> + <width>90</width> + <height>35</height> + <aspectratio align="right">keep</aspectratio> <texture>$INFO[MusicPlayer.Codec,flagging/audio/,.png]</texture> </control> <control type="image"> - <description>Channels Image</description> - <width>80</width> - <height>40</height> - <aspectratio>keep</aspectratio> - <texture>$INFO[MusicPlayer.Channels,flagging/audio/,.png]</texture> + <description>Rating</description> + <width>110</width> + <height>35</height> + <aspectratio align="center">keep</aspectratio> + <texture fallback="LeftRating/rating0.png">$INFO[Player.StarRating,LeftRating/]</texture> </control> </control> <control type="label"> - <description>Playing Label</description> <posx>0</posx> - <posy>0</posy> - <width>500</width> + <posy>120</posy> + <width>910</width> <height>25</height> - <align>left</align> + <label>$LOCALIZE[209]: $INFO[MusicPlayer.offset(1).Artist,, - ]$INFO[MusicPlayer.offset(1).Title]</label> + <align>center</align> <aligny>center</aligny> - <font>font13_title</font> - <textcolor>blue</textcolor> - <shadowcolor>black</shadowcolor> - <label>31040</label> - </control> - <control type="label"> - <posx>10</posx> - <posy>35</posy> - <width>880</width> - <height>30</height> - <label>$INFO[MusicPlayer.Artist]$INFO[MusicPlayer.Album, - ]</label> - <align>left</align> - <aligny>center</aligny> - <font>font13</font> + <font>font12</font> <textcolor>grey</textcolor> - <shadowcolor>black</shadowcolor> - </control> - <control type="label"> - <posx>10</posx> - <posy>65</posy> - <width>880</width> - <height>30</height> - <label>$INFO[MusicPlayer.Title]</label> <scroll>true</scroll> - <align>left</align> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <shadowcolor>black</shadowcolor> + <visible>MusicPlayer.HasNext + !Window.IsVisible(MusicOSD)</visible> + <animation effect="fade" time="200">VisibleChange</animation> </control> + </control> + <control type="group"> + <posx>330</posx> + <posy>85r</posy> <control type="label"> <posx>0</posx> - <posy>110</posy> - <width>300</width> - <height>20</height> - <label>$INFO[musicplayer.Playlistposition,[COLOR=blue]$LOCALIZE[554]:[/COLOR] ]$INFO[musicplayer.Playlistlength, / ]</label> + <posy>0</posy> + <width>100</width> + <height>40</height> + <font>font13</font> <align>left</align> <aligny>center</aligny> - <font>font12_title</font> - <textcolor>grey2</textcolor> - <shadowcolor>black</shadowcolor> + <label>$INFO[Player.Time(hh:mm:ss)]</label> </control> - <control type="label"> - <posx>890</posx> - <posy>115</posy> - <width>500</width> - <height>25</height> - <label>$INFO[Player.Time]$INFO[Player.Duration, / ]</label> - <align>right</align> - <aligny>center</aligny> - <font>font35_title</font> - <textcolor>grey</textcolor> - <shadowcolor>black</shadowcolor> + <control type="progress"> + <description>Progressbar</description> + <posx>100</posx> + <posy>15</posy> + <width>720</width> + <height>16</height> + <info>Player.Progress</info> </control> <control type="label"> - <posx>890</posx> - <posy>150</posy> - <width>890</width> - <height>20</height> - <label>[COLOR=blue]$LOCALIZE[209] :[/COLOR] $INFO[MusicPlayer.offset(1).Artist,, - ]$INFO[MusicPlayer.offset(1).Title]</label> + <posx>920</posx> + <posy>0</posy> + <width>100</width> + <height>40</height> + <font>font13</font> <align>right</align> <aligny>center</aligny> - <font>font12_title</font> - <textcolor>grey2</textcolor> - <shadowcolor>black</shadowcolor> + <label>$INFO[Player.Duration(hh:mm:ss)]</label> </control> </control> </control> - <control type="group"> - <visible>Player.ShowInfo</visible> - <animation effect="slide" start="0,0" end="160,0" delay="0" time="300" condition="!Window.IsVisible(MusicOSD)">hidden</animation> - <animation effect="slide" start="160,0" end="0,0" delay="0" time="300" condition="!Window.IsVisible(MusicOSD)">visible</animation> - <include>Clock</include> - </control> + <!-- codec & viz infos --> <control type="group" id="0"> - <posx>240</posx> - <posy>100</posy> - <include>VisibleFadeEffect</include> - <visible>Player.ShowCodec + ![Window.IsVisible(121) | Window.IsVisible(122)]</visible> + <posx>0</posx> + <posy>50</posy> + <visible>Player.ShowCodec + ![Window.IsVisible(script-XBMC_Lyrics-main.xml) | Window.IsVisible(VisualisationSettings) | Window.IsVisible(VisualisationPresetList)]</visible> + <animation effect="fade" time="200">VisibleChange</animation> <control type="image"> - <description>gradient</description> + <description>media info background image</description> <posx>0</posx> <posy>0</posy> - <width>800</width> - <height>200</height> - <colordiffuse>CCFFFFFF</colordiffuse> - <texture border="20">OverlayDialogBackground.png</texture> + <width>1280</width> + <height>105</height> + <colordiffuse>AAFFFFFF</colordiffuse> + <texture>black-back.png</texture> </control> <control type="label"> - <posx>30</posx> - <posy>20</posy> - <width>360</width> - <height>25</height> - <label>$LOCALIZE[31046]</label> + <description>row 1 label</description> + <posx>50</posx> + <posy>10</posy> + <label>-</label> <align>left</align> - <aligny>center</aligny> - <font>font13_title</font> - <textcolor>white</textcolor> - <shadowcolor>black</shadowcolor> + <label>$INFO[musicplayer.Codec,$LOCALIZE[21446]: ,]$INFO[musicplayer.Bitrate, · $LOCALIZE[623]: ,kbps]$INFO[musicplayer.bitspersample, · $LOCALIZE[612]: ,bit]$INFO[musicplayer.Samplerate, · $LOCALIZE[613]: ,kHz]$INFO[musicplayer.Channels, · $LOCALIZE[21444]: ]</label> + <font>font12</font> </control> <control type="label"> - <posx>30</posx> - <posy>50</posy> - <width>360</width> - <height>100</height> - <label>$INFO[musicplayer.Codec,· $LOCALIZE[21446]: ,]$INFO[musicplayer.Bitrate,[CR]· $LOCALIZE[623]: ,kbps]$INFO[musicplayer.bitspersample,[CR]· $LOCALIZE[612]: ,bit]$INFO[musicplayer.Samplerate,[CR]· $LOCALIZE[613]: ,kHz]$INFO[musicplayer.Channels,[CR]· $LOCALIZE[21444]: ]</label> + <description>row 2 label</description> + <posx>50</posx> + <posy>40</posy> + <label>-</label> <align>left</align> - <aligny>top</aligny> - <font>font13</font> - <textcolor>white</textcolor> - <shadowcolor>black</shadowcolor> - </control> - <control type="label"> - <posx>760</posx> - <posy>20</posy> - <width>360</width> - <height>25</height> - <label>$LOCALIZE[250]</label> - <align>right</align> - <aligny>center</aligny> - <font>font13_title</font> - <textcolor>white</textcolor> - <shadowcolor>black</shadowcolor> - </control> - <control type="label"> - <posx>760</posx> - <posy>50</posy> - <width>360</width> - <height>25</height> - <label>$INFO[Visualisation.Name] [I]($LOCALIZE[20166])[/I] ·[CR]fps: $INFO[System.FPS] ·</label> - <align>right</align> - <aligny>top</aligny> - <font>font13</font> - <textcolor>white</textcolor> - <shadowcolor>black</shadowcolor> + <label>$INFO[Visualisation.Name] [I][COLOR=orange]($LOCALIZE[20166])[/COLOR][/I] · fps: $INFO[System.FPS]</label> + <font>font12</font> <visible>Visualisation.Locked</visible> </control> <control type="label"> - <posx>760</posx> - <posy>50</posy> - <width>360</width> - <height>25</height> - <label>$INFO[Visualisation.Name] ·[CR]fps: $INFO[System.FPS] ·</label> - <align>right</align> - <aligny>top</aligny> - <font>font13</font> - <textcolor>white</textcolor> - <shadowcolor>black</shadowcolor> + <description>Unlocked row 2 label</description> + <posx>50</posx> + <posy>40</posy> + <label>-</label> + <align>left</align> + <label>$INFO[Visualisation.Name] · fps: $INFO[System.FPS]</label> + <font>font12</font> <visible>!Visualisation.Locked</visible> </control> <control type="label"> - <posx>760</posx> - <posy>105</posy> - <width>360</width> - <height>25</height> - <label>$LOCALIZE[31047]</label> - <align>right</align> - <aligny>center</aligny> - <font>font13_title</font> - <textcolor>white</textcolor> - <shadowcolor>black</shadowcolor> - </control> - <control type="label"> - <posx>760</posx> - <posy>135</posy> - <width>360</width> - <height>25</height> - <label fallback="161">$INFO[Visualisation.Preset,, ·]</label> - <align>right</align> - <aligny>top</aligny> + <description>row 3 label</description> + <posx>50</posx> + <posy>70</posy> + <label>-</label> + <align>left</align> + <label>$LOCALIZE[13388]: $INFO[Visualisation.Preset]</label> <font>font12</font> - <textcolor>white</textcolor> - <shadowcolor>black</shadowcolor> - <wrapmultiline>true</wrapmultiline> </control> </control> </controls> -</window> +</window>
\ No newline at end of file diff --git a/addons/skin.confluence/720p/VideoFullScreen.xml b/addons/skin.confluence/720p/VideoFullScreen.xml index e3c0e35019..7cfb7b67d7 100644 --- a/addons/skin.confluence/720p/VideoFullScreen.xml +++ b/addons/skin.confluence/720p/VideoFullScreen.xml @@ -1,41 +1,264 @@ <window id="2005"> <defaultcontrol>-</defaultcontrol> <controls> - <!-- codec infos --> - <control type="image"> - <description>media info background image</description> - <posx>0</posx> - <posy>30</posy> - <width>1280</width> - <height>130</height> - <texture>black-back.png</texture> - </control> - <control type="label" id="10"> - <description>row 1 label</description> - <posx>50</posx> - <posy>40</posy> - <label>-</label> - <align>left</align> - <font>font12</font> - <include>VisibleFadeEffect</include> + <!-- media infos --> + <control type="group" id="1"> + <visible>[Player.ShowInfo | Window.IsActive(VideoOSD)] + ![Window.IsVisible(123) | Window.IsVisible(124) | Window.IsVisible(125)]</visible> + <animation effect="fade" time="200">VisibleChange</animation> + <control type="image" id="1"> + <posx>0</posx> + <posy>-150</posy> + <width>1280</width> + <height>256</height> + <texture flipy="true">HomeNowPlayingBack.png</texture> + </control> + <control type="label" id="1"> + <description>Chapter Count Header label</description> + <posx>30</posx> + <posy>5</posy> + <width>1000</width> + <height>25</height> + <align>left</align> + <aligny>center</aligny> + <font>font13</font> + <textcolor>white</textcolor> + <shadowcolor>black</shadowcolor> + <label>$INFO[Player.Chapter,$LOCALIZE[21396]: ]$INFO[Player.ChapterCount, / ]$INFO[Player.ChapterName,[COLOR=grey] - (,)[/COLOR]]</label> + <visible>Player.ChapterCount</visible> + </control> + <control type="label" id="1"> + <description>Clock label</description> + <posx>1250</posx> + <posy>5</posy> + <width>800</width> + <height>25</height> + <align>right</align> + <aligny>center</aligny> + <font>font13</font> + <textcolor>white</textcolor> + <shadowcolor>black</shadowcolor> + <label>$INFO[System.Time]</label> + </control> + <control type="image" id="1"> + <posx>0</posx> + <posy>230r</posy> + <width>1280</width> + <height>230</height> + <texture>HomeNowPlayingBack.png</texture> + </control> + <control type="image" id="1"> + <description>cover image</description> + <posx>20</posx> + <posy>260r</posy> + <width>300</width> + <height>230</height> + <info>VideoPlayer.Cover</info> + <aspectratio aligny="bottom">keep</aspectratio> + <bordertexture border="19,3,19,3">thumb-border.png</bordertexture> + <bordersize>17,1,17,1</bordersize> + <visible>!VideoPlayer.Content(Movies)</visible> + </control> + <control type="image" id="1"> + <description>Movie cover image</description> + <posx>20</posx> + <posy>370r</posy> + <width>300</width> + <height>350</height> + <info>VideoPlayer.Cover</info> + <aspectratio aligny="bottom">keep</aspectratio> + <bordertexture border="19,3,19,3">thumb-border.png</bordertexture> + <bordersize>17,1,17,1</bordersize> + <visible>VideoPlayer.Content(Movies)</visible> + </control> + <control type="group" id="1"> + <posx>330</posx> + <posy>175r</posy> + <control type="label" id="1"> + <description>Heading label</description> + <posx>0</posx> + <posy>0</posy> + <width>910</width> + <height>25</height> + <align>left</align> + <font>font13</font> + <label>$LOCALIZE[31040]</label> + <textcolor>white</textcolor> + <shadowcolor>black</shadowcolor> + <animation effect="slide" start="0,0" end="0,25" time="0" condition="!VideoPlayer.Content(Movies) + !VideoPlayer.Content(Episodes) + !VideoPlayer.Content(MusicVideos)">conditional</animation> + </control> + <control type="label" id="1"> + <description>Studio label</description> + <posx>20</posx> + <posy>30</posy> + <width>910</width> + <height>25</height> + <align>left</align> + <font>font12</font> + <label>$INFO[VideoPlayer.Studio]</label> + <textcolor>grey2</textcolor> + <shadowcolor>black</shadowcolor> + <visible>VideoPlayer.Content(Movies)</visible> + </control> + <control type="label" id="1"> + <description>TV Show label</description> + <posx>20</posx> + <posy>30</posy> + <width>910</width> + <height>25</height> + <align>left</align> + <font>font12</font> + <label>$INFO[VideoPlayer.TVShowTitle] ($INFO[VideoPlayer.Season]x$INFO[VideoPlayer.Episode])</label> + <textcolor>grey2</textcolor> + <shadowcolor>black</shadowcolor> + <visible>VideoPlayer.Content(Episodes)</visible> + </control> + <control type="label" id="1"> + <description>Music Info label</description> + <posx>20</posx> + <posy>30</posy> + <width>910</width> + <height>25</height> + <align>left</align> + <font>font12</font> + <label>$INFO[VideoPlayer.Artist] $INFO[VideoPlayer.Album, - ]</label> + <textcolor>grey2</textcolor> + <shadowcolor>black</shadowcolor> + <visible>VideoPlayer.Content(MusicVideos)</visible> + </control> + <control type="grouplist" id="1"> + <posx>20</posx> + <posy>60</posy> + <width>910</width> + <height>35</height> + <itemgap>0</itemgap> + <orientation>horizontal</orientation> + <control type="label" id="1"> + <width min="10" max="680">auto</width> + <height>30</height> + <font>font30</font> + <align>left</align> + <aligny>center</aligny> + <label>$INFO[VideoPlayer.Title]</label> + <textcolor>orange</textcolor> + <scroll>true</scroll> + </control> + <control type="image" id="1"> + <description>Video Resolution Image</description> + <width>90</width> + <height>35</height> + <aspectratio align="center">keep</aspectratio> + <texture>$INFO[VideoPlayer.VideoResolution,flagging/video/,.png]</texture> + </control> + <control type="image" id="1"> + <description>Audio Codec Image</description> + <width>90</width> + <height>35</height> + <aspectratio align="center">keep</aspectratio> + <texture>$INFO[VideoPlayer.AudioCodec,flagging/audio/,.png]</texture> + </control> + <control type="image" id="1"> + <description>Audio Channels Image</description> + <width>50</width> + <height>35</height> + <aspectratio align="center">keep</aspectratio> + <texture>$INFO[VideoPlayer.AudioChannels,flagging/audio/,.png]</texture> + </control> + </control> + <control type="label" id="1"> + <posx>0</posx> + <posy>120</posy> + <width>910</width> + <height>25</height> + <label>$LOCALIZE[31049] $INFO[Player.FinishTime]</label> + <align>center</align> + <aligny>center</aligny> + <font>font12</font> + <textcolor>grey</textcolor> + <scroll>true</scroll> + <visible>!Window.IsVisible(VideoOSD)</visible> + <animation effect="fade" time="200">VisibleChange</animation> + </control> + </control> + <control type="group" id="1"> + <posx>330</posx> + <posy>85r</posy> + <control type="label" id="1"> + <posx>0</posx> + <posy>0</posy> + <width>100</width> + <height>40</height> + <font>font13</font> + <align>left</align> + <aligny>center</aligny> + <label>$INFO[Player.Time(hh:mm:ss)]</label> + </control> + <control type="progress" id="1"> + <description>Progressbar</description> + <posx>100</posx> + <posy>15</posy> + <width>720</width> + <height>16</height> + <info>Player.Progress</info> + </control> + <control type="label" id="1"> + <posx>920</posx> + <posy>0</posy> + <width>100</width> + <height>40</height> + <font>font13</font> + <align>right</align> + <aligny>center</aligny> + <label>$INFO[Player.Duration(hh:mm:ss)]</label> + </control> + </control> </control> - <control type="label" id="11"> - <description>row 2 label</description> - <posx>50</posx> - <posy>70</posy> - <label>-</label> - <align>left</align> - <font>font12</font> - <include>VisibleFadeEffect</include> - </control> - <control type="label" id="12"> - <description>row 3 label</description> - <posx>50</posx> - <posy>100</posy> - <label>-</label> - <align>left</align> - <font>font12</font> - <include>VisibleFadeEffect</include> + <!-- codec info --> + <control type="group" id="0"> + <posx>0</posx> + <posy>20</posy> + <animation effect="fade" time="200">VisibleChange</animation> + <control type="image"> + <description>media info background image</description> + <posx>0</posx> + <posy>0</posy> + <width>1280</width> + <height>140</height> + <colordiffuse>AAFFFFFF</colordiffuse> + <texture>black-back.png</texture> + </control> + <control type="label" id="10"> + <description>row 1 label</description> + <posx>50</posx> + <posy>10</posy> + <width>1180</width> + <height>30</height> + <align>left</align> + <aligny>center</aligny> + <font>font12</font> + <label>-</label> + </control> + <control type="label" id="11"> + <description>row 2 label</description> + <posx>50</posx> + <posy>40</posy> + <width>1180</width> + <height>30</height> + <align>left</align> + <aligny>center</aligny> + <font>font12</font> + <label>-</label> + </control> + <control type="label" id="12"> + <description>row 3 label</description> + <posx>50</posx> + <posy>85</posy> + <width>1180</width> + <height>30</height> + <align>left</align> + <aligny>center</aligny> + <font>font12</font> + <label>-</label> + </control> </control> </controls> </window>
\ No newline at end of file diff --git a/addons/skin.confluence/720p/VideoOSD.xml b/addons/skin.confluence/720p/VideoOSD.xml index 2391231d1e..2215f5896f 100644 --- a/addons/skin.confluence/720p/VideoOSD.xml +++ b/addons/skin.confluence/720p/VideoOSD.xml @@ -1,459 +1,439 @@ -<window type="dialog" id="2901"> +<window id="2901"> <defaultcontrol always="true">602</defaultcontrol> + <include>dialogeffect</include> + <coordinates> + <system>1</system> + <posx>0</posx> + <posy>0</posy> + </coordinates> <controls> - <control type="group"> - <animation effect="fade" start="0" end="100" time="300" tween="quadratic" easing="out">WindowOpen</animation> - <animation effect="fade" start="100" end="0" time="300" delay="150" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="fade" start="100" end="0" time="300" tween="quadratic" easing="out" condition="Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks)">Conditional</animation> - <control type="image"> - <description>media info background image</description> + <control type="slider" id="87"> + <description>Seek Slider</description> + <posx>430</posx> + <posy>72r</posy> + <width>720</width> + <height>16</height> + <onup>702</onup> + <ondown>26</ondown> + <action>seek</action> + <texturesliderbar>seekslider2.png</texturesliderbar> + <textureslidernib>osd_slider_nibNF.png</textureslidernib> + <textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus> + <animation effect="fade" time="200">VisibleChange</animation> + <visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks)]</visible> + </control> + <control type="group" id="100"> + <posx>325</posx> + <posy>50r</posy> + <animation effect="fade" time="200">VisibleChange</animation> + <visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks)]</visible> + <control type="button" id="600"> <posx>0</posx> - <posy>-20</posy> - <width>1280</width> - <height>160</height> - <texture flipy="true">HomeNowPlayingBack.png</texture> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>210</label> + <font>-</font> + <texturefocus>OSDPrevTrackFO.png</texturefocus> + <texturenofocus>OSDPrevTrackNF.png</texturenofocus> + <onleft>704</onleft> + <onright>601</onright> + <onup>600</onup> + <ondown>600</ondown> + <onclick>PlayerControl(Previous)</onclick> </control> - <control type="image"> - <description>media info background image</description> - <posx>0</posx> - <posy>-20</posy> - <width>1280</width> - <height>160</height> - <colordiffuse>88FFFFFF</colordiffuse> - <texture flipy="true">HomeNowPlayingBack.png</texture> + <control type="button" id="601"> + <posx>45</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>31354</label> + <font>-</font> + <texturefocus>OSDRewindFO.png</texturefocus> + <texturenofocus>OSDRewindNF.png</texturenofocus> + <onleft>600</onleft> + <onright>602</onright> + <onup>601</onup> + <ondown>601</ondown> + <onclick>PlayerControl(Rewind)</onclick> </control> - <control type="group" id="200"> - <posx>417</posx> - <posy>4</posy> - <control type="button" id="700"> - <posx>0</posx> - <posy>0</posy> - <width>45</width> - <height>45</height> - <label>298</label> - <font>-</font> - <texturefocus>OSDBookmarksFO.png</texturefocus> - <texturenofocus>OSDBookmarksNF.png</texturenofocus> - <onleft>705</onleft> - <onright>701</onright> - <onup>600</onup> - <ondown>600</ondown> - <onclick>ActivateWindow(125)</onclick> - </control> - <control type="button" id="701"> - <posx>50</posx> - <posy>0</posy> - <width>45</width> - <height>45</height> - <label>13396</label> - <font>-</font> - <texturefocus>OSDAudioFO.png</texturefocus> - <texturenofocus>OSDAudioNF.png</texturenofocus> - <onleft>700</onleft> - <onright>702</onright> - <onup>600</onup> - <ondown>600</ondown> - <onclick>ActivateWindow(124)</onclick> - </control> - <control type="button" id="702"> - <posx>100</posx> - <posy>0</posy> - <width>45</width> - <height>45</height> - <label>13395</label> - <font>-</font> - <texturefocus>OSDVideoFO.png</texturefocus> - <texturenofocus>OSDVideoNF.png</texturenofocus> - <onleft>701</onleft> - <onright>703</onright> - <onup>601</onup> - <ondown>601</ondown> - <onclick>ActivateWindow(123)</onclick> - </control> + <control type="togglebutton" id="602"> + <posx>90</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>31351</label> + <altlabel>208</altlabel> + <font>-</font> + <texturefocus>OSDPauseFO.png</texturefocus> + <texturenofocus>OSDPauseNF.png</texturenofocus> + <usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture> + <alttexturefocus>OSDPlayFO.png</alttexturefocus> + <alttexturenofocus>OSDPlayNF.png</alttexturenofocus> + <onleft>601</onleft> + <onright>603</onright> + <onup>602</onup> + <ondown>602</ondown> + <onclick>PlayerControl(Play)</onclick> </control> - <control type="image" id="11"> - <description>separator image</description> - <posx>567</posx> - <posy>25</posy> - <width>150</width> - <height>1</height> - <colordiffuse>66FFFFFF</colordiffuse> - <texture>separator2.png</texture> + <control type="button" id="603"> + <posx>135</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>31352</label> + <font>-</font> + <texturefocus>OSDStopFO.png</texturefocus> + <texturenofocus>OSDStopNF.png</texturenofocus> + <onleft>602</onleft> + <onright>604</onright> + <onup>603</onup> + <ondown>603</ondown> + <onclick>PlayerControl(Stop)</onclick> </control> - <control type="group" id="201"> - <posx>718</posx> - <posy>4</posy> - <control type="togglebutton" id="703"> - <posx>0</posx> - <posy>0</posy> - <width>45</width> - <height>45</height> - <label>31356</label> - <font>-</font> - <texturefocus>OSDSubtitlesFO.png</texturefocus> - <texturenofocus>OSDSubtitlesNF.png</texturenofocus> - <alttexturefocus>OSDSubtitlesFO.png</alttexturefocus> - <alttexturenofocus>OSDSubtitlesNF.png</alttexturenofocus> - <onleft>702</onleft> - <onright>704</onright> - <onup>604</onup> - <ondown>604</ondown> - <onclick>Close</onclick> - <onclick>XBMC.RunScript($INFO[Skin.String(SubtitleScript_Path)])</onclick> - <altclick>Skin.SetAddon(SubtitleScript_Path,xbmc.python.subtitles)</altclick> - <altclick>Close</altclick> - <altclick>XBMC.RunScript($INFO[Skin.String(SubtitleScript_Path)])</altclick> - <usealttexture>IsEmpty(Skin.String(SubtitleScript_Path))</usealttexture> - </control> - <control type="button" id="704"> - <posx>50</posx> - <posy>0</posy> - <width>45</width> - <height>45</height> - <label>31355</label> - <font>-</font> - <texturefocus>OSDDvdFO.png</texturefocus> - <texturenofocus>OSDDvdNF.png</texturenofocus> - <onleft>703</onleft> - <onright>705</onright> - <onup>605</onup> - <ondown>605</ondown> - <onclick>PlayerControl(ShowVideoMenu)</onclick> - <enable>VideoPlayer.HasMenu</enable> - <animation effect="fade" start="100" end="50" time="100" condition="!VideoPlayer.HasMenu">Conditional</animation> - </control> - <control type="button" id="705"> - <posx>100</posx> - <posy>0</posy> - <width>45</width> - <height>45</height> - <label>264</label> - <font>-</font> - <texturefocus>OSDRecordFO.png</texturefocus> - <texturenofocus>OSDRecordNF.png</texturenofocus> - <onleft>704</onleft> - <onright>700</onright> - <onup>605</onup> - <ondown>605</ondown> - <onclick>XBMC.PlayerControl(record)</onclick> - <enable>Player.CanRecord</enable> - <animation effect="fade" start="100" end="50" time="100" condition="!Player.CanRecord">Conditional</animation> - </control> + <control type="button" id="604"> + <posx>180</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>31353</label> + <font>-</font> + <texturefocus>OSDForwardFO.png</texturefocus> + <texturenofocus>OSDForwardNF.png</texturenofocus> + <onleft>603</onleft> + <onright>605</onright> + <onup>604</onup> + <ondown>604</ondown> + <onclick>PlayerControl(Forward)</onclick> </control> - <control type="group" id="100"> - <posx>490</posx> - <posy>40</posy> - <control type="button" id="600"> - <posx>0</posx> - <posy>0</posy> - <width>50</width> - <height>50</height> - <label>210</label> - <font>-</font> - <texturefocus>OSDPrevTrackFO.png</texturefocus> - <texturenofocus>OSDPrevTrackNF.png</texturenofocus> - <onleft>605</onleft> - <onright>601</onright> - <onup>701</onup> - <ondown>701</ondown> - <onclick>PlayerControl(Previous)</onclick> - </control> - <control type="button" id="601"> - <posx>50</posx> - <posy>0</posy> - <width>50</width> - <height>50</height> - <label>31354</label> - <font>-</font> - <texturefocus>OSDRewindFO.png</texturefocus> - <texturenofocus>OSDRewindNF.png</texturenofocus> - <onleft>600</onleft> - <onright>602</onright> - <onup>702</onup> - <ondown>702</ondown> - <onclick>PlayerControl(Rewind)</onclick> - </control> - <control type="togglebutton" id="602"> - <posx>100</posx> - <posy>0</posy> - <width>50</width> - <height>50</height> - <label>31351</label> - <altlabel>208</altlabel> - <font>-</font> - <texturefocus>OSDPauseFO.png</texturefocus> - <texturenofocus>OSDPauseNF.png</texturenofocus> - <usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture> - <alttexturefocus>OSDPlayFO.png</alttexturefocus> - <alttexturenofocus>OSDPlayNF.png</alttexturenofocus> - <onleft>601</onleft> - <onright>603</onright> - <onup>702</onup> - <ondown>702</ondown> - <onclick>PlayerControl(Play)</onclick> - </control> - <control type="button" id="603"> - <posx>150</posx> - <posy>0</posy> - <width>50</width> - <height>50</height> - <label>31352</label> - <font>-</font> - <texturefocus>OSDStopFO.png</texturefocus> - <texturenofocus>OSDStopNF.png</texturenofocus> - <onleft>602</onleft> - <onright>604</onright> - <onup>703</onup> - <ondown>703</ondown> - <onclick>PlayerControl(Stop)</onclick> - </control> - <control type="button" id="604"> - <posx>200</posx> - <posy>0</posy> - <width>50</width> - <height>50</height> - <label>31353</label> - <font>-</font> - <texturefocus>OSDForwardFO.png</texturefocus> - <texturenofocus>OSDForwardNF.png</texturenofocus> - <onleft>603</onleft> - <onright>605</onright> - <onup>703</onup> - <ondown>703</ondown> - <onclick>PlayerControl(Forward)</onclick> - </control> - <control type="button" id="605"> - <posx>250</posx> - <posy>0</posy> - <width>50</width> - <height>50</height> - <label>209</label> - <font>-</font> - <texturefocus>OSDNextTrackFO.png</texturefocus> - <texturenofocus>OSDNextTrackNF.png</texturenofocus> - <onleft>604</onleft> - <onright>600</onright> - <onup>704</onup> - <ondown>704</ondown> - <onclick>PlayerControl(Next)</onclick> - </control> + <control type="button" id="605"> + <posx>225</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>209</label> + <font>-</font> + <texturefocus>OSDNextTrackFO.png</texturefocus> + <texturenofocus>OSDNextTrackNF.png</texturenofocus> + <onleft>604</onleft> + <onright>701</onright> + <onup>605</onup> + <ondown>605</ondown> + <onclick>PlayerControl(Next)</onclick> </control> - <control type="label"> - <posx>20</posx> - <posy>60</posy> - <width>460</width> - <height>25</height> - <label>$INFO[System.CurrentControl]</label> - <scroll>true</scroll> - <align>left</align> - <aligny>center</aligny> - <font>font12_title</font> - <textcolor>grey</textcolor> - <shadowcolor>black</shadowcolor> - <visible>Window.IsTopmost(VideoOSD)</visible> + </control> + <control type="group"> + <posx>250r</posx> + <posy>50r</posy> + <animation effect="fade" time="200">VisibleChange</animation> + <visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks)]</visible> + <control type="togglebutton" id="701"> + <posx>0</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>31356</label> + <font>-</font> + <texturefocus>OSDSubtitlesFO.png</texturefocus> + <texturenofocus>OSDSubtitlesNF.png</texturenofocus> + <alttexturefocus>OSDSubtitlesFO.png</alttexturefocus> + <alttexturenofocus>OSDSubtitlesNF.png</alttexturenofocus> + <onleft>605</onleft> + <onright>702</onright> + <onup>701</onup> + <ondown>701</ondown> + <onclick>Close</onclick> + <onclick>XBMC.RunScript($INFO[Skin.String(SubtitleScript_Path)])</onclick> + <altclick>Skin.SetAddon(SubtitleScript_Path,xbmc.python.subtitles)</altclick> + <altclick>Close</altclick> + <altclick>XBMC.RunScript($INFO[Skin.String(SubtitleScript_Path)])</altclick> + <usealttexture>IsEmpty(Skin.String(SubtitleScript_Path))</usealttexture> </control> - <control type="group"> - <posx>120r</posx> - <posy>40</posy> - <control type="image"> - <posx>10</posx> - <posy>0</posy> - <width>80</width> - <height>50</height> - <texture>OSDSeekFrame.png</texture> - <visible>Player.Rewinding | Player.Forwarding</visible> - </control> - <control type="image"> - <posx>0</posx> - <posy>3</posy> - <width>20</width> - <height>44</height> - <texture>OSDSeekRewind.png</texture> - <visible>Player.Rewinding</visible> - </control> - <control type="image"> - <posx>80</posx> - <posy>3</posy> - <width>20</width> - <height>44</height> - <texture>OSDSeekForward.png</texture> - <visible>Player.Forwarding</visible> - </control> - - <control type="image"> - <posx>28</posx> - <posy>4</posy> - <width>40</width> - <height>40</height> - <texture>OSD2x.png</texture> - <visible>Player.Rewinding2x</visible> - </control> - <control type="image"> - <posx>25</posx> - <posy>4</posy> - <width>40</width> - <height>40</height> - <texture>OSD4x.png</texture> - <visible>Player.Rewinding4x</visible> - </control> - <control type="image"> - <posx>22</posx> - <posy>4</posy> - <width>40</width> - <height>40</height> - <texture>OSD8x.png</texture> - <visible>Player.Rewinding8x</visible> - </control> - <control type="image"> - <posx>19</posx> - <posy>4</posy> - <width>40</width> - <height>40</height> - <texture>OSD16x.png</texture> - <visible>Player.Rewinding16x</visible> - </control> - <control type="image"> - <posx>17</posx> - <posy>4</posy> - <width>40</width> - <height>40</height> - <texture>OSD32x.png</texture> - <visible>Player.Rewinding32x</visible> - </control> - - <control type="image"> - <posx>34</posx> - <posy>4</posy> - <width>40</width> - <height>40</height> - <texture>OSD2x.png</texture> - <visible>Player.Forwarding2x</visible> - </control> - <control type="image"> - <posx>37</posx> - <posy>4</posy> - <width>40</width> - <height>40</height> - <texture>OSD4x.png</texture> - <visible>Player.Forwarding4x</visible> - </control> - <control type="image"> - <posx>40</posx> - <posy>4</posy> - <width>40</width> - <height>40</height> - <texture>OSD8x.png</texture> - <visible>Player.Forwarding8x</visible> - </control> - <control type="image"> - <posx>43</posx> - <posy>4</posy> - <width>40</width> - <height>40</height> - <texture>OSD16x.png</texture> - <visible>Player.Forwarding16x</visible> - </control> - <control type="image"> - <posx>45</posx> - <posy>4</posy> - <width>40</width> - <height>40</height> - <texture>OSD32x.png</texture> - <visible>Player.Forwarding32x</visible> - </control> + <control type="button" id="702"> + <posx>45</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>13395</label> + <font>-</font> + <texturefocus>OSDVideoFO.png</texturefocus> + <texturenofocus>OSDVideoNF.png</texturenofocus> + <onleft>701</onleft> + <onright>703</onright> + <onup>702</onup> + <ondown>702</ondown> + <onclick>ActivateWindow(OSDVideoSettings)</onclick> </control> - <control type="group"> - <posx>0</posx> + <control type="button" id="703"> + <posx>90</posx> <posy>0</posy> - <animation effect="slide" end="-200,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-200,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>170</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <include>WindowTitleCommons</include> - <posx>140</posx> - <label>31141</label> - </control> + <width>45</width> + <height>45</height> + <label>13396</label> + <font>-</font> + <texturefocus>OSDAudioFO.png</texturefocus> + <texturenofocus>OSDAudioNF.png</texturenofocus> + <onleft>702</onleft> + <onright>704</onright> + <onup>703</onup> + <ondown>703</ondown> + <onclick>ActivateWindow(OSDAudioSettings)</onclick> </control> - <include>Clock</include> - <control type="image"> - <description>media info background image</description> - <posx>0</posx> - <posy>100r</posy> - <width>1280</width> - <height>150</height> - <texture>HomeNowPlayingBack.png</texture> + <control type="button" id="704"> + <posx>135</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>31355</label> + <font>-</font> + <texturefocus>OSDBookmarksFO.png</texturefocus> + <texturenofocus>OSDBookmarksNF.png</texturenofocus> + <onleft>703</onleft> + <onright>705</onright> + <onup>704</onup> + <ondown>704</ondown> + <onclick>ActivateWindow(VideoBookmarks)</onclick> </control> - <control type="image"> - <description>media info background image</description> + <control type="button" id="705"> + <posx>180</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>31355</label> + <font>-</font> + <texturefocus>OSDDvdFO.png</texturefocus> + <texturenofocus>OSDDvdNF.png</texturenofocus> + <onleft>704</onleft> + <onright>600</onright> + <onup>704</onup> + <ondown>704</ondown> + <onclick>PlayerControl(ShowVideoMenu)</onclick> + <enable>VideoPlayer.HasMenu</enable> + <animation effect="fade" start="100" end="50" time="100" condition="!VideoPlayer.HasMenu">Conditional</animation> + </control> + </control> + </controls> + </window> + + <!-- defaultcontrol always="true">402</defaultcontrol> + <include>dialogeffect</include> + <coordinates> + <system>1</system> + <posx>245</posx> + <posy>555</posy> + </coordinates> + <controls> + <control type="image"> + <description>Media Overlay Image</description> + <posx>0</posx> + <posy>0</posy> + <width>790</width> + <height>80</height> + <texture>osd_panel.png</texture> + </control> + <control type="image" id="0"> + <description>popup volume dialog background</description> + <posx>-50</posx> + <posy>75</posy> + <width>890</width> + <height>44</height> + <colordiffuse>DDFFFFFF</colordiffuse> + <texture>volume-panel-bg.png</texture> + </control> + <control type="button" id="600"> + <description>DVD menu button</description> + <posx>10</posx> + <posy>80</posy> + <width>150</width> + <height>30</height> + <font>font12</font> + <label>31003</label> + <focusedcolor>red</focusedcolor> + <align>center</align> + <texturefocus>-</texturefocus> + <texturenofocus>-</texturenofocus> + <onclick>XBMC.PlayerControl(ShowVideoMenu)</onclick> + <enable>VideoPlayer.HasMenu</enable> + <pulseonselect>no</pulseonselect> + <onleft>604</onleft> + <onright>601</onright> + <onup>9000</onup> + <ondown>9000</ondown> + <animation effect="zoom" end="110" center="auto" time="100">focus</animation> + <animation effect="zoom" start="110" center="auto" time="100">unfocus</animation> + </control> + <control type="button" id="601"> + <description>Bookmarks Menu</description> + <posx>165</posx> + <posy>80</posy> + <width>150</width> + <height>30</height> + <label>31004</label> + <focusedcolor>red</focusedcolor> + <font>font12</font> + <align>center</align> + <texturefocus>-</texturefocus> + <texturenofocus>-</texturenofocus> + <onclick>XBMC.ActivateWindow(125)</onclick> + <pulseonselect>no</pulseonselect> + <onleft>600</onleft> + <onright>602</onright> + <onup>9000</onup> + <ondown>9000</ondown> + <animation effect="zoom" end="110" center="auto" time="100">focus</animation> + <animation effect="zoom" start="110" center="auto" time="100">unfocus</animation> + </control> + <control type="button" id="602"> + <description>Playlist Menu</description> + <posx>320</posx> + <posy>80</posy> + <width>150</width> + <height>30</height> + <label>559</label> + <focusedcolor>red</focusedcolor> + <font>font12</font> + <align>center</align> + <texturefocus>-</texturefocus> + <texturenofocus>-</texturenofocus> + <onclick>XBMC.ActivateWindow(MyVideoPlaylist)</onclick> + <onleft>601</onleft> + <onright>603</onright> + <onup>9000</onup> + <ondown>9000</ondown> + <animation effect="zoom" end="110" center="auto" time="100">focus</animation> + <animation effect="zoom" start="110" center="auto" time="100">unfocus</animation> + </control> + <control type="button" id="603"> + <description>Audio Menu</description> + <posx>475</posx> + <posy>80</posy> + <width>150</width> + <height>30</height> + <label>31005</label> + <focusedcolor>red</focusedcolor> + <font>font12</font> + <align>center</align> + <texturefocus>-</texturefocus> + <texturenofocus>-</texturenofocus> + <onclick>XBMC.ActivateWindow(124)</onclick> + <onleft>602</onleft> + <onright>604</onright> + <onup>9000</onup> + <ondown>9000</ondown> + <animation effect="zoom" end="110" center="auto" time="100">focus</animation> + <animation effect="zoom" start="110" center="auto" time="100">unfocus</animation> + </control> + <control type="button" id="604"> + <description>Video Menu</description> + <posx>630</posx> + <posy>80</posy> + <width>150</width> + <height>30</height> + <label>31006</label> + <focusedcolor>red</focusedcolor> + <font>font12</font> + <align>center</align> + <texturefocus>-</texturefocus> + <texturenofocus>-</texturenofocus> + <onclick>XBMC.ActivateWindow(123)</onclick> + <onleft>603</onleft> + <onright>600</onright> + <onup>9000</onup> + <ondown>9000</ondown> + <animation effect="zoom" end="110" center="auto" time="100">focus</animation> + <animation effect="zoom" start="110" center="auto" time="100">unfocus</animation> + </control> + <control type="group" id="9000"> + <posx>220</posx> + <posy>5</posy> + <control type="button" id="400"> <posx>0</posx> - <posy>100r</posy> - <width>1280</width> - <height>150</height> - <colordiffuse>88FFFFFF</colordiffuse> - <texture>HomeNowPlayingBack.png</texture> + <posy>20</posy> + <width>30</width> + <height>30</height> + <label>-</label> + <texturefocus>mediacontrol-skipback.png</texturefocus> + <texturenofocus>mediacontrol-skipback.png</texturenofocus> + <onleft>405</onleft> + <onright>401</onright> + <onup>600</onup> + <ondown>600</ondown> + <onclick>XBMC.PlayerControl(Previous)</onclick> </control> - <control type="label"> - <posx>220</posx> - <posy>50r</posy> - <width>200</width> - <height>25</height> - <label>$INFO[Player.Time]</label> - <scroll>true</scroll> - <align>right</align> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>grey</textcolor> - <shadowcolor>black</shadowcolor> + <control type="button" id="401"> + <posx>78</posx> + <posy>20</posy> + <width>30</width> + <height>30</height> + <label>-</label> + <texturefocus>mediacontrol-rewind.png</texturefocus> + <texturenofocus>mediacontrol-rewind.png</texturenofocus> + <onleft>400</onleft> + <onright>402</onright> + <onup>601</onup> + <ondown>601</ondown> + <onclick>XBMC.PlayerControl(Rewind)</onclick> </control> - <control type="progress"> - <description>ProgressbarCache</description> - <posx>230</posx> - <posy>40r</posy> - <width>820</width> - <height>14</height> - <info>Player.ProgressCache</info> - <midtexture border="6,0,6,0">OSDProgressMidLight.png</midtexture> + <control type="togglebutton" id="402"> + <posx>156</posx> + <posy>15</posy> + <width>40</width> + <height>40</height> + <label>-</label> + <alttexturefocus>mediacontrol-play.png</alttexturefocus> + <alttexturenofocus>mediacontrol-play.png</alttexturenofocus> + <usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture> + <texturefocus>mediacontrol-pause.png</texturefocus> + <texturenofocus>mediacontrol-pause.png</texturenofocus> + <onleft>401</onleft> + <onright>404</onright> + <onup>602</onup> + <ondown>602</ondown> + <onclick>XBMC.PlayerControl(Play)</onclick> </control> - <control type="progress"> - <description>Progressbar</description> - <posx>230</posx> - <posy>40r</posy> - <width>820</width> - <height>14</height> - <info>Player.Progress</info> + <control type="button" id="404"> + <posx>245</posx> + <posy>20</posy> + <width>30</width> + <height>30</height> + <label>-</label> + <texturefocus>mediacontrol-fastforward.png</texturefocus> + <texturenofocus>mediacontrol-fastforward.png</texturenofocus> + <onclick>XBMC.PlayerControl(Forward)</onclick> + <onleft>402</onleft> + <onright>405</onright> + <onup>603</onup> + <ondown>603</ondown> </control> - <control type="slider" id="87"> - <description>Seek Slider</description> - <posx>230</posx> - <posy>44r</posy> - <width>820</width> - <height>17</height> - <onup>702</onup> - <ondown>26</ondown> - <action>seek</action> - <texturesliderbar>seekslider2.png</texturesliderbar> - <textureslidernib>osd_slider_nibNF.png</textureslidernib> - <textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus> + <control type="button" id="405"> + <posx>320</posx> + <posy>20</posy> + <width>30</width> + <height>30</height> + <label>-</label> + <texturefocus>mediacontrol-skipforward.png</texturefocus> + <texturenofocus>mediacontrol-skipforward.png</texturenofocus> + <onclick>XBMC.PlayerControl(Next)</onclick> + <onleft>404</onleft> + <onright>400</onright> + <onup>604</onup> + <ondown>604</ondown> </control> - <control type="label"> - <posx>220r</posx> - <posy>50r</posy> - <width>200</width> - <height>25</height> - <label>$INFO[Player.Duration]</label> - <scroll>true</scroll> - <align>left</align> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>grey</textcolor> - <shadowcolor>black</shadowcolor> + <control type="image"> + <description>Chrome Button Guy</description> + <posx>135</posx> + <posy>-5</posy> + <width>80</width> + <height>80</height> + <aspectratio>keep</aspectratio> + <texture>OSD_Button.png</texture> + <visible>ControlGroup(9000).HasFocus</visible> + <animation effect="fade" time="100">VisibleChange</animation> + <animation effect="slide" end="-160" time="100" condition="Control.HasFocus(400)">Conditional</animation> + <animation effect="slide" end="-80" time="100" condition="Control.HasFocus(401)">Conditional</animation> + <animation effect="slide" end="80" time="100" condition="Control.HasFocus(404)">Conditional</animation> + <animation effect="slide" end="160" time="100" condition="Control.HasFocus(405)">Conditional</animation> </control> </control> </controls> -</window> +</window -->
\ No newline at end of file diff --git a/addons/skin.confluence/media/flagging/audio/ac3.png b/addons/skin.confluence/media/flagging/audio/ac3.png Binary files differindex ccffb8a400..c3bbba8a71 100644 --- a/addons/skin.confluence/media/flagging/audio/ac3.png +++ b/addons/skin.confluence/media/flagging/audio/ac3.png |