Added : [PM3.HD] Mouse users rejoice added "Up One Level" (if needed),"Previous Window" and "Home" buttons to main windows (top Right). Non mouse users just disable mouse in "Settings\System\Input Devices" and they wont show up

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@30447 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

26 files changed, 164 insertions, 3 deletions

diff --git a/addons/skin.pm3-hd/720p/AddonBrowser.xml b/addons/skin.pm3-hd/720p/AddonBrowser.xml
index 25e008721f..156ff52a49 100644
--- a/addons/skin.pm3-hd/720p/AddonBrowser.xml
+++ b/addons/skin.pm3-hd/720p/AddonBrowser.xml
@@ -106,5 +106,6 @@
 			<label>$INFO[Container.Property(RepoName)]</label>

 			<include>Window_OpenClose_Animation</include>

 		</control>

+		<include>WindowTitleButtonsMedia</include>

 	</controls>

 </window>

diff --git a/addons/skin.pm3-hd/720p/MyMusicNav.xml b/addons/skin.pm3-hd/720p/MyMusicNav.xml
index a249914c5a..7046078f45 100644
--- a/addons/skin.pm3-hd/720p/MyMusicNav.xml
+++ b/addons/skin.pm3-hd/720p/MyMusicNav.xml
@@ -180,5 +180,6 @@
 			<include>WindowTitleCommons</include>

 			<label>$LOCALIZE[9] - $LOCALIZE[10516]$INFO[Container.PluginName, - ]</label>

 		</control>

+		<include>WindowTitleButtonsMedia</include>

 	</controls>

 </window>

diff --git a/addons/skin.pm3-hd/720p/MyMusicPlaylist.xml b/addons/skin.pm3-hd/720p/MyMusicPlaylist.xml
index 69ff9ecfdd..d1cb3e313a 100644
--- a/addons/skin.pm3-hd/720p/MyMusicPlaylist.xml
+++ b/addons/skin.pm3-hd/720p/MyMusicPlaylist.xml
@@ -105,5 +105,6 @@
 			<include>WindowTitleCommons</include>

 			<label>$LOCALIZE[9] - $LOCALIZE[10517]</label>

 		</control>

+		<include>WindowTitleButtons</include>

 	</controls>

 </window>
\ No newline at end of file
diff --git a/addons/skin.pm3-hd/720p/MyMusicPlaylistEditor.xml b/addons/skin.pm3-hd/720p/MyMusicPlaylistEditor.xml
index 2b34615884..8dda41a528 100644
--- a/addons/skin.pm3-hd/720p/MyMusicPlaylistEditor.xml
+++ b/addons/skin.pm3-hd/720p/MyMusicPlaylistEditor.xml
@@ -399,5 +399,6 @@
 			<include>WindowTitleCommons</include>

 			<label>$LOCALIZE[9] - $LOCALIZE[10503]</label>

 		</control>

+		<include>WindowTitleButtons</include>

 	</controls>

 </window>

diff --git a/addons/skin.pm3-hd/720p/MyMusicSongs.xml b/addons/skin.pm3-hd/720p/MyMusicSongs.xml
index a9b30335fe..b1ea740f47 100644
--- a/addons/skin.pm3-hd/720p/MyMusicSongs.xml
+++ b/addons/skin.pm3-hd/720p/MyMusicSongs.xml
@@ -113,5 +113,6 @@
 			<include>WindowTitleCommons</include>

 			<label>$LOCALIZE[9] - $LOCALIZE[31022]$INFO[Container.PluginName, - ]</label>

 		</control>

+		<include>WindowTitleButtonsMedia</include>

 	</controls>

 </window>

diff --git a/addons/skin.pm3-hd/720p/MyPics.xml b/addons/skin.pm3-hd/720p/MyPics.xml
index c273918daf..82903589ee 100644
--- a/addons/skin.pm3-hd/720p/MyPics.xml
+++ b/addons/skin.pm3-hd/720p/MyPics.xml
@@ -115,5 +115,6 @@
 			<include>WindowTitleCommons</include>

 			<label>$LOCALIZE[9] - $LOCALIZE[1]$INFO[Container.PluginName, - ]</label>

 		</control>

+		<include>WindowTitleButtonsMedia</include>

 	</controls>

 </window>
\ No newline at end of file
diff --git a/addons/skin.pm3-hd/720p/MyPrograms.xml b/addons/skin.pm3-hd/720p/MyPrograms.xml
index 91fb3c39cf..39f6fd965e 100644
--- a/addons/skin.pm3-hd/720p/MyPrograms.xml
+++ b/addons/skin.pm3-hd/720p/MyPrograms.xml
@@ -82,5 +82,6 @@
 			<include>WindowTitleCommons</include>

 			<label>$LOCALIZE[9] - $LOCALIZE[0]$INFO[Container.PluginName, - ]</label>

 		</control>

+		<include>WindowTitleButtonsMedia</include>

 	</controls>

 </window>
\ No newline at end of file
diff --git a/addons/skin.pm3-hd/720p/MyScripts.xml b/addons/skin.pm3-hd/720p/MyScripts.xml
index 915366657d..a76d7ddc9f 100644
--- a/addons/skin.pm3-hd/720p/MyScripts.xml
+++ b/addons/skin.pm3-hd/720p/MyScripts.xml
@@ -81,5 +81,6 @@
 			<include>WindowTitleCommons</include>

 			<label>$LOCALIZE[9] - $LOCALIZE[10020]</label>

 		</control>

+		<include>WindowTitleButtons</include>

 	</controls>

 </window>
\ No newline at end of file
diff --git a/addons/skin.pm3-hd/720p/MyVideo.xml b/addons/skin.pm3-hd/720p/MyVideo.xml
index 34242109d9..5ca919451e 100644
--- a/addons/skin.pm3-hd/720p/MyVideo.xml
+++ b/addons/skin.pm3-hd/720p/MyVideo.xml
@@ -125,5 +125,6 @@
 			<include>WindowTitleCommons</include>

 			<label>$LOCALIZE[9] - $LOCALIZE[31021]$INFO[Container.PluginName, - ]</label>

 		</control>

+		<include>WindowTitleButtonsMedia</include>

 	</controls>

 </window>
\ No newline at end of file
diff --git a/addons/skin.pm3-hd/720p/MyVideoNav.xml b/addons/skin.pm3-hd/720p/MyVideoNav.xml
index d9711ac135..b641164238 100644
--- a/addons/skin.pm3-hd/720p/MyVideoNav.xml
+++ b/addons/skin.pm3-hd/720p/MyVideoNav.xml
@@ -267,6 +267,7 @@
 			<include>WindowTitleCommons</include>

 			<label>$LOCALIZE[9] - $LOCALIZE[20314]$INFO[Container.PluginName, - ]</label>

 		</control>

+		<include>WindowTitleButtonsMedia</include>

 

 <!-- Test code for the flagging Can stay until all codecs done

 

diff --git a/addons/skin.pm3-hd/720p/MyVideoPlaylist.xml b/addons/skin.pm3-hd/720p/MyVideoPlaylist.xml
index dd2efa7e20..3c77e48e05 100644
--- a/addons/skin.pm3-hd/720p/MyVideoPlaylist.xml
+++ b/addons/skin.pm3-hd/720p/MyVideoPlaylist.xml
@@ -104,5 +104,6 @@
 			<include>WindowTitleCommons</include>

 			<label>$LOCALIZE[9] - $LOCALIZE[10522]</label>

 		</control>

+		<include>WindowTitleButtons</include>

 	</controls>

 </window>
\ No newline at end of file
diff --git a/addons/skin.pm3-hd/720p/MyWeather.xml b/addons/skin.pm3-hd/720p/MyWeather.xml
index bf8328f62a..fab61df91c 100644
--- a/addons/skin.pm3-hd/720p/MyWeather.xml
+++ b/addons/skin.pm3-hd/720p/MyWeather.xml
@@ -721,5 +721,6 @@
 			<info>Weather.Location</info>

 			<include>Window_OpenClose_Animation</include>

 		</control>

+		<include>WindowTitleButtons</include>

 	</controls>

 </window>
\ No newline at end of file
diff --git a/addons/skin.pm3-hd/720p/Settings.xml b/addons/skin.pm3-hd/720p/Settings.xml
index 89db3d655e..0870aee1ab 100644
--- a/addons/skin.pm3-hd/720p/Settings.xml
+++ b/addons/skin.pm3-hd/720p/Settings.xml
@@ -180,5 +180,6 @@
 			<include>WindowTitleCommons</include>

 			<label>$LOCALIZE[9] - $LOCALIZE[5]</label>

 		</control>

+		<include>WindowTitleButtons</include>

 	</controls>

 </window>
\ No newline at end of file
diff --git a/addons/skin.pm3-hd/720p/SettingsCategory.xml b/addons/skin.pm3-hd/720p/SettingsCategory.xml
index 822aa1464b..f1d724ec5a 100644
--- a/addons/skin.pm3-hd/720p/SettingsCategory.xml
+++ b/addons/skin.pm3-hd/720p/SettingsCategory.xml
@@ -101,5 +101,6 @@
 			<include>WindowTitleCommons</include>

 			<label>$LOCALIZE[9] - $LOCALIZE[5] - $INFO[Control.GetLabel(2)]</label>

 		</control>

+		<include>WindowTitleButtons</include>

 	</controls>

 </window>
diff --git a/addons/skin.pm3-hd/720p/SettingsProfile.xml b/addons/skin.pm3-hd/720p/SettingsProfile.xml
index 292a28320a..e72dc5e460 100644
--- a/addons/skin.pm3-hd/720p/SettingsProfile.xml
+++ b/addons/skin.pm3-hd/720p/SettingsProfile.xml
@@ -178,5 +178,6 @@
 			<include>WindowTitleCommons</include>

 			<label>$LOCALIZE[9] - $LOCALIZE[10034]</label>

 		</control>

+		<include>WindowTitleButtons</include>

 	</controls>

 </window>
\ No newline at end of file
diff --git a/addons/skin.pm3-hd/720p/SettingsSystemInfo.xml b/addons/skin.pm3-hd/720p/SettingsSystemInfo.xml
index 81e8b66395..732934636c 100644
--- a/addons/skin.pm3-hd/720p/SettingsSystemInfo.xml
+++ b/addons/skin.pm3-hd/720p/SettingsSystemInfo.xml
@@ -178,5 +178,6 @@
 			<include>WindowTitleCommons</include>

 			<label>$LOCALIZE[9] - $LOCALIZE[130]</label>

 		</control>

+		<include>WindowTitleButtons</include>

 	</controls>

 </window>
\ No newline at end of file
diff --git a/addons/skin.pm3-hd/720p/includes.xml b/addons/skin.pm3-hd/720p/includes.xml
index ee20270498..5e77ce2445 100644
--- a/addons/skin.pm3-hd/720p/includes.xml
+++ b/addons/skin.pm3-hd/720p/includes.xml
@@ -656,6 +656,144 @@
 		<texturenofocus border="2">button-nofocus.png</texturenofocus>

 		<pulseonselect>no</pulseonselect>

 	</include>

+	<include name="WindowTitleButtons">

+		<control type="group">

+			<posx>98r</posx>

+			<posy>0</posy>

+			<width>36</width>

+			<height>32</height>

+			<visible>system.getbool(input.enablemouse)</visible>

+			<animation effect="slide" start="0,-32" end="0,0" time="200">WindowOpen</animation>

+			<animation effect="slide" end="0,-32" start="0,0" time="200">WindowClose</animation>

+			<control type="image">

+				<description>Button background image</description>

+				<posx>0</posx>

+				<posy>0</posy>

+				<width>74</width>

+				<height>32</height>

+				<texture border="3">black-back2.png</texture>

+			</control>

+			<control type="button">

+				<posx>5</posx>

+				<posy>0</posy>

+				<width>32</width>

+				<height>28</height>

+				<label>31003</label>

+				<align>right</align>

+				<font>font10</font>

+				<textoffsetx>50</textoffsetx>

+				<textwidth>300</textwidth>

+				<textcolor>00FFFFFF</textcolor>

+				<focusedcolor>grey2</focusedcolor>

+				<texturefocus>HeaderControlBackFO.png</texturefocus>

+				<texturenofocus>HeaderControlBackNF.png</texturenofocus>

+				<onleft>9000</onleft>

+				<onright>9000</onright>

+				<onup>9000</onup>

+				<ondown>9000</ondown>

+				<onclick>PreviousMenu</onclick>

+			</control>

+			<control type="button">

+				<posx>37</posx>

+				<posy>0</posy>

+				<width>32</width>

+				<height>28</height>

+				<label>31004</label>

+				<align>right</align>

+				<font>font10</font>

+				<textoffsetx>82</textoffsetx>

+				<textwidth>300</textwidth>

+				<textcolor>00FFFFFF</textcolor>

+				<focusedcolor>grey2</focusedcolor>

+				<texturefocus>HeaderControlHomeFO.png</texturefocus>

+				<texturenofocus>HeaderControlHomeNF.png</texturenofocus>

+				<onleft>9000</onleft>

+				<onright>9000</onright>

+				<onup>9000</onup>

+				<ondown>9000</ondown>

+				<onclick>ActivateWindow(Home)</onclick>

+			</control>

+		</control>

+	</include>

+	<include name="WindowTitleButtonsMedia">

+		<control type="group">

+			<posx>130r</posx>

+			<posy>0</posy>

+			<width>36</width>

+			<height>32</height>

+			<visible>system.getbool(input.enablemouse)</visible>

+			<animation effect="slide" start="0,-32" end="0,0" time="200">WindowOpen</animation>

+			<animation effect="slide" end="0,-32" start="0,0" time="200">WindowClose</animation>

+			<control type="image">

+				<description>Button background image</description>

+				<posx>0</posx>

+				<posy>0</posy>

+				<width>106</width>

+				<height>32</height>

+				<texture border="3">black-back2.png</texture>

+			</control>

+			<control type="button">

+				<posx>5</posx>

+				<posy>0</posy>

+				<width>32</width>

+				<height>28</height>

+				<label>31002</label>

+				<align>right</align>

+				<font>font10</font>

+				<textoffsetx>50</textoffsetx>

+				<textwidth>300</textwidth>

+				<textcolor>00FFFFFF</textcolor>

+				<focusedcolor>grey2</focusedcolor>

+				<texturefocus>HeaderControlUpOneLevelFO.png</texturefocus>

+				<texturenofocus>HeaderControlUpOneLevelNF.png</texturenofocus>

+				<onleft>9000</onleft>

+				<onright>9000</onright>

+				<onup>9000</onup>

+				<ondown>9000</ondown>

+				<onclick>ParentDir</onclick>

+			</control>

+			<control type="button">

+				<posx>37</posx>

+				<posy>0</posy>

+				<width>32</width>

+				<height>28</height>

+				<label>31003</label>

+				<align>right</align>

+				<font>font10</font>

+				<textoffsetx>82</textoffsetx>

+				<textwidth>300</textwidth>

+				<textcolor>00FFFFFF</textcolor>

+				<focusedcolor>grey2</focusedcolor>

+				<texturefocus>HeaderControlBackFO.png</texturefocus>

+				<texturenofocus>HeaderControlBackNF.png</texturenofocus>

+				<onleft>9000</onleft>

+				<onright>9000</onright>

+				<onup>9000</onup>

+				<ondown>9000</ondown>

+				<onclick>PreviousMenu</onclick>

+			</control>

+			<control type="button">

+				<posx>69</posx>

+				<posy>0</posy>

+				<width>32</width>

+				<height>28</height>

+				<label>31004</label>

+				<align>right</align>

+				<font>font10</font>

+				<textoffsetx>114</textoffsetx>

+				<textwidth>300</textwidth>

+				<textcolor>00FFFFFF</textcolor>

+				<focusedcolor>grey2</focusedcolor>

+				<texturefocus>HeaderControlHomeFO.png</texturefocus>

+				<texturenofocus>HeaderControlHomeNF.png</texturenofocus>

+				<onleft>9000</onleft>

+				<onright>9000</onright>

+				<onup>9000</onup>

+				<ondown>9000</ondown>

+				<onclick>ActivateWindow(Home)</onclick>

+			</control>

+		</control>

+	</include>

 	<include name="backgroundfade">

 		 <animation effect="fade" time="600">Visible</animation>

 		 <animation effect="fade" time="600">Hidden</animation>

diff --git a/addons/skin.pm3-hd/720p/script-Apple_Movie_Trailers-main.xml b/addons/skin.pm3-hd/720p/script-Apple_Movie_Trailers-main.xml
index 096688ecf9..4819acf163 100644
--- a/addons/skin.pm3-hd/720p/script-Apple_Movie_Trailers-main.xml
+++ b/addons/skin.pm3-hd/720p/script-Apple_Movie_Trailers-main.xml
@@ -712,6 +712,7 @@
 			<include>Window_OpenClose_Animation</include>

 			<visible>!Control.IsVisible(4000)</visible>

 		</control>

+		<include>WindowTitleButtonsMedia</include>

 <!-- Bunch of stuff required by amt to run proper but not in this skin -->

 		<!-- ** Required ** Do not change id or type-->

 		<control type="button" id="108">

diff --git a/addons/skin.pm3-hd/language/English/strings.xml b/addons/skin.pm3-hd/language/English/strings.xml
index d6152d6001..8da1aaef57 100644
--- a/addons/skin.pm3-hd/language/English/strings.xml
+++ b/addons/skin.pm3-hd/language/English/strings.xml
@@ -2,9 +2,9 @@
 <strings>
   <string id="31000">Volume muted</string>
   <string id="31001">Working...</string>
-  <string id="31002"></string>
-  <string id="31003"></string>
-  <string id="31004"></string>
+  <string id="31002">Up One Level</string>
+  <string id="31003">Previous Window</string>
+  <string id="31004">Home</string>
   <string id="31005"></string>
   <string id="31006"></string>
   <string id="31007"></string>
diff --git a/addons/skin.pm3-hd/media/HeaderControlBackFO.png b/addons/skin.pm3-hd/media/HeaderControlBackFO.png
new file mode 100644
index 0000000000..fa4bd8098a
--- /dev/null
+++ b/addons/skin.pm3-hd/media/HeaderControlBackFO.png
diff --git a/addons/skin.pm3-hd/media/HeaderControlBackNF.png b/addons/skin.pm3-hd/media/HeaderControlBackNF.png
new file mode 100644
index 0000000000..1f68b13606
--- /dev/null
+++ b/addons/skin.pm3-hd/media/HeaderControlBackNF.png
diff --git a/addons/skin.pm3-hd/media/HeaderControlHomeFO.png b/addons/skin.pm3-hd/media/HeaderControlHomeFO.png
new file mode 100644
index 0000000000..34b30c1e52
--- /dev/null
+++ b/addons/skin.pm3-hd/media/HeaderControlHomeFO.png
diff --git a/addons/skin.pm3-hd/media/HeaderControlHomeNF.png b/addons/skin.pm3-hd/media/HeaderControlHomeNF.png
new file mode 100644
index 0000000000..fc354652cf
--- /dev/null
+++ b/addons/skin.pm3-hd/media/HeaderControlHomeNF.png
diff --git a/addons/skin.pm3-hd/media/HeaderControlUpOneLevelFO.png b/addons/skin.pm3-hd/media/HeaderControlUpOneLevelFO.png
new file mode 100644
index 0000000000..8a8f3cb9f7
--- /dev/null
+++ b/addons/skin.pm3-hd/media/HeaderControlUpOneLevelFO.png
diff --git a/addons/skin.pm3-hd/media/HeaderControlUpOneLevelNF.png b/addons/skin.pm3-hd/media/HeaderControlUpOneLevelNF.png
new file mode 100644
index 0000000000..4dc2b2243d
--- /dev/null
+++ b/addons/skin.pm3-hd/media/HeaderControlUpOneLevelNF.png
diff --git a/addons/skin.pm3-hd/media/Makefile b/addons/skin.pm3-hd/media/Makefile
index 25921a763d..04c17679da 100644
--- a/addons/skin.pm3-hd/media/Makefile
+++ b/addons/skin.pm3-hd/media/Makefile
@@ -245,6 +245,12 @@ IMAGES= \
 	lastfm-love-focus.png \
 	lastfm-love-nofocus.png \
 	list-focus.png \
+	HeaderControlBackFO.png \
+	HeaderControlBackNF.png \
+	HeaderControlHomeFO.png \
+	HeaderControlHomeNF.png \
+	HeaderControlUpOneLevelFO.png \
+	HeaderControlUpOneLevelNF.png \
 	NoCover_1.png \
 	NoCover_2.png \
 	osd-panel-top.png \