improving touchscreen support

2020-04-02 18:42:40 +01:00 · 2020-04-02 18:42:40 +01:00 · 3d57fc1121
parent ab7d3eb67f
commit 3d57fc1121
46 changed files with 140 additions and 19 deletions
--- a/1080i/AddonBrowser.xml
+++ b/1080i/AddonBrowser.xml
@ -340,6 +340,8 @@
                </control>
            </control>
        </control>
+		<!--touchscreen controls-->
+		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogAddonInfo.xml
+++ b/1080i/DialogAddonInfo.xml
@ -285,6 +285,8 @@
                <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,6 +220,8 @@
                </control>
            </control>
        </control>
+		<!--touchscreen controls-->
+		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogButtonMenu.xml
+++ b/1080i/DialogButtonMenu.xml
@ -105,6 +105,8 @@
                </content>
            </control>
        </control>
+		<!--touchscreen controls-->
+		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogContextMenu.xml
+++ b/1080i/DialogContextMenu.xml
@ -54,6 +54,8 @@
 	            <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,6 +109,8 @@
                </focusedlayout>
            </control>
        </control>
+		<!--touchscreen controls-->
+		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogGameControllers.xml
+++ b/1080i/DialogGameControllers.xml
@ -225,6 +225,8 @@
                <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,6 +1080,8 @@
                </control>
            </control>
        </control>
+		<!--touchscreen controls-->
+		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogMediaSource.xml
+++ b/1080i/DialogMediaSource.xml
@ -343,6 +343,8 @@
                <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,6 +765,8 @@
 				<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,6 +290,8 @@
                </control>
            </control>
        </control>
+		<!--touchscreen controls-->
+		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogPVRInfo.xml
+++ b/1080i/DialogPVRInfo.xml
@ -243,6 +243,8 @@
                <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,6 +48,8 @@
                </focusedlayout>
            </control>
        </control>
+		<!--touchscreen controls-->
+		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogSelect.xml
+++ b/1080i/DialogSelect.xml
@ -331,9 +331,10 @@
                        <label>186</label>
                    </control>
                </control>
-
            </control>
        </control>
+		<!--touchscreen controls-->
+		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogSubtitles.xml
+++ b/1080i/DialogSubtitles.xml
@ -256,6 +256,8 @@
                </control>
            </control>
        </control>
+		<!--touchscreen controls-->
+		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/DialogTextViewer.xml
+++ b/1080i/DialogTextViewer.xml
@ -46,6 +46,8 @@
                <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,6 +519,8 @@
                <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,6 +154,8 @@
                <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,6 +229,8 @@
 	            </control>
            </control>
        </control>
+		<!--touchscreen controls-->
+		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@ -297,6 +297,25 @@
            </control>
        </control>
    </include>
+
+	<!--touchscreen controls-->
+	<include name="touchscreenControls">
+		<control type="group">
+			<visible>System.GetBool(input.enablemouse)</visible>
+			<!--universal back button-->
+			<control type="button" id="8542">
+	            <description>black button</description>
+				<posx>0</posx>
+	            <posy>0</posy>
+	            <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+	            <focusedcolor>textActive</focusedcolor>
+	            <height>fullscreenHeight</height>
+				<width>12</width>
+	            <onclick>back</onclick>
+	        </control>
+		</control>
+	</include>
+
   <!--debugging-->
    <include name="DialogID">
        <posx>15</posx>
--- a/1080i/MyGames.xml
+++ b/1080i/MyGames.xml
@ -36,6 +36,8 @@
        <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,6 +64,8 @@
        <include>hubMenu</include>
        <!--loading indicator-->
        <include>loadingIndicator</include>
+		<!--touchscreen controls-->
+		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/MyPVRChannels.xml
+++ b/1080i/MyPVRChannels.xml
@ -48,7 +48,9 @@
        <include>miniVideoPlayer</include>
        <!--hub menu-->
        <include>hubMenu</include>
-        <!--debugging-->
+		<!--touchscreen controls-->
+		<include>touchscreenControls</include>
+		<!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
            <include>DialogID</include>
--- a/1080i/MyPVRGuide.xml
+++ b/1080i/MyPVRGuide.xml
@ -166,6 +166,8 @@
 		<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,6 +167,8 @@
        <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
@ -249,6 +249,8 @@
        </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,6 +37,8 @@
        <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,6 +51,8 @@
        <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,6 +138,8 @@
        <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,6 +63,8 @@
        <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,6 +207,8 @@
            <onright>Weather.LocationNext</onright>
            <onleft>Weather.LocationPrevious</onleft>
        </control>
+		<!--touchscreen controls-->
+		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/Pointer.xml
+++ b/1080i/Pointer.xml
@ -8,24 +8,28 @@
    </coordinates>
    <controls>
        <control type="image" id="1">
+			<visible>!Skin.HasSetting(hideMouse)</visible>
            <description>Pointer</description>
            <width>45</width>
            <height>45</height>
            <texture>UIControls/PointerNF.png</texture>
        </control>
        <control type="image" id="2">
+			<visible>!Skin.HasSetting(hideMouse)</visible>
            <description>Pointer Focus</description>
            <width>45</width>
            <height>45</height>
            <texture>UIControls/PointerFO.png</texture>
        </control>
        <control type="image" id="3">
+			<visible>!Skin.HasSetting(hideMouse)</visible>
            <description>Pointer Drag</description>
            <width>45</width>
            <height>45</height>
            <texture>UIControls/PointerDrag.png</texture>
        </control>
        <control type="image" id="4">
+			<visible>!Skin.HasSetting(hideMouse)</visible>
            <description>pointer_click</description>
            <width>45</width>
            <height>45</height>
--- a/1080i/Settings.xml
+++ b/1080i/Settings.xml
@ -233,6 +233,8 @@
 				<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
@ -148,6 +148,8 @@
                <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,6 +163,8 @@
                </focusedlayout>
            </control>
        </control>
+		<!--touchscreen controls-->
+		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/SettingsScreenCalibration.xml
+++ b/1080i/SettingsScreenCalibration.xml
@ -61,6 +61,8 @@
            <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
@ -207,32 +207,28 @@
                        <label>482</label>
                        <label2>$INFO[System.BuildVersion][CR]$INFO[System.BuildDate]</label2>
                        <property name="itemIcon">&gt;</property>
-                        <thumb></thumb>
-                        
+                        <thumb></thumb>                       
                    </item>
                    <item id="2">
                        <description>Connectivity</description>
                        <label>705</label>
                        <label2>$INFO[Network.IPAddress][CR]$INFO[Network.MacAddress]</label2>
                        <property name="itemIcon">&gt;</property>
-                        <thumb></thumb>
-                        
+                        <thumb></thumb>                       
                    </item>
                    <item id="3">
                        <description>Storage</description>
                        <label>13277</label>
                        <label2>$INFO[System.TotalSpace][CR]$INFO[System.FreeSpace]</label2>
                        <property name="itemIcon">&gt;</property>
-                        <thumb></thumb>
-                        
+                        <thumb></thumb>                        
                    </item>
                    <item id="4">
                        <description>Memory</description>
                        <label>31062</label>
                        <label2>$INFO[System.Memory(total),, $LOCALIZE[20161]][CR]$INFO[System.FreeMemory] / $INFO[System.Memory(free.percent),, $LOCALIZE[156]]</label2>
                        <property name="itemIcon">&gt;</property>
-                        <thumb></thumb>
-                        
+                        <thumb></thumb>                       
                    </item>
                    <item id="5">
                        <description>CPU</description>
@ -240,23 +236,20 @@
                        <label2>$INFO[System.CpuFrequency][CR]$LOCALIZE[139]$INFO[System.CPUTemperature, ,]</label2>
                        <property name="itemIcon">&gt;</property>
                        <thumb></thumb>
-                        
                    </item>
                    <item id="6">
                        <description>Screen Resolution</description>
                        <label>31070</label>
                        <label2>$INFO[System.ScreenWidth] x $INFO[System.ScreenHeight][CR]$INFO[System.FPS,, $LOCALIZE[31144]]</label2>
                        <property name="itemIcon">&gt;</property>
-                        <thumb></thumb>
-                        
+                        <thumb></thumb>                      
                    </item>
                    <item id="7">
                        <description>Media</description>
                        <label>20060</label>
                        <label2>$INFO[Window(Home).Property(Movies.Count),$LOCALIZE[20342]: ,][CR]$INFO[Window(Home).Property(TVShows.Count),$LOCALIZE[20343]: ,][CR]$INFO[Window(Home).Property(Music.AlbumsCount),$LOCALIZE[132]: ,]</label2>
                        <property name="itemIcon">&gt;</property>
-                        <thumb></thumb>
-                        
+                        <thumb></thumb>                       
                    </item>
                    <item id="8">
                        <visible>PVR.HasTVChannels</visible>
@ -264,8 +257,7 @@
                        <label>24019</label>
                        <label2>$INFO[Pvr.BackendName][CR]$INFO[PVR.BackendDiskspace]</label2>
                        <property name="itemIcon">&gt;</property>
-                        <thumb></thumb>
-                        
+                        <thumb></thumb>                       
                    </item>
                    <item id="9">
                        <visible>!PVR.HasTVChannels</visible>
@ -274,7 +266,6 @@
                        <label2>$LOCALIZE[31118]</label2>
                        <property name="itemIcon">&gt;</property>
                        <thumb></thumb>
-                        
                    </item>
                </content>
            </control>
@ -291,6 +282,8 @@
                <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,6 +123,15 @@
                <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>
@ -148,6 +157,7 @@
                    <onclick>Skin.Reset(homeBackground)</onclick>
                    <textwidth>8-col</textwidth>
                </control>
+
                <control type="radiobutton" id="1">
                    <visible>Container(8000).Hasfocus(1)</visible>
                    <description>Reverse power down options</description>
@ -258,6 +268,8 @@
                </control>
            </control>
        </control>
+		<!--touchscreen controls-->
+		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/VideoFullScreen.xml
+++ b/1080i/VideoFullScreen.xml
@ -91,6 +91,8 @@
                <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,6 +402,8 @@
                </content>
            </control>
        </control>
+		<!--touchscreen controls-->
+		<include>touchscreenControls</include>
        <!--debugging-->
        <include>DebugGrid</include>
        <control type="label">
--- a/1080i/VideoOSDBookmarks.xml
+++ b/1080i/VideoOSDBookmarks.xml
@ -207,6 +207,8 @@
                <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
@ -124,6 +124,14 @@
 		</control>
 		<!--hidden buttons to handle dialog autohide-->
 		<control type="button" id="9876">
+			<visible>System.GetBool(input.enablemouse)</visible>
+			<include>dimensionsFullscreen</include>
+			<texturefocus></texturefocus>
+	        <texturenofocus></texturenofocus>
+			<onclick>activatewindow(1105)</onclick>
+		</control>
+		<control type="button" id="9876">
+			<visible>!System.GetBool(input.enablemouse)</visible>
 			<posx>-100</posx>
 			<posy>-100</posy>
 			<height>1-col</height>
@ -134,6 +142,8 @@
 			<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
@ -270,6 +270,8 @@
 	            </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,6 +207,8 @@
        <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
@ -153,7 +153,9 @@
                    </control>
                </focusedlayout>
            </control>
-		</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
@ -1015,4 +1015,8 @@ msgstr ""

 msgctxt "#31247"
 msgid "Import content"
+msgstr ""
+
+msgctxt "#31248"
+msgid "Hide mouse pointer"
 msgstr ""