From 21226e3f50fff919664c0515f25267188110f558 Mon Sep 17 00:00:00 2001 From: theDeadMan Date: Sun, 5 Apr 2020 18:31:04 +0100 Subject: [PATCH] touchscreen support first pass --- 1080i/Includes.xml | 168 +++++++++++++++++++++---- 1080i/MyMusicPlaylistEditor.xml | 2 + 1080i/MyPVRRecordings.xml | 2 +- 1080i/custom_musicPlayerFullscreen.xml | 38 +++++- README.md | 1 + addon.xml | 2 +- 6 files changed, 188 insertions(+), 25 deletions(-) diff --git a/1080i/Includes.xml b/1080i/Includes.xml index cc9ae71..7d7761d 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -58,7 +58,11 @@ !String.IsEmpty(Window(Weather).Property(WeatherProvider)) + !String.String.IsEmpty(weather.temperature) + !String.String.IsEmpty(weather.conditions) - + + [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) + + + 0 @@ -302,33 +306,153 @@ System.GetBool(input.enablemouse) - + 0 + 0 + + + !$EXP[openSideBlade] back button - 0 + -5 0 - colors/black.png - textActive - fullscreenHeight - 45 - back - activateWindow(home) - setfocus(9000) - Back + colors/black.png + colors/black.png + 807 + 50 + symbol + 14 + 22FFFFFF + 22FFFFFF + + back - - - player controls + + + + $EXP[openSideBlade] + back button + -5 + 0 + colors/black.png + colors/black.png + 807 + 50 + symbol + 14 + 22FFFFFF + 22FFFFFF + + setfocus(9000) + activateWindow(home) + + + + + home + !window.isactive(home) + -5 + 810 + colors/black.png + colors/black.png + 267 + 50 + symbol + 14 + 22FFFFFF + 22FFFFFF + + activateWindow(home) + + + + + 45r 0 - colors/black.png - textActive - fullscreenHeight - 45 - action(pause) - action(stop) - action(play) - + + + Pause + player.playing + 0 + 0 + colors/black.png + colors/black.png + 22FFFFFF + 267 + 50 + symbol + 14 + 22FFFFFF + + action(pause) + + + + play + !player.playing + 0 + 0 + colors/black.png + colors/black.png + 267 + 50 + symbol + 14 + 22FFFFFF + 22FFFFFF + + action(play) + + + + stop + 0 + 270 + colors/black.png + colors/black.png + 267 + 50 + symbol + 14 + 22FFFFFF + 22FFFFFF + + action(stop) + + + + volume up + 0 + 540 + colors/black.png + colors/black.png + 267 + 50 + symbol + 14 + 22FFFFFF + 22FFFFFF + + action(volumeup) + + + + volume down + 0 + 810 + colors/black.png + colors/black.png + 270 + 50 + symbol + 14 + 22FFFFFF + 22FFFFFF + + action(volumedown) + + + page up diff --git a/1080i/MyMusicPlaylistEditor.xml b/1080i/MyMusicPlaylistEditor.xml index 83be6ca..be5755b 100644 --- a/1080i/MyMusicPlaylistEditor.xml +++ b/1080i/MyMusicPlaylistEditor.xml @@ -284,6 +284,8 @@ Clear button + + touchscreenControls DebugGrid diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml index 6443c2e..289010a 100644 --- a/1080i/MyPVRRecordings.xml +++ b/1080i/MyPVRRecordings.xml @@ -173,7 +173,7 @@ DebugGrid DialogID - + diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml index 2cbe482..328e8ac 100644 --- a/1080i/custom_musicPlayerFullscreen.xml +++ b/1080i/custom_musicPlayerFullscreen.xml @@ -58,7 +58,7 @@ - + 0 0 @@ -119,6 +119,42 @@ 99000000 + + + System.GetBool(input.enablemouse) + + previous + 7-col-gutter + 200 + colors/black.png + colors/black.png + textActive + 1-col + 1-col + symbol + 24 + 22FFFFFF + 22FFFFFF + + playercontrol(previous) + + + next + 1178 + 200 + colors/black.png + colors/black.png + textActive + 1-col + 1-col + symbol + 24 + 22FFFFFF + 22FFFFFF + + playercontrol(next) + + diff --git a/README.md b/README.md index 567f8cb..37acbe1 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ Built for the living room, Pellucid is a clean and carefully designed Kodi exper - Skin Shortcuts addon support is available from the Krypton release onwards. - Full PVR / Live TV support +- Support for touchscreens Discussion thread: http://forum.kodi.tv/forumdisplay.php?fid=267 diff --git a/addon.xml b/addon.xml index b3fe6aa..9d15b91 100644 --- a/addon.xml +++ b/addon.xml @@ -11,7 +11,7 @@ A skin for Kodi by theDeadMan - Built for the living room, Pellucid is a clean and simple kodi experience designed for maximum usability and minimum fuss. Skin Shortcuts addon support is available for full menu customisation. With thanks to Marco "Dadebue" Debus for the homescreen photography. + Built for the living room, Pellucid is a clean and carefully designed kodi experience designed for maximum usability and minimum fuss. Skin Shortcuts addon support is available for full menu customisation. With thanks to Marco "Dadebue" Debus for the homescreen photography. all Creative Commons Attribution-Noncommercial-Share Alike 3.0 https://forum.kodi.tv/forumdisplay.php?fid=267