diff options
author | Jezz_X <jezzx2@gmail.com> | 2012-03-28 22:46:10 +1100 |
---|---|---|
committer | Jezz_X <jezzx2@gmail.com> | 2012-04-25 09:50:32 +1000 |
commit | 113e973e9060999491122fabd6b611a40d95a6c2 (patch) | |
tree | e2f868804c388c8bb19f022ae60faf9468c1ce76 /addons/skin.confluence/720p | |
parent | 15c52510561fb56c2a04ea2463d6aa79b0d826ec (diff) |
Added: [Confluence] Better mouse/touch support
Diffstat (limited to 'addons/skin.confluence/720p')
21 files changed, 241 insertions, 66 deletions
diff --git a/addons/skin.confluence/720p/AddonBrowser.xml b/addons/skin.confluence/720p/AddonBrowser.xml index 9e1d93c1d4..ccd1a2a18c 100644 --- a/addons/skin.confluence/720p/AddonBrowser.xml +++ b/addons/skin.confluence/720p/AddonBrowser.xml @@ -14,6 +14,7 @@ </control> <include>CommonPageCount</include> <include>CommonNowPlaying</include> + <include>MainWindowMouseButtons</include> <include>BehindDialogFadeOut</include> <include>ScrollOffsetLabel</include> <control type="image"> diff --git a/addons/skin.confluence/720p/FileManager.xml b/addons/skin.confluence/720p/FileManager.xml index 53a4487155..399735374c 100644 --- a/addons/skin.confluence/720p/FileManager.xml +++ b/addons/skin.confluence/720p/FileManager.xml @@ -406,6 +406,65 @@ <shadowcolor>black</shadowcolor> <label>([COLOR=blue]$INFO[Container(21).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(21).CurrentPage]/$INFO[Container(21).NumPages][/COLOR])</label> </control> + <control type="group" id="10"> + <posx>595</posx> + <posy>55r</posy> + <include>Window_OpenClose_Animation</include> + <visible>system.getbool(input.enablemouse)</visible> + <include>Window_OpenClose_Animation</include> + <control type="button"> + <description>Back push button</description> + <posx>0</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>1036</label> + <font>-</font> + <aligny>-</aligny> + <onclick>back</onclick> + <texturefocus border="5">floor_buttonFO.png</texturefocus> + <texturenofocus border="5">floor_button.png</texturenofocus> + <onleft>50</onleft> + <onright>50</onright> + <onup>50</onup> + <ondown>50</ondown> + </control> + <control type="image"> + <description>Back Icon</description> + <posx>5</posx> + <posy>5</posy> + <width>35</width> + <height>35</height> + <aspectratio>keep</aspectratio> + <texture>icon_back.png</texture> + </control> + <control type="button"> + <description>Home push button</description> + <posx>55</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>31003</label> + <font>-</font> + <aligny>-</aligny> + <onclick>ActivateWindow(home)</onclick> + <texturefocus border="5">floor_buttonFO.png</texturefocus> + <texturenofocus border="5">floor_button.png</texturenofocus> + <onleft>50</onleft> + <onright>50</onright> + <onup>50</onup> + <ondown>50</ondown> + </control> + <control type="image"> + <description>Home Icon</description> + <posx>60</posx> + <posy>5</posy> + <width>35</width> + <height>35</height> + <aspectratio>keep</aspectratio> + <texture>icon_home.png</texture> + </control> + </control> <include>Clock</include> </controls> </window>
\ No newline at end of file diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml index 84a8d034f7..a8584e0f72 100644 --- a/addons/skin.confluence/720p/Home.xml +++ b/addons/skin.confluence/720p/Home.xml @@ -678,6 +678,7 @@ <control type="fixedlist" id="9002"> <animation effect="slide" start="0,0" end="-91,0" time="0" condition="StringCompare(Container(9002).NumItems,2) | StringCompare(Container(9002).NumItems,4)">conditional</animation> <include>Window_OpenClose_Animation</include> + <hitrect x="0" y="530" w="1280" h="120" /> <posx>0</posx> <posy>190r</posy> <width>1280</width> @@ -951,50 +952,61 @@ </control> </control> <control type="group" id="10"> - <posx>0</posx> - <posy>60r</posy> + <posx>20</posx> + <posy>55r</posy> <include>Window_OpenClose_Animation</include> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>150</width> - <height>60</height> - <texture>HomeButtonsBack.png</texture> - </control> <control type="button" id="20"> <description>Power push button</description> <posx>55</posx> - <posy>15</posy> - <width>43</width> - <height>43</height> + <posy>0</posy> + <width>45</width> + <height>45</height> <label>31003</label> <font>-</font> <aligny>-</aligny> <onclick>ActivateWindow(ShutdownMenu)</onclick> - <texturefocus>home-power-FO.png</texturefocus> - <texturenofocus>home-power.png</texturenofocus> + <texturefocus border="5">floor_buttonFO.png</texturefocus> + <texturenofocus border="5">floor_button.png</texturenofocus> <onleft>21</onleft> <onright>21</onright> <onup>9002</onup> <ondown>9003</ondown> </control> + <control type="image"> + <description>Power Icon</description> + <posx>60</posx> + <posy>5</posy> + <width>35</width> + <height>35</height> + <aspectratio>keep</aspectratio> + <texture>icon_power.png</texture> + </control> <control type="button" id="21"> <description>Favourites push button</description> - <posx>10</posx> - <posy>15</posy> - <width>43</width> - <height>43</height> + <posx>0</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> <label>1036</label> <font>-</font> <aligny>-</aligny> <onclick>ActivateWindow(Favourites)</onclick> - <texturefocus>home-favourites-FO.png</texturefocus> - <texturenofocus>home-favourites.png</texturenofocus> + <texturefocus border="5">floor_buttonFO.png</texturefocus> + <texturenofocus border="5">floor_button.png</texturenofocus> <onleft>20</onleft> <onright>20</onright> <onup>9002</onup> <ondown>9003</ondown> </control> + <control type="image"> + <description>Favourites Icon</description> + <posx>5</posx> + <posy>5</posy> + <width>35</width> + <height>35</height> + <aspectratio>keep</aspectratio> + <texture>icon_favourites.png</texture> + </control> </control> <control type="group"> <posx>20</posx> diff --git a/addons/skin.confluence/720p/MyMusicNav.xml b/addons/skin.confluence/720p/MyMusicNav.xml index 81e3cff33b..b906bbe899 100644 --- a/addons/skin.confluence/720p/MyMusicNav.xml +++ b/addons/skin.confluence/720p/MyMusicNav.xml @@ -20,6 +20,7 @@ </control> <include>CommonPageCount</include> <include>CommonNowPlaying</include> + <include>MainWindowMouseButtons</include> <include>BehindDialogFadeOut</include> <include>ScrollOffsetLabel</include> <control type="image"> diff --git a/addons/skin.confluence/720p/MyMusicPlaylist.xml b/addons/skin.confluence/720p/MyMusicPlaylist.xml index 8174adce7e..c13c13509b 100644 --- a/addons/skin.confluence/720p/MyMusicPlaylist.xml +++ b/addons/skin.confluence/720p/MyMusicPlaylist.xml @@ -13,6 +13,7 @@ </control> <include>CommonPageCount</include> <include>CommonNowPlaying</include> + <include>MainWindowMouseButtons</include> <include>BehindDialogFadeOut</include> <include>ScrollOffsetLabel</include> <control type="image"> diff --git a/addons/skin.confluence/720p/MyMusicSongs.xml b/addons/skin.confluence/720p/MyMusicSongs.xml index 1f3fcc830d..b5c449516b 100644 --- a/addons/skin.confluence/720p/MyMusicSongs.xml +++ b/addons/skin.confluence/720p/MyMusicSongs.xml @@ -16,6 +16,7 @@ </control> <include>CommonPageCount</include> <include>CommonNowPlaying</include> + <include>MainWindowMouseButtons</include> <include>BehindDialogFadeOut</include> <include>ScrollOffsetLabel</include> <control type="image"> diff --git a/addons/skin.confluence/720p/MyPics.xml b/addons/skin.confluence/720p/MyPics.xml index 89d4271ba0..7301d5e8c4 100644 --- a/addons/skin.confluence/720p/MyPics.xml +++ b/addons/skin.confluence/720p/MyPics.xml @@ -29,6 +29,7 @@ </control> <include>CommonPageCount</include> <include>CommonNowPlaying</include> + <include>MainWindowMouseButtons</include> <include>BehindDialogFadeOut</include> <include>ScrollOffsetLabel</include> <control type="image"> diff --git a/addons/skin.confluence/720p/MyPrograms.xml b/addons/skin.confluence/720p/MyPrograms.xml index 7fec3fc0ca..e1b8f699ea 100644 --- a/addons/skin.confluence/720p/MyPrograms.xml +++ b/addons/skin.confluence/720p/MyPrograms.xml @@ -15,6 +15,7 @@ </control> <include>CommonPageCount</include> <include>CommonNowPlaying</include> + <include>MainWindowMouseButtons</include> <include>BehindDialogFadeOut</include> <include>ScrollOffsetLabel</include> <control type="image"> diff --git a/addons/skin.confluence/720p/MyVideoNav.xml b/addons/skin.confluence/720p/MyVideoNav.xml index 2e2de5d0c9..58aca0c531 100644 --- a/addons/skin.confluence/720p/MyVideoNav.xml +++ b/addons/skin.confluence/720p/MyVideoNav.xml @@ -23,6 +23,7 @@ </control> <include>CommonPageCount</include> <include>CommonNowPlaying</include> + <include>MainWindowMouseButtons</include> <include>BehindDialogFadeOut</include> <include>ScrollOffsetLabel</include> <control type="image"> diff --git a/addons/skin.confluence/720p/MyVideoPlaylist.xml b/addons/skin.confluence/720p/MyVideoPlaylist.xml index 9da9ea41d4..645702707e 100644 --- a/addons/skin.confluence/720p/MyVideoPlaylist.xml +++ b/addons/skin.confluence/720p/MyVideoPlaylist.xml @@ -12,6 +12,7 @@ </control> <include>CommonPageCount</include> <include>CommonNowPlaying</include> + <include>MainWindowMouseButtons</include> <include>BehindDialogFadeOut</include> <include>ScrollOffsetLabel</include> <control type="image"> diff --git a/addons/skin.confluence/720p/MyWeather.xml b/addons/skin.confluence/720p/MyWeather.xml index e9cd2a3508..3b5346164a 100644 --- a/addons/skin.confluence/720p/MyWeather.xml +++ b/addons/skin.confluence/720p/MyWeather.xml @@ -804,6 +804,7 @@ </control> </control> <include>CommonNowPlaying</include> + <include>MainWindowMouseButtons</include> <control type="group"> <posx>-250</posx> <include>SideBladeLeft</include> diff --git a/addons/skin.confluence/720p/PlayerControls.xml b/addons/skin.confluence/720p/PlayerControls.xml index 7f1899e238..4b0a3238ab 100644 --- a/addons/skin.confluence/720p/PlayerControls.xml +++ b/addons/skin.confluence/720p/PlayerControls.xml @@ -228,5 +228,22 @@ <visible>Player.HasVideo</visible> <include>SmallVideoInfo</include> </control> + <control type="button"> + <description>Close Window button</description> + <posx>420</posx> + <posy>5</posy> + <width>64</width> + <height>32</height> + <label>-</label> + <font>-</font> + <onclick>back</onclick> + <texturefocus>DialogCloseButton-focus.png</texturefocus> + <texturenofocus>DialogCloseButton.png</texturenofocus> + <onleft>100</onleft> + <onright>100</onright> + <onup>100</onup> + <ondown>100</ondown> + <visible>system.getbool(input.enablemouse)</visible> + </control> </controls> </window>
\ No newline at end of file diff --git a/addons/skin.confluence/720p/Settings.xml b/addons/skin.confluence/720p/Settings.xml index 2110ffff4d..4d9c6520fc 100644 --- a/addons/skin.confluence/720p/Settings.xml +++ b/addons/skin.confluence/720p/Settings.xml @@ -245,6 +245,7 @@ </control> </control> <include>CommonNowPlaying</include> + <include>MainWindowMouseButtons</include> <include>BehindDialogFadeOut</include> <control type="image"> <description>Section header image</description> diff --git a/addons/skin.confluence/720p/SettingsCategory.xml b/addons/skin.confluence/720p/SettingsCategory.xml index e00f01b48c..70ffdfc7a0 100644 --- a/addons/skin.confluence/720p/SettingsCategory.xml +++ b/addons/skin.confluence/720p/SettingsCategory.xml @@ -52,6 +52,7 @@ <onup>1</onup> <ondown>1</ondown> <visible>system.getbool(input.enablemouse)</visible> + <include>VisibleFadeEffect</include> </control> <control type="image"> <description>LOGO</description> @@ -197,6 +198,7 @@ <visible>false</visible> </control> <include>CommonNowPlaying</include> + <include>MainWindowMouseButtons</include> <control type="image"> <description>Section header image</description> <posx>20</posx> diff --git a/addons/skin.confluence/720p/SettingsProfile.xml b/addons/skin.confluence/720p/SettingsProfile.xml index dccef83686..335c0c083d 100644 --- a/addons/skin.confluence/720p/SettingsProfile.xml +++ b/addons/skin.confluence/720p/SettingsProfile.xml @@ -268,6 +268,7 @@ </control> </control> <include>CommonNowPlaying</include> + <include>MainWindowMouseButtons</include> <include>BehindDialogFadeOut</include> <control type="image"> <description>Section header image</description> diff --git a/addons/skin.confluence/720p/SettingsSystemInfo.xml b/addons/skin.confluence/720p/SettingsSystemInfo.xml index ae06ff28a1..0f89b5dcfb 100644 --- a/addons/skin.confluence/720p/SettingsSystemInfo.xml +++ b/addons/skin.confluence/720p/SettingsSystemInfo.xml @@ -314,6 +314,7 @@ </control> </control> <include>CommonNowPlaying</include> + <include>MainWindowMouseButtons</include> <control type="image"> <description>Section header image</description> <posx>20</posx> diff --git a/addons/skin.confluence/720p/custom_SkinSetting_1111.xml b/addons/skin.confluence/720p/custom_SkinSetting_1111.xml index bab41c2471..032605a828 100644 --- a/addons/skin.confluence/720p/custom_SkinSetting_1111.xml +++ b/addons/skin.confluence/720p/custom_SkinSetting_1111.xml @@ -982,6 +982,7 @@ </control> </control> <include>CommonNowPlaying</include> + <include>MainWindowMouseButtons</include> <include>BehindDialogFadeOut</include> <include>Clock</include> </controls> diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml index 670859d049..57704164aa 100644 --- a/addons/skin.confluence/720p/includes.xml +++ b/addons/skin.confluence/720p/includes.xml @@ -43,19 +43,6 @@ <align>left</align> <aligny>center</aligny> </include> - <include name="WindowTitleHomeButton"> - <control type="button"> - <hitrect x="0" y="0" w="60" h="45" /> - <posx>20</posx> - <posy>3</posy> - <width>35</width> - <height>35</height> - <texturenofocus>icon_home.png</texturenofocus> - <texturefocus>icon_home_focus.png</texturefocus> - <label>-</label> - <onclick>ActivateWindow(Home)</onclick> - </control> - </include> <include name="ButtonCommonValues"> <height>40</height> <width>250</width> @@ -158,18 +145,97 @@ <texture>Confluence_Logo.png</texture> </control> </include> + <include name="MainWindowMouseButtons"> + <control type="group"> + <posx>120r</posx> + <posy>55r</posy> + <animation effect="fade" time="250" condition="Window.Previous(Home)">WindowOpen</animation> + <animation effect="fade" time="250" condition="Window.Next(Home)">WindowClose</animation> + <visible>system.getbool(input.enablemouse)</visible> + <control type="button"> + <description>Back push button</description> + <posx>0</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>1036</label> + <font>-</font> + <aligny>-</aligny> + <onclick>back</onclick> + <texturefocus border="5">floor_buttonFO.png</texturefocus> + <texturenofocus border="5">floor_button.png</texturenofocus> + <onleft>50</onleft> + <onright>50</onright> + <onup>50</onup> + <ondown>50</ondown> + </control> + <control type="image"> + <description>Back Icon</description> + <posx>5</posx> + <posy>5</posy> + <width>35</width> + <height>35</height> + <aspectratio>keep</aspectratio> + <texture>icon_back.png</texture> + </control> + <control type="button"> + <description>Home push button</description> + <posx>55</posx> + <posy>0</posy> + <width>45</width> + <height>45</height> + <label>31003</label> + <font>-</font> + <aligny>-</aligny> + <onclick>ActivateWindow(home)</onclick> + <texturefocus border="5">floor_buttonFO.png</texturefocus> + <texturenofocus border="5">floor_button.png</texturenofocus> + <onleft>50</onleft> + <onright>50</onright> + <onup>50</onup> + <ondown>50</ondown> + </control> + <control type="image"> + <description>Home Icon</description> + <posx>60</posx> + <posy>5</posy> + <width>35</width> + <height>35</height> + <aspectratio>keep</aspectratio> + <texture>icon_home.png</texture> + </control> + </control> + </include> <include name="CommonNowPlaying"> <control type="group"> <visible>Player.HasMedia + !SubString(Window(videolibrary).Property(TvTunesIsAlive),TRUE)</visible> <include>VisibleFadeEffect</include> <include>Window_OpenClose_Animation</include> - <control type="image"> - <description>Icon</description> + <control type="button"> + <description>push button</description> <posx>30</posx> - <posy>56r</posy> - <width>50</width> - <height>50</height> - <texture>NowPlayingIcon.png</texture> + <posy>55r</posy> + <width>45</width> + <height>45</height> + <label>31003</label> + <font>-</font> + <aligny>-</aligny> + <onclick>ActivateWindow(PlayerControls)</onclick> + <texturefocus border="5">floor_buttonFO.png</texturefocus> + <texturenofocus border="5">floor_button.png</texturenofocus> + <onleft>50</onleft> + <onright>50</onright> + <onup>50</onup> + <ondown>50</ondown> + </control> + <control type="image"> + <description>Player Icon</description> + <posx>35</posx> + <posy>50r</posy> + <width>35</width> + <height>35</height> + <aspectratio>keep</aspectratio> + <texture>icon_player.png</texture> </control> <control type="label"> <posx>85</posx> @@ -238,33 +304,36 @@ </control> </include> <include name="CommonPageCount"> - <control type="label"> - <description>Page Count Label</description> - <posx>40r</posx> - <posy>53r</posy> - <width>500</width> - <height>20</height> - <font>font12</font> - <textcolor>grey</textcolor> - <scroll>false</scroll> - <align>right</align> - <aligny>center</aligny> - <label>$INFO[Window.Property(filter),$LOCALIZE[587] ([COLOR=blue],[/COLOR]) - ]$INFO[Container.NumItems,([COLOR=blue],[/COLOR]) $LOCALIZE[31025]]$INFO[Container.CurrentPage, - $LOCALIZE[31024] ([COLOR=blue]]$INFO[Container.NumPages,/,[/COLOR])]</label> - <include>Window_OpenClose_Animation</include> - </control> - <control type="label"> - <description>Container Duration Label</description> - <posx>40r</posx> - <posy>30r</posy> - <width>500</width> - <height>20</height> - <font>font12</font> - <textcolor>grey</textcolor> - <scroll>false</scroll> - <align>right</align> - <aligny>center</aligny> - <label>$INFO[Container.TotalTime,$LOCALIZE[180] ([COLOR=blue],[/COLOR])]</label> - <include>Window_OpenClose_Animation</include> + <control type="group"> + <animation effect="slide" start="0,0" end="-90,0" time="0" condition="system.getbool(input.enablemouse)">Conditional</animation> + <control type="label"> + <description>Page Count Label</description> + <posx>40r</posx> + <posy>53r</posy> + <width>500</width> + <height>20</height> + <font>font12</font> + <textcolor>grey</textcolor> + <scroll>false</scroll> + <align>right</align> + <aligny>center</aligny> + <label>$INFO[Window.Property(filter),$LOCALIZE[587] ([COLOR=blue],[/COLOR]) - ]$INFO[Container.NumItems,([COLOR=blue],[/COLOR]) $LOCALIZE[31025]]$INFO[Container.CurrentPage, - $LOCALIZE[31024] ([COLOR=blue]]$INFO[Container.NumPages,/,[/COLOR])]</label> + <include>Window_OpenClose_Animation</include> + </control> + <control type="label"> + <description>Container Duration Label</description> + <posx>40r</posx> + <posy>30r</posy> + <width>500</width> + <height>20</height> + <font>font12</font> + <textcolor>grey</textcolor> + <scroll>false</scroll> + <align>right</align> + <aligny>center</aligny> + <label>$INFO[Container.TotalTime,$LOCALIZE[180] ([COLOR=blue],[/COLOR])]</label> + <include>Window_OpenClose_Animation</include> + </control> </control> </include> <include name="SmallMusicInfo"> diff --git a/addons/skin.confluence/720p/weather+/10DayForecast.xml b/addons/skin.confluence/720p/weather+/10DayForecast.xml index 2b7e1b11fc..13e83658e9 100644 --- a/addons/skin.confluence/720p/weather+/10DayForecast.xml +++ b/addons/skin.confluence/720p/weather+/10DayForecast.xml @@ -248,6 +248,7 @@ <visible>Control.IsVisible(50)</visible> </control> <control type="label"> + <animation effect="slide" start="0,0" end="-90,0" time="0" condition="system.getbool(input.enablemouse)">Conditional</animation> <description>number of files/pages</description> <posx>660</posx> <posy>627</posy> diff --git a/addons/skin.confluence/720p/weather+/HourlyForecast.xml b/addons/skin.confluence/720p/weather+/HourlyForecast.xml index e4a1195e92..75adf970f3 100644 --- a/addons/skin.confluence/720p/weather+/HourlyForecast.xml +++ b/addons/skin.confluence/720p/weather+/HourlyForecast.xml @@ -264,6 +264,7 @@ <visible>Control.IsVisible(50)</visible> </control> <control type="label"> + <animation effect="slide" start="0,0" end="-90,0" time="0" condition="system.getbool(input.enablemouse)">Conditional</animation> <description>number of files/pages</description> <posx>660</posx> <posy>627</posy> diff --git a/addons/skin.confluence/720p/weather+/MapsVideo.xml b/addons/skin.confluence/720p/weather+/MapsVideo.xml index 624e9edcbb..8f4b62f518 100644 --- a/addons/skin.confluence/720p/weather+/MapsVideo.xml +++ b/addons/skin.confluence/720p/weather+/MapsVideo.xml @@ -420,6 +420,7 @@ <visible>Control.IsVisible(50)</visible> </control> <control type="label"> + <animation effect="slide" start="0,0" end="-90,0" time="0" condition="system.getbool(input.enablemouse)">Conditional</animation> <description>number of files/pages</description> <posx>660</posx> <posy>627</posy> |