various

2020-06-04 18:47:59 +01:00 · 2020-06-04 18:47:59 +01:00 · 388ebee876
parent 80a8bdb4ea
commit 388ebee876
49 changed files with 32 additions and 365 deletions
--- a/1080i/AddonBrowser.xml
+++ b/1080i/AddonBrowser.xml
@ -340,8 +340,6 @@
                </control>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogAddonInfo.xml
+++ b/1080i/DialogAddonInfo.xml
@ -285,8 +285,6 @@
                <description>Launch addon</description>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogAddonSettings.xml
+++ b/1080i/DialogAddonSettings.xml
@ -220,8 +220,6 @@
                </control>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogButtonMenu.xml
+++ b/1080i/DialogButtonMenu.xml
@ -105,8 +105,6 @@
                </content>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogContextMenu.xml
+++ b/1080i/DialogContextMenu.xml
@ -54,8 +54,6 @@
 	            <width>12-col</width>
 	        </control>
 		</control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogFavourites.xml
+++ b/1080i/DialogFavourites.xml
@ -109,8 +109,6 @@
                </focusedlayout>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogGameControllers.xml
+++ b/1080i/DialogGameControllers.xml
@ -225,8 +225,6 @@
                <description>Help button</description>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogKeyboard.xml
+++ b/1080i/DialogKeyboard.xml
@ -1080,8 +1080,6 @@
                </control>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogMediaSource.xml
+++ b/1080i/DialogMediaSource.xml
@ -343,8 +343,6 @@
                <description>Cancel Button</description>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogMusicInfo.xml
+++ b/1080i/DialogMusicInfo.xml
@ -765,8 +765,6 @@
 				<label>20413</label>
 			</control>
 		</control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
 		<!--debugging-->
 		<include>DebugGrid</include>
 		<control type="label">
--- a/1080i/DialogNumeric.xml
+++ b/1080i/DialogNumeric.xml
@ -290,8 +290,6 @@
                </control>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogPVRInfo.xml
+++ b/1080i/DialogPVRInfo.xml
@ -243,8 +243,6 @@
                <label>19687</label>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogPictureInfo.xml
+++ b/1080i/DialogPictureInfo.xml
@ -48,8 +48,6 @@
                </focusedlayout>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogSelect.xml
+++ b/1080i/DialogSelect.xml
@ -333,8 +333,6 @@
                </control>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogSubtitles.xml
+++ b/1080i/DialogSubtitles.xml
@ -13,7 +13,7 @@
                <width>20-col</width>
                <height>23-row</height>
                <texture>colors/black.png</texture>
-                <colordiffuse>99FFFFFF</colordiffuse>
+                <colordiffuse>aaFFFFFF</colordiffuse>
                <aspectratio>stretch</aspectratio>
            </control>
            <control type="image">
@ -256,8 +256,6 @@
                </control>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogTextViewer.xml
+++ b/1080i/DialogTextViewer.xml
@ -46,8 +46,6 @@
                <font>textbox</font>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogVideoInfo.xml
+++ b/1080i/DialogVideoInfo.xml
@ -519,8 +519,6 @@
                <description>Trailer</description>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/EventLog.xml
+++ b/1080i/EventLog.xml
@ -154,8 +154,6 @@
                <visible>Control.IsVisible(570)</visible>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/FileManager.xml
+++ b/1080i/FileManager.xml
@ -229,8 +229,6 @@
 	            </control>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@ -285,8 +285,6 @@
 			<ondown>setfocus(9000,0)</ondown>
 			<onclick>setfocus(9000,0)</onclick>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
 		<!--debugging-->
 		<include>DebugGrid</include>
 		<control type="label">
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@ -58,9 +58,6 @@
 	<!--weather-->
 	<expression name="hasWeather">!String.IsEmpty(Window(Weather).Property(WeatherProvider)) + !String.String.IsEmpty(weather.temperature) + !String.String.IsEmpty(weather.conditions)</expression>

-    <!--touchscreen back function-->
-	<expression name="openSideBlade">[window.isactive(pictures) + String.IsEqual(container.folderpath,] | String.IsEqual(container.folderpath,addons://sources/game) | [window.isactive(games) + String.IsEqual(container.folderpath,] | String.IsEqual(container.folderpath,sources://video/) | String.IsEqual(container.folderpath,special://videoplaylists/) | String.IsEqual(container.folderpath,addons://sources/video) | String.IsEqual(container.folderpath,pvr://recordings/tv/active/) | String.IsEqual(container.folderpath,sources://music/) | String.IsEqual(container.folderpath,addons://sources/audio) | String.IsEqual(container.folderpath,special://musicplaylists/) | String.IsEqual(container.folderpath,musicdb://genres/) | String.IsEqual(container.folderpath,musicdb://artists/) | String.IsEqual(container.folderpath,musicdb://albums/) | container.content(movies) | container.content(tvshows) | window.isactive(TVChannels) | window.isactive(RadioChannels) | window.isactive(TVGuide) | window.isactve(TVRecordings)</expression>
-
 	<!--item fanart-->
    <include name="itemFanart">
        <control type="wraplist" id="99999">
@ -303,178 +300,7 @@

 	<!--touchscreen screen edge controls-->
 	<include name="touchscreenControls">
-		<control type="group">
-			<visible>System.GetBool(input.enablemouse)</visible>
-			<posx>0</posx>
-            <posy>0</posy>
 		
-			<!--standard back-->
-			<control type="button" id="8542">
-				<visible>!$EXP[openSideBlade] | window.isactive(1103)</visible>
-	            <description>back button</description>
-				<posx>-5</posx>
-	            <posy>0</posy>
-	            <texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
-				<texturefocus colordiffuse="overlay">colors/black.png</texturefocus>
-	            <height>807</height>
-				<width>50</width>
-				<font>symbol</font>
-				<textoffsetx>14</textoffsetx>
-				<textcolor>22FFFFFF</textcolor>
-		        <focusedcolor>22FFFFFF</focusedcolor>
-				<label></label>
-				<onclick>back</onclick>
-			</control>
-			
-			<!--sideblade open-->
-			<control type="button" id="8514">
-				<visible>$EXP[openSideBlade] + !window.isactive(1103)</visible>
-	            <description>back button</description>
-				<posx>-5</posx>
-	            <posy>0</posy>
-	            <texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
-				<texturefocus colordiffuse="overlay">colors/black.png</texturefocus>
-	            <height>807</height>
-				<width>50</width>
-				<font>symbol</font>
-				<textoffsetx>14</textoffsetx>
-				<textcolor>22FFFFFF</textcolor>
-		        <focusedcolor>22FFFFFF</focusedcolor>
-				<label></label>
-				<onclick condition="!controlgroup(9000).hasfocus">setfocus(9000)</onclick>
-				<onclick condition="controlgroup(9000).hasfocus">activateWindow(home)</onclick>
-			</control>
-			
-			<!--home-->
-			<control type="button" id="8520">
-	            <description>home</description>
-				<posx>-5</posx>
-	            <posy>810</posy>
-	            <texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
-				<texturefocus colordiffuse="overlay">colors/black.png</texturefocus>
-	            <height>267</height>
-				<width>50</width>
-				<font>symbol</font>
-				<textoffsetx>14</textoffsetx>
-				<textcolor>22FFFFFF</textcolor>
-		        <focusedcolor>22FFFFFF</focusedcolor>
-				<label></label>
-				<onclick>dialog.close(all,true)</onclick>
-				<onclick>activateWindow(home)</onclick>
-	        </control>			
-			
-			
-			<!--universal player control buttons-->
-			<control type="group">
-				<posx>45r</posx>
-	            <posy>0</posy>
-				
-				<control type="button" id="8519">
-		            <description>Pause</description>
-					<visible>player.playing</visible>
-					<posx>0</posx>
-		            <posy>0</posy>
-		            <texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
-					<texturefocus colordiffuse="overlay">colors/black.png</texturefocus>
-		            <focusedcolor>22FFFFFF</focusedcolor>
-		            <height>267</height>
-					<width>50</width>
-					<font>symbol</font>
-					<textoffsetx>14</textoffsetx>
-					<textcolor>22FFFFFF</textcolor>
-					<label></label>
-		            <onclick>action(pause)</onclick>
-		        </control>
-		
-				<control type="button" id="8518">
-		            <description>play</description>
-					<visible>!player.playing</visible>
-					<posx>0</posx>
-		            <posy>0</posy>
-		            <texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
-					<texturefocus colordiffuse="overlay">colors/black.png</texturefocus>
-		            <height>267</height>
-					<width>50</width>
-					<font>symbol</font>
-					<textoffsetx>14</textoffsetx>
-					<textcolor>22FFFFFF</textcolor>
-			        <focusedcolor>22FFFFFF</focusedcolor>
-					<label></label>
-		            <onclick>action(play)</onclick>
-		        </control>
-		
-				<control type="button" id="8517">
-		            <description>stop</description>
-					<posx>0</posx>
-		            <posy>270</posy>
-		            <texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
-					<texturefocus colordiffuse="overlay">colors/black.png</texturefocus>
-		            <height>267</height>
-					<width>50</width>
-					<font>symbol</font>
-					<textoffsetx>14</textoffsetx>
-					<textcolor>22FFFFFF</textcolor>
-			        <focusedcolor>22FFFFFF</focusedcolor>
-					<label></label>
-					<onclick>action(stop)</onclick>
-		        </control>
-		
-				<control type="button" id="8516">
-		            <description>volume up</description>
-					<posx>0</posx>
-		            <posy>540</posy>
-		            <texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
-					<texturefocus colordiffuse="overlay">colors/black.png</texturefocus>
-		            <height>267</height>
-					<width>50</width>
-					<font>symbol</font>
-					<textoffsetx>14</textoffsetx>
-					<textcolor>22FFFFFF</textcolor>
-			        <focusedcolor>22FFFFFF</focusedcolor>
-					<label></label>
-					<onclick>action(volumeup)</onclick>
-		        </control>
-		
-				<control type="button" id="8515">
-		            <description>volume down</description>
-					<posx>0</posx>
-		            <posy>810</posy>
-		            <texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
-					<texturefocus colordiffuse="overlay">colors/black.png</texturefocus>
-		            <height>270</height>
-					<width>50</width>
-					<font>symbol</font>
-					<textoffsetx>14</textoffsetx>
-					<textcolor>22FFFFFF</textcolor>
-			        <focusedcolor>22FFFFFF</focusedcolor>
-					<label></label>
-					<onclick>action(volumedown)</onclick>
-		        </control>
-			
-			</control>
-			<!--page up-->
-			<control type="button" id="8538">
-	            <description>page up</description>
-				<posx>0</posx>
-	            <posy>0</posy>
-	            <texturefocus colordiffuse="overlay">colors/black.png</texturefocus>
-	            <focusedcolor>textActive</focusedcolor>
-	            <width>fullscreenWidth</width>
-				<height>45</height>
-	            <onclick>PageUp(60)</onclick>
-	        </control>
-			<!--page down-->
-			<control type="button" id="8537">
-	            <description>page down</description>
-				<posx>0</posx>
-	            <posy>1035</posy>
-	            <texturefocus colordiffuse="overlay">colors/black.png</texturefocus>
-	            <focusedcolor>textActive</focusedcolor>
-	            <width>fullscreenWidth</width>
-				<height>45</height>
-	            <onclick>PageDown(60)</onclick>
-	        </control>
-		</control>
 	</include>
 	
   <!--debugging-->
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@ -26,6 +26,7 @@
 		<value condition="Window.isactive(TVchannels) | Window.isactive(TVGuide)">$LOCALIZE[31006] [COLOR highlight]$LOCALIZE[31078][/COLOR]</value>
 		<value condition="Window.isactive(RadioChannels)">$LOCALIZE[31164] [COLOR highlight]$LOCALIZE[31078][/COLOR]</value>
 		<value condition="Window.isactive(TVRecordings)">$LOCALIZE[31006] [COLOR highlight]$LOCALIZE[31165][/COLOR]</value>
+		<value condition="Window.isactive(MyPVRTimers.xml)">$LOCALIZE[31060] [COLOR highlight]$LOCALIZE[31087][/COLOR]</value>
 		<value condition="Window.isactive(programs)">$LOCALIZE[10506]</value>
 		<value condition="Window.isactive(musicplaylist) | Window.isactive(videoplaylist)">$LOCALIZE[31123]</value>
 		<value condition="Window.isactive(pictures)">$LOCALIZE[31056]</value>
@ -34,6 +35,7 @@
    <variable name="listSubTitle">
        <value condition="Window.isactive(Videos)">$INFO[Container.NumAllItems,, $LOCALIZE[31014]] $VAR[unwatchedOnly]</value>
        <value condition="Window.isactive(Music)">$INFO[container.NumAllItems,, $LOCALIZE[31014]]</value>
+		<value condition="Window.isactive(MyPVRTimers.xml)">$INFO[container.NumAllItems,, $LOCALIZE[31145]]</value>
 		<value condition="Window.isactive(Weather)">$LOCALIZE[31212] $INFO[Window.Property(WeatherProvider)]</value>
 		<value condition="Window.isactive(TVchannels) | Window.isactive(RadioChannels) | Window.isactive(TVGuide)">$INFO[Pvr.BackendChannels] $LOCALIZE[31017] ($INFO[control.getlabel(29)])</value>
 		<value condition="Window.isactive(TVRecordings)">$INFO[container.NumAllItems] $LOCALIZE[31165] ($INFO[Pvr.BackendDiskSpace])</value>
--- a/1080i/MyGames.xml
+++ b/1080i/MyGames.xml
@ -36,8 +36,6 @@
        <include>hubMenu</include>
        <!--mini window-->
        <include>miniVideoPlayer</include>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debug-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/MyMusicNav.xml
+++ b/1080i/MyMusicNav.xml
@ -64,8 +64,6 @@
        <include>hubMenu</include>
        <!--loading indicator-->
        <include>loadingIndicator</include>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/MyMusicPlaylistEditor.xml
+++ b/1080i/MyMusicPlaylistEditor.xml
@ -284,8 +284,6 @@
                <description>Clear button</description>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/MyPVRChannels.xml
+++ b/1080i/MyPVRChannels.xml
@ -48,8 +48,6 @@
        <include>miniVideoPlayer</include>
        <!--hub menu-->
        <include>hubMenu</include>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
 		<!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/MyPVRGuide.xml
+++ b/1080i/MyPVRGuide.xml
@ -166,8 +166,6 @@
 		<include>miniVideoPlayer</include>
 		<!--hub menu-->
 		<include>hubMenu</include>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
 		<!--debugging-->
 		<include>DebugGrid</include>
 		<control type="label">
--- a/1080i/MyPVRRecordings.xml
+++ b/1080i/MyPVRRecordings.xml
@ -167,8 +167,6 @@
        <include>miniVideoPlayer</include>
        <!--hub menu-->
        <include>hubMenu</include>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/MyPVRTimers.xml
+++ b/1080i/MyPVRTimers.xml
@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
    <defaultcontrol always="false">9999</defaultcontrol>
-    <include>fadeInOut</include>
+    <animation type="windowClose">
+        <effect type="fade" start="100" end="0" time="300"/>
+    </animation>
+	<views>50</views>
    <controls>
        <include>globalBackground</include>
        <!--page container group-->
        <control type="group">
+	        <!--window fader-->
+            <animation type="conditional" condition="window.next(0) | window.next(1)">
+                <effect type="fade" start="100" end="0" time="300"/>
+            </animation>
            <!--shift page for certain modal dialogs-->
            <include>modalDialogContentShift</include>
            <!--Main content listing-->
@ -17,7 +24,7 @@
                    <posx>0</posx>
                    <posy>0</posy>
                    <width>24-col</width>
-                    <height>21-row</height>
+                    <height>23-row</height>
                    <onleft>9000</onleft>
                    <onright>60</onright>
                    <onback>9000</onback>
@ -152,36 +159,10 @@
                        </control>
                    </focusedlayout>
                </control>
-                <!--Additional info-->
-                <control type="group">
-                    <posx>6-col</posx>
-                    <posy>22-row</posy>
-                    <control type="progress">
-                        <description>Disk usage bar</description>
-                        <left>0</left>
-                        <top>1</top>
-                        <width>12-col</width>
-                        <height>48</height>
-                        <texturebg colordiffuse="textboxInactive">colors/black.png</texturebg>
-                        <midtexture colordiffuse="highlight">colors/white.png</midtexture>
-                        <info>PVR.backenddiskspaceprogr</info><visible>!Integer.IsGreater(PVR.backenddiskspaceprogr,100)</visible>
-                    </control>
-                    <control type="label">
-                        <posx>0</posx>
-                        <posy>6</posy>
-                        <width>12-col</width>
-                        <font>itemSubTitle</font>
-                        <align>center</align>
-                        <textcolor>textActive</textcolor>
-                        <selectedcolor>textActive</selectedcolor>
-                        <shadowcolor></shadowcolor>
-                        <label>$INFO[Pvr.BackendDiskSpace]</label>
-                    </control>
-                </control>
            </control>
-            <!--page scrollbar-->
+			<!--page scrollbar-->
            <control type="group" id="9400">
-                <visible>Control.IsVisible(60) + !control.isvisible(10)</visible>
+                <visible>Control.IsVisible(60)</visible>
                <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(9400).hasfocus">conditional</animation>
                <control type="scrollbar" id="60">
                    <posx>54r</posx>
@ -191,66 +172,13 @@
                    <onback>9999</onback>
                </control>
            </control>
-            <!--Folder titles-->
-			<control type="group">
-				<posx>col-1-begin</posx>
-	            <posy>row-1-begin</posy>
-				<!--title-->
-				<control type="label">
-                    <visible>Window.IsVisible(TVTimerRules)</visible>
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>18-col</width>
-                    <font>pageTitle</font>
-                    <label>$LOCALIZE[31006] [COLOR highlight]$LOCALIZE[31055][/COLOR]</label>
-                    <textcolor>textActive</textcolor>
-                </control>
-                <control type="label">
-                    <visible>Window.IsVisible(RadioTimerRules)</visible>
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>18-col</width>
-                    <font>pageTitle</font>
-                    <label>$LOCALIZE[31059] [COLOR highlight]$LOCALIZE[31055][/COLOR]</label>
-                    <textcolor>textActive</textcolor>
-                </control>
-		        <!--subtitle-->
-		        <control type="label">
-		            <posx>0</posx>
-		            <posy>1-row</posy>
-		            <width>12-col</width>
-					<height>2-row</height>
-		            <font>pageSubTitle</font>
-		            <label>$INFO[container.numitems] $LOCALIZE[31145]</label>
-		            <textcolor>textActive</textcolor>
-		        </control>
-				<!--time-->
-				<control type="label">
-		            <posx>24-col</posx>
-		            <posy>0</posy>
-		            <width>12-col</width>
-		            <align>right</align>
-		            <font>pageTitle</font>
-		            <label>$INFO[System.Time]</label>
-		            <textcolor>textActive</textcolor>
-		        </control>
-				<!--date-->
-		        <control type="label">
-		            <posx>24-col</posx>
-		            <posy>1-row</posy>
-		            <width>12-col</width>
-					<height>2-row</height>
-					<align>right</align>
-		            <font>pageSubTitle</font>
-		            <label>$INFO[System.Date(DDD)], $INFO[system.Date(mmm d)]</label>
-		            <textcolor>textActive</textcolor>
-		        </control>
-			</control>
+            <!--page header-->
+            <control type="group">
+				<include>pageHeader</include>    
+            </control>
        </control>
        <!--hub menu-->
        <include>hubMenu</include>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/MyPics.xml
+++ b/1080i/MyPics.xml
@ -37,8 +37,6 @@
        <include>hubMenu</include>
        <!--mini window-->
        <include>miniVideoPlayer</include>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debug-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/MyPlaylist.xml
+++ b/1080i/MyPlaylist.xml
@ -51,8 +51,6 @@
        <include>miniVideoPlayer</include>
        <!--hub menu-->
        <include>hubMenu</include>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/MyPrograms.xml
+++ b/1080i/MyPrograms.xml
@ -138,8 +138,6 @@
        <include>miniVideoPlayer</include>
        <!--hub menu-->
        <include>hubMenu</include>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/MyVideoNav.xml
+++ b/1080i/MyVideoNav.xml
@ -63,8 +63,6 @@
        <include>hubMenu</include>
        <!--loading indicator-->
        <include>loadingIndicator</include>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/MyWeather.xml
+++ b/1080i/MyWeather.xml
@ -207,8 +207,6 @@
            <onright>Weather.LocationNext</onright>
            <onleft>Weather.LocationPrevious</onleft>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/Settings.xml
+++ b/1080i/Settings.xml
@ -233,8 +233,6 @@
 				<onup>9000</onup>
 			</control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/SettingsCategory.xml
+++ b/1080i/SettingsCategory.xml
@ -79,7 +79,7 @@
                <posy>2-row</posy>
                <width></width>
                <itemgap>0</itemgap>
-                <height>15-row</height>
+                <height>538</height>
                <onleft>9000</onleft>
                <onright>5</onright>
                <onup></onup>
@ -148,8 +148,6 @@
                <description>Change settings level</description>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/SettingsProfile.xml
+++ b/1080i/SettingsProfile.xml
@ -163,8 +163,6 @@
                </focusedlayout>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/SettingsScreenCalibration.xml
+++ b/1080i/SettingsScreenCalibration.xml
@ -61,8 +61,6 @@
            <align>center</align>
            <label></label>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/SettingsSystemInfo.xml
+++ b/1080i/SettingsSystemInfo.xml
@ -282,8 +282,6 @@
                <autoscroll delay="5000" repeat="7500" time="5000">true</autoscroll>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@ -123,15 +123,6 @@
                <onleft>8000</onleft>
                <itemgap>0</itemgap>
                <orientation>vertical</orientation>
-
-				<control type="radiobutton" id="21">
-                    <visible>Container(8000).Hasfocus(1)</visible>
-                    <description>Hide mouse pointer</description>
-                    <width>14-col</width>
-                    <label>31248</label>
-                    <onclick>Skin.ToggleSetting(hideMouse)</onclick>
-                    <selected>Skin.HasSetting(hideMouse)</selected>
-                </control>
                <control type="radiobutton" id="6">
                    <visible>Container(8000).Hasfocus(1)</visible>
                    <description>Stop video on return to menu</description>
@ -268,8 +259,6 @@
                </control>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/VideoFullScreen.xml
+++ b/1080i/VideoFullScreen.xml
@ -91,8 +91,6 @@
                <shadowcolor></shadowcolor>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/VideoOSD.xml
+++ b/1080i/VideoOSD.xml
@ -402,8 +402,6 @@
                </content>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/VideoOSDBookmarks.xml
+++ b/1080i/VideoOSDBookmarks.xml
@ -207,8 +207,6 @@
                <description>Clear Bookmark button</description>
            </control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/custom_musicPlayerFullscreen.xml
+++ b/1080i/custom_musicPlayerFullscreen.xml
@ -170,8 +170,6 @@
 			<onright>playercontrol(next)</onright>
 			<onclick>activatewindow(1105)</onclick>
 		</control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
 		<!--debugging-->
 		<include>DebugGrid</include>
 		<control type="label">
--- a/1080i/custom_musicPlayerOptions.xml
+++ b/1080i/custom_musicPlayerOptions.xml
@ -269,8 +269,6 @@
 	            </control>
 			</control>
        </control>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/script-globalsearch.xml
+++ b/1080i/script-globalsearch.xml
@ -207,8 +207,6 @@
        <include>hubMenu</include>
        <!--loading indicator-->
        <include>loadingIndicator</include>
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/script-skinshortcuts.xml
+++ b/1080i/script-skinshortcuts.xml
@ -154,8 +154,6 @@
                </focusedlayout>
            </control>
 		</control>     
-		<!--touchscreen controls-->
-		<include>touchscreenControls</include>     
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@ -374,7 +374,7 @@ msgid "Add Music Addon"
 msgstr ""

 msgctxt "#31087"
-msgid "PVR Timers"
+msgid "Timers"
 msgstr ""

 msgctxt "#31088"
@ -518,7 +518,7 @@ msgid "Reset home backgrounds to default"
 msgstr ""

 msgctxt "#31123"
-msgid "Current Playlist"
+msgid "Current Queue"
 msgstr ""

 msgctxt "#31124"
@ -606,7 +606,7 @@ msgid "FPS"
 msgstr ""

 msgctxt "#31145"
-msgid "Items"
+msgid "Item(s)"
 msgstr ""

 msgctxt "#31146"
@ -1018,5 +1018,5 @@ msgid "Import content"
 msgstr ""

 msgctxt "#31248"
-msgid "Hide mouse pointer"
+msgid "Queue"
 msgstr ""
--- a/shortcuts/musicsubmenu.DATA.xml
+++ b/shortcuts/musicsubmenu.DATA.xml
@ -7,6 +7,14 @@
        <icon>DefaultAddon.png</icon>
        <thumb />
        <action>activateWindow(1103)</action>
+    </shortcut>
+	<shortcut>
+        <visible>MusicPlayer.HasNext</visible>
+        <label>31248</label>
+        <label2>10005</label2>
+        <icon>DefaultAddon.png</icon>
+        <thumb />
+        <action>activateWindow(musicplaylist)</action>
    </shortcut>
    <shortcut>
        <visible>Library.HasContent(Music)</visible>