diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml index 1f18c10..b5ff47d 100644 --- a/1080i/AddonBrowser.xml +++ b/1080i/AddonBrowser.xml @@ -315,109 +315,68 @@ - - - - - - + + + - 0 - 0 - col-5-begin - fullscreenHeight - colors/white.png - highlight + dimensionsFullscreen + colors/black.png + ddFFFFFF stretch - - - - col-1-begin - row-1-begin - 2-col - 1-col - symbolVeryLarge - center - textActive - - - - + + dimensionsFullscreen + vignette.png + ffffffff + stretch - 0 - row-4-begin + col-10-begin + 8-row + 0 6-col + 17-row + 0 + control.setfocus(50) + control.setfocus(50) vertical - 2-row - col-5-begin - menuTitle - 4-col-gutter - textActive - highlight - menuDisabled - colors/white.png - - + 6-col + colors/white.png + textActive - - - 21 - - 9999 + - 2-row - col-5-begin - menuTitle - 4-col-gutter - textActive - highlight - menuDisabled - colors/white.png - - + 6-col + colors/white.png + textActive - - - 21 - - 9999 + - 2-row - col-5-begin - menuTitle - textActive - highlight - menuDisabled - colors/white.png - - - col-1-begin - 4-col-gutter + colors/white.png + textActive + 6-col - 9999 - 2-row - col-5-begin - menuTitle - textActive - highlight - menuDisabled - colors/white.png - - - col-1-begin - 4-col-gutter + colors/white.png + textActive + 6-col - 9999 diff --git a/1080i/DialogConfirm.xml b/1080i/DialogConfirm.xml index 000ee6d..8a2a4ee 100644 --- a/1080i/DialogConfirm.xml +++ b/1080i/DialogConfirm.xml @@ -1,255 +1,155 @@ + 9000 fadeInOut modalDialog - 0 - row-9-begin + col-9-begin + row-8-begin modalDialogInOut - - col-1-begin + + heading + 0 0 - - heading - 0 - 0 - 12-col-gutter - 2-row - true - dialogTitle - textActive - - - Progressbar - 0 - 2-row - 12-col-gutter - 1-row - System.Progressbar - - - 0 - 2-row - 828 - 156 - textbox - textActive - - + 8-col-gutter + 2-row + true + dialogTitle + textActive - - - col-1-begin - 8-row - - - - Control.IsVisible(11) + !Control.IsVisible(10) + !Control.IsVisible(12) - - 0 - 0 - 1-col - 2-row - stretch - colors/black.png - - - control.hasfocus(11) - 0 - 0 - 1-col - 2-row - stretch - colors/white.png - highlight - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - - - - Control.IsVisible(10) + Control.IsVisible(11) - - 0 - 0 - 1-col - 2-row - stretch - colors/black.png - - - control.hasfocus(10) - 0 - 0 - 1-col - 2-row - stretch - colors/white.png - highlight - - - - - - - String.IsEqual(control.getlabel(10),$LOCALIZE[186]) - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - !String.IsEqual(control.getlabel(10),$LOCALIZE[186]) - 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 - - - - - - - String.IsEqual(control.getlabel(11),$LOCALIZE[107]) - 4-col - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - !String.IsEqual(control.getlabel(11),$LOCALIZE[107]) - 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 - colors/white.png - colors/black.png - black - 3-col - - - - + + Progressbar + -96 + 2-row + 8-col + 1-row + System.Progressbar + + + 0 + 2-row + 8-col-gutter + 124 + textbox + textActive + + + + + 0 + 6-row + 8-col + 6-row + vertical + + + 0 + 0 + 1-col + 2-row + center + center + symbolLarge + textActive + + + + 1-col-indent + -1 + 7-col-gutter + 2-row + center + buttonTitle + textActive + + + + + + 0 + 0 + 1-col-textbox + 2-row + stretch + colors/white.png + highlight + spinFocusIcon + + + 1-col + 0 + 7-col + 2-row + stretch + colors/white.png + + + 0 + 0 + 1-col + 2-row + center + center + symbolLarge + textActive + + - + + + 1-col-indent + -1 + 7-col-gutter + 2-row + center + buttonTitle + black + + - + + + + + No + + + - + SendClick(10) + + + Yes / OK + + + - + SendClick(11) + + + Control.IsVisible(12) + Custom Button + + + - + SendClick(12) + + + + + + false + + + No + + + Yes + + + Custom + + + DebugGrid diff --git a/1080i/DialogFullScreenInfo.xml b/1080i/DialogFullScreenInfo.xml index b7edfb7..ef17aaf 100644 --- a/1080i/DialogFullScreenInfo.xml +++ b/1080i/DialogFullScreenInfo.xml @@ -11,11 +11,11 @@ dateTime - - - col-1-begin + + + col-1-begin row-1-begin - + @@ -23,15 +23,15 @@ - - 0 - 0 - 2-col-textbox - 4-col-textbox - keep - $INFO[player.art(thumb)] - - + + 0 + 0 + 2-col-textbox + 4-col-textbox + keep + $INFO[player.art(thumb)] + + 0 @@ -45,18 +45,18 @@ - col-1-begin + 0 0 - 24-col - 6-row + fullscreenWidth + 10-row colors/black.png textboxInactive stretch - - col-1-begin + + 0 0 - 24-col + fullscreenWidth 2-row colors/white.png ccffffff @@ -68,18 +68,18 @@ 16-col 2-row pageSubTitle - center + center textActive - - VideoPlayer.HasMenu + + VideoPlayer.HasMenu col-17-begin 0 4-col 2-row pageSubTitle - center + center textActive @@ -90,13 +90,13 @@ 2-row pageSubTitle right - center + center textActive false - 120 + 120 84 textbox 23-col diff --git a/1080i/DialogPlayerProcessInfo.xml b/1080i/DialogPlayerProcessInfo.xml index e69de29..5961aa9 100644 --- a/1080i/DialogPlayerProcessInfo.xml +++ b/1080i/DialogPlayerProcessInfo.xml @@ -0,0 +1,93 @@ + + + + + + 0 + 0 + fullscreenWidth + fullscreenHeight + colors/black.png + textboxInactive + stretch + + + col-1-begin + row-5-begin + + 24-col + + + + 24-col + + + + 24-col + + + + 24-col + + + + 24-col + + + + 24-col + + + + 24-col + + + + 24-col + + + + 24-col + + + + 24-col + + + + 24-col + + + + 24-col + + + + 24-col + + + + 24-col + + + + 24-col + + + + 24-col + + + + 24-col + + + + + DebugGrid + + DialogID + + + + \ No newline at end of file diff --git a/1080i/DialogSettings.xml b/1080i/DialogSettings.xml index 70489a0..83f149f 100644 --- a/1080i/DialogSettings.xml +++ b/1080i/DialogSettings.xml @@ -1,12 +1,13 @@ 5 - fadeInOut + fadeInOut - modalDialog + + globalBackground !Window.IsVisible(sliderdialog) - col-5-begin + col-5-begin row-4-begin modalDialogInOutVertical @@ -28,7 +29,7 @@ overlay stretch - + 0 2-row 12-col @@ -47,7 +48,6 @@ textActive - - control area 0 @@ -58,7 +58,6 @@ 5 5 - Default Button @@ -69,7 +68,13 @@ Default SpinControlex - Default Edit + 8-col + buttonTitle + left + colors/white.png + - + 24 + black Default Slider @@ -86,7 +91,7 @@ - - + 12-col 2-row @@ -187,7 +192,6 @@ - false @@ -202,5 +206,11 @@ + + DebugGrid + + DialogID + + \ No newline at end of file diff --git a/1080i/FileManager.xml b/1080i/FileManager.xml index 7b653b0..a5b25c3 100644 --- a/1080i/FileManager.xml +++ b/1080i/FileManager.xml @@ -1,187 +1,186 @@ 20 - + fadeInOut globalBackground - - + + modalDialogInOutVertical - - - col-6-begin - row-4-begin - - 0 - 0 - 16-col - 2-row - colors/white.png - highlight - stretch - - - - 24 - 0 - 16-col - 2-row - dialogTitle - - textActive - - - - - 0 - 2-row - 16-col - 660 - colors/black.png - overlay - stretch - - - - - - col-6-begin - row-7-begin - - Header Label - 24 - 0 - 8-col-gutter - - settingsCategoryTitle - highlight - - - - - - 12 - 2-row - 8-col - 15-row - 21 - - - 12 - 8-col-gutter - 2-row - center - ListItem.Label - itemTitle - - - 12r - 3-col - 2-row - center - right - ListItem.Label2 - itemTitle - highlight - - - - - 8-col-gutter - 2-row - colors/white.png - Conditional - - - 12 - 8-col-gutter - 2-row - center - ListItem.Label - itemTitle - black - - - 12r - 3-col - 2-row - center - right - ListItem.Label2 - itemTitle - black - - - - - - - col-14-begin - row-7-begin - - Header Label - 12 - 0 - 8-col-gutter - - settingsCategoryTitle - highlight - - - 0 - 2-row - 8-col - 15-row - 20 - - - 12 - 8-col-gutter - 2-row - center - ListItem.Label - itemTitle - - - 12r - 3-col - 2-row - center - right - ListItem.Label2 - itemTitle - highlight - - - - - 8-col-gutter - 2-row - colors/white.png - Conditional - - - 12 - 8-col-gutter - 2-row - center - ListItem.Label - itemTitle - black - - - 12r - 3-col - 2-row - center - right - ListItem.Label2 - itemTitle - black - - - - - + + + col-6-begin + row-4-begin + + 0 + 0 + 16-col + 2-row + colors/white.png + highlight + stretch + + + + 24 + 0 + 16-col + 2-row + dialogTitle + + textActive + - + + + 0 + 2-row + 16-col + 660 + colors/black.png + overlay + stretch + + + + + col-6-begin + row-7-begin + + Header Label + 24 + 0 + 8-col-gutter + + settingsCategoryTitle + highlight + - + + + + 12 + 2-row + 8-col + 15-row + 21 + + + 12 + 8-col-gutter + 2-row + center + ListItem.Label + itemTitle + + + 12r + 3-col + 2-row + center + right + ListItem.Label2 + itemTitle + highlight + + + + + 8-col-gutter + 2-row + colors/white.png + Conditional + + + 12 + 8-col-gutter + 2-row + center + ListItem.Label + itemTitle + black + + + 12r + 3-col + 2-row + center + right + ListItem.Label2 + itemTitle + black + + + + + + + col-14-begin + row-7-begin + + Header Label + 12 + 0 + 8-col-gutter + + settingsCategoryTitle + highlight + + + 0 + 2-row + 8-col + 15-row + 20 + + + 12 + 8-col-gutter + 2-row + center + ListItem.Label + itemTitle + + + 12r + 3-col + 2-row + center + right + ListItem.Label2 + itemTitle + highlight + + + + + 8-col-gutter + 2-row + colors/white.png + Conditional + + + 12 + 8-col-gutter + 2-row + center + ListItem.Label + itemTitle + black + + + 12r + 3-col + 2-row + center + right + ListItem.Label2 + itemTitle + black + + + + + DebugGrid diff --git a/1080i/Home.xml b/1080i/Home.xml index 9e189fa..0571dc2 100644 --- a/1080i/Home.xml +++ b/1080i/Home.xml @@ -6,51 +6,107 @@ WindowOpen globalBackground - - - 18-col - row-21-begin - - 8-col - 12 - 24-col - 4-row - right - veryLarge - textActive - + + !isempty(skin.string(homeBackground)) + + + + + dimensionsFullscreen + $INFO[skin.string(homeBackground)] + 6Affffff + stretch - - 8-col - 3-row - 24-col - 4-row - right - Large - textActive - - - - !isempty(Window(Weather).Property(WeatherProvider)) - 8-col - 182 - 24-col - 3-row - right - regular - textActive - - - - 800 - 0 - 1-col - 1-col - noop - 6789 - 9001 + + dimensionsFullscreen + vignette.png + ffffffff + stretch + + + 1716 + row-26-begin + + 0 + 0 + 24-col + 4-row + regular + right + textActive + + + + + + col-24-begin + row-27-begin + 6-col + 2-row + horizontal + 9000 + + + 0 + 0 + 1-col + 2-row + colors/black.png + stretch + overlay + + + 0 + 0 + 1-col + 2-row + symbolLarge + center + center> + textActive + - + + + + + + 0 + 0 + 1-col + 2-row + colors/white.png + stretch + spinFocusIcon + + + 0 + 0 + 1-col + 2-row + symbolLarge + center + center + black + - + + + + + + + ActivateWindow(settings) + - + + + + ActivateWindow(shutdownmenu) + - + + + + hubMenu hubOptions diff --git a/1080i/LoginScreen.xml b/1080i/LoginScreen.xml index d3bb9dc..8b6bf35 100644 --- a/1080i/LoginScreen.xml +++ b/1080i/LoginScreen.xml @@ -1,21 +1,11 @@ 52 - globalBackground - - - - - dimensionsFullscreen - logoOverlay.png - ffffffff - stretch - - 0 - 0 + col-10-begin + row-8-begin modalDialogInOutVertical @@ -41,15 +31,15 @@ 0 6-row 6-col - 8-row + 7-row 0 0 69 - 69 + 2-row stretch - $INFO[Listitem.thumb] + $INFO[Listitem.thumb] 1-col @@ -77,7 +67,7 @@ 0 0 69 - 69 + 2-row stretch $INFO[Listitem.thumb] diff --git a/1080i/SettingsProfile.xml b/1080i/SettingsProfile.xml index 31fa724..e89a129 100644 --- a/1080i/SettingsProfile.xml +++ b/1080i/SettingsProfile.xml @@ -1,7 +1,6 @@ 4 - globalBackground @@ -39,7 +38,7 @@ 2-row center dialogTitle - + textActive - @@ -54,7 +53,7 @@ profile image 156 - 84 + 96 4-col-gutter 4-col-gutter $INFO[System.ProfileThumb] @@ -105,7 +104,7 @@ 69 69 stretch - $INFO[listitem.icon] + $INFO[listitem.icon] 0 ffffffff @@ -144,12 +143,13 @@ 0 0 - 69 + 1-col 69 stretch $INFO[listitem.icon] 0 ffffffff + spinFocusIcon 1-col-indent diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml index c88686a..6a100c9 100644 --- a/1080i/SkinSettings.xml +++ b/1080i/SkinSettings.xml @@ -1,7 +1,7 @@ 8000 - RunScript(script.skinshortcuts,type=buildxml&mainmenuID=9000) + RunScript(script.skinshortcuts,type=buildxml&mainmenuID=9000) globalBackground @@ -129,6 +129,15 @@ 8000 0 vertical + + Container(8000).Hasfocus(1) + Set home background image + 14-col + + $INFO[Skin.String(homeBackground)] + Skin.SetFile(homeBackground,.png|.jpg|.gif) + 8-col + Container(8000).Hasfocus(1) Reverse power down options @@ -170,13 +179,13 @@ ReloadSkin() Skin.HasSetting(lowPowerMode) - + Container(8000).Hasfocus(2) Reset main menu 14-col RunScript(script.skinshortcuts,type=resetall) - + diff --git a/1080i/VideoFullScreen.xml b/1080i/VideoFullScreen.xml index 516e812..e7c000e 100644 --- a/1080i/VideoFullScreen.xml +++ b/1080i/VideoFullScreen.xml @@ -2,45 +2,55 @@ - - - + 0 0 - + fullscreenWidth + 8-row + colors/black.png + textboxInactive + + + + col-1-begin + 1-row + 0 0 - fullscreenWidth - 5-row - colors/black.png - 77FFFFFF - - - col-1-begin - row-1-begin smallMedium textActive 24-col - 2-row + 1-row + + - + + + 0 + 2-row + smallMedium + textActive + 24-col + 1-row - - col-1-begin - row-2-begin + 0 + 3-row smallMedium textActive 24-col - 2-row + 1-row - - col-1-begin - row-3-begin + 0 + 4-row smallMedium textActive 24-col - 3-row + 1-row - diff --git a/1080i/script-skinshortcuts-includes.xml b/1080i/script-skinshortcuts-includes.xml index 9a13ed7..3f3ddea 100644 --- a/1080i/script-skinshortcuts-includes.xml +++ b/1080i/script-skinshortcuts-includes.xml @@ -19,6 +19,22 @@ $NUMBER[2] + + Custom item + DefaultShortcut.png + + files + + ActivateWindow(Videos,sources://video/,return) + ActivateWindow(Videos,sources://video/,return) + sources://video/ + StringCompare(System.ProfileName,Master user) + files + mainmenu + False + + + $NUMBER[3] Common menu item DefaultShortcut.png @@ -34,8 +50,8 @@ mainmenu True - - $NUMBER[3] + + $NUMBER[4] Custom item DefaultShortcut.png @@ -51,8 +67,8 @@ mainmenu True - - $NUMBER[4] + + $NUMBER[5] Common menu item DefaultShortcut.png @@ -68,8 +84,8 @@ mainmenu True - - $NUMBER[5] + + $NUMBER[6] Common menu item DefaultShortcut.png @@ -84,8 +100,8 @@ mainmenu True - - $NUMBER[6] + + $NUMBER[7] Common menu item DefaultShortcut.png @@ -100,8 +116,8 @@ mainmenu False - - $NUMBER[7] + + $NUMBER[8] Common menu item DefaultShortcut.png @@ -116,8 +132,8 @@ mainmenu True - - $NUMBER[8] + + $NUMBER[9] Common menu item DefaultShortcut.png @@ -133,8 +149,8 @@ mainmenu True - - $NUMBER[9] + + $NUMBER[10] Common menu item DefaultShortcut.png @@ -150,8 +166,8 @@ mainmenu False - - $NUMBER[10] + + $NUMBER[11] Common menu item DefaultShortcut.png @@ -1245,6 +1261,22 @@ $NUMBER[2] + + Custom item + DefaultShortcut.png + + files + + ActivateWindow(Videos,sources://video/,return) + ActivateWindow(Videos,sources://video/,return) + sources://video/ + StringCompare(System.ProfileName,Master user) + files + mainmenu + False + + + $NUMBER[3] Common menu item DefaultShortcut.png @@ -1329,8 +1361,8 @@ True livetv - - $NUMBER[3] + + $NUMBER[4] Custom item DefaultShortcut.png @@ -1448,8 +1480,8 @@ True movies - - $NUMBER[4] + + $NUMBER[5] Common menu item DefaultShortcut.png @@ -1550,8 +1582,8 @@ True tvshows - - $NUMBER[5] + + $NUMBER[6] Common menu item DefaultShortcut.png @@ -1615,8 +1647,8 @@ True music - - $NUMBER[6] + + $NUMBER[7] Common menu item DefaultShortcut.png @@ -1631,8 +1663,8 @@ mainmenu False - - $NUMBER[7] + + $NUMBER[8] Common menu item DefaultShortcut.png @@ -1664,8 +1696,8 @@ True pictures - - $NUMBER[8] + + $NUMBER[9] Common menu item DefaultShortcut.png @@ -1698,8 +1730,8 @@ True dvd - - $NUMBER[9] + + $NUMBER[10] Common menu item DefaultShortcut.png @@ -1715,8 +1747,8 @@ mainmenu False - - $NUMBER[10] + + $NUMBER[11] Common menu item DefaultShortcut.png @@ -2527,6 +2559,12 @@ No items + + No items + + + No items + $NUMBER[1] diff --git a/1080i/script-skinshortcuts.xml b/1080i/script-skinshortcuts.xml index e796372..5ce8369 100644 --- a/1080i/script-skinshortcuts.xml +++ b/1080i/script-skinshortcuts.xml @@ -143,6 +143,5 @@ WindowID - diff --git a/changelog.txt b/changelog.txt index dea5e8e..20d2402 100644 --- a/changelog.txt +++ b/changelog.txt @@ -14,37 +14,29 @@ - [NEW] Busy spinner (nicked from Estuary) - [NEW] DialogPlayerProcessInfo.xml - [MODIFIED] Addon Browser design reworked +- [NEW] DialogPlayerProcessInfo.xml - Numerous misc tweaks and fixes [TODO] -Addon Options side menu - -Check control is active for recent items - -Dialog OK / yesNo revision - Check yes / no progress bar works ok - -Revise onback for the menu to prevent dodgy nav - +Gamepad setup +DialogAudioDSPManager.xml event log screen (in settings) +MyPVRTimers -Home Background slideshow +Pictures section refresh Fix stop from fullscreen music view -Add user option Revise player stop on return +Revise onback for the menu to prevent dodgy nav -DialogAudioDSPManager.xml - -Gamepad setup - -DialogPlayerProcessInfo.xml +Add user option: Revise player stop on return Check RCB (e.g. busy spinner and menu width) check all active strings -MyPVRTimers needs creating and testing + Screenshots etc Check if feedback notification appears when updating libraries diff --git a/language/English/strings.po b/language/English/strings.po index 5bbd88c..16d03e7 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -453,6 +453,18 @@ msgctxt "#31113" msgid "Kodi Addons" msgstr "" +msgctxt "#31114" +msgid "Pixel format" +msgstr "" + +msgctxt "#31115" +msgid "Video decoder" +msgstr "" + +msgctxt "#31116" +msgid "Set Homescreen Background" +msgstr "" + msgctxt "#31117" msgid "Launch addon" msgstr ""