From 4df73904e9ef40c5a91a4645af43407d628940db Mon Sep 17 00:00:00 2001 From: Chris Bevan Date: Sun, 15 Nov 2015 12:52:30 +0000 Subject: [PATCH] various --- 1080i/DialogPVRChannelManager.xml | 75 ++++++++++-- 1080i/DialogPVRGroupManager.xml | 19 ++- 1080i/VideoOSD.xml | 189 +++++++++++++++++------------- 1080i/custom_subtitleMenu.xml | 27 +++-- changelog.txt | 7 +- language/English/strings.po | 12 ++ 6 files changed, 218 insertions(+), 111 deletions(-) diff --git a/1080i/DialogPVRChannelManager.xml b/1080i/DialogPVRChannelManager.xml index bdfc93b..1332c77 100644 --- a/1080i/DialogPVRChannelManager.xml +++ b/1080i/DialogPVRChannelManager.xml @@ -11,8 +11,6 @@ col-2-begin row-3-begin - - modalDialogInOutVertical 0 0 @@ -34,7 +32,7 @@ 8-col 2-row - 14-col + 8-col 21-row colors/black.png overlay @@ -66,11 +64,32 @@ - + + 0 + 2-row + 8-col-textbox + 2-row + colors/white.png + stretch + 44FFFFFF + + + name label 0 2-row 8-col - 21-row + 2-row + center + center + itemSubTitle + black + + + + 0 + 4-row + 8-col-textbox + 19-row 7 @@ -132,9 +151,30 @@ - + 8-col 2-row + 8-col-textbox + 2-row + colors/white.png + stretch + 44FFFFFF + + + name label + 8-col + 2-row + 8-col + 2-row + center + center + itemSubTitle + black + + + + 8-col + 4-row Channel activated 0 @@ -263,9 +303,30 @@ - + 16-col 2-row + 6-col + 2-row + colors/white.png + stretch + 44FFFFFF + + + name label + 16-col + 2-row + 6-col + 2-row + center + center + itemSubTitle + black + + + + 16-col + 4-row 8-col 6-row 3 diff --git a/1080i/DialogPVRGroupManager.xml b/1080i/DialogPVRGroupManager.xml index 9c02d44..3132332 100644 --- a/1080i/DialogPVRGroupManager.xml +++ b/1080i/DialogPVRGroupManager.xml @@ -6,7 +6,7 @@ globalBackground col-3-begin - row-2-begin + row-3-begin modalDialogInOutVertical @@ -83,7 +83,7 @@ 6-col 2-row center - itemTitle + itemSubTitle black @@ -166,7 +166,7 @@ 2-row center center - itemTitle + itemSubTitle black @@ -257,7 +257,7 @@ 2-row center center - itemTitle + itemSubTitle black @@ -336,6 +336,17 @@ stretch 44FFFFFF + + 16-col + 2-row + 4-col + 2-row + center + center + itemSubTitle + black + + 16-col 4-row diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml index 8284b91..af8f7e3 100644 --- a/1080i/VideoOSD.xml +++ b/1080i/VideoOSD.xml @@ -29,7 +29,7 @@ col-1-begin 23-row - 16-col + 18-col 2-row pageTitle textActive @@ -66,89 +66,112 @@ - - col-21-begin + + col-17-begin 0 - 24-col - 8-row - 0 - horizontal - - - 0 - 0 - 1-col-textbox - 2-row - stretch - colors/black.png - textboxInactive - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - - - 0 - 0 - 1-col-textbox - 2-row - stretch - colors/white.png - highlight - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - - - - - System.GetBool(pvrmanager.enabled) + Player.CanRecord - - - - - PlayerControl(record) - - - Subtitles - - - - - Close - activateWindow(1104) - - - Audio Settings - - - - - ActivateWindow(124) - - - Bookmarks - - - - - ActivateWindow(125) - - + + 0 + 0 + 5-col-textbox + 2-row + colors/white.png + ffffffff + stretch + + + 24 + 0 + 324 + 2-row + center + itemTitle + black + + + + 5-col + 0 + 12-col + 2-row + 0 + horizontal + + + 0 + 0 + 1-col-textbox + 2-row + stretch + colors/black.png + textboxInactive + + + 0 + 0 + 1-col + 2-row + center + center + symbolLarge + textActive + + + + + + 0 + 0 + 1-col-textbox + 2-row + stretch + colors/white.png + highlight + + + 0 + 0 + 1-col + 2-row + center + center + symbolLarge + textActive + + - + + + + + System.GetBool(pvrmanager.enabled) + Player.CanRecord + + + - + PlayerControl(record) + + + Subtitles + + + - + Close + activateWindow(1104) + + + Audio Settings + + + - + ActivateWindow(124) + + + Bookmarks + + + - + ActivateWindow(125) + + + diff --git a/1080i/custom_subtitleMenu.xml b/1080i/custom_subtitleMenu.xml index 7f22cf8..b557d7d 100644 --- a/1080i/custom_subtitleMenu.xml +++ b/1080i/custom_subtitleMenu.xml @@ -1,7 +1,7 @@ 5000 - + fadeInOut @@ -33,21 +33,16 @@ 6-col 11-row 0 - - Download Subtitle - 8-col - - colors/white.png - textActive - Dialog.Close(VideoOSD) - ActivateWindow(SubtitleSearch) - Enable subtitles VideoPlayer.HasSubtitles colors/white.png textActive - + + - + - + + ShowSubtitles VideoPlayer.SubtitlesEnabled @@ -60,7 +55,15 @@ textActive SubtitleDelay - + + Download Subtitle + 8-col + + colors/white.png + textActive + Dialog.Close(VideoOSD) + ActivateWindow(SubtitleSearch) + diff --git a/changelog.txt b/changelog.txt index 4416a22..b1cd7c9 100644 --- a/changelog.txt +++ b/changelog.txt @@ -30,15 +30,10 @@ on startup: add check for parent folder items: system.getbool(showparentdiritems) -PVR channel manager -PVR Group manager - Pictures section update DialogPVRinfo - button update -Add filename to subtitles listings - Radio RDS test Touchscreen controls - get Android tablet for testing @@ -47,6 +42,8 @@ Addons manager - clean up a bit. Expand menu system to add options for sub menu etc (see xbox NXE for inspiration) +Android file view is not working properly. + [B]0.1.0[/B] - Initial Commit diff --git a/language/English/strings.po b/language/English/strings.po index d2f33d9..267008f 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -389,6 +389,10 @@ msgctxt "#31142" msgid "Prioritise exit over shutdown in power menu" msgstr "" +msgctxt "#31143" +msgid "Remaining" +msgstr "" + msgctxt "#31144" msgid "FPS" msgstr "" @@ -417,6 +421,10 @@ msgctxt "#31150" msgid "Home: Hide Search" msgstr "" +msgctxt "#31151" +msgid "Subtitles" +msgstr "" + msgctxt "#31152" msgid "Press OK to cancel" msgstr "" @@ -465,6 +473,10 @@ msgctxt "#31178" msgid "Recent TV Shows" msgstr "" +msgctxt "#31179" +msgid "Options" +msgstr "" + msgctxt "#31180" msgid "Recent Albums" msgstr ""