From 3d57fc112131d3c6bca8d47ee019f80418dabf8f Mon Sep 17 00:00:00 2001 From: theDeadMan Date: Thu, 2 Apr 2020 18:42:40 +0100 Subject: [PATCH] improving touchscreen support --- 1080i/AddonBrowser.xml | 2 ++ 1080i/DialogAddonInfo.xml | 2 ++ 1080i/DialogAddonSettings.xml | 2 ++ 1080i/DialogButtonMenu.xml | 2 ++ 1080i/DialogContextMenu.xml | 2 ++ 1080i/DialogFavourites.xml | 2 ++ 1080i/DialogGameControllers.xml | 2 ++ 1080i/DialogKeyboard.xml | 2 ++ 1080i/DialogMediaSource.xml | 2 ++ 1080i/DialogMusicInfo.xml | 2 ++ 1080i/DialogNumeric.xml | 2 ++ 1080i/DialogPVRInfo.xml | 2 ++ 1080i/DialogPictureInfo.xml | 2 ++ 1080i/DialogSelect.xml | 3 ++- 1080i/DialogSubtitles.xml | 2 ++ 1080i/DialogTextViewer.xml | 2 ++ 1080i/DialogVideoInfo.xml | 2 ++ 1080i/EventLog.xml | 2 ++ 1080i/FileManager.xml | 2 ++ 1080i/Includes.xml | 19 ++++++++++++++++ 1080i/MyGames.xml | 2 ++ 1080i/MyMusicNav.xml | 2 ++ 1080i/MyPVRChannels.xml | 4 +++- 1080i/MyPVRGuide.xml | 2 ++ 1080i/MyPVRRecordings.xml | 2 ++ 1080i/MyPVRTimers.xml | 2 ++ 1080i/MyPics.xml | 2 ++ 1080i/MyPlaylist.xml | 2 ++ 1080i/MyPrograms.xml | 2 ++ 1080i/MyVideoNav.xml | 2 ++ 1080i/MyWeather.xml | 2 ++ 1080i/Pointer.xml | 4 ++++ 1080i/Settings.xml | 2 ++ 1080i/SettingsCategory.xml | 2 ++ 1080i/SettingsProfile.xml | 2 ++ 1080i/SettingsScreenCalibration.xml | 2 ++ 1080i/SettingsSystemInfo.xml | 25 ++++++++------------- 1080i/SkinSettings.xml | 12 ++++++++++ 1080i/VideoFullScreen.xml | 2 ++ 1080i/VideoOSD.xml | 2 ++ 1080i/VideoOSDBookmarks.xml | 2 ++ 1080i/custom_musicPlayerFullscreen.xml | 10 +++++++++ 1080i/custom_musicPlayerOptions.xml | 2 ++ 1080i/script-globalsearch.xml | 2 ++ 1080i/script-skinshortcuts.xml | 4 +++- language/resource.language.en_gb/strings.po | 4 ++++ 46 files changed, 140 insertions(+), 19 deletions(-) diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml index 98b4df4..502df24 100644 --- a/1080i/AddonBrowser.xml +++ b/1080i/AddonBrowser.xml @@ -340,6 +340,8 @@ + + touchscreenControls DebugGrid diff --git a/1080i/DialogAddonInfo.xml b/1080i/DialogAddonInfo.xml index 9677aeb..28d9327 100644 --- a/1080i/DialogAddonInfo.xml +++ b/1080i/DialogAddonInfo.xml @@ -285,6 +285,8 @@ Launch addon + + touchscreenControls DebugGrid diff --git a/1080i/DialogAddonSettings.xml b/1080i/DialogAddonSettings.xml index 35dd4e5..bdb883b 100644 --- a/1080i/DialogAddonSettings.xml +++ b/1080i/DialogAddonSettings.xml @@ -220,6 +220,8 @@ + + touchscreenControls DebugGrid diff --git a/1080i/DialogButtonMenu.xml b/1080i/DialogButtonMenu.xml index 9b6e780..969284e 100644 --- a/1080i/DialogButtonMenu.xml +++ b/1080i/DialogButtonMenu.xml @@ -105,6 +105,8 @@ + + touchscreenControls DebugGrid diff --git a/1080i/DialogContextMenu.xml b/1080i/DialogContextMenu.xml index 83cf558..ec611b1 100644 --- a/1080i/DialogContextMenu.xml +++ b/1080i/DialogContextMenu.xml @@ -54,6 +54,8 @@ 12-col + + touchscreenControls DebugGrid diff --git a/1080i/DialogFavourites.xml b/1080i/DialogFavourites.xml index 25c0ff4..2f0e3ce 100644 --- a/1080i/DialogFavourites.xml +++ b/1080i/DialogFavourites.xml @@ -109,6 +109,8 @@ + + touchscreenControls DebugGrid diff --git a/1080i/DialogGameControllers.xml b/1080i/DialogGameControllers.xml index 6bc2303..be16be6 100644 --- a/1080i/DialogGameControllers.xml +++ b/1080i/DialogGameControllers.xml @@ -225,6 +225,8 @@ Help button + + touchscreenControls DebugGrid diff --git a/1080i/DialogKeyboard.xml b/1080i/DialogKeyboard.xml index 1870bf3..bd3945a 100644 --- a/1080i/DialogKeyboard.xml +++ b/1080i/DialogKeyboard.xml @@ -1080,6 +1080,8 @@ + + touchscreenControls DebugGrid diff --git a/1080i/DialogMediaSource.xml b/1080i/DialogMediaSource.xml index df00c4a..b675b22 100644 --- a/1080i/DialogMediaSource.xml +++ b/1080i/DialogMediaSource.xml @@ -343,6 +343,8 @@ Cancel Button + + touchscreenControls DebugGrid diff --git a/1080i/DialogMusicInfo.xml b/1080i/DialogMusicInfo.xml index a2dfcf1..8d34835 100644 --- a/1080i/DialogMusicInfo.xml +++ b/1080i/DialogMusicInfo.xml @@ -765,6 +765,8 @@ + + touchscreenControls DebugGrid diff --git a/1080i/DialogNumeric.xml b/1080i/DialogNumeric.xml index 79f2f55..adf31b1 100644 --- a/1080i/DialogNumeric.xml +++ b/1080i/DialogNumeric.xml @@ -290,6 +290,8 @@ + + touchscreenControls DebugGrid diff --git a/1080i/DialogPVRInfo.xml b/1080i/DialogPVRInfo.xml index d9dd569..83011a3 100644 --- a/1080i/DialogPVRInfo.xml +++ b/1080i/DialogPVRInfo.xml @@ -243,6 +243,8 @@ + + touchscreenControls DebugGrid diff --git a/1080i/DialogPictureInfo.xml b/1080i/DialogPictureInfo.xml index 2fbdce1..6316d8e 100644 --- a/1080i/DialogPictureInfo.xml +++ b/1080i/DialogPictureInfo.xml @@ -48,6 +48,8 @@ + + touchscreenControls DebugGrid diff --git a/1080i/DialogSelect.xml b/1080i/DialogSelect.xml index 96bd189..9053171 100644 --- a/1080i/DialogSelect.xml +++ b/1080i/DialogSelect.xml @@ -331,9 +331,10 @@ - + + touchscreenControls DebugGrid diff --git a/1080i/DialogSubtitles.xml b/1080i/DialogSubtitles.xml index fb696db..978359b 100644 --- a/1080i/DialogSubtitles.xml +++ b/1080i/DialogSubtitles.xml @@ -256,6 +256,8 @@ + + touchscreenControls DebugGrid diff --git a/1080i/DialogTextViewer.xml b/1080i/DialogTextViewer.xml index bec2f7d..fb48ae6 100644 --- a/1080i/DialogTextViewer.xml +++ b/1080i/DialogTextViewer.xml @@ -46,6 +46,8 @@ textbox + + touchscreenControls DebugGrid diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml index 7160bf2..05b9c0c 100644 --- a/1080i/DialogVideoInfo.xml +++ b/1080i/DialogVideoInfo.xml @@ -519,6 +519,8 @@ Trailer + + touchscreenControls DebugGrid diff --git a/1080i/EventLog.xml b/1080i/EventLog.xml index ab63eb2..b677aa2 100644 --- a/1080i/EventLog.xml +++ b/1080i/EventLog.xml @@ -154,6 +154,8 @@ Control.IsVisible(570) + + touchscreenControls DebugGrid diff --git a/1080i/FileManager.xml b/1080i/FileManager.xml index 75ee549..acd8da7 100644 --- a/1080i/FileManager.xml +++ b/1080i/FileManager.xml @@ -229,6 +229,8 @@ + + touchscreenControls DebugGrid diff --git a/1080i/Includes.xml b/1080i/Includes.xml index 1f81378..51b172c 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -297,6 +297,25 @@ + + + + + System.GetBool(input.enablemouse) + + + black button + 0 + 0 + colors/white.png + textActive + fullscreenHeight + 12 + back + + + + 15 diff --git a/1080i/MyGames.xml b/1080i/MyGames.xml index 78ae320..48f0e13 100644 --- a/1080i/MyGames.xml +++ b/1080i/MyGames.xml @@ -36,6 +36,8 @@ hubMenu miniVideoPlayer + + touchscreenControls DebugGrid diff --git a/1080i/MyMusicNav.xml b/1080i/MyMusicNav.xml index 645b017..2507461 100644 --- a/1080i/MyMusicNav.xml +++ b/1080i/MyMusicNav.xml @@ -64,6 +64,8 @@ hubMenu loadingIndicator + + touchscreenControls DebugGrid diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml index 631ca83..0805571 100644 --- a/1080i/MyPVRChannels.xml +++ b/1080i/MyPVRChannels.xml @@ -48,7 +48,9 @@ miniVideoPlayer hubMenu - + + touchscreenControls + DebugGrid DialogID diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml index 5ecdd4d..24d891e 100644 --- a/1080i/MyPVRGuide.xml +++ b/1080i/MyPVRGuide.xml @@ -166,6 +166,8 @@ miniVideoPlayer hubMenu + + touchscreenControls DebugGrid diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml index d53da8b..6443c2e 100644 --- a/1080i/MyPVRRecordings.xml +++ b/1080i/MyPVRRecordings.xml @@ -167,6 +167,8 @@ miniVideoPlayer hubMenu + + touchscreenControls DebugGrid diff --git a/1080i/MyPVRTimers.xml b/1080i/MyPVRTimers.xml index 2d163f6..2a602d3 100644 --- a/1080i/MyPVRTimers.xml +++ b/1080i/MyPVRTimers.xml @@ -249,6 +249,8 @@ hubMenu + + touchscreenControls DebugGrid diff --git a/1080i/MyPics.xml b/1080i/MyPics.xml index 2afa4d5..526a5cf 100644 --- a/1080i/MyPics.xml +++ b/1080i/MyPics.xml @@ -37,6 +37,8 @@ hubMenu miniVideoPlayer + + touchscreenControls DebugGrid diff --git a/1080i/MyPlaylist.xml b/1080i/MyPlaylist.xml index f95960d..fe38258 100644 --- a/1080i/MyPlaylist.xml +++ b/1080i/MyPlaylist.xml @@ -51,6 +51,8 @@ miniVideoPlayer hubMenu + + touchscreenControls DebugGrid diff --git a/1080i/MyPrograms.xml b/1080i/MyPrograms.xml index 9bebab2..f735cd0 100644 --- a/1080i/MyPrograms.xml +++ b/1080i/MyPrograms.xml @@ -138,6 +138,8 @@ miniVideoPlayer hubMenu + + touchscreenControls DebugGrid diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml index 27cc3e5..fb04ff4 100644 --- a/1080i/MyVideoNav.xml +++ b/1080i/MyVideoNav.xml @@ -63,6 +63,8 @@ hubMenu loadingIndicator + + touchscreenControls DebugGrid diff --git a/1080i/MyWeather.xml b/1080i/MyWeather.xml index 185146f..e04a749 100644 --- a/1080i/MyWeather.xml +++ b/1080i/MyWeather.xml @@ -207,6 +207,8 @@ Weather.LocationNext Weather.LocationPrevious + + touchscreenControls DebugGrid diff --git a/1080i/Pointer.xml b/1080i/Pointer.xml index 7a7bf44..f00dc97 100644 --- a/1080i/Pointer.xml +++ b/1080i/Pointer.xml @@ -8,24 +8,28 @@ + !Skin.HasSetting(hideMouse) Pointer 45 45 UIControls/PointerNF.png + !Skin.HasSetting(hideMouse) Pointer Focus 45 45 UIControls/PointerFO.png + !Skin.HasSetting(hideMouse) Pointer Drag 45 45 UIControls/PointerDrag.png + !Skin.HasSetting(hideMouse) pointer_click 45 45 diff --git a/1080i/Settings.xml b/1080i/Settings.xml index 7e54552..3c6adc7 100644 --- a/1080i/Settings.xml +++ b/1080i/Settings.xml @@ -233,6 +233,8 @@ 9000 + + touchscreenControls DebugGrid diff --git a/1080i/SettingsCategory.xml b/1080i/SettingsCategory.xml index cc994e6..0f26f4d 100644 --- a/1080i/SettingsCategory.xml +++ b/1080i/SettingsCategory.xml @@ -148,6 +148,8 @@ Change settings level + + touchscreenControls DebugGrid diff --git a/1080i/SettingsProfile.xml b/1080i/SettingsProfile.xml index 77dca82..d20cf16 100644 --- a/1080i/SettingsProfile.xml +++ b/1080i/SettingsProfile.xml @@ -163,6 +163,8 @@ + + touchscreenControls DebugGrid diff --git a/1080i/SettingsScreenCalibration.xml b/1080i/SettingsScreenCalibration.xml index 6381492..e405a3b 100644 --- a/1080i/SettingsScreenCalibration.xml +++ b/1080i/SettingsScreenCalibration.xml @@ -61,6 +61,8 @@ center + + touchscreenControls DebugGrid diff --git a/1080i/SettingsSystemInfo.xml b/1080i/SettingsSystemInfo.xml index c4aff09..68c726f 100644 --- a/1080i/SettingsSystemInfo.xml +++ b/1080i/SettingsSystemInfo.xml @@ -207,32 +207,28 @@ $INFO[System.BuildVersion][CR]$INFO[System.BuildDate] > - - + Connectivity $INFO[Network.IPAddress][CR]$INFO[Network.MacAddress] > - - + Storage $INFO[System.TotalSpace][CR]$INFO[System.FreeSpace] > - - + Memory $INFO[System.Memory(total),, $LOCALIZE[20161]][CR]$INFO[System.FreeMemory] / $INFO[System.Memory(free.percent),, $LOCALIZE[156]] > - - + CPU @@ -240,23 +236,20 @@ $INFO[System.CpuFrequency][CR]$LOCALIZE[139]$INFO[System.CPUTemperature, ,] > - Screen Resolution $INFO[System.ScreenWidth] x $INFO[System.ScreenHeight][CR]$INFO[System.FPS,, $LOCALIZE[31144]] > - - + Media $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]: ,] > - - + PVR.HasTVChannels @@ -264,8 +257,7 @@ $INFO[Pvr.BackendName][CR]$INFO[PVR.BackendDiskspace] > - - + !PVR.HasTVChannels @@ -274,7 +266,6 @@ $LOCALIZE[31118] > - @@ -291,6 +282,8 @@ true + + touchscreenControls DebugGrid diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml index 6e3313c..c0bd120 100644 --- a/1080i/SkinSettings.xml +++ b/1080i/SkinSettings.xml @@ -123,6 +123,15 @@ 8000 0 vertical + + + Container(8000).Hasfocus(1) + Hide mouse pointer + 14-col + + Skin.ToggleSetting(hideMouse) + Skin.HasSetting(hideMouse) + Container(8000).Hasfocus(1) Stop video on return to menu @@ -148,6 +157,7 @@ Skin.Reset(homeBackground) 8-col + Container(8000).Hasfocus(1) Reverse power down options @@ -258,6 +268,8 @@ + + touchscreenControls DebugGrid diff --git a/1080i/VideoFullScreen.xml b/1080i/VideoFullScreen.xml index 507ffc2..1cbbc74 100644 --- a/1080i/VideoFullScreen.xml +++ b/1080i/VideoFullScreen.xml @@ -91,6 +91,8 @@ + + touchscreenControls DebugGrid diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml index d734233..cc8fcc9 100644 --- a/1080i/VideoOSD.xml +++ b/1080i/VideoOSD.xml @@ -402,6 +402,8 @@ + + touchscreenControls DebugGrid diff --git a/1080i/VideoOSDBookmarks.xml b/1080i/VideoOSDBookmarks.xml index f1d4328..e12be90 100644 --- a/1080i/VideoOSDBookmarks.xml +++ b/1080i/VideoOSDBookmarks.xml @@ -207,6 +207,8 @@ Clear Bookmark button + + touchscreenControls DebugGrid diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml index 593bf20..753c9e0 100644 --- a/1080i/custom_musicPlayerFullscreen.xml +++ b/1080i/custom_musicPlayerFullscreen.xml @@ -124,6 +124,14 @@ + System.GetBool(input.enablemouse) + dimensionsFullscreen + + + activatewindow(1105) + + + !System.GetBool(input.enablemouse) -100 -100 1-col @@ -134,6 +142,8 @@ playercontrol(next) activatewindow(1105) + + touchscreenControls DebugGrid diff --git a/1080i/custom_musicPlayerOptions.xml b/1080i/custom_musicPlayerOptions.xml index 6debb30..c3c7fec 100644 --- a/1080i/custom_musicPlayerOptions.xml +++ b/1080i/custom_musicPlayerOptions.xml @@ -270,6 +270,8 @@ + + touchscreenControls DebugGrid diff --git a/1080i/script-globalsearch.xml b/1080i/script-globalsearch.xml index 3d99437..b3c4990 100644 --- a/1080i/script-globalsearch.xml +++ b/1080i/script-globalsearch.xml @@ -207,6 +207,8 @@ hubMenu loadingIndicator + + touchscreenControls DebugGrid diff --git a/1080i/script-skinshortcuts.xml b/1080i/script-skinshortcuts.xml index 086414c..77ffbcc 100644 --- a/1080i/script-skinshortcuts.xml +++ b/1080i/script-skinshortcuts.xml @@ -153,7 +153,9 @@ - + + + touchscreenControls DebugGrid diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po index 0594dda..7105434 100644 --- 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 "" \ No newline at end of file