From 51facdad2eabfb67eafae08d20bad31b8ad0fd3c Mon Sep 17 00:00:00 2001 From: chrisbevan Date: Tue, 9 Aug 2016 20:18:07 +0100 Subject: [PATCH] more Krypton --- 1080i/AddonBrowser.xml | 12 +- 1080i/DialogAddonInfo.xml | 63 +++++-- 1080i/DialogBusy.xml | 1 - 1080i/DialogConfirm.xml | 265 +++++++++++++++++------------- 1080i/DialogPlayerProcessInfo.xml | 0 1080i/Includes.xml | 76 +++++---- 1080i/View_VideoFiles.xml | 34 +++- changelog.txt | 10 +- language/English/strings.po | 2 +- media/spinner.png | Bin 0 -> 3604 bytes 10 files changed, 284 insertions(+), 179 deletions(-) create mode 100644 1080i/DialogPlayerProcessInfo.xml create mode 100644 media/spinner.png diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml index 78a7bc7..b8a40f7 100644 --- a/1080i/AddonBrowser.xml +++ b/1080i/AddonBrowser.xml @@ -106,18 +106,10 @@ 0 22-col 11-row - keep + scale $INFO[ListItem.art(fanart)] 22ffffff - - 0 - 0 - 22-col - 11-row - scale - vignette.png - 4-col 1-row @@ -137,7 +129,7 @@ 10-col-gutter 2-row center - medium + mediumLight diff --git a/1080i/DialogAddonInfo.xml b/1080i/DialogAddonInfo.xml index a4a93e9..10a789c 100644 --- a/1080i/DialogAddonInfo.xml +++ b/1080i/DialogAddonInfo.xml @@ -48,7 +48,48 @@ scale $INFO[ListItem.art(fanart)] - + + + 6-col + 3-row + 12-col + 8-row + 50 + 50 + 8000 + horizontal + 600 + + + 0 + 0 + 6-col-gutter + 4-col-gutter + scale + $INFO[Listitem.thumb] + colors/white.png + 3 + ffffffff + + + + + focusThumb + + 0 + 0 + 6-col-gutter + 4-col-gutter + scale + $INFO[Listitem.thumb] + colors/white.png + 6 + ffffffff + + + + + 0 2-row 18-col @@ -58,9 +99,9 @@ 1-col - 3-row - 4-col - 4-col + 7-row + 2-col + 2-col stretch $INFO[ListItem.art(thumb)] colors/white.png @@ -94,7 +135,7 @@ 12-col-gutter small highlight - + 12 @@ -118,6 +159,7 @@ 14-row 3 vertical + 50 0 @@ -233,13 +275,6 @@ - SendClick(146,7) - - Control.IsEnabled(10) - - - - - SendClick(146,10) - @@ -262,10 +297,6 @@ Addon Settings - - Changelog button - - Launch addon diff --git a/1080i/DialogBusy.xml b/1080i/DialogBusy.xml index 5b4ac31..390c77f 100644 --- a/1080i/DialogBusy.xml +++ b/1080i/DialogBusy.xml @@ -1,7 +1,6 @@ - - 0 diff --git a/1080i/DialogConfirm.xml b/1080i/DialogConfirm.xml index 18c8ec2..98d0968 100644 --- a/1080i/DialogConfirm.xml +++ b/1080i/DialogConfirm.xml @@ -10,13 +10,13 @@ modalDialogInOut - col-9-begin + col-7-begin 0 heading 12 0 - 540 + 12-col-gutter 2-row true dialogTitle @@ -26,129 +26,170 @@ Progressbar 12 2-row - 540 - 24 + 12-col-gutter + 1-row System.Progressbar 12 - 3-row - 540 - 78 + 2-row + 828 + 156 textbox textActive + - - col-9-begin - 6-row - 1-col - 2-row - stretch - colors/black.png - - - control.hasfocus(10) - col-9-begin - 6-row - 1-col - 2-row - stretch - colors/white.png - highlight - - - - - - - col-9-begin - 6-row - 1-col - 2-row - center - center - symbolLarge - textActive - - - - col-13-begin - 6-row - 1-col - 2-row - stretch - colors/black.png - - - control.hasfocus(11) - col-13-begin - 6-row - 1-col - 2-row - stretch - colors/white.png - highlight - - - - - - - col-13-begin - 6-row - 1-col - 2-row - center - center - symbolLarge - textActive - - - - col-10-begin - 6-row - 8-col - 2-row - 1-col - 50 - 50 - 9999 - 9999 - horizontal - - - OK - colors/white.png - colors/black.png - black - 3-col - - - - Cancel - colors/white.png - colors/black.png - black - 3-col - - - - Custom Button - colors/white.png - colors/black.png - black - 3-col - - - - + + col-7-begin + 8-row + + 0 + 0 + 1-col + 2-row + stretch + colors/black.png + + + control.hasfocus(10) + 0 + 0 + 1-col + 2-row + stretch + colors/white.png + highlight + + + + + + + 0 + 0 + 1-col + 2-row + center + center + symbolLarge + textActive + + + + 4-col + 0 + 1-col + 2-row + stretch + colors/black.png + + + control.hasfocus(11) + 4-col + 0 + 1-col + 2-row + stretch + colors/white.png + highlight + + + + + + + 4-col + 0 + 1-col + 2-row + center + center + symbolLarge + textActive + + + + Control.IsVisible(12) + + 8-col + 0 + 1-col + 2-row + stretch + colors/black.png + + + control.hasfocus(12) + 8-col + 0 + 1-col + 2-row + stretch + colors/white.png + highlight + + + + + + + 8-col + 0 + 1-col + 2-row + center + center + symbolLarge + textActive + + + + + 1-col + 0 + 12-col + 2-row + 1-col + 50 + 50 + 9999 + 9999 + horizontal + + + OK + colors/white.png + colors/black.png + black + 3-col + + + + Cancel + colors/white.png + colors/black.png + black + 3-col + + + + Custom Button + colors/white.png + colors/black.png + black + 3-col + + + + + DebugGrid DialogID - + diff --git a/1080i/DialogPlayerProcessInfo.xml b/1080i/DialogPlayerProcessInfo.xml new file mode 100644 index 0000000..e69de29 diff --git a/1080i/Includes.xml b/1080i/Includes.xml index 919f9ca..465f6e4 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -78,40 +78,48 @@ - - !isempty(container.foldername) + !IntegerGreaterThan(container.numitems,0) | window.isactive(busydialog) - 0 - 0 - - - - - - - - - dimensionsFullscreen - colors/black.png - 77FFFFFF - stretch - - - dimensionsFullscreen - backgrounds/vignette.png - ffffffff - stretch - - - 13-col - row-14-begin - 50 - 50 - keep - busy.gif - - - 99FFFFFF - - + + + + + + + + + + + !Window.IsActive(startup) + !isempty(container.foldername) + !IntegerGreaterThan(container.numitems,0) | window.isactive(busydialog) + + colors/black.png + dimensionsFullscreen + Conditional + Conditional + WindowOpen + WindowClose + + + DepthMax + 920 + 513 + 80 + 80 + keep + Conditional + spinner.png + WindowOpen + + + DepthMax + 935 + 528 + 50 + 50 + keep + Conditional + spinner.png + WindowOpen + + row-2-begin diff --git a/1080i/View_VideoFiles.xml b/1080i/View_VideoFiles.xml index 091f04e..4bdd186 100644 --- a/1080i/View_VideoFiles.xml +++ b/1080i/View_VideoFiles.xml @@ -31,9 +31,9 @@ textboxInactive - 1-col-indent + 1-col-indent 0 - 23-col-gutter + 22-col-gutter 2-row center itemTitle @@ -41,6 +41,19 @@ - + + !isempty(ListItem.playcount) + 23-col-gutter + 0 + 1-col + 2-row + center + right + symbolLarge + textActive + - + + @@ -65,9 +78,9 @@ highlight - 1-col-indent + 1-col-indent 0 - 23-col-gutter + 22-col-gutter 2-row center itemTitle @@ -75,6 +88,19 @@ - + + !isempty(ListItem.playcount) + 23-col-gutter + 0 + 1-col + 2-row + center + right + symbolLarge + textActive + - + + diff --git a/changelog.txt b/changelog.txt index e4b4ced..f397f5c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -11,14 +11,22 @@ - [NEW] MyPlaylist.xml - [REMOVED] MyMusicPlaylist.xml - [REMOVED] MyVideoPlaylist.xml +- [NEW] Busy spinner (nicked from Estuary) +- [NEW] DialogPlayerProcessInfo.xml + [TODO] +Revise player stop on return DialogAudioDSPManager.xml -Check yes / no dialogs working correctly +DialogPlayerProcessInfo.xml +Check screenshots work in dialogAddonSettings +Check yes / no progress bar works ok [DONE] Check layouts for newly aggregated dialogs (dialogSettings.xml) [Finalise] strings for settings dialog check all active strings MyPVRTimers needs creating and testing +Screenshots etc + diff --git a/language/English/strings.po b/language/English/strings.po index 0a033a7..d598c02 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -342,7 +342,7 @@ msgid "Digital Television Setup" msgstr "" msgctxt "#31082" -msgid "Version" +msgid "By" msgstr "" msgctxt "#31083" diff --git a/media/spinner.png b/media/spinner.png new file mode 100644 index 0000000000000000000000000000000000000000..7e7413b137cddc122a579f28d72a8108525c6a33 GIT binary patch literal 3604 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 aTlYDQ>PVq~t@MBZ0000