Skip to content

Commit

Permalink
Added: [Confluence] Close full screen playback (minimize) buttons to …
Browse files Browse the repository at this point in the history 
…top right MusicOSD.xml and VideoOSD.xml. Useful for Mouse users or people with limited remotes (you can navigate to it)
  • Loading branch information
@JezzX
JezzX committed May 18, 2011
1 parent e4349a5 commit 4744e32
Show file tree
Hide file tree
Showing 4 changed files with 90 additions and 48 deletions.
72 changes: 46 additions & 26 deletions addons/skin.confluence/720p/MusicOSD.xml
View file
Expand Up @@ -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>
Expand Down Expand Up @@ -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">
Expand All @@ -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">
Expand All @@ -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">
Expand All @@ -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">
Expand All @@ -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">
Expand All @@ -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">
Expand All @@ -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>
Expand Down Expand Up @@ -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">
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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">
Expand All @@ -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">
Expand All @@ -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>
Expand Down
1 change: 1 addition & 0 deletions addons/skin.confluence/720p/MusicVisualisation.xml
View file
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions addons/skin.confluence/720p/VideoFullScreen.xml
View file
Expand Up @@ -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>
Expand Down
64 changes: 42 additions & 22 deletions addons/skin.confluence/720p/VideoOSD.xml
View file
Expand Up @@ -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>
Expand Down Expand Up @@ -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">
Expand All @@ -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">
Expand All @@ -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">
Expand All @@ -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">
Expand All @@ -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">
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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">
Expand All @@ -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">
Expand All @@ -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">
Expand All @@ -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>
Expand Down

2 comments on commit 4744e32

@Hitcher
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm glad you just added this because I tried to do the same thing for XeeBo but couldn't get it to work and now I know why - I was using Close + Fullscreen instead of Dialog.Close() + Fullscreen.

Cheers Jezz.

@JezzX
Copy link
Contributor Author

@JezzX JezzX commented on 4744e32 May 18, 2011

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your welcome :) the force close on the dialog is needed too because so the fullscreen command happens in the main windows and not the dialogs for some reason

Please sign in to comment.