diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml index 8c91b86..dfa5b1e 100644 --- a/1080i/AddonBrowser.xml +++ b/1080i/AddonBrowser.xml @@ -4,8 +4,6 @@ 50,51 globalBackground - - miniVideoPlayer col-9-begin diff --git a/1080i/Defaults.xml b/1080i/Defaults.xml index 99aa634..e2d1a9c 100644 --- a/1080i/Defaults.xml +++ b/1080i/Defaults.xml @@ -284,8 +284,8 @@ textDisabled colors/white.png - 0 - 0 + -24 + diff --git a/1080i/DialogAddonInfo.xml b/1080i/DialogAddonInfo.xml index 1675010..78b9fee 100644 --- a/1080i/DialogAddonInfo.xml +++ b/1080i/DialogAddonInfo.xml @@ -3,8 +3,6 @@ 8000 globalBackground - - miniVideoPlayer col-4-begin diff --git a/1080i/DialogAddonSettings.xml b/1080i/DialogAddonSettings.xml index 93961a4..a933c0c 100644 --- a/1080i/DialogAddonSettings.xml +++ b/1080i/DialogAddonSettings.xml @@ -3,8 +3,6 @@ 9 globalBackground - - miniVideoPlayer col-4-begin diff --git a/1080i/DialogBusy.xml b/1080i/DialogBusy.xml index 3a4dcbe..896e241 100644 --- a/1080i/DialogBusy.xml +++ b/1080i/DialogBusy.xml @@ -6,7 +6,7 @@ 0 DialogID - + loadingIndicator DebugGrid diff --git a/1080i/DialogButtonMenu.xml b/1080i/DialogButtonMenu.xml index 472c69d..5865a23 100644 --- a/1080i/DialogButtonMenu.xml +++ b/1080i/DialogButtonMenu.xml @@ -18,7 +18,7 @@ 0 - 12 + 24 0 6-col-gutter 2-row @@ -34,13 +34,12 @@ 0 6-col 2-row - scale - colors/white.png + stretch + masks/menuTitle.png 0 - highlight - 12 + 24 0 6-col-gutter 2-row diff --git a/1080i/DialogConfirm.xml b/1080i/DialogConfirm.xml index 16f8dd7..a76ea2c 100644 --- a/1080i/DialogConfirm.xml +++ b/1080i/DialogConfirm.xml @@ -58,8 +58,8 @@ center 0 8-col - UIControls/button.png - UIControls/button.png + masks/menuTitle.png + masks/menuTitle.png textActive @@ -67,8 +67,8 @@ center 0 8-col - UIControls/button.png - UIControls/button.png + masks/menuTitle.png + masks/menuTitle.png textActive @@ -76,8 +76,8 @@ center 0 8-col - UIControls/button.png - UIControls/button.png + masks/menuTitle.png + masks/menuTitle.png textActive diff --git a/1080i/DialogContextMenu.xml b/1080i/DialogContextMenu.xml index aa105a3..5fc1b44 100644 --- a/1080i/DialogContextMenu.xml +++ b/1080i/DialogContextMenu.xml @@ -1,6 +1,5 @@ - control.setfocus(9004) fadeInOut modalDialog @@ -15,13 +14,11 @@ Buttons - UIControls/button.png - UIControls/button.png + masks/menuTitle.png textActive 8-col - center - 0 left + 24 diff --git a/1080i/DialogFavourites.xml b/1080i/DialogFavourites.xml deleted file mode 100644 index 25c0ff4..0000000 --- a/1080i/DialogFavourites.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - 450 - - fadeInOut - - - - 0 - 0 - dimensionsFullscreen - colors/black.png - ddffffff - stretch - - - dimensionsFullscreen - backgrounds/vignette.png - stretch - - - col-1-begin - row-2-begin - - 0 - 0 - 8-col - pageTitle - textActive - - - - !Integer.IsGreater(Container(450).NumItems,0) - 0 - 45 - 8-col - - regular - textActive - - - 0 - 2-row - 24-col - 23-row - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.icon] - - - 1-col - 0 - 23-col - 69 - stretch - colors/black.png - textboxInactive - - - 1-col-indent - 0 - 23-col-gutter - 2-row - center - itemTitle - textActive - - - - - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.icon] - - - - - - - 1-col - 0 - 23-col - 2-row - stretch - colors/white.png - highlight - - - 1-col-indent - 0 - 23-col-gutter - 2-row - center - itemTitle - textActive - - - - - - - - DebugGrid - - DialogID - - - - diff --git a/1080i/DialogMediaSource.xml b/1080i/DialogMediaSource.xml index cf12973..dd7e356 100644 --- a/1080i/DialogMediaSource.xml +++ b/1080i/DialogMediaSource.xml @@ -4,8 +4,6 @@ globalBackground - - miniVideoPlayer col-7-begin row-7-begin diff --git a/1080i/DialogMusicInfo.xml b/1080i/DialogMusicInfo.xml index f34d0b6..19cefda 100644 --- a/1080i/DialogMusicInfo.xml +++ b/1080i/DialogMusicInfo.xml @@ -115,7 +115,7 @@ 8-col left textActive - 524 + 612 false 61 @@ -180,8 +180,8 @@ thumbTitle center 0 - UIControls/button.png - UIControls/button.png + masks/menuTitle.png + masks/menuTitle.png textActive 10 @@ -194,8 +194,8 @@ thumbTitle center 0 - UIControls/button.png - UIControls/button.png + masks/menuTitle.png + masks/menuTitle.png textActive 6 @@ -271,7 +271,7 @@ 12r - 216 + row-10-begin 10-row 8000 8000 @@ -341,22 +341,22 @@ thumbTitle center 0 - UIControls/button.png - UIControls/button.png + masks/menuTitle.png + masks/menuTitle.png textActive - + dialog.close(all,true) - activatewindow(music,musicdb://albums/$INFO[listitem.DBID]/,return) + activatewindow(music,musicdb://artists/$INFO[listitem.DBID]/,return) Go to album thumbTitle center 0 - UIControls/button.png - UIControls/button.png + masks/menuTitle.png + masks/menuTitle.png textActive - + @@ -437,8 +437,8 @@ thumbTitle center 0 - UIControls/button.png - UIControls/button.png + masks/menuTitle.png + masks/menuTitle.png textActive dialog.close(all,true) @@ -449,8 +449,8 @@ thumbTitle center 0 - UIControls/button.png - UIControls/button.png + masks/menuTitle.png + masks/menuTitle.png textActive diff --git a/1080i/DialogPVRGuideSearch.xml b/1080i/DialogPVRGuideSearch.xml deleted file mode 100644 index 19ef50c..0000000 --- a/1080i/DialogPVRGuideSearch.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - action(back) - - - - \ No newline at end of file diff --git a/1080i/DialogPVRInfo.xml b/1080i/DialogPVRInfo.xml index 02785ff..287afb7 100644 --- a/1080i/DialogPVRInfo.xml +++ b/1080i/DialogPVRInfo.xml @@ -113,11 +113,12 @@ horizontal 61 + !window.isactive(tvrecordings) + !window.isactive(radiorecordings) Switch to Channel center 0 - UIControls/button.png - UIControls/button.png + masks/menuTitle.png + masks/menuTitle.png textActive @@ -126,44 +127,47 @@ Find similar center 0 - UIControls/button.png - UIControls/button.png + masks/menuTitle.png + masks/menuTitle.png textActive + !window.isactive(tvrecordings) + !window.isactive(radiorecordings) Record center 0 - UIControls/button.png - UIControls/button.png + masks/menuTitle.png + masks/menuTitle.png textActive Play recording center 0 - UIControls/button.png - UIControls/button.png + masks/menuTitle.png + masks/menuTitle.png textActive + false Set Reminder center 0 - UIControls/button.png - UIControls/button.png + masks/menuTitle.png + masks/menuTitle.png textActive + !window.isactive(tvrecordings) + !window.isactive(radiorecordings) TV Guide center 0 - UIControls/button.png - UIControls/button.png + masks/menuTitle.png + masks/menuTitle.png textActive dialog.close(all,true) ActivateWindow(TVGuide) diff --git a/1080i/DialogPictureInfo.xml b/1080i/DialogPictureInfo.xml deleted file mode 100644 index ee6d7c0..0000000 --- a/1080i/DialogPictureInfo.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - 5 - - fadeInOut - - modalDialog - - col-1-begin - row-4-begin - - modalDialogInOut - - 0 - 0 - 12-col - - keep - $INFO[listitem.thumb] - - - 13-col - 0 - 11-col - 12-row - false - - - 0 - 0 - 324 - itemSubTitle - highlight - - - - - 0 - 32 - 324 - itemSubTitle - textActive - - - - - - - - - - DebugGrid - - DialogID - - - - diff --git a/1080i/DialogSeekBar.xml b/1080i/DialogSeekBar.xml index 64d5479..53a7ae6 100644 --- a/1080i/DialogSeekBar.xml +++ b/1080i/DialogSeekBar.xml @@ -2,162 +2,126 @@ !window.isactive(videoosd) + !window.isactive(osdvideosettings) + !window.isactive(osdaudiosettings) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [!String.IsEmpty(Player.SeekNumeric) | Player.ShowInfo | Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding] - - !String.IsEmpty(player.Art(clearart)) - col-15-begin - row-18-begin - 12-col - 6-col - $INFO[player.Art(clearart)] - scale - BBffffff - - - !String.IsEmpty(player.Art(clearlogo)) + String.IsEmpty(player.Art(clearart)) - col-14-begin - row-18-begin - 12-col - 6-col + + col-1-begin + row-1-begin + 432 + 167 $INFO[player.Art(clearlogo)] - keep + stretch BBffffff + dimensionsFullscreen vignette.png ffffffff stretch - - Numeric Input OSD - col-1-begin - row-11-begin - 24-col - veryLarge - center - - textActive - + col-1-begin - row-19-begin + row-1-begin + - !String.IsEmpty(Player.SeekNumeric) 0 - 12 + 21-row 24-col - 2-row + 4-row center - veryLarge - textActive - - - - - col-3-begin - row-24-begin - - Player.Paused + !Player.Caching - 0 - -32 - 18-col - 2-row - left - pageTitle - textActive - - - - buffering - 0 - -32 - 18-col - 2-row - left - pageTitle - textActive - - [Player.Paused + Player.Caching] + !Player.Seeking - - - !VideoPlayer.Content(LiveTV) - Progress Bar - 0 - 88 - 20-col - 6 - colors/black.png - colors/white.png - Player.Progress - - - VideoPlayer.Content(LiveTV) - 0 - 88 - 20-col - 6 - colors/black.png - colors/white.png - PVR.EpgEventProgress - - - 0 - 88 - 20-col - 6 - colors/white.png - colors/white.png - horizontal - - - 0 - 88 - 20-col - 6 - colors/white.png - colors/white.png - colors/white.png - horizontal - Player.SeekEnabled + !Player.ChannelPreviewActive - - - 0 - 1-row - 13-col - left - menuTitle + dialogTitle textActive - - - - !VideoPlayer.Content(LiveTV) - 20-col - 1-row - 8-col - right - itemTitle - textActive - - - - - VideoPlayer.Content(LiveTV) - 20-col - 1-row - 8-col - right - itemTitle - textActive - - + 44000000 + + + 0 + 24-row + + !VideoPlayer.Content(LiveTV) + 2-col + 14 + 20-col + 6 + colors/white.png + colors/white.png + Player.Progress + + + VideoPlayer.Content(LiveTV) + 2-col + 14 + 20-col + 6 + colors/white.png + colors/white.png + PVR.EpgEventProgress + + + + !VideoPlayer.Content(LiveTV) + 0 + 0 + 2-col-gutter + left + itemTitle + textActive + + + + + VideoPlayer.Content(LiveTV) + 0 + 0 + 2-col-gutter + left + itemTitle + textActive + + + + VideoPlayer.Content(LiveTV) + 24-col + 0 + 2-col-gutter + right + itemTitle + textActive + + + + !VideoPlayer.Content(LiveTV) + 24-col + 0 + 2-col-gutter + right + itemTitle + textActive + + + + + Player.Paused + !Player.Caching + 0 + 24 + 24-col + 2-row + center + center + itemTitle + textActive + + + + + Player.seeking - col-3-begin - row-22-begin + 852 + row-14-begin -18 -48 @@ -167,7 +131,7 @@ symbolVeryLarge textActive - + 44000000 1-col-indent @@ -177,7 +141,7 @@ pageTitle textActive - + 44000000 diff --git a/1080i/DialogSelect.xml b/1080i/DialogSelect.xml index bff65a8..16d7e5c 100644 --- a/1080i/DialogSelect.xml +++ b/1080i/DialogSelect.xml @@ -7,7 +7,7 @@ globalBackground - col-5-begin + col-7-begin row-4-begin modalDialogInOutVertical @@ -24,7 +24,7 @@ -12 -12 - 1176 + 888 780 dialogBackground.png overlay @@ -33,7 +33,7 @@ 0 0 - 16-col + 12-col 2-row masks/menuTitle2.png highlight @@ -67,19 +67,10 @@ 84 12-col 681 - 9999 + 9760 60 60 - - !ListItem.IsSelected - 0 - 0 - 69 - 69 - stretch - $INFO[Listitem.icon] - ListItem.IsSelected 0 @@ -94,7 +85,7 @@ - 1-col-indent + 1-col 0 11-col-gutter 2-row @@ -107,22 +98,9 @@ - !ListItem.IsSelected 0 0 - 69 - 69 - stretch - $INFO[Listitem.icon] - - - - - - - 1-col - 0 - 11-col + 12-col 69 stretch colors/white.png @@ -138,13 +116,13 @@ center center symbolLarge - textActive - textActive + black + black - 1-col-indent + 1-col 0 11-col-gutter 2-row @@ -162,19 +140,24 @@ 84 12-col 19-row - 9999 + 9760 60 - + + ListItem.IsSelected 0 - 0 - 69 - 69 - stretch - $INFO[Listitem.icon] + 3 + 66 + 66 + center + center + symbolLarge + textActive + textActive + - 1-col-indent + 1-col 0 11-col-gutter 2-row @@ -189,20 +172,7 @@ 0 0 - 69 - 69 - stretch - $INFO[Listitem.icon] - highlight - - - - - - - 1-col - 0 - 11-col + 12-col 69 stretch colors/white.png @@ -210,7 +180,21 @@ ffffffff - 1-col-indent + ListItem.IsSelected + 0 + 3 + 66 + 66 + center + center + symbolLarge + black + black + + + + + 1-col 0 11-col-gutter 2-row @@ -223,106 +207,18 @@ - - + + + 12-col - 84 - 4-col - 6-row - vertical + 2-row 9000 - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - - 1-col-indent - 0 - 5-col-gutter - 2-row - center - buttonTitle - textActive - - - - - - - 0 - 0 - 1-col - 2-row - stretch - colors/white.png - highlight - spinFocusIcon - - - 1-col - 0 - 5-col - 2-row - stretch - colors/white.png - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - - 1-col-indent - 0 - 5-col-gutter - 2-row - center - buttonTitle - black - - - - - - - Ok / manual / get more Button - - - - SendClick(2000,5) - - - Cancel Button - - - - PreviousMenu - - - - - false OK / Manual button + diff --git a/1080i/DialogSettings.xml b/1080i/DialogSettings.xml index 0d820af..8f043f6 100644 --- a/1080i/DialogSettings.xml +++ b/1080i/DialogSettings.xml @@ -12,7 +12,6 @@ col-7-begin row-4-begin - modalDialogInOutVertical -12 -12 @@ -51,15 +50,53 @@ textActive + + + 0 + 78 + horizontal + 0 + 5 + + + 4-col + center + 0 + colors/black.png + dialog.close(osdaudiosettings,force) + dialog.close(osdvideosettings,force) + ActivateWindow(osdsubtitlesettings) + + + + 4-col + center + 0 + colors/black.png + dialog.close(osdvideosettings,force) + dialog.close(osdsubtitlesettings,force) + ActivateWindow(osdaudiosettings) + + + + 4-col + center + 0 + colors/black.png + dialog.close(osdaudiosettings,force) + dialog.close(osdsubtitlesettings,force) + ActivateWindow(osdvideosettings) + + control area 0 - 84 + 160 12-col - 654 + 556 9000 - 5 - 5 + 4501 + 4501 Default Button diff --git a/1080i/DialogSubtitles.xml b/1080i/DialogSubtitles.xml index 9b6748d..305dfd8 100644 --- a/1080i/DialogSubtitles.xml +++ b/1080i/DialogSubtitles.xml @@ -13,16 +13,16 @@ -12 1464 23-row - colors/black.png - aaFFFFFF + dialogBackground.png + overlay stretch - + 0 0 20-col - 71 - colors/white.png + 2-row + masks/menuTitle2.png highlight stretch diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml index a376d55..ad8e816 100644 --- a/1080i/DialogVideoInfo.xml +++ b/1080i/DialogVideoInfo.xml @@ -218,8 +218,8 @@ thumbTitle center 0 - UIControls/button.png - UIControls/button.png + masks/menuTitle.png + masks/menuTitle.png textActive @@ -229,8 +229,8 @@ thumbTitle center 0 - UIControls/button.png - UIControls/button.png + masks/menuTitle.png + masks/menuTitle.png textActive @@ -241,8 +241,8 @@ thumbTitle center 0 - UIControls/button.png - UIControls/button.png + masks/menuTitle.png + masks/menuTitle.png textActive @@ -254,8 +254,8 @@ thumbTitle center 0 - UIControls/button.png - UIControls/button.png + masks/menuTitle.png + masks/menuTitle.png textActive @@ -266,8 +266,8 @@ thumbTitle center 0 - UIControls/button.png - UIControls/button.png + masks/menuTitle.png + masks/menuTitle.png textActive @@ -365,8 +365,8 @@ Play center 0 - UIControls/button.png - UIControls/button.png + masks/menuTitle.png + masks/menuTitle.png textActive diff --git a/1080i/FileBrowser.xml b/1080i/FileBrowser.xml index 6a8d82b..92ebfe8 100644 --- a/1080i/FileBrowser.xml +++ b/1080i/FileBrowser.xml @@ -7,34 +7,6 @@ globalBackground - - - String.Contains(ListItem.label,fanart) - dimensionsFullscreen - $INFO[listitem.thumb] - 6affffff - stretch - 400 - - - !String.Contains(ListItem.label,fanart) - dimensionsFullscreen - $INFO[listitem.FileNameAndPath] - ffffffff - stretch - 400 - - - - - String.Contains(ListItem.label,remote art) - dimensionsFullscreen - $INFO[listitem.thumb] - 6affffff - keep - 400 - - col-6-begin @@ -46,16 +18,16 @@ -12 1178 792 - colors/black.png + dialogBackground.png overlay stretch - + 0 0 16-col 2-row - colors/white.png + masks/menuTitle2.png highlight stretch @@ -91,16 +63,21 @@ 60 60 - + + ListItem.IsSelected 0 - 0 - 69 - 69 - stretch - $INFO[Listitem.thumb] + 3 + 66 + 66 + center + center + symbolLarge + textActive + textActive + - 1-col-indent + 1-col 0 11-col-gutter 2-row @@ -113,30 +90,31 @@ - 1-col + 0 0 - 11-col + 12-col 69 stretch colors/white.png 0 ffffffff - + + ListItem.IsSelected 0 - 0 - 69 - 69 - stretch - $INFO[Listitem.thumb] - highlight - - - - + 3 + 66 + 66 + center + center + symbolLarge + black + black + + - 1-col-indent + 1-col 0 11-col-gutter 2-row @@ -149,129 +127,22 @@ - - - 864 - 228 - 4-col - 4-col - keep - $INFO[Listitem.icon] - 200 - - + 12-col 86 4-col - 6-row + 10-row vertical 450 - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - - 1-col-indent - 0 - 5-col-gutter - 2-row - center - buttonTitle - textActive - - - - - - - 0 - 0 - 1-col - 2-row - stretch - colors/white.png - highlight - spinFocusIcon - - - 1-col - 0 - 5-col - 2-row - stretch - colors/white.png - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - - 1-col-indent - 0 - 5-col-gutter - 2-row - center - buttonTitle - black - - - - - - - Ok Button - - - - SendClick(126,413) - - - Cancel Button - - - - SendClick(126,414) - - - Control.IsEnabled(415) - New Folder Button - - - - SendClick(126,415) - - - - - - - false - - OK - - - Cancel - - - New folder + + OK + + + + New folder + + diff --git a/1080i/FileManager.xml b/1080i/FileManager.xml deleted file mode 100644 index e24c140..0000000 --- a/1080i/FileManager.xml +++ /dev/null @@ -1,229 +0,0 @@ - - - 20 - - fadeInOut - - globalBackground - - miniVideoPlayer - - - modalDialogInOutVertical - - - col-4-begin - row-5-begin - - -12 - -12 - 1320 - 732 - colors/black.png - overlay - stretch - - - 0 - 0 - 18-col - 2-row - colors/white.png - highlight - stretch - - - - 24 - 0 - 18-col - 2-row - dialogTitle - - textActive - - - - 0 - 84 - 18-col - 71 - colors/offblack.png - stretch - - - - - col-4-begin - 270 - - Header Label - 24 - 12 - 2-row - 636 - - itemTitle - textActive - - - - - Control.IsVisible(60) - conditional - - -18 - 2-row - 16-row - 20 - - - - - 0 - 96 - 636 - 540 - 21 - 60 - 60 - - - 24 - 9-col-gutter - 2-row - center - ListItem.Label - itemTitle - - - 12r - 3-col - 2-row - center - right - ListItem.Label2 - itemTitle - highlight - - - - - 9-col-textbox - 2-row - colors/white.png - Conditional - - - 24 - 9-col-gutter - 2-row - center - ListItem.Label - itemTitle - black - - - 12r - 3-col - 2-row - center - right - ListItem.Label2 - itemTitle - black - - - - - - - col-13-begin - row-7-begin - - Header Label - 24 - 12 - 9-col-gutter - 2-row - - itemTitle - textActive - - - 0 - 96 - 9-col - 540 - 20 - 61 - 61 - - - 24 - 636 - 2-row - center - ListItem.Label - itemTitle - - - 12r - 3-col - 2-row - center - right - ListItem.Label2 - itemTitle - highlight - - - - - 9-col - 2-row - colors/white.png - Conditional - - - 24 - 636 - 2-row - center - ListItem.Label - itemTitle - black - - - 12r - 3-col - 2-row - center - right - ListItem.Label2 - itemTitle - black - - - - - - Control.IsVisible(61) - conditional - - 654 - 2-row - 16-row - 21 - - - - - - DebugGrid - - WindowID - - - - diff --git a/1080i/Home.xml b/1080i/Home.xml index 182fe10..959ccc5 100644 --- a/1080i/Home.xml +++ b/1080i/Home.xml @@ -2,157 +2,56 @@ 9000 fadeInOut - PlayerControl(stop) + PlayMedia(special://skin/extras/playlists/homeBackground.xsp,1) AlarmClock(hidemenu,setfocus(9999),00:20,true) CancelAlarm(hidemenu,true) + Playercontrol(stop) globalBackground + + + + + dimensionsFullscreen + colors/black.png + ffFFFFFF + stretch + + + WindowOpen + dimensionsFullscreen + $VAR[homeBackgroundLocation] + 45000 + 200 + 10000 + true + yes + scale + 99ffffff + + + + dimensionsFullScreen + + + dimensionsFullscreen + vignette.png + ffffffff + stretch + + - - - - - - 0 - 1080 - - - 0 - fullscreenWidth - 3-row - colors/black.png - ffffffff - stretch - - - - col-11-begin - 6 - 7-col - 2-row - 0 - 8001 - 8001 - 9001 - horizontal - - - 0 - 0 - 1-col - 2-row - center - center - symbol - textActive - - - - - - 0 - 0 - 1-col - 69 - stretch - colors/white.png - highlight - - - 0 - 0 - 1-col - 2-row - center - center - symbol - textActive - - - - - - - Playlist - - - activateWindow(musicplaylist) - - - Previous - - - PlayerControl(previous) - - - Stop - - - PlayerControl(stop) - Dialog.Close(1103) - - - Player.Playing | player.forwarding | player.rewinding - Play/Pause - - - PlayerControl(play) - - - Player.Paused - Pause - - - PlayerControl(play) - - - Next Chapter - - - PlayerControl(next) - - - - - - - dimensionsFullscreen - colors/black.png - ffFFFFFF - stretch - - - WindowOpen - dimensionsFullscreen - $VAR[homeBackgroundLocation] - 45000 - 200 - 10000 - true - yes - scale - 99ffffff - - - dimensionsFullscreen - vignette.png - ffffffff - stretch - - - - miniVideoPlayer - col-5-begin + col-7-begin conditional conditional conditional row-12-begin - 18-col + 12-col 12-row setfocus(9001,1) vertical @@ -219,7 +118,6 @@ 1-col horizontal 9000 - 8001 0.4 @@ -291,19 +189,6 @@ - $EXP[hasWeather] - 0 - 1-row - 24-col - 2-row - regular - center - textActive - 44000000 - - - - !$EXP[hasWeather] 0 1-row 24-col @@ -315,68 +200,6 @@ - - - player.hasaudio - col-1-begin - row-24-begin - - 0 - 8 - 24-col - center - 18 - horizontal - - !player.paused + !Skin.HasSetting(lowPowerMode) - 0 - 0 - 1-col-gutter - 1-col-gutter - equaliser.gif - - - !player.paused + Skin.HasSetting(lowPowerMode) - 0 - 0 - 1-col-gutter - 2-row - center - center - symbolLarge - textActive - - - - - player.paused - 0 - 0 - 1-col-gutter - 2-row - center - center - symbolLarge - textActive - - - - - Artist - 0 - 0 - small - auto - 2-row - center - center - - true - textActive - false - - - -500 diff --git a/1080i/Includes.xml b/1080i/Includes.xml index 8accdf7..21c5e3a 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -221,14 +221,6 @@ - - - - - - - - !Window.IsActive(startup) + !String.IsEmpty(container.foldername) + !Integer.IsGreater(container.numitems,0) + !ListItem.IsParentFolder | window.isactive(busydialog) colors/black.png @@ -237,7 +229,7 @@ Conditional WindowOpen WindowClose - + DepthMax 920 @@ -265,31 +257,6 @@ row-2-begin row-6-begin - - - - - !Skin.hassetting(stopVideoOnMenu) + Player.HasVideo + !VideoPlayer.IsFullscreen + !SlideShow.IsActive - col-20-begin - 12 - - 0 - 0 - 444 - 255 - stretch - colors/black.png - colors/black.png - 6 - - - 6 - 6 - 6-col - 243 - - - diff --git a/1080i/Includes_animations.xml b/1080i/Includes_animations.xml index 25b2ec9..3319c65 100644 --- a/1080i/Includes_animations.xml +++ b/1080i/Includes_animations.xml @@ -67,7 +67,7 @@ - + diff --git a/1080i/Includes_menus.xml b/1080i/Includes_menus.xml index ee1766e..3812b2d 100644 --- a/1080i/Includes_menus.xml +++ b/1080i/Includes_menus.xml @@ -1,54 +1,6 @@ - - $NUMBER[1] - - DefaultAddon.png - - 31136 - 31136 - Player.HasMedia - action(FullScreen) - action(FullScreen) - action(FullScreen) - String.IsEqual(System.ProfileName,Master user) - num-31136 - mainmenu - False - - - $NUMBER[2] - - DefaultAddon.png - - 31221 - 31221 - System.HasMediaDVD - XBMC.PlayDVD() - XBMC.PlayDVD() - XBMC.PlayDVD() - String.IsEqual(System.ProfileName,Master user) - num-31221 - mainmenu - False - - - $NUMBER[3] - - DefaultAddon.png - - 31251 - 31251 - System.HasMediaDVD - EjectTray() - EjectTray() - EjectTray() - String.IsEqual(System.ProfileName,Master user) - num-31251 - mainmenu - False - $NUMBER[4] @@ -168,22 +120,6 @@ mainmenu False - - $NUMBER[11] - - DefaultAddon.png - - 31229 - 31229 - Library.HasContent(Music) - PlayerControl(Partymode(music)) - PlayerControl(Partymode(music)) - PlayerControl(Partymode(music)) - String.IsEqual(System.ProfileName,Master user) - num-31229 - mainmenu - False - $NUMBER[12] @@ -199,37 +135,6 @@ mainmenu False - - $NUMBER[13] - - DefaultAddon.png - - weather - weather - !String.IsEmpty(Weather.Plugin) - ActivateWindow(Weather) - ActivateWindow(Weather) - Weather - String.IsEqual(System.ProfileName,Master user) - weather - mainmenu - False - - - $NUMBER[14] - - DefaultAddon.png - - pictures - pictures - ActivateWindow(Pictures) - ActivateWindow(Pictures) - Pictures - String.IsEqual(System.ProfileName,Master user) - pictures - mainmenu - True - @@ -351,7 +256,7 @@ $NUMBER[7] 15 - + DefaultAddon.png 31088 @@ -364,38 +269,6 @@ videosubmenu True - - $NUMBER[8] - 15 - - DefaultAddon.png - - 136 - 136 - control.setfocus(9999) - ActivateWindow(Videos,special://videoplaylists/,return) - ActivateWindow(Videos,special://videoplaylists/,return) - special://videoplaylists/ - String.IsEqual(System.ProfileName,Master user) - videosubmenu - True - - - $NUMBER[9] - 15 - - DefaultAddon.png - - 744 - 744 - control.setfocus(9999) - ActivateWindow(Videos,sources://video/) - ActivateWindow(Videos,sources://video/) - sources://video/ - String.IsEqual(System.ProfileName,Master user) - videosubmenu - True - @@ -410,24 +283,6 @@ Player.HasMedia control.setfocus(9999) activateWindow(1103) - activateWindow(1103) - activateWindow(1103) - String.IsEqual(System.ProfileName,Master user) - musicsubmenu - True - - - $NUMBER[2] - 16 - - $LOCALIZE[10005] - DefaultAddon.png - - 31248 - 31248 - MusicPlayer.HasNext - control.setfocus(9999) - activateWindow(musicplaylist) activateWindow(musicplaylist) activateWindow(musicplaylist) String.IsEqual(System.ProfileName,Master user) @@ -515,25 +370,6 @@ musicsubmenu True - - $NUMBER[7] - 16 - - $LOCALIZE[10005] - DefaultAddon.png - - 135 - 135 - Library.HasContent(Music) - control.setfocus(9999) - Container.Update(musicdb://genres/) - Container.Update(musicdb://genres/) - Container.Update(musicdb://genres/) - ActivateWindow(Music,musicdb://genres/) - String.IsEqual(System.ProfileName,Master user) - musicsubmenu - True - $NUMBER[8] 16 @@ -573,7 +409,7 @@ $NUMBER[10] 16 - + $LOCALIZE[10005] DefaultAddon.png @@ -587,57 +423,6 @@ musicsubmenu True - - $NUMBER[11] - 16 - - $LOCALIZE[10005] - DefaultAddon.png - - 744 - 744 - control.setfocus(9999) - ActivateWindow(Music,Files) - ActivateWindow(Music,Files) - Files - String.IsEqual(System.ProfileName,Master user) - musicsubmenu - True - - - - - $NUMBER[1] - 17 - - DefaultShortcut.png - - 744 - 744 - control.setfocus(9999) - ActivateWindow(Pictures,files) - ActivateWindow(Pictures,files) - files - String.IsEqual(System.ProfileName,Master user) - picturessubmenu - True - - - $NUMBER[2] - 17 - - DefaultShortcut.png - - 1039 - 1039 - control.setfocus(9999) - ActivateWindow(Pictures,Addons,return) - ActivateWindow(Pictures,Addons,return) - Addons - String.IsEqual(System.ProfileName,Master user) - picturessubmenu - True - diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml index 0d2f468..d129a96 100644 --- a/1080i/Includes_variables.xml +++ b/1080i/Includes_variables.xml @@ -6,8 +6,8 @@ $LOCALIZE[20389] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE] [CAPITALIZE]$INFO[container.foldername][/CAPITALIZE] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE] $INFO[container.foldername] $INFO[ListItem.TVShowTitle,- ,] $INFO[ListItem.season,$LOCALIZE[20373] ,] - $LOCALIZE[20342] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE] - $LOCALIZE[31216] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE] + $LOCALIZE[20342] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR][/LOWERCASE] + $LOCALIZE[31216] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR][/LOWERCASE] $LOCALIZE[20343] $INFO[container.foldername] $LOCALIZE[31012] @@ -26,23 +26,19 @@ $LOCALIZE[19020] [COLOR highlight]$LOCALIZE[31078][/COLOR] $LOCALIZE[19021] [COLOR highlight]$LOCALIZE[31078][/COLOR] $LOCALIZE[19020] [COLOR highlight]$LOCALIZE[31165][/COLOR] - $LOCALIZE[31060] [COLOR highlight]$LOCALIZE[31087][/COLOR] $LOCALIZE[10506] $LOCALIZE[31123] - $LOCALIZE[31056] $LOCALIZE[31232] [LOWERCASE][COLOR highlight]$INFO[container.foldername][/COLOR][/LOWERCASE] $INFO[Container.NumAllItems,, $LOCALIZE[31014]] $INFO[container.NumAllItems,, $LOCALIZE[31014]] - $INFO[container.NumAllItems,, $LOCALIZE[31145]] $LOCALIZE[31212] $INFO[Window.Property(WeatherProvider)] $INFO[Pvr.BackendChannels] $LOCALIZE[19019] ($INFO[control.getlabel(29)]) $INFO[container.NumAllItems] $LOCALIZE[31165] ($INFO[Pvr.BackendDiskSpace]) $INFO[container.NumAllItems,, $LOCALIZE[31145]] $INFO[container.NumAllItems,, $LOCALIZE[31145]] $INFO[container.NumAllItems,, $LOCALIZE[31014]] - $INFO[container.NumAllItems,, $LOCALIZE[31014]] diff --git a/1080i/LoginScreen.xml b/1080i/LoginScreen.xml deleted file mode 100644 index 6451cf0..0000000 --- a/1080i/LoginScreen.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - 52 - - globalBackground - - col-10-begin - row-8-begin - - modalDialogInOutVertical - - -12 - -12 - 456 - 408 - stretch - colors/black.png - 0 - overlay - - - 0 - 0 - 6-col - 6-row - stretch - colors/white.png - 0 - highlight - - - 142 - 36 - 4-row - 4-row - kodilogo.png - textActive - stretch - - - 0 - 228 - 6-col - 7-row - - - 0 - 0 - 69 - 2-row - stretch - $INFO[Listitem.thumb] - - - 1-col - 0 - 5-col - 69 - stretch - colors/black.png - 0 - overlay - - - 1-col-indent - 0 - 5-col-gutter - 2-row - center - itemTitle - textActive - - - - - - 0 - 0 - 69 - 2-row - stretch - $INFO[Listitem.thumb] - - - - - - - 1-col - 0 - 5-col - 2-row - stretch - colors/white.png - 0 - ffffffff - - - 1-col-indent - 0 - 5-col-gutter - 2-row - center - itemTitle - black - - - - - - - DebugGrid - - WindowID - - - - diff --git a/1080i/MyGames.xml b/1080i/MyGames.xml index 78ae320..44a4d10 100644 --- a/1080i/MyGames.xml +++ b/1080i/MyGames.xml @@ -34,8 +34,6 @@ hubMenu - - miniVideoPlayer DebugGrid diff --git a/1080i/MyMusicNav.xml b/1080i/MyMusicNav.xml index 9482135..760175f 100644 --- a/1080i/MyMusicNav.xml +++ b/1080i/MyMusicNav.xml @@ -59,8 +59,6 @@ pageHeader - - miniVideoPlayer hubMenu diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml index 911821f..8a0a9e3 100644 --- a/1080i/MyPVRChannels.xml +++ b/1080i/MyPVRChannels.xml @@ -1,7 +1,7 @@ 9999 - PlayerControl(stop) + PlayerControl(stop) Skin.SetString(recentitems,music) Skin.SetString(recentitems,video) @@ -44,8 +44,6 @@ false - - miniVideoPlayer hubMenu diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml index 14ed553..6904e46 100644 --- a/1080i/MyPVRGuide.xml +++ b/1080i/MyPVRGuide.xml @@ -2,7 +2,7 @@ 10 9999 - PlayerControl(stop) + PlayerControl(stop) Skin.SetString(recentitems,video) @@ -56,28 +56,31 @@ 0 0 69 - 69 + 70 stretch colors/black.png d0000000 - - 0 - 0 - 69 - 69 - stretch - $INFO[listitem.thumb] - 8 - - + + 0 + 0 + 1-col-textbox + 69 + center + center + itemTitle + textActive + + + false + 1-col 0 - 3-col-textbox - 69 + 213 + 70 stretch - masks/tvChannel.png + colors/black.png d0000000 @@ -94,39 +97,41 @@ 1-col - 216 + 213 2-row colors/white.png highlight - - + 0 0 - 69 + 72 72 stretch colors/white.png highlight - - 0 - 0 - 69 - 69 - stretch - $INFO[listitem.thumb] - 8 - - + + + 0 + 0 + 1-col-textbox + 69 + center + center + itemTitle + textActive + + + false 1-col-indent - 198 + 186 2-row itemTitle textActive @@ -196,8 +201,6 @@ false - - miniVideoPlayer hubMenu diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml index 472e969..2547dcb 100644 --- a/1080i/MyPVRRecordings.xml +++ b/1080i/MyPVRRecordings.xml @@ -1,7 +1,7 @@ 9999 - PlayerControl(stop) + PlayerControl(stop) Skin.SetString(recentitems,video) @@ -97,15 +97,13 @@ - - 0 0 69 - 69 + 70 stretch $INFO[Listitem.thumb] highlight @@ -166,8 +164,6 @@ pageHeader - - miniVideoPlayer hubMenu diff --git a/1080i/MyPVRSearch.xml b/1080i/MyPVRSearch.xml deleted file mode 100644 index 19ef50c..0000000 --- a/1080i/MyPVRSearch.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - action(back) - - - - \ No newline at end of file diff --git a/1080i/MyPVRTimers.xml b/1080i/MyPVRTimers.xml deleted file mode 100644 index c76a31f..0000000 --- a/1080i/MyPVRTimers.xml +++ /dev/null @@ -1,189 +0,0 @@ - - - 9999 - - - - 50 - - globalBackground - - - - - - - - modalDialogContentShift - - - contentOpen - col-1-begin - row-5-begin - - 0 - 0 - 24-col - 23-row - 9000 - 60 - 9000 - 60 - - - 1-col - 0 - 23-col - 69 - stretch - colors/black.png - overlay - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.thumb] - - - ListItem.HasTimer - 16 - 2 - 66 - 66 - symbolLarge - textActive - - - - - 1-col-indent - 0 - 11-col - 2-row - itemTitle - textActive - - - - - 13-col - 0 - 8-col-gutter - 2-row - itemTitle - textActive - - - - - 20-col - 0 - 4-col-gutter - 2-row - itemTitle - textActive - - - - - - - 1-col - 0 - 23-col - 2-row - stretch - colors/white.png - highlight - - - - - - - - 0 - 3 - 66 - 66 - stretch - colors/offblack.png - - - !String.IsEmpty(ListItem.playcount) + !ListItem.IsResumable - 16 - 2 - 66 - 66 - symbolLarge - black - - - - - - 1-col-indent - 0 - 11-col - 2-row - itemTitle - textActive - textActive - - - - - 13-col - 0 - 8-col-gutter - 2-row - itemTitle - textActive - textActive - - - - - 20-col - 0 - 4-col-gutter - 2-row - itemTitle - textActive - textActive - - - - - - - - - Control.IsVisible(60) - conditional - - 54r - row-6-begin - 20-row - 9999 - 9999 - - - - - pageHeader - - - - hubMenu - - DebugGrid - - DialogID - - - - \ No newline at end of file diff --git a/1080i/MyPics.xml b/1080i/MyPics.xml deleted file mode 100644 index 2afa4d5..0000000 --- a/1080i/MyPics.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 9999 - PlayerControl(stop) - fadeInOut - 50,51 - - globalBackground - - - - modalDialogContentShift - - - contentOpen - 9000 - photos - - - - Control.IsVisible(60) + !EXP[isPhotoAlbum] - conditional - - 54r - row-6-begin - 20-row - 9999 - 9999 - - - - - pageHeader - - - - hubMenu - - miniVideoPlayer - - DebugGrid - - WindowID - - - - diff --git a/1080i/MyPlaylist.xml b/1080i/MyPlaylist.xml index f95960d..4dfa91c 100644 --- a/1080i/MyPlaylist.xml +++ b/1080i/MyPlaylist.xml @@ -1,7 +1,7 @@ - 59 - PlayerControl(stop) + 9876 + PlayerControl(stop) fadeInOut 59 @@ -41,16 +41,27 @@ 9999 9999 - - + + + + control.hasfocus(59) pageHeader - + - - miniVideoPlayer hubMenu + + + -100 + -100 + 1-col + 1-col + control.setfocus(9000) + control.setfocus(9000) + control.setfocus(2100) + control.setfocus(9000) + DebugGrid diff --git a/1080i/MyPrograms.xml b/1080i/MyPrograms.xml index 6acce97..f3b24c6 100644 --- a/1080i/MyPrograms.xml +++ b/1080i/MyPrograms.xml @@ -1,7 +1,7 @@ 9999 - PlayerControl(stop) + PlayerControl(stop) fadeInOut 50 @@ -33,8 +33,8 @@ 69 69 stretch - $INFO[Listitem.thumb] - overlay + colors/black.png + d0000000 1-col @@ -73,13 +73,11 @@ 0 0 - 69 + 1-col 69 stretch - $INFO[Listitem.thumb] + colors/white.png - - highlight @@ -137,8 +135,6 @@ pageHeader - - miniVideoPlayer hubMenu diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml index ef00024..d08c8e6 100644 --- a/1080i/MyVideoNav.xml +++ b/1080i/MyVideoNav.xml @@ -1,7 +1,7 @@ 9999 - PlayerControl(stop) + PlayerControl(stop) Skin.SetString(recentitems,video) Sin.SetString(tvQuickLinkValue,Skin.SetString(tvQuickLinkValue,special://skin/extras/playlists/recentEpisodes.xsp)) Skin.SetString(movieQuickLinkValue,special://skin/extras/playlists/recentMovies.xsp) @@ -59,8 +59,6 @@ pageHeader - - miniVideoPlayer hubMenu diff --git a/1080i/MyWeather.xml b/1080i/MyWeather.xml deleted file mode 100644 index c9ff667..0000000 --- a/1080i/MyWeather.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - 100 - fadeInOut - - - globalBackground - - - pageHeader - - - col-1-begin - row-5-begin - - - 0 - 2-row - - 0 - 0 - 24-col - 2-row - veryLarge - - textActive - - - - - 0 - 3-row - 21-col - 2-row - largeTitle - - highlight - - - - 0 - 6-row - 21-col - 2-row - large - - textActive - - - - 0 - 8-row - 12-col - 2-row - regular - - textActive - - - - 0 - 336 - 12-col - 2-row - regular - - textActive - - - - - - - - - 0 - 15-row - 24-col - 24-row - - - 0 - -24 - 6-col-gutter - 2-row - dialogTitle - - textActive - - - - 0 - 18 - 6-col-gutter - 2-row - itemSubTitle - textActive - - - - - 0 - 76 - 6-col-gutter - 1-row - itemSubTitle - textActive - - - - - - - Day 1 - - $INFO[Window.Property(Day1.fanartCode)] - $INFO[Window.Property(Day1.HighTemp)] - $INFO[Window.Property(Day1.LowTemp)] - $INFO[Window.Property(Day1.Outlook)] - $INFO[System.TemperatureUnits] - - - Day 2 - - $INFO[Window.Property(Day2.fanartCode)] - $INFO[Window.Property(Day2.HighTemp)] - $INFO[Window.Property(Day2.LowTemp)] - $INFO[Window.Property(Day2.Outlook)] - $INFO[System.TemperatureUnits] - - - Day 3 - - $INFO[Window.Property(Day3.fanartCode)] - $INFO[Window.Property(Day3.HighTemp)] - $INFO[Window.Property(Day3.LowTemp)] - $INFO[Window.Property(Day3.Outlook)] - $INFO[System.TemperatureUnits] - - - Day 4 - - $INFO[Window.Property(Day4.fanartCode)] - $INFO[Window.Property(Day4.HighTemp)] - $INFO[Window.Property(Day4.LowTemp)] - $INFO[Window.Property(Day4.Outlook)] - $INFO[System.TemperatureUnits] - - - - - - - - - change location button - -100 - -100 - 6-col - Weather.LocationNext - Weather.LocationPrevious - - - DebugGrid - - WindowID - - - - \ No newline at end of file diff --git a/1080i/Settings.xml b/1080i/Settings.xml index ed3b3c3..a05e01b 100644 --- a/1080i/Settings.xml +++ b/1080i/Settings.xml @@ -4,8 +4,6 @@ globalBackground - - miniVideoPlayer col-4-begin @@ -100,7 +98,6 @@ stretch masks/square.png textActive - spinFocusIcon 0 @@ -178,6 +175,7 @@ activatewindow(gamesettings) + false Profiles @@ -198,13 +196,6 @@ $LOCALIZE[31067] activatewindow(AddonBrowser) - - File Manager - - - $LOCALIZE[31095] - activatewindow(filemanager) - Programs diff --git a/1080i/SettingsCategory.xml b/1080i/SettingsCategory.xml index a5978f1..85f64b5 100644 --- a/1080i/SettingsCategory.xml +++ b/1080i/SettingsCategory.xml @@ -4,8 +4,6 @@ globalBackground - - miniVideoPlayer false diff --git a/1080i/SettingsProfile.xml b/1080i/SettingsProfile.xml deleted file mode 100644 index 4ab8645..0000000 --- a/1080i/SettingsProfile.xml +++ /dev/null @@ -1,157 +0,0 @@ - - - 4 - - - globalBackground - - col-9-begin - row-4-begin - - modalDialogInOutVertical - - - - - - -12 - -12 - 600 - 768 - colors/black.png - overlay - stretch - - - 0 - 0 - 8-col - 2-row - colors/white.png - highlight - stretch - - - 24 - 0 - 8-col - 2-row - center - dialogTitle - - textActive - - - - profile image - 0 - 84 - 8-col - 10-row - $INFO[System.ProfileThumb] - scale - - - 0 - 372 - 8-col - 73 - colors/black.png - textboxInactive - stretch - - - 0 - 372 - 8-col - 2-row - center - center - itemSubTitle - - textActive - - - - - Enable Login Screen - 0 - 456 - 8-col - - colors/black.png - left - 2 - - - 0 - 540 - 8-col - 204 - 4 - - - - 0 - 0 - 69 - 69 - stretch - $INFO[listitem.icon] - 0 - - - - 1-col-indent - 0 - 7-col - 2-row - center - buttonTitle - textActive - - - - - - 1-col - 0 - 7-col - 69 - stretch - colors/white.png - 0 - ffffffff - - - 0 - 0 - 1-col - 69 - stretch - $INFO[listitem.icon] - 0 - highlight - spinFocusIcon - - - 1-col-indent - 0 - 6-col - 2-row - center - buttonTitle - black - - - - - - - DebugGrid - - DialogID - - - - diff --git a/1080i/SettingsSystemInfo.xml b/1080i/SettingsSystemInfo.xml index 5165dfc..dbb5056 100644 --- a/1080i/SettingsSystemInfo.xml +++ b/1080i/SettingsSystemInfo.xml @@ -5,92 +5,55 @@ globalBackground - - - col-1-begin + + col-1-begin row-1-begin - - - - - - 0 - 0 - 14-col - pageTitle - - textActive - + + + 0 + 0 + 18-col + sectionTitle + + textActive + + + + 0 + 26 + 12-col + 2-row + menuTitle2 + + textActive + 24-col 0 12-col right - pageTitle - + sectionTitle + textActive 24-col - 1-row + 26 12-col 2-row right - pageSubTitle + menuTitle2 textActive - - - 0 - 1-row - 12-col - 2-row - horizontal - - - 0 - 0 - 4-col - 2-row - pageSubTitle - 44FFFFFF - - - - - - - 0 - 0 - 4-col - 2-row - pageSubTitle - textActive - - - Conditional - - - - - - - - - - - - - + col-1-begin row-6-begin modalDialogInOutVertical - container(95).hasfocus(1) 0 0 24-col @@ -217,18 +180,6 @@ - - - container(95).hasfocus(2) - 0 - -36 - textbox - 24-col - textActive - 23-row - - true - DebugGrid diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml index e767805..050ea4e 100644 --- a/1080i/SkinSettings.xml +++ b/1080i/SkinSettings.xml @@ -102,17 +102,6 @@ 8000 0 vertical - - Container(8000).Hasfocus(1) - Stop video on return to menu - 14-col - - colors/white.png - - Skin.ToggleSetting(stopVideoOnMenu) - Skin.HasSetting(stopVideoOnMenu) - buttonTitle - Container(8000).Hasfocus(1) Set home background image directory diff --git a/1080i/SmartPlaylistEditor.xml b/1080i/SmartPlaylistEditor.xml index 4979297..ffc2442 100644 --- a/1080i/SmartPlaylistEditor.xml +++ b/1080i/SmartPlaylistEditor.xml @@ -10,12 +10,22 @@ col-7-begin row-3-begin + + -12 + -12 + 888 + 22-row + dialogBackground.png + + overlay + stretch + 0 0 12-col 2-row - colors/white.png + masks/menuTitle.png highlight stretch @@ -33,17 +43,9 @@ 0 2-row - - 0 - 0 - 12-col - 96 - colors/black.png - overlay - stretch - Name Button + false 12 12 12-col-gutter @@ -60,16 +62,7 @@ 0 - 5-row - - 0 - 0 - 12-col - 5-row - colors/black.png - overlay - stretch - + 2-row Set Playlist type 12 @@ -120,16 +113,7 @@ 0 - 372 - - 0 - 0 - 12-col - 8-row - colors/black.png - overlay - stretch - + 240 Rules List Control 1-col-indent @@ -189,18 +173,9 @@ - - 0 - 300 - 12-col - 96 - colors/black.png - overlay - stretch - 12 - 312 + 12-row 12-col-gutter 9002 @@ -211,7 +186,7 @@ 12 - 382 + 250 12-col-gutter 8-row 10 @@ -248,7 +223,6 @@ stretch colors/white.png highlight - spinFocusIcon 0 @@ -274,127 +248,38 @@ - - 0 - 780 - 8-col + + -12 + 786 + 10-col 2-row horizontal 16 - - - 0 - 0 - 276 - 2-row - stretch - colors/black.png - overlay - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - 1-col-indent - -1 - 5-col-gutter - 2-row - center - buttonTitle - textActive - - - - - - 0 - 0 - 1-col - 2-row - stretch - colors/white.png - highlight - spinFocusIcon - - - 1-col - 0 - 204 - 2-row - stretch - colors/white.png - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - - 1-col-indent - -1 - 5-col-gutter - 2-row - center - buttonTitle - black - - - - - - - Ok Button - - - - SendClick(129,20) - - - Cancel Button - - - - SendClick(129,21) - - + + + Ok Button + + center + 0 + 3-col + masks/menuTitle.png + masks/menuTitle.png + textActive + + + Cancel Button + + center + 0 + 3-col + masks/menuTitle.png + masks/menuTitle.png + textActive + + - - false - - Add Rule Button - - - Remove Rule Button - - - Edit Rule Button - - - Ok Button - - - - Cancel Button - - - DebugGrid diff --git a/1080i/SmartPlaylistRule.xml b/1080i/SmartPlaylistRule.xml index e5e0738..314d78d 100644 --- a/1080i/SmartPlaylistRule.xml +++ b/1080i/SmartPlaylistRule.xml @@ -28,7 +28,7 @@ 0 12-col 2-row - colors/white.png + masks/menuTitle.png highlight stretch @@ -108,114 +108,35 @@ 9002 - - 204 - 168 + + 0 + 6-row 9-col 2-row 17 horizontal - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - 1-col-indent - -1 - 3-col-gutter - 2-row - center - buttonTitle - textActive - - - - - - 0 - 0 - 1-col-textbox - 2-row - stretch - colors/white.png - highlight - spinFocusIcon - - - 1-col - 0 - 2-col - 2-row - stretch - colors/white.png - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - - 1-col-indent - -1 - 5-col-gutter - 2-row - center - buttonTitle - black - - - - - - - OK - - - - SendClick(129,18) - - - Cancel - - - - SendClick(129,19) - - - Remove Rule - - - - dialog.close(137,true) - Control.Message(14,click,136) - Control.setfocus(10) - - - - - - - false - - Ok Button - - - Cancel Button + + + Ok Button + + center + 0 + 3-col + masks/menuTitle.png + masks/menuTitle.png + textActive + + + Cancel Button + + center + 0 + 3-col + masks/menuTitle.png + masks/menuTitle.png + textActive + + diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml index 9343183..c29ccc0 100644 --- a/1080i/VideoOSD.xml +++ b/1080i/VideoOSD.xml @@ -1,7 +1,6 @@ 8001 - Control.SetFocus(8001,3) col-1-begin @@ -20,7 +19,7 @@ textActive - 1236 + 1284 0 @@ -54,16 +53,26 @@ vertical 32 + !Pvr.IsPlayingTv 8-col left 1-row - itemTitle + menuTitle textActive - + + Pvr.IsPlayingTv 8-col left + 1-row + menuTitle + textActive + + + + 8-col-gutter + left 3-row center largeTitle @@ -138,7 +147,6 @@ - Pvr.IsPlayingTv 3-col-gutter @@ -153,7 +161,7 @@ Pvr.IsPlayingTv 3-col-gutter 32 - 6-col + 5-col-gutter itemTitle textActive @@ -165,7 +173,7 @@ 0 9-row textbox - 552 + 540 left textActive 314 @@ -184,18 +192,17 @@ 36 - row-21-begin + row-26-begin 10-col 2-row 0 - Control.SetFocus(8002,0) Control.SetFocus(61) horizontal - + 0 0 - 1-col + 116 2-row stretch colors/black.png @@ -204,7 +211,7 @@ 0 0 - 1-col + 116 2-row center center @@ -213,11 +220,11 @@ - + 0 0 - 1-col + 116 2-row stretch colors/white.png @@ -226,7 +233,7 @@ 0 0 - 1-col + 116 2-row center center @@ -236,24 +243,12 @@ - + - Vol Down - + settings + - VolumeDown - - - Vol Up - - - VolumeUp - - - Rewind - - - PlayerControl(rewind) + ActivateWindow(osdsubtitlesettings) Stop @@ -277,105 +272,13 @@ PlayerControl(play) - Fast forward - - - PlayerControl(forward) - - - - false + true PVR.ToggleRecordPlayingChannel - - - 36 - row-24-begin - 8-col - 12-row - 12 - 8001 - - - 0 - 0 - 4-col-gutter - 2-row - stretch - UIControls/button.png - 44000000 - - - 0 - 0 - 4-col-gutter - 2-row - center - center - thumbTitle - textActive - - - - - - 0 - 0 - 4-col-gutter - 2-row - stretch - UIControls/button.png - highlight - - - 0 - 0 - 4-col-gutter - 2-row - center - center - thumbTitle - textActive - - - - - - VideoPlayer.HasMenu - - - PlayerControl(ShowVideoMenu) - - - Subtitles - - - ActivateWindow(osdsubtitlesettings) - - - Video Settings - - - ActivateWindow(osdvideosettings) - - - Audio Settings - - - ActivateWindow(osdaudiosettings) - - - Bookmarks - - - ActivateWindow(videobookmarks) - - - DebugGrid diff --git a/1080i/VideoOSDBookmarks.xml b/1080i/VideoOSDBookmarks.xml deleted file mode 100644 index f1d4328..0000000 --- a/1080i/VideoOSDBookmarks.xml +++ /dev/null @@ -1,217 +0,0 @@ - - - 9000 - - - - 0 - 0 - fullscreenWidth - fullscreenHeight - stretch - colors/black.png - ddFFFFFF - fadeInOut - - - col-1-begin - row-1-begin - - modalDialogInOutVertical - - 0 - 0 - 12-col - pageTitle - textActive - - - - - 0 - 2-row - 12-col - 2-row - horizontal - 11 - - - 0 - 0 - 1-col-textbox - 2-row - stretch - colors/black.png - - - 1-col - 0 - 5-col-textbox - 2-row - stretch - colors/black.png - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - 1-col-indent - -1 - 5-col-gutter - 2-row - center - buttonTitle - textActive - - - - - - 0 - 0 - 1-col-textbox - 2-row - stretch - colors/white.png - highlight - spinFocusIcon - - - 1-col - 0 - 5-col-textbox - 2-row - stretch - colors/white.png - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - - 1-col-indent - -1 - 5-col-gutter - 2-row - center - buttonTitle - black - - - - - - - Create Bookmark button - - - - SendClick(125,2) - - - Clear Bookmark button - - - - SendClick(125,3) - - - Clear Bookmark button (episodes) - videoplayer.content(episodes) - - - - SendClick(125,4) - - - - - - 0 - 5-row - 24-col - 11-row - horizontal - 9000 - - - 0 - 0 - 6-col-gutter - 230 - scale - $INFO[Listitem.icon] - colors/white.png - 3 - ffFFFFFF - - - 12 - 233 - 6-col-gutter - itemTitle - textActive - - - - - - 0 - 0 - 6-col-gutter - 230 - scale - $INFO[Listitem.icon] - colors/white.png - 3 - ffFFFFFF - focusThumb - - - 12 - 233 - 6-col-gutter - itemTitle - textActive - - - - - - - - false - - Create Bookmark button - - - Clear Bookmark button - - - Clear Bookmark button - - - - DebugGrid - - DialogID - - - - diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml index fc7f801..92f15a7 100644 --- a/1080i/View_Albums.xml +++ b/1080i/View_Albums.xml @@ -14,13 +14,15 @@ $EXP[isMusicAlbum] + !$EXP[isMusicArtistCatalogue] + !Skin.HasSetting(disableRecentAlbums) - + + - - - + + + + @@ -45,7 +47,6 @@ 9000 Search - System.HasAddon(script.globalsearch) 1-col masks/circle.png @@ -54,7 +55,7 @@ black symbolLarge - RunScript(script.globalsearch,artists=true&albums=true&songs=true&musicvideos=true) + Runscript(script.quickfind,media=albums) diff --git a/1080i/View_Artists.xml b/1080i/View_Artists.xml index 28ea432..2f31005 100644 --- a/1080i/View_Artists.xml +++ b/1080i/View_Artists.xml @@ -6,15 +6,15 @@ $EXP[isMusicArtist] - col-4-begin + col-8-begin 170 0 0 - 18-col + 10-col 2-row stretch - masks/menuBar.png + masks/menuBar.png 77000000 @@ -38,6 +38,17 @@ RunScript(script.globalsearch,artists=true&albums=true&songs=true&musicvideos=true) + + + UIControls/button.png + thumbTitle + 4-col + center + 0 + + Container.Update(musicdb://genres/) + control.setfocus(55) + Sort by @@ -80,7 +91,7 @@ 9000 60 51 - 51 + 9202 9202 250 60 @@ -100,7 +111,7 @@ 230 scale $INFO[Listitem.art(thumb)] - 88FFFFFF + 55FFFFFF 24 diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml index 2ab9578..22139d3 100644 --- a/1080i/View_Episodes.xml +++ b/1080i/View_Episodes.xml @@ -186,7 +186,7 @@ 0 0 - 1-col-textbox + 1-col 2-row stretch colors/white.png diff --git a/1080i/View_LiveTVChannels.xml b/1080i/View_LiveTVChannels.xml index b58bac4..c54c6aa 100644 --- a/1080i/View_LiveTVChannels.xml +++ b/1080i/View_LiveTVChannels.xml @@ -24,29 +24,33 @@ masks/tvChannel.png d0000000 - - 0 - 0 - 69 - 69 - stretch - colors/black.png - d0000000 - - - 0 - 0 - 69 - 69 - scale - $INFO[listitem.thumb] - 6 - - + + 0 + 0 + 1-col-textbox + 69 + stretch + colors/black.png + 0 + textboxInactive + + + 0 + 0 + 1-col-textbox + 69 + center + center + itemTitle + textActive + + + false + 96 0 - 276 + 252 2-row center itemTitle @@ -110,36 +114,39 @@ masks/tvChannel.png highlight - - - - - - - 0 - 0 - 69 - 69 - stretch - colors/white.png - highlight - - - 0 - 0 - 69 - 69 - scale - $INFO[listitem.thumb] - 6 - + + + + + 0 + 0 + 1-col + 70 + stretch + colors/white.png + 0 + highlight + + + 0 + 0 + 1-col-textbox + 2-row + center + center + itemTitle + textActive + + + false 96 0 - 276 + 252 2-row center + false itemTitle textActive @@ -160,6 +167,7 @@ 520 0 444 + false 2-row center itemTitle @@ -185,6 +193,7 @@ 7-col-gutter 2-row center + false itemTitle textActive diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml index 172d940..12468d9 100644 --- a/1080i/View_Movies.xml +++ b/1080i/View_Movies.xml @@ -21,14 +21,17 @@ $EXP[isMovie] + !string.contains(container.folderpath,playlists) + !Skin.HasSetting(disableRecentMovies) - - + + + - - - + + + + + col-4-begin @@ -50,9 +53,8 @@ 9000 9103 9000 - + Search - System.HasAddon(script.globalsearch) 1-col masks/circle.png @@ -61,7 +63,7 @@ 0 center - RunScript(script.globalsearch,movies=true) + Runscript(script.quickfind,media=movies) @@ -71,7 +73,7 @@ center 3-col 0 - Skin.SetString(movieQuickLinkValue,special://skin/extras/playlists/recentMovies.xsp) + Skin.SetString(movieQuickLinkValue,special://skin/extras/playlists/recentMovies.xsp) control.setfocus(9103,0) @@ -81,25 +83,36 @@ thumbTitle center 0 - Skin.SetString(movieQuickLinkValue,special://skin/extras/playlists/inprogressMovies.xsp) + Skin.SetString(movieQuickLinkValue,special://skin/extras/playlists/inprogressMovies.xsp) control.setfocus(9103,0) - + + System.Setting(hidewatched) Watched Toggle - + 4-col thumbTitle - left + center 24 UIControls/button.png - UIControls/toggle-on.png - UIControls/toggle-off.png - 60 - 30 - 204 - black + [COLOR highlight]On[/COLOR] + sendclick(14) + + + !System.Setting(hidewatched) + Watched Toggle + + 4-col + thumbTitle + center + 24 + + + UIControls/button.png + [COLOR highlight]Off[/COLOR] + sendclick(14) Sort by @@ -255,11 +268,22 @@ - + - !controlgroup(9000).hasfocus + !$EXP[isTVShow] + $EXP[isMovie] + !string.contains(container.folderpath,playlists) + !controlgroup(9000).hasfocus + !$EXP[isTVShow] + $EXP[isMovie] + System.Setting(hidewatched) + col-1-begin + 736 + 12-col + 2-row + center + menuTitle + textActive + + + + !controlgroup(9000).hasfocus + !$EXP[isTVShow] + $EXP[isMovie] + !System.Setting(hidewatched) col-1-begin 736 12-col @@ -268,17 +292,6 @@ menuTitle textActive - - - !controlgroup(9000).hasfocus + !$EXP[isTVShow] + $EXP[isMovie] + string.contains(container.folderpath,playlists) - col-1-begin - 736 - 12-col - 2-row - center - menuTitle - textActive - $EXP[isMovie] diff --git a/1080i/View_MusicFiles.xml b/1080i/View_MusicFiles.xml index 2cbb3fb..25b9470 100644 --- a/1080i/View_MusicFiles.xml +++ b/1080i/View_MusicFiles.xml @@ -6,7 +6,7 @@ col-1-begin row-5-begin - !$EXP[isMusicPlaylist] + !$EXP[isMusicSong] + !$EXP[isMusicSpotifyAlbum] + !$EXP[isMusicSpotifyArtist] + !$EXP[isMusicAlbum] + $EXP[isMusicList] + !$EXP[isMusicPlaylist] + !$EXP[isMusicSong] + !$EXP[isMusicAlbum] + $EXP[isMusicList] 0 0 24-col @@ -24,7 +24,6 @@ 69 stretch colors/black.png - overlay 1-col @@ -51,13 +50,11 @@ 0 0 - 69 + 1-col 69 stretch colors/white.png - - - + highlight diff --git a/1080i/View_MusicPlaylist.xml b/1080i/View_MusicPlaylist.xml index a0c3f09..4bb2817 100644 --- a/1080i/View_MusicPlaylist.xml +++ b/1080i/View_MusicPlaylist.xml @@ -4,251 +4,351 @@ $EXP[isMusicPlaylist] - - - col-4-begin - 170 + + + col-1-begin + row-7-begin + + + + + + + + + + + !Visualisation.Enabled + 612 + -60 + 7-col + 7-col + stretch + $INFO[MusicPlayer.Cover] + ffffffff + + + + 0 + 12-row + + 7-col + 50 + 10-col + 2-row + center + menuTitle3 + textActive + true + + 99000000 + true + + + 4-col + 112 + 16-col + 3-row + center + buttonTitle + textActive + true + + 99000000 + + + Pvr.IsPlayingRadio + 4-col + 112 + 16-col + 3-row + center + buttonTitle + textActive + true + + 99000000 + + + Progress Bar + 9-col + 230 + 6-col + 12 + colors/offblack.png + colors/white.png + player.progress + + + 628 + 6-row + 4-col + right + buttonTitle2 + textActive + true + + 99000000 + + + 1100 + 6-row + 4-col + left + buttonTitle2 + textActive + true + + 99000000 + + + + + + 540 + 21-row + + + 287 + -12 + 1-col + 1-col + symbol + center + center + textActive + + + + + + 2-row + horizontal + 9876 + + center + 0 + + 3-col + masks/menuTitle.png + masks/menuTitle.png + textActive + + + center + 0 + + 3-col + masks/menuTitle.png + masks/menuTitle.png + textActive + + + center + 0 + + 3-col + masks/menuTitle.png + masks/menuTitle.png + textActive + setfocus(59) + + + + + 0 - 0 - 18-col - 2-row - stretch - masks/menuBar.png - 77000000 - - - 0 - 0 - horizontal - 0 - 9000 - 59 - 9000 - - Sort by - - - Container.NextSortMethod - - - Sort direction - black - textActive - - masks/circle.png - masks/circle.png - - 0 - 1-col - symbolLarge - - - Container.SetSortDirection - - - - - - col-1-begin - row-7-begin - 24-col - 23-row - 9000 - 60 - 9103 - 59 - 9103 - 60 - 200 - - - 0 - 0 - 1-col - 69 - stretch - $INFO[listitem.icon] - overlay - - - 76 - 0 - 7-col-gutter - 69 - stretch - colors/black.png - overlay - - - 560 - 0 - 7-col - 69 - stretch - colors/black.png - overlay - - - 1068 - 0 - 514 - 69 - stretch - colors/black.png - overlay - - - 1587 - 0 - 141 - 69 - stretch - colors/black.png - overlay - - - 96 - 0 - 6-col - 2-row - center - itemTitle - textActive - - - - - 8-col - 0 - 7-col-gutter - 2-row - center - playlistSubTitle - textActive - - - - - 1086 - 0 - 7-col-gutter - 2-row - center - playlistSubTitle - textActive - - - - - -36 - 0 - 3-col-gutter - 2-row - center - right - itemTitle - textActive - - - - - - - - - - 0 - 0 - 1-col - 69 - stretch - $INFO[listitem.icon] - highlight - - - 76 - 0 - 7-col-gutter - 69 - stretch - colors/white.png - highlight - - - 560 - 0 - 7-col - 69 - stretch - colors/white.png - highlight - - - 1068 - 0 - 514 - 69 - stretch - colors/white.png - highlight - - - 1587 - 0 - 141 - 69 - stretch - colors/white.png - highlight - - - 96 - 0 - 6-col - 2-row - center - itemTitle - textActive - - - - - 8-col - 0 - 7-col-gutter - 2-row - center - playlistSubTitle - textActive - - - - - 1086 - 0 - 7-col-gutter - 2-row - center - playlistSubTitle - textActive - - - - - -36 - 0 - 3-col-gutter - 2-row - center - right - itemTitle - textActive - - - - - + 1172 + 24-col + 23-row + 9000 + 60 + 3123 + 59 + 3123 + 60 + 200 + + + 0 + 0 + 1-col + 69 + stretch + colors/black.png + overlay + + + 76 + 0 + 1508 + 69 + stretch + colors/black.png + overlay + + + 1587 + 0 + 141 + 69 + stretch + colors/black.png + overlay + + + 0 + 0 + 1-col + 2-row + center + center + itemTitle + textActive + + + + + 96 + 0 + 6-col + 2-row + center + itemTitle + textActive + + + + + 8-col + 0 + 6-col-gutter + 2-row + center + playlistSubTitle + textActive + + + + + 1026 + 0 + 7-col-gutter + 2-row + center + playlistSubTitle + textActive + + + + + -36 + 0 + 3-col-gutter + 2-row + center + right + itemTitle + textActive + + + + + + + 0 + 0 + 76 + 69 + stretch + colors/white.png + + + + highlight + + + 76 + 0 + 1510 + 69 + stretch + colors/white.png + highlight + + + 1587 + 0 + 141 + 69 + stretch + colors/white.png + highlight + + + 0 + 0 + 1-col + 2-row + center + center + itemTitle + textActive + + + + + 96 + 0 + 6-col + 2-row + center + itemTitle + textActive + + + false + + + 8-col + 0 + 6-col-gutter + 2-row + center + playlistSubTitle + textActive + + + false + + + 1026 + 0 + 7-col-gutter + 2-row + center + playlistSubTitle + textActive + + + false + + + -36 + 0 + 3-col-gutter + 2-row + center + right + itemTitle + textActive + + + + + + diff --git a/1080i/View_Photos.xml b/1080i/View_Photos.xml deleted file mode 100644 index bfe3fcb..0000000 --- a/1080i/View_Photos.xml +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - $EXP[isPhotoAlbum] - - dimensionsFullscreen - $INFO[container(50).listitem.art(thumb)] - FF555555 - scale - 250 - - - dimensionsFullscreen - vignette.png - ffffffff - stretch - - - col-1-begin - 20-row - 18-col - 1-row - largeTitle - textActive - center - - true - - - - - $EXP[isPhotoAlbum] - 96 - row-22-begin - 1764 - 10-row - 9000 - 50 - horizontal - 600 - 60 - - - 0 - 0 - 4-col-textbox - 160 - scale - colors/black.png - 6 - - - ListItem.IsFolder + !ListItem.IsParentFolder - 0 - 0 - 4-col-textbox - 160 - scale - $INFO[Listitem.thumb] - 6 - 33ffffff - - - !ListItem.IsFolder + !ListItem.IsParentFolder - 0 - 0 - 4-col-textbox - 160 - scale - $INFO[Listitem.thumb] - 6 - 77ffffff - - - ListItem.IsFolder - 0 - 0 - 4-col-textbox - 160 - scale - colors/black.png - 6 - 77111111 - - - ListItem.IsFolder + !ListItem.IsParentFolder - 0 - 56 - 4-col-textbox - 1-row - center - center - largeLight - textActive - - - - ListItem.IsFolder - 24 - 160 - 230 - 60 - thumbTitle - true - textActive - - - - - - focusThumb - - 0 - 0 - 4-col-textbox - 160 - scale - colors/black.png - colors/white.png - 6 - FF000000 - - - ListItem.IsFolder + !ListItem.IsParentFolder - 0 - 0 - 4-col-textbox - 160 - scale - $INFO[Listitem.thumb] - 6 - 33ffffff - - - !ListItem.IsFolder + !ListItem.IsParentFolder - 0 - 0 - 4-col-textbox - 160 - scale - $INFO[Listitem.thumb] - 6 - - - ListItem.IsFolder - 0 - 0 - 4-col-textbox - 160 - scale - colors/black.png - 6 - 99FFFFFF - - - ListItem.IsFolder + !ListItem.IsParentFolder - 0 - 56 - 4-col-textbox - 1-row - center - center - largeLight - textActive - - - - ListItem.IsFolder - 24 - 160 - 230 - 60 - thumbTitle - true - textActive - - - - - - - !$EXP[isPhotoAlbum] - col-1-begin - row-5-begin - 24-col - 23-row - 9000 - 61 - 51 - 51 - 61 - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.thumb] - - - 1-col - 0 - 23-col - 69 - stretch - colors/black.png - overlay - - - 1-col-indent - 0 - 22-col-gutter - 2-row - center - itemTitle - textActive - - - - - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.thumb] - - - - - - - 1-col - 0 - 23-col - 2-row - stretch - colors/white.png - highlight - - - 1-col-indent - 0 - 22-col-gutter - 2-row - center - itemTitle - textActive - - - - - - - diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml index dedb936..15c7ceb 100644 --- a/1080i/View_Seasons.xml +++ b/1080i/View_Seasons.xml @@ -30,7 +30,7 @@ !String.Contains(Container.folderpath,plugin) col-1-begin row-7-begin - + 0 4-row 12-col @@ -159,8 +159,8 @@ 378 stretch colors/black.png - 0 - BBFFFFFF + colors/white.png + 6 ListItem.IsParentFolder diff --git a/1080i/View_Songs.xml b/1080i/View_Songs.xml index c2c596a..18c4dfc 100644 --- a/1080i/View_Songs.xml +++ b/1080i/View_Songs.xml @@ -218,7 +218,7 @@ 0 0 - 1-col-textbox + 1-col 69 stretch colors/white.png @@ -251,7 +251,7 @@ !ListItem.IsPlaying 0 0 - 1-col-textbox + 1-col 2-row center center @@ -266,7 +266,7 @@ 1-col 0 - 861 + 864 69 stretch colors/white.png diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml index 5e7dd61..be2d02d 100644 --- a/1080i/View_TVShows.xml +++ b/1080i/View_TVShows.xml @@ -21,13 +21,15 @@ $EXP[isTVShow] + !string.contains(container.folderpath,playlists) + !Skin.HasSetting(disableRecentTVShows) - + + - - - + + + + @@ -50,9 +52,8 @@ 9000 9203 9000 - + Search - System.HasAddon(script.globalsearch) 1-col masks/circle.png @@ -61,7 +62,7 @@ 0 center - RunScript(script.globalsearch,tvshows=true&episodes=true&) + Runscript(script.quickfind,media=tvshows) @@ -71,7 +72,7 @@ thumbTitle center 0 - Skin.SetString(tvQuickLinkValue,special://skin/extras/playlists/recentEpisodes.xsp) + Skin.SetString(tvQuickLinkValue,special://skin/extras/playlists/recentEpisodes.xsp) control.setfocus(9203,0) @@ -81,25 +82,36 @@ thumbTitle center 0 - Skin.SetString(tvQuickLinkValue,special://skin/extras/playlists/inprogressTVShows.xsp) + Skin.SetString(tvQuickLinkValue,special://skin/extras/playlists/inprogressTVShows.xsp) control.setfocus(9203,0) - + + System.Setting(hidewatched) Watched Toggle - + 4-col thumbTitle - left + center 24 UIControls/button.png - UIControls/toggle-on.png - UIControls/toggle-off.png - 60 - 30 - 204 - black + [COLOR highlight]On[/COLOR] + sendclick(14) + + + !System.Setting(hidewatched) + Watched Toggle + + 4-col + thumbTitle + center + 24 + + + UIControls/button.png + [COLOR highlight]Off[/COLOR] + sendclick(14) Sort by @@ -282,7 +294,18 @@ - !controlgroup(9000).hasfocus + $EXP[isTVShow] + !$EXP[isMovie] + !controlgroup(9000).hasfocus + $EXP[isTVShow] + !$EXP[isMovie] + System.Setting(hidewatched) + col-1-begin + 736 + 12-col + 2-row + center + menuTitle + textActive + + + + !controlgroup(9000).hasfocus + $EXP[isTVShow] + !$EXP[isMovie] + !System.Setting(hidewatched) col-1-begin 736 12-col @@ -325,25 +348,25 @@ Integer.IsGreater(ListItem.Property(UnWatchedEpisodes),0) - 96r - 12 + 174 + 6 0 0 - 38 - 38 + 72 + 36 stretch - colors/white.png + masks/homeMenuButton.png highlight - + 0 -2 - 38 - 38 + 72 + 36 center center - smallStrong + thumbTitle textActive @@ -377,25 +400,25 @@ Integer.IsGreater(ListItem.Property(UnWatchedEpisodes),0) - 98r + 168 12 0 0 - 38 - 38 + 72 + 36 stretch - colors/white.png + masks/homeMenuButton.png highlight - + 0 -2 - 38 - 38 + 72 + 36 center center - smallStrong + thumbTitle textActive diff --git a/1080i/View_VideoFiles.xml b/1080i/View_VideoFiles.xml index 7140079..c6216b2 100644 --- a/1080i/View_VideoFiles.xml +++ b/1080i/View_VideoFiles.xml @@ -31,7 +31,7 @@ 69 stretch $INFO[Listitem.thumb] - overlay + d0000000 1-col @@ -71,13 +71,11 @@ 0 0 - 69 + 72 69 stretch - $INFO[Listitem.thumb] - - - + colors/white.png + highlight diff --git a/1080i/custom_musicFullscreenDisabler.xml b/1080i/custom_musicFullscreenDisabler.xml index 0ea49ad..748dd53 100644 --- a/1080i/custom_musicFullscreenDisabler.xml +++ b/1080i/custom_musicFullscreenDisabler.xml @@ -1,7 +1,7 @@ action(back) - Window.IsActive(1103) + !player.playing + !player.paused + Window.IsActive(musicplaylist) + !player.playing + !player.paused DebugGrid diff --git a/1080i/custom_musicOverlay.xml b/1080i/custom_musicOverlay.xml index efaea40..c1e7315 100644 --- a/1080i/custom_musicOverlay.xml +++ b/1080i/custom_musicOverlay.xml @@ -1,6 +1,6 @@ - player.hasaudio + !Window.IsActive(visualisation) + !window.isactive(home) + !window.isactive(1103) + player.hasaudio + !Window.IsActive(visualisation) + !window.isactive(home) + !window.isactive(musicplaylist) col-12-begin diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml deleted file mode 100644 index 00265e2..0000000 --- a/1080i/custom_musicPlayerFullscreen.xml +++ /dev/null @@ -1,165 +0,0 @@ - - - 9876 - control.setfocus(9999) - - - dimensionsFullscreen - colors/black.png - stretch - - - fadeInOut - - - - !Visualisation.Enabled - dimensionsFullscreen - colors/black.png - stretch - - - !Visualisation.Enabled - dimensionsFullscreen - stretch - $INFO[MusicPlayer.Property(Fanart_Image)] - 500 - 77ffffff - - - !Visualisation.Enabled - dimensionsFullscreen - vignette.png - ffffffff - stretch - - - - Visualisation.Enabled - visualisation - 0 - 0 - dimensionsFullscreen - - - - - col-1-begin - row-9-begin - - - - - - - - - - - - !Visualisation.Enabled - 612 - -60 - 7-col - 7-col - stretch - $INFO[MusicPlayer.Cover] - ffffffff - - - - 0 - 12-row - - 7-col - 50 - 10-col - 2-row - center - menuTitle3 - textActive - true - - 99000000 - true - - - 4-col - 112 - 16-col - 3-row - center - buttonTitle - textActive - true - - 99000000 - - - Pvr.IsPlayingRadio - 4-col - 112 - 16-col - 3-row - center - buttonTitle - textActive - true - - 99000000 - - - Progress Bar - 9-col - 230 - 6-col - 12 - colors/offblack.png - colors/white.png - player.progress - - - 628 - 6-row - 4-col - right - buttonTitle2 - textActive - true - - 99000000 - - - 1100 - 6-row - 4-col - left - buttonTitle2 - textActive - true - - 99000000 - - - - - - - -100 - -100 - 1-col - 1-col - control.setfocus(9000) - control.setfocus(9000) - control.setfocus(9000) - - - hubMenu - - DebugGrid - - DialogID - - - - diff --git a/1080i/script-globalsearch.xml b/1080i/script-globalsearch.xml deleted file mode 100644 index 7fe99a2..0000000 --- a/1080i/script-globalsearch.xml +++ /dev/null @@ -1,217 +0,0 @@ - - - 50 - - globalBackground - - - modalDialogContentShift - ![Window.IsVisible(DialogVideoInfo.xml) | Window.IsVisible(DialogMusicInfo.xml)] - - - col-1-begin - row-5-begin - 4-col - 18-row - 50 - - - 0 - 0 - 4-col - 69 - stretch - colors/black.png - textboxInactive - - - 12 - 0 - 2-row - 276 - center - itemTitle - - - - - - 0 - 0 - 4-col - 2-row - stretch - colors/white.png - highlight - - - 12 - 0 - 2-row - 276 - center - itemTitle - - - - - - - col-6-begin - row-5-begin - 19-col - 23-row - 9000 - 60 - 50 - 50 - 60 - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.thumb] - - - 1-col - 0 - 23-col - 69 - stretch - colors/black.png - textboxInactive - - - 1-col-indent - 0 - 18-col - 2-row - center - itemTitle - textActive - - - - - - - 0 - 3 - 66 - 66 - stretch - $INFO[Listitem.thumb] - - - - - - - 1-col - 0 - 18-col - 2-row - stretch - colors/white.png - highlight - - - 1-col-indent - 0 - 18-col - 2-row - center - itemTitle - textActive - - - - - - - - Control.IsVisible(60) - conditional - - 54r - row-8-begin - 20-row - 50 - 50 - - - - - col-1-begin - row-1-begin - - - 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 - - - - - - - -2000 - - - -2000 - - - -2000 - - - - miniVideoPlayer - - hubMenu - - loadingIndicator - - DebugGrid - - WindowID - - - - diff --git a/1080i/script-quickfind.xml b/1080i/script-quickfind.xml new file mode 100644 index 0000000..de6a455 --- /dev/null +++ b/1080i/script-quickfind.xml @@ -0,0 +1,234 @@ + + + 100 + fadeInOut + + + + dimensionsFullscreen + $INFO[container(200).listitem.art(fanart)] + FF555555 + scale + 250 + + + dimensionsFullscreen + vignette.png + + stretch + + + + + col-1-begin + row-1-begin + + + 0 + 0 + 18-col + sectionTitle + textActive + + + + 0 + 26 + 12-col + 2-row + menuTitle2 + textActive + + + + 24-col + 0 + 12-col + right + sectionTitle + + textActive + + + + 24-col + 26 + 12-col + 2-row + right + menuTitle2 + + textActive + + + + + + col-1-begin + row-8-begins + + + -6 + 6-row + 1-col + 1-col + 100 + 100 + 100 + + masks/square.png + 0 + textActive + textActive + symbol + center + + 100 + + + + 1-col + 0 + 1-col + 14-row + 3 + 1 + 200 + + + 0 + 0 + 1-col + 2-row + center + center + itemTitle + textActive + + + + + + 0 + 0 + 1-col + 1-col + stretch + colors/white.png + highlight + + + 0 + 0 + 1-col + 2-row + center + center + itemTitle + textActive + + + + + + + + + col-4-begin + row-3-begin + + + 0 + 2-row + 12-col + 19-row + 100 + + + 96 + 0 + 7-col-gutter + 2-row + center + itemTitle + textActive + + + + + + + 0 + 0 + 1-col + 69 + stretch + colors/white.png + + + + highlight + + + 1-col + 0 + 11-col + 69 + stretch + masks/tvChannel.png + highlight + + + 96 + 0 + 7-col-gutter + 2-row + center + itemTitle + textActive + + + + + 9-col-gutter + 0 + 3-col + 2-row + right + center + smallStrong + textActive + + + + + + + + 13-col + 2-row + 7-col + 756 + stretch + $INFO[container(200).listitem.art(poster)] + + + + + 13-col + 5-row + 7-col + 7-col + stretch + $INFO[container(200).listitem.art(thumb)] + + + + + DebugGrid + + WindowID + + + + \ No newline at end of file diff --git a/extras/backgrounds/music.jpg b/extras/backgrounds/music.jpg deleted file mode 100644 index 1eb5c43..0000000 Binary files a/extras/backgrounds/music.jpg and /dev/null differ diff --git a/extras/playlists/homeBackground.xsp b/extras/playlists/homeBackground.xsp new file mode 100644 index 0000000..9d962bf --- /dev/null +++ b/extras/playlists/homeBackground.xsp @@ -0,0 +1,5 @@ + + + all + random +