aboutsummaryrefslogtreecommitdiff
path: root/addons/skin.confluence
diff options
context:
space:
mode:
Diffstat (limited to 'addons/skin.confluence')
-rw-r--r--addons/skin.confluence/720p/DialogAlbumInfo.xml16
-rw-r--r--addons/skin.confluence/720p/DialogButtonMenu.xml4
-rw-r--r--addons/skin.confluence/720p/DialogVideoInfo.xml26
-rw-r--r--addons/skin.confluence/720p/MusicOSD.xml72
-rw-r--r--addons/skin.confluence/720p/MusicVisualisation.xml1
-rw-r--r--addons/skin.confluence/720p/VideoFullScreen.xml1
-rw-r--r--addons/skin.confluence/720p/VideoOSD.xml64
-rw-r--r--addons/skin.confluence/720p/includes.xml6
8 files changed, 120 insertions, 70 deletions
diff --git a/addons/skin.confluence/720p/DialogAlbumInfo.xml b/addons/skin.confluence/720p/DialogAlbumInfo.xml
index f5be3d16f3..cff6982f01 100644
--- a/addons/skin.confluence/720p/DialogAlbumInfo.xml
+++ b/addons/skin.confluence/720p/DialogAlbumInfo.xml
@@ -39,7 +39,7 @@
<posy>50</posy>
<width>1030</width>
<height>30</height>
- <font>font35_title</font>
+ <font>font24_title</font>
<label>$INFO[Listitem.Album]</label>
<align>center</align>
<aligny>center</aligny>
@@ -53,7 +53,7 @@
<posy>50</posy>
<width>1030</width>
<height>30</height>
- <font>font35_title</font>
+ <font>font24_title</font>
<label>$INFO[Listitem.Artist]</label>
<align>center</align>
<aligny>center</aligny>
@@ -138,7 +138,7 @@
<posy>0</posy>
<width>160</width>
<height>30</height>
- <font>font13_title</font>
+ <font>font13</font>
<align>right</align>
<aligny>center</aligny>
<textcolor>blue</textcolor>
@@ -173,7 +173,7 @@
<posy>0</posy>
<width>160</width>
<height>30</height>
- <font>font13_title</font>
+ <font>font13</font>
<align>right</align>
<aligny>center</aligny>
<textcolor>blue</textcolor>
@@ -291,7 +291,7 @@
<posy>0</posy>
<width>160</width>
<height>30</height>
- <font>font13_title</font>
+ <font>font13</font>
<align>right</align>
<aligny>center</aligny>
<textcolor>blue</textcolor>
@@ -326,7 +326,7 @@
<posy>0</posy>
<width>160</width>
<height>30</height>
- <font>font13_title</font>
+ <font>font13</font>
<align>right</align>
<aligny>center</aligny>
<textcolor>blue</textcolor>
@@ -549,7 +549,7 @@
<width>430</width>
<height>40</height>
<visible>Control.HasFocus(50)</visible>
- <texture border="5">button-focus.png</texture>
+ <texture border="5">button-focus2.png</texture>
</control>
<control type="label">
<posx>10</posx>
@@ -609,7 +609,7 @@
<width>430</width>
<height>40</height>
<visible>Control.HasFocus(50)</visible>
- <texture border="5">button-focus.png</texture>
+ <texture border="5">button-focus2.png</texture>
</control>
<control type="label">
<posx>10</posx>
diff --git a/addons/skin.confluence/720p/DialogButtonMenu.xml b/addons/skin.confluence/720p/DialogButtonMenu.xml
index 939f55eeed..ec8487b52e 100644
--- a/addons/skin.confluence/720p/DialogButtonMenu.xml
+++ b/addons/skin.confluence/720p/DialogButtonMenu.xml
@@ -135,6 +135,7 @@
<pulseonselect>no</pulseonselect>
<font>-</font>
<label>$LOCALIZE[13012]</label>
+ <visible>System.ShowExitButton</visible>
</control>
<control type="group" id="13">
<width>90</width>
@@ -225,7 +226,8 @@
</control>
</control>
<control type="group">
- <posx>270</posx>
+ <include condition="System.ShowExitButton">ExitButtonOffset</include>
+ <include condition="!System.ShowExitButton">NoExitButtonOffset</include>
<posy>70</posy>
<visible>ControlGroup(13).HasFocus</visible>
<include>VisibleFadeEffect</include>
diff --git a/addons/skin.confluence/720p/DialogVideoInfo.xml b/addons/skin.confluence/720p/DialogVideoInfo.xml
index 4af3e0f687..190863b0c7 100644
--- a/addons/skin.confluence/720p/DialogVideoInfo.xml
+++ b/addons/skin.confluence/720p/DialogVideoInfo.xml
@@ -36,10 +36,10 @@
<control type="label">
<description>header label</description>
<posx>210</posx>
- <posy>50</posy>
+ <posy>40</posy>
<width>1030</width>
<height>30</height>
- <font>font35_title</font>
+ <font>font24_title</font>
<label>$INFO[Listitem.Title]</label>
<align>center</align>
<aligny>center</aligny>
@@ -191,7 +191,7 @@
<posy>0</posy>
<width>160</width>
<height>30</height>
- <font>font13_title</font>
+ <font>font13</font>
<align>right</align>
<aligny>center</aligny>
<textcolor>blue</textcolor>
@@ -226,7 +226,7 @@
<posy>0</posy>
<width>160</width>
<height>30</height>
- <font>font13_title</font>
+ <font>font13</font>
<align>right</align>
<aligny>center</aligny>
<textcolor>blue</textcolor>
@@ -371,7 +371,7 @@
<posy>0</posy>
<width>160</width>
<height>30</height>
- <font>font13_title</font>
+ <font>font13</font>
<align>right</align>
<aligny>center</aligny>
<textcolor>blue</textcolor>
@@ -406,7 +406,7 @@
<posy>0</posy>
<width>160</width>
<height>30</height>
- <font>font13_title</font>
+ <font>font13</font>
<align>right</align>
<aligny>center</aligny>
<textcolor>blue</textcolor>
@@ -515,7 +515,7 @@
<posy>0</posy>
<width>160</width>
<height>30</height>
- <font>font13_title</font>
+ <font>font13</font>
<align>right</align>
<aligny>center</aligny>
<textcolor>blue</textcolor>
@@ -550,7 +550,7 @@
<posy>0</posy>
<width>160</width>
<height>30</height>
- <font>font13_title</font>
+ <font>font13</font>
<align>right</align>
<aligny>center</aligny>
<textcolor>blue</textcolor>
@@ -660,7 +660,7 @@
<posy>0</posy>
<width>160</width>
<height>30</height>
- <font>font13_title</font>
+ <font>font13</font>
<align>right</align>
<aligny>center</aligny>
<textcolor>blue</textcolor>
@@ -695,7 +695,7 @@
<posy>0</posy>
<width>160</width>
<height>30</height>
- <font>font13_title</font>
+ <font>font13</font>
<align>right</align>
<aligny>center</aligny>
<textcolor>blue</textcolor>
@@ -825,7 +825,7 @@
<posy>0</posy>
<width>160</width>
<height>30</height>
- <font>font13_title</font>
+ <font>font13</font>
<align>right</align>
<aligny>center</aligny>
<textcolor>blue</textcolor>
@@ -860,7 +860,7 @@
<posy>0</posy>
<width>160</width>
<height>30</height>
- <font>font13_title</font>
+ <font>font13</font>
<align>right</align>
<aligny>center</aligny>
<textcolor>blue</textcolor>
@@ -1059,7 +1059,7 @@
<width>430</width>
<height>40</height>
<visible>Control.HasFocus(50)</visible>
- <texture border="5">button-focus.png</texture>
+ <texture border="5">button-focus2.png</texture>
</control>
<control type="label">
<posx>10</posx>
diff --git a/addons/skin.confluence/720p/MusicOSD.xml b/addons/skin.confluence/720p/MusicOSD.xml
index 7ed544cb8e..c9ae71089c 100644
--- a/addons/skin.confluence/720p/MusicOSD.xml
+++ b/addons/skin.confluence/720p/MusicOSD.xml
@@ -7,6 +7,26 @@
<posy>0</posy>
</coordinates>
<controls>
+ <control type="button" id="1000">
+ <description>Close Window button</description>
+ <posx>84r</posx>
+ <posy>0</posy>
+ <width>64</width>
+ <height>32</height>
+ <label>-</label>
+ <font>-</font>
+ <onclick>Dialog.Close(MusicOSD,true)</onclick>
+ <onclick>FullScreen</onclick>
+ <texturefocus>DialogCloseButton-focus.png</texturefocus>
+ <texturenofocus>DialogCloseButton.png</texturenofocus>
+ <onleft>1000</onleft>
+ <onright>1000</onright>
+ <onup>100</onup>
+ <ondown>100</ondown>
+ <visible>system.getbool(input.enablemouse)</visible>
+ <animation effect="fade" time="200">VisibleChange</animation>
+ <visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList)]</visible>
+ </control>
<control type="slider" id="87">
<description>Seek Slider</description>
<posx>430</posx>
@@ -38,8 +58,8 @@
<texturenofocus>OSDPrevTrackNF.png</texturenofocus>
<onleft>704</onleft>
<onright>601</onright>
- <onup>600</onup>
- <ondown>600</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
<onclick>PlayerControl(Previous)</onclick>
</control>
<control type="button" id="601">
@@ -53,8 +73,8 @@
<texturenofocus>OSDRewindNF.png</texturenofocus>
<onleft>600</onleft>
<onright>602</onright>
- <onup>601</onup>
- <ondown>601</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
<onclick>PlayerControl(Rewind)</onclick>
</control>
<control type="togglebutton" id="602">
@@ -72,8 +92,8 @@
<alttexturenofocus>OSDPlayNF.png</alttexturenofocus>
<onleft>601</onleft>
<onright>603</onright>
- <onup>602</onup>
- <ondown>602</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
<onclick>PlayerControl(Play)</onclick>
</control>
<control type="button" id="603">
@@ -87,8 +107,8 @@
<texturenofocus>OSDStopNF.png</texturenofocus>
<onleft>602</onleft>
<onright>604</onright>
- <onup>603</onup>
- <ondown>603</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
<onclick>PlayerControl(Stop)</onclick>
</control>
<control type="button" id="604">
@@ -102,8 +122,8 @@
<texturenofocus>OSDForwardNF.png</texturenofocus>
<onleft>603</onleft>
<onright>605</onright>
- <onup>604</onup>
- <ondown>604</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
<onclick>PlayerControl(Forward)</onclick>
</control>
<control type="button" id="605">
@@ -117,8 +137,8 @@
<texturenofocus>OSDNextTrackNF.png</texturenofocus>
<onleft>604</onleft>
<onright>606</onright>
- <onup>605</onup>
- <ondown>605</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
<onclick>PlayerControl(Next)</onclick>
</control>
<control type="button" id="606">
@@ -133,8 +153,8 @@
<onclick>XBMC.PlayerControl(Repeat)</onclick>
<onleft>605</onleft>
<onright>607</onright>
- <onup>606</onup>
- <ondown>606</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
</control>
<control type="image">
<posx>270</posx>
@@ -205,8 +225,8 @@
<onclick>XBMC.PlayerControl(Random)</onclick>
<onleft>606</onleft>
<onright>701</onright>
- <onup>607</onup>
- <ondown>607</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
</control>
</control>
<control type="group">
@@ -227,8 +247,8 @@
<alttexturenofocus>OSDLyricsNF.png</alttexturenofocus>
<onleft>607</onleft>
<onright>500</onright>
- <onup>701</onup>
- <ondown>701</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
<onclick>Close</onclick>
<onclick>XBMC.RunScript($INFO[Skin.String(LyricScript_Path)])</onclick>
<altclick>Skin.SetAddon(LyricScript_Path,xbmc.python.lyrics)</altclick>
@@ -247,8 +267,8 @@
<texturenofocus>OSDVizNF.png</texturenofocus>
<onleft>701</onleft>
<onright>702</onright>
- <onup>500</onup>
- <ondown>500</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
</control>
<control type="button" id="702">
<posx>90</posx>
@@ -261,8 +281,8 @@
<texturenofocus>OSDPresetSettingsNF.png</texturenofocus>
<onleft>500</onleft>
<onright>703</onright>
- <onup>702</onup>
- <ondown>702</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
<onclick>Addon.Default.OpenSettings(xbmc.player.musicviz)</onclick>
</control>
<control type="button" id="703">
@@ -276,8 +296,8 @@
<texturenofocus>OSDPreNF.png</texturenofocus>
<onleft>702</onleft>
<onright>704</onright>
- <onup>703</onup>
- <ondown>703</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
<onclick>ActivateWindow(122)</onclick>
</control>
<control type="button" id="704">
@@ -291,8 +311,8 @@
<texturenofocus>OSDRecordNF.png</texturenofocus>
<onleft>703</onleft>
<onright>600</onright>
- <onup>704</onup>
- <ondown>704</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
<onclick>XBMC.PlayerControl(record)</onclick>
<enable>Player.CanRecord</enable>
<animation effect="fade" start="100" end="50" time="100" condition="!Player.CanRecord">Conditional</animation>
diff --git a/addons/skin.confluence/720p/MusicVisualisation.xml b/addons/skin.confluence/720p/MusicVisualisation.xml
index b1af1995d0..270be1c062 100644
--- a/addons/skin.confluence/720p/MusicVisualisation.xml
+++ b/addons/skin.confluence/720p/MusicVisualisation.xml
@@ -61,6 +61,7 @@
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
<label>$INFO[System.Time]</label>
+ <animation effect="slide" start="0,0" end="-70,0" time="0" condition="Window.IsVisible(MusicOSD)">conditional</animation>
</control>
<control type="image">
<posx>0</posx>
diff --git a/addons/skin.confluence/720p/VideoFullScreen.xml b/addons/skin.confluence/720p/VideoFullScreen.xml
index eb4025eef2..e12ec819f6 100644
--- a/addons/skin.confluence/720p/VideoFullScreen.xml
+++ b/addons/skin.confluence/720p/VideoFullScreen.xml
@@ -38,6 +38,7 @@
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
<label>$INFO[System.Time]</label>
+ <animation effect="slide" start="0,0" end="-70,0" time="0" condition="Window.IsVisible(VideoOSD)">conditional</animation>
</control>
<control type="image" id="1">
<posx>0</posx>
diff --git a/addons/skin.confluence/720p/VideoOSD.xml b/addons/skin.confluence/720p/VideoOSD.xml
index 904b01248e..60ef158d1c 100644
--- a/addons/skin.confluence/720p/VideoOSD.xml
+++ b/addons/skin.confluence/720p/VideoOSD.xml
@@ -7,6 +7,26 @@
<posy>0</posy>
</coordinates>
<controls>
+ <control type="button" id="1000">
+ <description>Close Window button</description>
+ <posx>84r</posx>
+ <posy>0</posy>
+ <width>64</width>
+ <height>32</height>
+ <label>-</label>
+ <font>-</font>
+ <onclick>Dialog.Close(VideoOSD,true)</onclick>
+ <onclick>FullScreen</onclick>
+ <texturefocus>DialogCloseButton-focus.png</texturefocus>
+ <texturenofocus>DialogCloseButton.png</texturenofocus>
+ <onleft>1000</onleft>
+ <onright>1000</onright>
+ <onup>100</onup>
+ <ondown>100</ondown>
+ <visible>system.getbool(input.enablemouse)</visible>
+ <animation effect="fade" time="200">VisibleChange</animation>
+ <visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks)]</visible>
+ </control>
<control type="slider" id="87">
<description>Seek Slider</description>
<posx>430</posx>
@@ -38,8 +58,8 @@
<texturenofocus>OSDPrevTrackNF.png</texturenofocus>
<onleft>705</onleft>
<onright>601</onright>
- <onup>600</onup>
- <ondown>600</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
<onclick>PlayerControl(Previous)</onclick>
</control>
<control type="button" id="601">
@@ -53,8 +73,8 @@
<texturenofocus>OSDRewindNF.png</texturenofocus>
<onleft>600</onleft>
<onright>602</onright>
- <onup>601</onup>
- <ondown>601</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
<onclick>PlayerControl(Rewind)</onclick>
</control>
<control type="togglebutton" id="602">
@@ -72,8 +92,8 @@
<alttexturenofocus>OSDPlayNF.png</alttexturenofocus>
<onleft>601</onleft>
<onright>603</onright>
- <onup>602</onup>
- <ondown>602</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
<onclick>PlayerControl(Play)</onclick>
</control>
<control type="button" id="603">
@@ -87,8 +107,8 @@
<texturenofocus>OSDStopNF.png</texturenofocus>
<onleft>602</onleft>
<onright>604</onright>
- <onup>603</onup>
- <ondown>603</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
<onclick>PlayerControl(Stop)</onclick>
</control>
<control type="button" id="604">
@@ -102,8 +122,8 @@
<texturenofocus>OSDForwardNF.png</texturenofocus>
<onleft>603</onleft>
<onright>605</onright>
- <onup>604</onup>
- <ondown>604</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
<onclick>PlayerControl(Forward)</onclick>
</control>
<control type="button" id="605">
@@ -117,8 +137,8 @@
<texturenofocus>OSDNextTrackNF.png</texturenofocus>
<onleft>604</onleft>
<onright>701</onright>
- <onup>605</onup>
- <ondown>605</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
<onclick>PlayerControl(Next)</onclick>
</control>
</control>
@@ -140,8 +160,8 @@
<alttexturenofocus>OSDSubtitlesNF.png</alttexturenofocus>
<onleft>605</onleft>
<onright>702</onright>
- <onup>701</onup>
- <ondown>701</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
<onclick>Close</onclick>
<onclick>XBMC.RunScript($INFO[Skin.String(SubtitleScript_Path)])</onclick>
<altclick>Skin.SetAddon(SubtitleScript_Path,xbmc.python.subtitles)</altclick>
@@ -160,8 +180,8 @@
<texturenofocus>OSDVideoNF.png</texturenofocus>
<onleft>701</onleft>
<onright>703</onright>
- <onup>702</onup>
- <ondown>702</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
<onclick>ActivateWindow(OSDVideoSettings)</onclick>
</control>
<control type="button" id="703">
@@ -175,8 +195,8 @@
<texturenofocus>OSDAudioNF.png</texturenofocus>
<onleft>702</onleft>
<onright>704</onright>
- <onup>703</onup>
- <ondown>703</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
<onclick>ActivateWindow(OSDAudioSettings)</onclick>
</control>
<control type="button" id="704">
@@ -190,8 +210,8 @@
<texturenofocus>OSDBookmarksNF.png</texturenofocus>
<onleft>703</onleft>
<onright>705</onright>
- <onup>704</onup>
- <ondown>704</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
<onclick>ActivateWindow(VideoBookmarks)</onclick>
</control>
<control type="button" id="705">
@@ -205,8 +225,8 @@
<texturenofocus>OSDDvdNF.png</texturenofocus>
<onleft>704</onleft>
<onright>600</onright>
- <onup>704</onup>
- <ondown>704</ondown>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
<onclick>PlayerControl(ShowVideoMenu)</onclick>
<enable>VideoPlayer.HasMenu</enable>
<animation effect="fade" start="100" end="50" time="100" condition="!VideoPlayer.HasMenu">Conditional</animation>
diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml
index 2f6e597c2f..72e8fba66b 100644
--- a/addons/skin.confluence/720p/includes.xml
+++ b/addons/skin.confluence/720p/includes.xml
@@ -779,4 +779,10 @@
<animation effect="fade" time="300">Visible</animation>
<animation effect="fade" time="300">Hidden</animation>
</include>
+ <include name="ExitButtonOffset">
+ <posx>270</posx>
+ </include>
+ <include name="NoExitButtonOffset">
+ <posx>215</posx>
+ </include>
</includes>
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-25 22:14:30 +0000