diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml index 502df24..98b4df4 100644 --- a/1080i/AddonBrowser.xml +++ b/1080i/AddonBrowser.xml @@ -340,8 +340,6 @@ - - touchscreenControls DebugGrid diff --git a/1080i/DialogAddonInfo.xml b/1080i/DialogAddonInfo.xml index 28d9327..9677aeb 100644 --- a/1080i/DialogAddonInfo.xml +++ b/1080i/DialogAddonInfo.xml @@ -285,8 +285,6 @@ Launch addon - - touchscreenControls DebugGrid diff --git a/1080i/DialogAddonSettings.xml b/1080i/DialogAddonSettings.xml index bdb883b..35dd4e5 100644 --- a/1080i/DialogAddonSettings.xml +++ b/1080i/DialogAddonSettings.xml @@ -220,8 +220,6 @@ - - touchscreenControls DebugGrid diff --git a/1080i/DialogButtonMenu.xml b/1080i/DialogButtonMenu.xml index 969284e..9b6e780 100644 --- a/1080i/DialogButtonMenu.xml +++ b/1080i/DialogButtonMenu.xml @@ -105,8 +105,6 @@ - - touchscreenControls DebugGrid diff --git a/1080i/DialogContextMenu.xml b/1080i/DialogContextMenu.xml index ec611b1..83cf558 100644 --- a/1080i/DialogContextMenu.xml +++ b/1080i/DialogContextMenu.xml @@ -54,8 +54,6 @@ 12-col - - touchscreenControls DebugGrid diff --git a/1080i/DialogFavourites.xml b/1080i/DialogFavourites.xml index 2f0e3ce..25c0ff4 100644 --- a/1080i/DialogFavourites.xml +++ b/1080i/DialogFavourites.xml @@ -109,8 +109,6 @@ - - touchscreenControls DebugGrid diff --git a/1080i/DialogGameControllers.xml b/1080i/DialogGameControllers.xml index be16be6..6bc2303 100644 --- a/1080i/DialogGameControllers.xml +++ b/1080i/DialogGameControllers.xml @@ -225,8 +225,6 @@ Help button - - touchscreenControls DebugGrid diff --git a/1080i/DialogKeyboard.xml b/1080i/DialogKeyboard.xml index bd3945a..1870bf3 100644 --- a/1080i/DialogKeyboard.xml +++ b/1080i/DialogKeyboard.xml @@ -1080,8 +1080,6 @@ - - touchscreenControls DebugGrid diff --git a/1080i/DialogMediaSource.xml b/1080i/DialogMediaSource.xml index b675b22..df00c4a 100644 --- a/1080i/DialogMediaSource.xml +++ b/1080i/DialogMediaSource.xml @@ -343,8 +343,6 @@ Cancel Button - - touchscreenControls DebugGrid diff --git a/1080i/DialogMusicInfo.xml b/1080i/DialogMusicInfo.xml index 8d34835..a2dfcf1 100644 --- a/1080i/DialogMusicInfo.xml +++ b/1080i/DialogMusicInfo.xml @@ -765,8 +765,6 @@ - - touchscreenControls DebugGrid diff --git a/1080i/DialogNumeric.xml b/1080i/DialogNumeric.xml index adf31b1..79f2f55 100644 --- a/1080i/DialogNumeric.xml +++ b/1080i/DialogNumeric.xml @@ -290,8 +290,6 @@ - - touchscreenControls DebugGrid diff --git a/1080i/DialogPVRInfo.xml b/1080i/DialogPVRInfo.xml index 83011a3..d9dd569 100644 --- a/1080i/DialogPVRInfo.xml +++ b/1080i/DialogPVRInfo.xml @@ -243,8 +243,6 @@ - - touchscreenControls DebugGrid diff --git a/1080i/DialogPictureInfo.xml b/1080i/DialogPictureInfo.xml index 6316d8e..2fbdce1 100644 --- a/1080i/DialogPictureInfo.xml +++ b/1080i/DialogPictureInfo.xml @@ -48,8 +48,6 @@ - - touchscreenControls DebugGrid diff --git a/1080i/DialogSelect.xml b/1080i/DialogSelect.xml index 9053171..88b9494 100644 --- a/1080i/DialogSelect.xml +++ b/1080i/DialogSelect.xml @@ -333,8 +333,6 @@ - - touchscreenControls DebugGrid diff --git a/1080i/DialogSubtitles.xml b/1080i/DialogSubtitles.xml index 978359b..1e0493a 100644 --- a/1080i/DialogSubtitles.xml +++ b/1080i/DialogSubtitles.xml @@ -13,7 +13,7 @@ 20-col 23-row colors/black.png - 99FFFFFF + aaFFFFFF stretch @@ -256,8 +256,6 @@ - - touchscreenControls DebugGrid diff --git a/1080i/DialogTextViewer.xml b/1080i/DialogTextViewer.xml index fb48ae6..bec2f7d 100644 --- a/1080i/DialogTextViewer.xml +++ b/1080i/DialogTextViewer.xml @@ -46,8 +46,6 @@ textbox - - touchscreenControls DebugGrid diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml index 05b9c0c..7160bf2 100644 --- a/1080i/DialogVideoInfo.xml +++ b/1080i/DialogVideoInfo.xml @@ -519,8 +519,6 @@ Trailer - - touchscreenControls DebugGrid diff --git a/1080i/EventLog.xml b/1080i/EventLog.xml index b677aa2..ab63eb2 100644 --- a/1080i/EventLog.xml +++ b/1080i/EventLog.xml @@ -154,8 +154,6 @@ Control.IsVisible(570) - - touchscreenControls DebugGrid diff --git a/1080i/FileManager.xml b/1080i/FileManager.xml index acd8da7..75ee549 100644 --- a/1080i/FileManager.xml +++ b/1080i/FileManager.xml @@ -229,8 +229,6 @@ - - touchscreenControls DebugGrid diff --git a/1080i/Home.xml b/1080i/Home.xml index 5f8569e..2dadc16 100644 --- a/1080i/Home.xml +++ b/1080i/Home.xml @@ -285,8 +285,6 @@ setfocus(9000,0) setfocus(9000,0) - - touchscreenControls DebugGrid diff --git a/1080i/Includes.xml b/1080i/Includes.xml index 808595b..6d50a26 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -58,9 +58,6 @@ !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) - @@ -303,178 +300,7 @@ - - System.GetBool(input.enablemouse) - 0 - 0 - - - - !$EXP[openSideBlade] | window.isactive(1103) - back button - -5 - 0 - colors/black.png - colors/black.png - 807 - 50 - symbol - 14 - 22FFFFFF - 22FFFFFF - - back - - - - - $EXP[openSideBlade] + !window.isactive(1103) - back button - -5 - 0 - colors/black.png - colors/black.png - 807 - 50 - symbol - 14 - 22FFFFFF - 22FFFFFF - - setfocus(9000) - activateWindow(home) - - - - - home - -5 - 810 - colors/black.png - colors/black.png - 267 - 50 - symbol - 14 - 22FFFFFF - 22FFFFFF - - dialog.close(all,true) - activateWindow(home) - - - - - - 45r - 0 - - - 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 - 0 - 0 - colors/black.png - textActive - fullscreenWidth - 45 - PageUp(60) - - - - page down - 0 - 1035 - colors/black.png - textActive - fullscreenWidth - 45 - PageDown(60) - - diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml index 6949983..715dc17 100644 --- a/1080i/Includes_variables.xml +++ b/1080i/Includes_variables.xml @@ -26,6 +26,7 @@ $LOCALIZE[31006] [COLOR highlight]$LOCALIZE[31078][/COLOR] $LOCALIZE[31164] [COLOR highlight]$LOCALIZE[31078][/COLOR] $LOCALIZE[31006] [COLOR highlight]$LOCALIZE[31165][/COLOR] + $LOCALIZE[31060] [COLOR highlight]$LOCALIZE[31087][/COLOR] $LOCALIZE[10506] $LOCALIZE[31123] $LOCALIZE[31056] @@ -34,6 +35,7 @@ $INFO[Container.NumAllItems,, $LOCALIZE[31014]] $VAR[unwatchedOnly] $INFO[container.NumAllItems,, $LOCALIZE[31014]] + $INFO[container.NumAllItems,, $LOCALIZE[31145]] $LOCALIZE[31212] $INFO[Window.Property(WeatherProvider)] $INFO[Pvr.BackendChannels] $LOCALIZE[31017] ($INFO[control.getlabel(29)]) $INFO[container.NumAllItems] $LOCALIZE[31165] ($INFO[Pvr.BackendDiskSpace]) diff --git a/1080i/MyGames.xml b/1080i/MyGames.xml index 48f0e13..78ae320 100644 --- a/1080i/MyGames.xml +++ b/1080i/MyGames.xml @@ -36,8 +36,6 @@ hubMenu miniVideoPlayer - - touchscreenControls DebugGrid diff --git a/1080i/MyMusicNav.xml b/1080i/MyMusicNav.xml index 2507461..645b017 100644 --- a/1080i/MyMusicNav.xml +++ b/1080i/MyMusicNav.xml @@ -64,8 +64,6 @@ hubMenu loadingIndicator - - touchscreenControls DebugGrid diff --git a/1080i/MyMusicPlaylistEditor.xml b/1080i/MyMusicPlaylistEditor.xml index be5755b..83be6ca 100644 --- a/1080i/MyMusicPlaylistEditor.xml +++ b/1080i/MyMusicPlaylistEditor.xml @@ -284,8 +284,6 @@ Clear button - - touchscreenControls DebugGrid diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml index fc8980f..911821f 100644 --- a/1080i/MyPVRChannels.xml +++ b/1080i/MyPVRChannels.xml @@ -48,8 +48,6 @@ miniVideoPlayer hubMenu - - touchscreenControls DebugGrid diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml index 24d891e..5ecdd4d 100644 --- a/1080i/MyPVRGuide.xml +++ b/1080i/MyPVRGuide.xml @@ -166,8 +166,6 @@ miniVideoPlayer hubMenu - - touchscreenControls DebugGrid diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml index 289010a..f7c287a 100644 --- a/1080i/MyPVRRecordings.xml +++ b/1080i/MyPVRRecordings.xml @@ -167,8 +167,6 @@ miniVideoPlayer hubMenu - - touchscreenControls DebugGrid diff --git a/1080i/MyPVRTimers.xml b/1080i/MyPVRTimers.xml index 2a602d3..c76a31f 100644 --- a/1080i/MyPVRTimers.xml +++ b/1080i/MyPVRTimers.xml @@ -1,11 +1,18 @@ 9999 - fadeInOut + + + + 50 globalBackground + + + + modalDialogContentShift @@ -17,7 +24,7 @@ 0 0 24-col - 21-row + 23-row 9000 60 9000 @@ -152,36 +159,10 @@ - - - 6-col - 22-row - - Disk usage bar - 0 - 1 - 12-col - 48 - colors/black.png - colors/white.png - PVR.backenddiskspaceprogr!Integer.IsGreater(PVR.backenddiskspaceprogr,100) - - - 0 - 6 - 12-col - itemSubTitle - center - textActive - textActive - - - - - + - Control.IsVisible(60) + !control.isvisible(10) + Control.IsVisible(60) conditional 54r @@ -191,66 +172,13 @@ 9999 - - - col-1-begin - row-1-begin - - - Window.IsVisible(TVTimerRules) - 0 - 0 - 18-col - pageTitle - - textActive - - - Window.IsVisible(RadioTimerRules) - 0 - 0 - 18-col - pageTitle - - textActive - - - - 0 - 1-row - 12-col - 2-row - pageSubTitle - - textActive - - - - 24-col - 0 - 12-col - right - pageTitle - - textActive - - - - 24-col - 1-row - 12-col - 2-row - right - pageSubTitle - - textActive - - + + + pageHeader + hubMenu - - touchscreenControls DebugGrid diff --git a/1080i/MyPics.xml b/1080i/MyPics.xml index 526a5cf..2afa4d5 100644 --- a/1080i/MyPics.xml +++ b/1080i/MyPics.xml @@ -37,8 +37,6 @@ hubMenu miniVideoPlayer - - touchscreenControls DebugGrid diff --git a/1080i/MyPlaylist.xml b/1080i/MyPlaylist.xml index fe38258..f95960d 100644 --- a/1080i/MyPlaylist.xml +++ b/1080i/MyPlaylist.xml @@ -51,8 +51,6 @@ miniVideoPlayer hubMenu - - touchscreenControls DebugGrid diff --git a/1080i/MyPrograms.xml b/1080i/MyPrograms.xml index f735cd0..9bebab2 100644 --- a/1080i/MyPrograms.xml +++ b/1080i/MyPrograms.xml @@ -138,8 +138,6 @@ miniVideoPlayer hubMenu - - touchscreenControls DebugGrid diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml index fb04ff4..27cc3e5 100644 --- a/1080i/MyVideoNav.xml +++ b/1080i/MyVideoNav.xml @@ -63,8 +63,6 @@ hubMenu loadingIndicator - - touchscreenControls DebugGrid diff --git a/1080i/MyWeather.xml b/1080i/MyWeather.xml index e04a749..185146f 100644 --- a/1080i/MyWeather.xml +++ b/1080i/MyWeather.xml @@ -207,8 +207,6 @@ Weather.LocationNext Weather.LocationPrevious - - touchscreenControls DebugGrid diff --git a/1080i/Settings.xml b/1080i/Settings.xml index 3c6adc7..7e54552 100644 --- a/1080i/Settings.xml +++ b/1080i/Settings.xml @@ -233,8 +233,6 @@ 9000 - - touchscreenControls DebugGrid diff --git a/1080i/SettingsCategory.xml b/1080i/SettingsCategory.xml index 0f26f4d..cd68ba1 100644 --- a/1080i/SettingsCategory.xml +++ b/1080i/SettingsCategory.xml @@ -79,7 +79,7 @@ 2-row 0 - 15-row + 538 9000 5 @@ -148,8 +148,6 @@ Change settings level - - touchscreenControls DebugGrid diff --git a/1080i/SettingsProfile.xml b/1080i/SettingsProfile.xml index d20cf16..77dca82 100644 --- a/1080i/SettingsProfile.xml +++ b/1080i/SettingsProfile.xml @@ -163,8 +163,6 @@ - - touchscreenControls DebugGrid diff --git a/1080i/SettingsScreenCalibration.xml b/1080i/SettingsScreenCalibration.xml index e405a3b..6381492 100644 --- a/1080i/SettingsScreenCalibration.xml +++ b/1080i/SettingsScreenCalibration.xml @@ -61,8 +61,6 @@ center - - touchscreenControls DebugGrid diff --git a/1080i/SettingsSystemInfo.xml b/1080i/SettingsSystemInfo.xml index 68c726f..1410f42 100644 --- a/1080i/SettingsSystemInfo.xml +++ b/1080i/SettingsSystemInfo.xml @@ -282,8 +282,6 @@ true - - touchscreenControls DebugGrid diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml index c0bd120..35c5332 100644 --- a/1080i/SkinSettings.xml +++ b/1080i/SkinSettings.xml @@ -123,15 +123,6 @@ 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 @@ -268,8 +259,6 @@ - - touchscreenControls DebugGrid diff --git a/1080i/VideoFullScreen.xml b/1080i/VideoFullScreen.xml index 1cbbc74..507ffc2 100644 --- a/1080i/VideoFullScreen.xml +++ b/1080i/VideoFullScreen.xml @@ -91,8 +91,6 @@ - - touchscreenControls DebugGrid diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml index cc8fcc9..d734233 100644 --- a/1080i/VideoOSD.xml +++ b/1080i/VideoOSD.xml @@ -402,8 +402,6 @@ - - touchscreenControls DebugGrid diff --git a/1080i/VideoOSDBookmarks.xml b/1080i/VideoOSDBookmarks.xml index e12be90..f1d4328 100644 --- a/1080i/VideoOSDBookmarks.xml +++ b/1080i/VideoOSDBookmarks.xml @@ -207,8 +207,6 @@ Clear Bookmark button - - touchscreenControls DebugGrid diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml index be51f2c..2000455 100644 --- a/1080i/custom_musicPlayerFullscreen.xml +++ b/1080i/custom_musicPlayerFullscreen.xml @@ -170,8 +170,6 @@ playercontrol(next) activatewindow(1105) - - touchscreenControls DebugGrid diff --git a/1080i/custom_musicPlayerOptions.xml b/1080i/custom_musicPlayerOptions.xml index bab4827..663fbc5 100644 --- a/1080i/custom_musicPlayerOptions.xml +++ b/1080i/custom_musicPlayerOptions.xml @@ -269,8 +269,6 @@ - - touchscreenControls DebugGrid diff --git a/1080i/script-globalsearch.xml b/1080i/script-globalsearch.xml index b3c4990..3d99437 100644 --- a/1080i/script-globalsearch.xml +++ b/1080i/script-globalsearch.xml @@ -207,8 +207,6 @@ hubMenu loadingIndicator - - touchscreenControls DebugGrid diff --git a/1080i/script-skinshortcuts.xml b/1080i/script-skinshortcuts.xml index 77ffbcc..086414c 100644 --- a/1080i/script-skinshortcuts.xml +++ b/1080i/script-skinshortcuts.xml @@ -153,9 +153,7 @@ - - - touchscreenControls + DebugGrid diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po index 7105434..8f60b2f 100644 --- 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 "" \ No newline at end of file diff --git a/shortcuts/musicsubmenu.DATA.xml b/shortcuts/musicsubmenu.DATA.xml index a7e3c4f..3957d71 100644 --- a/shortcuts/musicsubmenu.DATA.xml +++ b/shortcuts/musicsubmenu.DATA.xml @@ -7,6 +7,14 @@ DefaultAddon.png activateWindow(1103) + + + MusicPlayer.HasNext + + 10005 + DefaultAddon.png + + activateWindow(musicplaylist) Library.HasContent(Music)