diff --git a/addon.xml b/addon.xml index 1346508..af57485 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + @@ -15,8 +15,7 @@ Mangrove skin is based on the Estuary skin - Mangrove skin is based Estuary the default skin of Kodi, for which credit goes to phil65, Ichabod Fletchman for the original work on Estuary - Estuary is the default skin for Kodi, removing it may cause issues + Mangrove skin is based on Estuary which is the default skin of Kodi. Credit for the original work on Estuary goes phil65, Ichabod Fletchman without which a derivative work such as this would not be possible. all CC BY-SA 4.0, GNU GENERAL PUBLIC LICENSE Version 2.0 http://forum.kodi.tv/ diff --git a/colors/defaults.xml b/colors/defaults.xml index bf5d7b1..8653c55 100644 --- a/colors/defaults.xml +++ b/colors/defaults.xml @@ -1,20 +1,34 @@ - FF0E597E - 330BAA8E - FF1A2123 + FF11375C + 334F4F9E + + C0000000 + 99000000 + FF657895 + 80A0A0A0 + C0A0A0A0 + + + + FF808080 + FF6c8e74 FF000000 FF909090 30FFFFFF FF000000 FFF0F0F0 FFA0A0A0 - FF7ACAFE - FFCE4421 - FF12A0C7 - 22000000 + FF36454f + + FF657895 + FF6c8e74 + FFbc2d29 + FFffff99 + FF000000 60FFFFFF 40FFFFFF - FF11E7B1 - FFFF0000 + FFFF0000 diff --git a/colors/original.xml b/colors/original.xml new file mode 100644 index 0000000..bf5d7b1 --- /dev/null +++ b/colors/original.xml @@ -0,0 +1,20 @@ + + + FF0E597E + 330BAA8E + FF1A2123 + FF000000 + FF909090 + 30FFFFFF + FF000000 + FFF0F0F0 + FFA0A0A0 + FF7ACAFE + FFCE4421 + FF12A0C7 + 22000000 + 60FFFFFF + 40FFFFFF + FF11E7B1 + FFFF0000 + diff --git a/extras/backgrounds/background.jpg b/extras/backgrounds/background.jpg new file mode 100644 index 0000000..1917877 Binary files /dev/null and b/extras/backgrounds/background.jpg differ diff --git a/extras/backgrounds/background1.jpg b/extras/backgrounds/background1.jpg new file mode 100644 index 0000000..fb740b4 Binary files /dev/null and b/extras/backgrounds/background1.jpg differ diff --git a/media/ItemSeperator.png b/media/ItemSeperator.png new file mode 100644 index 0000000..3c5c396 Binary files /dev/null and b/media/ItemSeperator.png differ diff --git a/media/dialogs/vertical-separator.png b/media/dialogs/vertical-separator.png new file mode 100644 index 0000000..47ba9d9 Binary files /dev/null and b/media/dialogs/vertical-separator.png differ diff --git a/xml/AddonBrowser.xml b/xml/AddonBrowser.xml index 62c97da..6a6b181 100644 --- a/xml/AddonBrowser.xml +++ b/xml/AddonBrowser.xml @@ -2,7 +2,7 @@ 50 background - 50,52,55 + 50,52 9000 DefaultBackground @@ -10,37 +10,7 @@ Conditional View_50_List View_52_IconWall - View_55_WideList CommonScrollbars - - OpenClose_Left - Control.IsVisible(55) - Container.Content(addons) | Container.Content() - Visible_Left - - - - - String.IsEqual(ListItem.AddonLifecycleType,$LOCALIZE[24170]) | String.IsEqual(ListItem.AddonLifecycleType,$LOCALIZE[24171]) - - 64 - 109 - 472 - 472 - colors/black.png - - - 75 - 110 - 450 - 470 - center - center - - font32_title - - - diff --git a/xml/Custom_1100_AddonLauncher.xml b/xml/Custom_1100_AddonLauncher.xml index b2039f2..9ec14f4 100644 --- a/xml/Custom_1100_AddonLauncher.xml +++ b/xml/Custom_1100_AddonLauncher.xml @@ -96,7 +96,7 @@ 0 0 0 - lists/focus.png + colors/white.png Conditional diff --git a/xml/Custom_1109_TopBarOverlay.xml b/xml/Custom_1109_TopBarOverlay.xml index 3dabea4..b834419 100644 --- a/xml/Custom_1109_TopBarOverlay.xml +++ b/xml/Custom_1109_TopBarOverlay.xml @@ -1,257 +1,4 @@ - Window.IsActive(fullscreenvideo) | Window.IsActive(visualisation) - Window.IsActive(seekbar) | Window.IsActive(pvrosdchannels) | Window.IsActive(pvrchannelguide) - DepthOSD - Animation_TopSlide - 0 - - - ![Player.ShowInfo | Window.IsActive(fullscreeninfo) | Player.ShowTime | Window.IsActive(videoosd) | Window.IsActive(musicosd) | Window.IsActive(playerprocessinfo) | !String.IsEmpty(PVR.ChannelNumberInput) | Window.IsActive(pvrosdchannels) | Window.IsActive(pvrchannelguide)] + [!String.IsEmpty(Player.SeekNumeric) | Player.Seeking | Player.DisplayAfterSeek | Player.Forwarding | Player.Rewinding | Player.Paused] - VisibleChange - Conditional - - 0 - 0 - 100% - 55 - frame/osdfade.png - - - 25 - 6 - 700 - 60 - - font30_title - black - - - 50% - 0 - 50% - 55 - center - - font37 - !Player.ChannelPreviewActive | VideoPlayer.HasEpg - - - 25 - 6 - 700 - 60 - right - font30_title - - !VideoPlayer.Content(LiveTV) + player.chaptercount - - - 25 - 6 - 700 - 60 - right - font30_title - - VideoPlayer.Content(LiveTV) + PVR.IsTimeShift - - - 0 - 55 - 100% - 16 - Player.ProgressCache - colors/white50.png - colors/white50.png - !VideoPlayer.Content(LiveTV) - - - 0 - 55 - 100% - 16 - Player.Progress - colors/white50.png - colors/white.png - !VideoPlayer.Content(LiveTV) - - - 0 - 50 - 100% - 26 - osd/progress/nub_bar.png - osd/progress/nub_bar.png - colors/white.png - Player.Seekbar - !VideoPlayer.Content(LiveTV) + [Player.Seeking | Player.DisplayAfterSeek] - - - VideoPlayer.Content(LiveTV) - - Player.SeekEnabled + VideoPlayer.HasEPG - - - - - - - - - Player.SeekEnabled + !VideoPlayer.HasEPG - - - - - - - !Player.SeekEnabled + VideoPlayer.HasEPG - - - - - - - - 0 - 50 - 100% - 26 - osd/progress/nub_bar.png - osd/progress/nub_bar.png - colors/white.png - PVR.TimeShiftSeekbar - VideoPlayer.Content(LiveTV) + [Player.Seeking | Player.DisplayAfterSeek] + !Player.ChannelPreviewActive - - - 0 - 55 - 100% - 8 - colors/white50.png - colors/white.png - colors/white.png - colors/white.png - Player.Cutlist - - - 0 - 67 - 100% - 4 - colors/white50.png - colors/white.png - Player.Chapters - - - - conditional - VisibleChange - Player.ShowInfo | Window.IsActive(fullscreeninfo) | Player.ShowTime | Window.IsActive(videoosd) | Window.IsActive(musicosd) | Window.IsActive(playerprocessinfo) | !String.IsEmpty(PVR.ChannelNumberInput) | Window.IsActive(pvrosdchannels) | Window.IsActive(pvrchannelguide) + ![Player.Seeking | Player.DisplayAfterSeek | Player.Forwarding | Player.Rewinding | Player.Paused] - DepthBars - - 0 - 0 - 100% - 170 - frame/osdfade.png - - - conditional - - !String.IsEmpty(Player.Art(tvshow.clearlogo)) | !String.IsEmpty(Player.Art(clearlogo)) - 10 - 20 - 400 - 100 - 10 - horizontal - - 300 - $VAR[PlayerClearLogoVar] - keep - - - left - center - font13 - - text_shadow - true - - - - !Window.IsActive(pvrosdchannels) + !Window.IsActive(pvrchannelguide) - String.IsEmpty(Player.Art(clearlogo)) - String.IsEmpty(Player.Art(tvshow.clearlogo)) - VisibleChange - 20 - 400 - - - font45 - text_shadow - 7 - 50 - - - 60 - - text_shadow - 60 - - - - - !Window.IsVisible(extendedprogressdialog) - VisibleChange - - font_clock - text_shadow - 0 - 20 - 200 - 600 - right - - - - 24 - 74 - 800 - 100 - right - 5 - horizontal - true - - - text_shadow - 100 - auto - !String.isempty(Player.Duration) - Player.HasVideo + ![Player.HasGame | VideoPlayer.HasEpg] - - - - text_shadow - 100 - auto - VideoPlayer.HasEpg - - - 2 - 0 - 60 - 40 - 300 - keep - dialogs/volume/mute.png - Player.Muted - - - - - + diff --git a/xml/Custom_1111_OSDExtendedInfo.xml b/xml/Custom_1111_OSDExtendedInfo.xml new file mode 100644 index 0000000..1ac2427 --- /dev/null +++ b/xml/Custom_1111_OSDExtendedInfo.xml @@ -0,0 +1,28 @@ + + + 1000 + Animation_DialogPopupOpenClose + + + 300 + 170 + 200 + + + + + + + + 1% + 100 + 1580 + 600 + black + 3000 + font26 + + + + + diff --git a/xml/Defaults.xml b/xml/Defaults.xml index 5980707..2ee2642 100644 --- a/xml/Defaults.xml +++ b/xml/Defaults.xml @@ -13,7 +13,7 @@ left - font13 + font28 white disabled selected @@ -27,8 +27,8 @@ disabled - buttons/button-fo.png - buttons/button-nofo.png + colors/white.png + colors/white.png font13 white disabled @@ -49,11 +49,10 @@ left white - font13 - + font26 progress/texturebg_border_white.png - progress/texturebg_white.png + progress/texturebg_white.png @@ -98,7 +97,7 @@ 120 - 76 + 60 buttons/radio-button-on.png buttons/radio-button-on.png buttons/radio-button-off.png diff --git a/xml/DialogAddonInfo.xml b/xml/DialogAddonInfo.xml index 616cf31..91e4169 100644 --- a/xml/DialogAddonInfo.xml +++ b/xml/DialogAddonInfo.xml @@ -153,7 +153,7 @@ 410 30 font27_narrow - + 10 @@ -178,7 +178,7 @@ 410 30 font27_narrow - + false diff --git a/xml/DialogAddonSettings.xml b/xml/DialogAddonSettings.xml index ee19298..a675333 100644 --- a/xml/DialogAddonSettings.xml +++ b/xml/DialogAddonSettings.xml @@ -64,7 +64,7 @@ 70 font12 justify - button_focus + blue true @@ -83,7 +83,7 @@ separator image 3 - dialogs/separator-grey.png + dialogs/separator-grey.png DefaultSettingButton diff --git a/xml/DialogBusy.xml b/xml/DialogBusy.xml index 1d96d50..21c5b41 100644 --- a/xml/DialogBusy.xml +++ b/xml/DialogBusy.xml @@ -26,7 +26,7 @@ 80 keep Conditional - spinner.png + spinner.png 50% diff --git a/xml/DialogContextMenu.xml b/xml/DialogContextMenu.xml index 32b9f84..f472740 100644 --- a/xml/DialogContextMenu.xml +++ b/xml/DialogContextMenu.xml @@ -8,15 +8,7 @@ Window.IsActive(Home) - - -1920 - -1080 - 5760 - 3240 - WindowOpen - WindowClose - colors/black.png - + -1920 -1080 @@ -58,7 +50,7 @@ 450 65 center - lists/focus.png + colors/white.png diff --git a/xml/DialogGameControllers.xml b/xml/DialogGameControllers.xml index da83b41..4b0176c 100644 --- a/xml/DialogGameControllers.xml +++ b/xml/DialogGameControllers.xml @@ -28,7 +28,7 @@ center center - button_focus + blue Controller profiles grouplist background @@ -143,7 +143,7 @@ Feature separator image 3 - dialogs/separator-grey.png + dialogs/separator-grey.png diff --git a/xml/DialogKeyboard.xml b/xml/DialogKeyboard.xml index 6e91601..bb5970f 100644 --- a/xml/DialogKeyboard.xml +++ b/xml/DialogKeyboard.xml @@ -13,46 +13,28 @@ 0 0 - 100% - 300% - frame/osdfade.png - - - 0 - 0 - 100% - 470 + 1140 + 450 colors/white.png - - 50% - 50 - 1542 - 100 - font45 - - center - center - black - - 50% - 184 - 1542 + 20 + 330 + 1100 100 colors/white.png - 50% - 184 - 1542 + 20 + 330 + 1100 100 buttons/button-alt-nofo.png - 50% - 183 - 1510 + 40 + 331 + 1070 100 font37 center @@ -61,16 +43,15 @@ - 59% + 0 0 480 - 1920 - conditional - conditional + 800 - 320 - -30 + 20 + 160 + 0 horizontal 95200 @@ -167,9 +148,9 @@ - 320 - 90 - -30 + 20 + 220 + 0 horizontal 95200 @@ -253,11 +234,11 @@ - 320 - 180 + 20 + 280 horizontal 95200 - -30 + 0 (2,0) key button 120 @@ -339,9 +320,9 @@ - 320 - 270 - -30 + 20 + 340 + 0 horizontal 95200 @@ -425,64 +406,65 @@ - 320 - 360 - -30 + 20 + 400 + 0 horizontal 95200 Symbols button 120 - 120 + 60 160 100 - buttons/roundbutton-fo.png + colors/white.png icons/keyboard/letters.png icons/keyboard/letters.png icons/keyboard/symbols.png icons/keyboard/symbols.png - 32l - 56 - 36 + 5 + 115 + 40 CAPS LOCK button - 120 - 120 + 60 + 60 161 101 - buttons/roundbutton-fo.png + colors/white.png icons/keyboard/capslock.png - icons/keyboard/capslock.png + colors/white.png icons/keyboard/capslock.png icons/keyboard/capslock.png - 40 - 42 - 42 - 47 + 10 + 10 + 40 + 40 SHIFT button - 120 - 120 + 60 + 60 162 102 - buttons/roundbutton-fo.png + colors/white.png icons/keyboard/shift.png icons/keyboard/shift.png icons/keyboard/shift.png icons/keyboard/shift.png - 42 - 36 - 36 + 10 + 10 + 40 + 40 SPACE button - 390 - 120 + 340 + 60 164 104 @@ -491,65 +473,68 @@ icons/keyboard/spacebar.png icons/keyboard/spacebar.png icons/keyboard/spacebar.png - 34 - 328 - 36 + 10 + 10 + 320 + 40 previous button - 120 - 120 + 60 + 60 107 167 - buttons/roundbutton-fo.png + colors/white.png icons/keyboard/arrowleft.png icons/keyboard/arrowleft.png icons/keyboard/arrowleft.png icons/keyboard/arrowleft.png - 38 - 36 - 36 + 10 + 10 + 40 + 40 next button - 120 - 120 + 60 + 60 108 168 - buttons/roundbutton-fo.png + colors/white.png icons/keyboard/arrowright.png icons/keyboard/arrowright.png icons/keyboard/arrowright.png icons/keyboard/arrowright.png - 45 - 36 - 36 + 10 + 10 + 40 + 40 BACKSPACE button - 120 - 120 + 80 + 60 169 109 - buttons/roundbutton-fo.png + colors/white.png icons/keyboard/backspace.png icons/keyboard/backspace.png icons/keyboard/backspace.png icons/keyboard/backspace.png - 31 - 51 - 36 + 10 + 60 + 40 0 - 460 - 88% - dialogbuttons_itemgap + 320 + 800 + 0 95200 9010 95200 @@ -557,24 +542,28 @@ 140 350 vertical - + - + + - + - + + - + - + + - + - + + diff --git a/xml/DialogMediaSource.xml b/xml/DialogMediaSource.xml index 4a37a28..777cecd 100644 --- a/xml/DialogMediaSource.xml +++ b/xml/DialogMediaSource.xml @@ -61,7 +61,7 @@ 0 0 Control.HasFocus(10) - lists/focus.png + colors/white.png 10 diff --git a/xml/DialogMusicInfo.xml b/xml/DialogMusicInfo.xml index 6ad1779..8996c0f 100644 --- a/xml/DialogMusicInfo.xml +++ b/xml/DialogMusicInfo.xml @@ -172,7 +172,7 @@ 340 true - button_focus + blue @@ -293,7 +293,7 @@ font27_narrow center center - + 230 @@ -330,7 +330,7 @@ center center true - + 230 @@ -471,7 +471,7 @@ 410 30 font27_narrow - + @@ -480,7 +480,7 @@ 1 446 33 - lists/focus.png + colors/white.png Control.HasFocus(41) @@ -499,7 +499,7 @@ 410 30 font27_narrow - + false !Control.HasFocus(41) @@ -532,7 +532,7 @@ String.IsEqual(ListItem.DBType,song) + !Window.IsActive(musicinformation) - + diff --git a/xml/DialogNumeric.xml b/xml/DialogNumeric.xml index 35b729d..9dc1acf 100644 --- a/xml/DialogNumeric.xml +++ b/xml/DialogNumeric.xml @@ -37,7 +37,7 @@ 80 505 90 - button_focus + blue center center diff --git a/xml/DialogPVRChannelGuide.xml b/xml/DialogPVRChannelGuide.xml index a99a1e5..ccb6e8c 100644 --- a/xml/DialogPVRChannelGuide.xml +++ b/xml/DialogPVRChannelGuide.xml @@ -52,7 +52,7 @@ 0 780 0 - lists/focus.png + colors/white.png Control.HasFocus(11) UnFocus diff --git a/xml/DialogPVRChannelManager.xml b/xml/DialogPVRChannelManager.xml index d61c727..e3e510d 100644 --- a/xml/DialogPVRChannelManager.xml +++ b/xml/DialogPVRChannelManager.xml @@ -94,7 +94,7 @@ 0 0 0 - lists/focus.png + colors/white.png conditional @@ -152,7 +152,7 @@ font12 center - button_focus + blue black @@ -216,7 +216,7 @@ font12 center - button_focus + blue black diff --git a/xml/DialogPVRChannelsOSD.xml b/xml/DialogPVRChannelsOSD.xml index 6d1f1b4..a7e6e12 100644 --- a/xml/DialogPVRChannelsOSD.xml +++ b/xml/DialogPVRChannelsOSD.xml @@ -28,7 +28,7 @@ 0 0 0 - lists/focus.png + colors/white.png Control.hasFocus(11) diff --git a/xml/DialogPVRGroupManager.xml b/xml/DialogPVRGroupManager.xml index 629f621..0783024 100644 --- a/xml/DialogPVRGroupManager.xml +++ b/xml/DialogPVRGroupManager.xml @@ -102,7 +102,7 @@ center center - button_focus + blue 0 @@ -149,7 +149,7 @@ 0 0 0 - lists/focus.png + colors/white.png Control.HasFocus(13) diff --git a/xml/DialogPVRRadioRDSInfo.xml b/xml/DialogPVRRadioRDSInfo.xml index de70b3d..c1ad26e 100644 --- a/xml/DialogPVRRadioRDSInfo.xml +++ b/xml/DialogPVRRadioRDSInfo.xml @@ -27,7 +27,7 @@ 180 780 25 - button_focus + blue font36_title @@ -79,7 +79,7 @@ 595 780 25 - button_focus + blue font36_title @@ -115,7 +115,7 @@ 180 780 25 - button_focus + blue font36_title @@ -167,7 +167,7 @@ 595 780 25 - button_focus + blue font36_title @@ -200,7 +200,7 @@ 780 25 - button_focus + blue font36_title @@ -209,7 +209,7 @@ 780 170 justify - + true @@ -227,7 +227,7 @@ 780 25 - button_focus + blue font36_title diff --git a/xml/DialogPictureInfo.xml b/xml/DialogPictureInfo.xml index 2a6d20e..2a49974 100644 --- a/xml/DialogPictureInfo.xml +++ b/xml/DialogPictureInfo.xml @@ -78,7 +78,7 @@ center font12 - button_focus + blue text_shadow @@ -100,7 +100,7 @@ center font12 - button_focus + blue text_shadow diff --git a/xml/DialogPlayerProcessInfo.xml b/xml/DialogPlayerProcessInfo.xml index 5341fed..41b4e37 100644 --- a/xml/DialogPlayerProcessInfo.xml +++ b/xml/DialogPlayerProcessInfo.xml @@ -24,7 +24,7 @@ 1200 50 bottom - + font14 black @@ -32,7 +32,7 @@ 1200 50 bottom - + font14 black @@ -40,7 +40,7 @@ 1200 50 bottom - + font14 black @@ -48,7 +48,7 @@ 1200 50 bottom - + font14 black @@ -56,7 +56,7 @@ 1200 50 bottom - + font14 black @@ -64,7 +64,7 @@ 1200 50 bottom - + font14 black @@ -78,7 +78,7 @@ 600 50 bottom - + font14 black @@ -86,7 +86,7 @@ 600 50 bottom - + font14 black @@ -94,7 +94,7 @@ 600 50 bottom - + font14 black @@ -102,7 +102,7 @@ 600 50 bottom - + font14 black @@ -117,7 +117,7 @@ 1600 50 bottom - + font14 black @@ -136,7 +136,7 @@ 1600 50 bottom - + font14 black Player.HasVideo @@ -145,7 +145,7 @@ 1600 50 bottom - + font14 black Player.HasVideo @@ -154,7 +154,7 @@ 1600 50 bottom - + font14 black Player.HasVideo @@ -163,7 +163,7 @@ 1600 50 bottom - + font14 black Player.HasVideo @@ -172,7 +172,7 @@ 1600 50 bottom - + font14 black @@ -180,7 +180,7 @@ 1600 50 bottom - + font14 black System.SupportsCPUUsage @@ -189,7 +189,7 @@ 1600 50 bottom - + font14 black !System.SupportsCPUUsage diff --git a/xml/DialogSeekBar.xml b/xml/DialogSeekBar.xml index 0eb1b90..bdb92be 100644 --- a/xml/DialogSeekBar.xml +++ b/xml/DialogSeekBar.xml @@ -1,389 +1,803 @@ + SetFocus(801) + 801 Player.Seeking | Player.DisplayAfterSeek | [Player.Paused + !Player.Caching] | Player.Forwarding | Player.Rewinding | Player.ShowInfo | Window.IsActive(fullscreeninfo) | Player.ShowTime | Window.IsActive(videoosd) | Window.IsActive(musicosd) | Window.IsActive(playerprocessinfo) | !String.IsEmpty(Player.SeekNumeric) | !String.IsEmpty(PVR.ChannelNumberInput) ![Window.IsActive(sliderdialog) | Window.IsActive(pvrosdchannels) | Window.IsActive(pvrguideinfo) | Window.IsActive(1110)] Window.IsActive(fullscreenvideo) | Window.IsActive(visualisation) - Animation_BottomSlide DepthOSD 0 - PVRChannelNumberInput + - VisibleChange - Player.ShowInfo | Window.IsActive(fullscreeninfo) | Player.ShowTime | Window.IsActive(videoosd) | Window.IsActive(musicosd) | Window.IsActive(playerprocessinfo) | !String.IsEmpty(PVR.ChannelNumberInput) | Window.IsActive(pvrosdchannels) | Window.IsActive(pvrchannelguide) | ![!String.IsEmpty(Player.SeekNumeric) | Player.Seeking | Player.DisplayAfterSeek | Player.Forwarding | Player.Rewinding | Player.Paused] - !Player.HasGame - 0 - 190 + Player.ShowInfo | Window.IsActive(fullscreeninfo) | Player.ShowTime | Window.IsActive(videoosd) | Window.IsActive(musicosd) | Window.IsActive(playerprocessinfo) | !String.IsEmpty(PVR.ChannelNumberInput) | Window.IsActive(pvrosdchannels) | Window.IsActive(pvrchannelguide) | !String.IsEmpty(Player.SeekNumeric) | Player.Seeking | Player.DisplayAfterSeek | Player.Forwarding | Player.Rewinding | Player.Paused + Animation_TopSlide + VisibleChange - -40 - 120% - 200 - frame/osdfade.png - - - !Window.IsVisible(videoosd) + !Window.IsVisible(musicosd) - VisibleChange - - [PVR.IsRecordingPlayingChannel + !Player.ChannelPreviewActive] | PVR.IsPlayingActiveRecording - 20 - 125 - 60 - left - horizontal - -5 - - 100 - 20 - 60 - 60 - center - osd/fullscreen/buttons/record.png - - - 110 - 90 - 400 - 60 - center - font25_title - - - - - 20 - 125 - 800 - 50 - right - Animation_BottomSlide - horizontal - 10 - [Player.ShowInfo | Window.IsActive(fullscreeninfo)] + !Player.ChannelPreviewActive + Window.IsActive(fullscreenvideo) - Visible - - - - - - - - - - - - - - - - - - 20 - 125 - 800 - 50 - right - Animation_BottomSlide - horizontal - 10 - Player.ShowInfo + !Player.ChannelPreviewActive + Window.IsActive(visualisation) - Visible - - - - - - - - - - - - !String.IsEmpty(MusicPlayer.SampleRate) - 115 - - 115 - 60 - center - center - - font_flag - - - - - - - !String.IsEmpty(MusicPlayer.BitRate) - 115 - - 115 - 60 - center - center - - font_flag - - - - - - - !String.IsEmpty(MusicPlayer.BitsPerSample) - 115 - - 115 - 60 - center - center - - font_flag - - - - - - + 0 + 0 + 100% + 135 + colors/white.png + + 20 + 90 + 820 + 40 + left + top + + font26_bold + !VideoPlayer.Content(LiveTV) 50% - 125 - 50% - 60 + 0 + auto + 50 center - top - - font45 + center black + + font32_bold !Player.ChannelPreviewActive | VideoPlayer.HasEpg - + 50% - 175 - 50% - 50 + 90 + 280 + 40 center top + black - font13 + font26_bold black - - VideoPlayer.Content(LiveTV) - - Player.SeekEnabled + VideoPlayer.HasEPG - - - - - - - - - Player.SeekEnabled + !VideoPlayer.HasEPG - - - - - - - !Player.SeekEnabled + VideoPlayer.HasEPG - - - - - - - !Player.SeekEnabled + !VideoPlayer.HasEPG - + + 20 + 0 + 400 + 50 + right + 10 + horizontal + true + + 80 + 50 + 300 + keep + dialogs/volume/mute.png + Player.Muted - - 0 - 65 - 100% - 26 - osd/progress/nub_bar.png - osd/progress/nub_bar.png - colors/white.png - Player.SeekEnabled + !Player.ChannelPreviewActive + + 50 + auto + center + font32_bold + black + + + 20 + 90 + 250 + 40 + right + top + font26_bold + black + grey + + !String.isempty(Player.Duration) + !VideoPlayer.Content(LiveTV) + + + 20 + 90 + 500 + 40 + right + top + font26_bold + black + grey + + VideoPlayer.Content(LiveTV) + PVR.IsTimeShift + !VideoPlayer.Content(LiveTV) 0 - 70 + 67 100% - 16 + 14 Player.ProgressCache - colors/white50.png - colors/white50.png + colors/white50.png + colors/white50.png 0 - 70 + 67 100% - 16 + 14 Player.Progress - colors/white50.png - colors/white.png + colors/white50.png + colors/white.png - + 0 - 65 + 60 100% - 26 + 28 osd/progress/nub_bar.png - osd/progress/nub_bar.png - colors/white.png - Player.SeekEnabled + osd/progress/nub_bar.png + colors/white.png + Player.Seekbar + + + 0 + 67 + 100% + 8 + colors/white50.png + colors/white.png + colors/white.png + colors/white.png + Player.Cutlist + + + 0 + 67 + 100% + 8 + colors/white50.png + colors/white.png + Player.Chapters - - 0 - 70 - 100% - 8 - colors/white50.png - colors/white.png - colors/white.png - colors/white.png - Player.Cutlist - - - 0 - 82 - 100% - 4 - colors/white50.png - colors/white.png - Player.Chapters - - - - !Window.IsVisible(playerprocessinfo) - [Player.ShowInfo | Window.IsActive(fullscreeninfo)] + VideoPlayer.Content(LiveTV) - Player.ShowInfo | Window.IsActive(fullscreeninfo) | !Player.Seeking | !Player.DisplayAfterSeek | !Player.Forwarding | !Player.Rewinding | !Player.Paused - Visible - Hidden - conditional - 0 - 380 - - 20 - 220 - -80 - 25 - - black - center - WeatherTemp - center - - - 0 - 100% - 240 - dialogs/dialog-bg-nobo.png - - - 20 - 20 - 200 - 200 - keep - $INFO[Player.Icon] - - - 240 - 10 - 20 - 160 - - justify - - String.IsEmpty(PVR.EpgEventIcon) - - - 240 - 10 - 240 - 160 - - justify - - !String.IsEmpty(PVR.EpgEventIcon) - - - 20 - 20 - 200 - 200 - keep - $INFO[PVR.EpgEventIcon] - !String.IsEmpty(PVR.EpgEventIcon) - - - 240 - 180 - 20 - 25 - - VideoPlayer.HasEpg + !RDS.HasRadioText - - - 240 - 180 - 25 - - RDS.HasRadioText + + VideoPlayer.Content(LiveTV) + + !Player.ChannelPreviewActive + + VideoPlayer.HasEPG + + 0 + 60 + 100% + 28 + PVR.TimeshiftProgressBufferStart + PVR.TimeshiftProgressBufferEnd + colors/white50.png + colors/white50.png + + + 0 + 67 + 100% + 14 + PVR.TimeshiftProgressEpgStart + PVR.TimeshiftProgressPlayPos + colors/white50.png + colors/white.png + + + 0 + 60 + 100% + 28 + osd/progress/nub_bar.png + osd/progress/nub_bar.png + colors/white.png + PVR.TimeShiftSeekbar + VideoPlayer.Content(LiveTV) + !Player.ChannelPreviewActive + + + + + VisibleChange + Player.ChannelPreviewActive + + 0 + 70 + 100% + 5 + PVR.EpgEventProgress + colors/white50.png + colors/white.png + + + PVRChannelNumberInput + - !Window.IsVisible(playerprocessinfo) - [Player.ShowInfo | Window.IsActive(fullscreeninfo)] + !VideoPlayer.Content(LiveTV) + Window.IsActive(fullscreenvideo) - Player.ShowInfo | Window.IsActive(fullscreeninfo) | !Player.Seeking | !Player.DisplayAfterSeek | !Player.Forwarding | !Player.Rewinding | !Player.Paused + !Window.IsVisible(playerprocessinfo) + !Window.IsActive(visualisation) + Player.ShowInfo | Window.IsActive(fullscreeninfo) + Animation_BottomSlide Visible Hidden - 0 - 470 - - 0 - 100% - 330 - dialogs/dialog-bg-nobo.png - - - DepthOSD+ - 10 - 145 - 400 - 600 - keep - $VAR[NowPlayingPosterVar] - overlays/shadow.png - 20 - OpenClose_Left - - - 420 - 10 - 20 - 300 - left - vertical - 10 - - 250 - - left - + + + + + !Integer.IsGreater(Playlist.Length(video),1) + !VideoPlayer.Content(LiveTV) + Conditional + + 0 + 0 + 100% + 220 + colors/white.png + + + 300 + 15 + 20 + 200 + left + vertical + 0 + + 245 + 300 + 1660 + 50 + left + center + + font30_bold + + + 235 + 270 + 1660 + 5 + left + scale + dialogs/separator-grey.png + OpenClose_Left + + + 50 + auto + left + center + + font30 + + + auto + 50 + + font30 + grey + true + black + center + left + !String.IsEmpty(VideoPlayer.Genre) + + + 55 + left + horizontal + 5 + + 100 + 50 + 0 + keep + $INFO[VideoPlayer.VideoCodec,flags/videocodec/,.png] + + + 100 + 50 + 0 + keep + $INFO[VideoPlayer.VideoResolution,flags/videoresolution/,.png] + + + 100 + 50 + 0 + keep + $INFO[VideoPlayer.VideoAspect,flags/aspectratio/,.png] + + + 45 + auto + left + center + + font30_bold + grey + + + 100 + 50 + 0 + keep + $INFO[VideoPlayer.AudioCodec,flags/audiocodec/,.png] + + + 100 + 50 + 0 + keep + $INFO[VideoPlayer.AudioChannels,flags/audiochannel/,.png] + + + 100 + + 100 + 50 + center + center + + font_flag + grey + + + + + + + + + - - 50 - - Integer.IsGreater(Playlist.Length(video),1) + + + + + Integer.IsGreater(Playlist.Length(video),1) | VideoPlayer.Content(LiveTV) + Conditional + + 0 + 0 + 100% + 280 + colors/white.png + + + !VideoPlayer.Content(LiveTV) + 300 + 15 + 20 + 260 + left + vertical + 0 + + 245 + 300 + 1660 + 50 + left + center + + font30_bold + + + 235 + 270 + 1660 + 5 + left + scale + dialogs/separator-grey.png + OpenClose_Left + + + 50 + horizontal + 20 + + 50 + 80 + left + center + + font30_bold + grey + + + 50 + auto + left + center + + font30 + + + + !String.IsEmpty(VideoPlayer.Genre) + 50 + 1680 + left + horizontal + 20 + + 80 + + + auto + 50 + + font30 + grey + true + black + center + left + + + + Visible + 55 + left + horizontal + 5 + + 50 + 95 + + + 100 + 50 + 0 + keep + $INFO[VideoPlayer.VideoCodec,flags/videocodec/,.png] + + + 100 + 50 + 0 + keep + $INFO[VideoPlayer.VideoResolution,flags/videoresolution/,.png] + + + 100 + 50 + 0 + keep + $INFO[VideoPlayer.VideoAspect,flags/aspectratio/,.png] + + + 45 + auto + left + center + + font30_bold + grey + Integer.IsGreater(Playlist.Length(video),1) + + + 100 + 50 + 0 + keep + $INFO[VideoPlayer.AudioCodec,flags/audiocodec/,.png] + + + 100 + 50 + 0 + keep + $INFO[VideoPlayer.AudioChannels,flags/audiochannel/,.png] + + + 100 + + 100 + 50 + center + center + + font_flag + grey + + + + + + + + + + 235 + 270 + 1660 + 5 + left + scale + dialogs/separator-grey.png + OpenClose_Left + + + 1680 + 50 + left + horizontal + 20 + + 50 + 80 + + font30_bold + grey + left + center + + + 50 + auto + left + center + + font30 + + + + + VideoPlayer.Content(LiveTV) + + 225 + 300 + 800 + 50 + left + center + + font30_bold + grey + + + 225 + 20 + 800 + 50 + right + center + + font30_bold + grey + + + 300 + 15 + 20 + 210 + left + vertical + 0 + + 235 + 270 + 1660 + 5 + left + scale + dialogs/separator-grey.png + OpenClose_Left + + + 50 + horizontal + 20 + + 50 + 310 + left + center + + font30_bold + grey + + + 50 + auto + left + center + + font30 + + + + !String.IsEmpty(VideoPlayer.Genre) + 50 + 1680 + left + horizontal + 20 + + 310 + + + auto + 50 + + font30 + grey + true + black + center + left + + + + Visible + 55 + left + horizontal + 5 + + 50 + 325 + + + 100 + 50 + 0 + keep + $INFO[VideoPlayer.VideoCodec,flags/videocodec/,.png] + + + 100 + 50 + 0 + keep + $INFO[VideoPlayer.VideoResolution,flags/videoresolution/,.png] + + + 100 + 50 + 0 + keep + $INFO[VideoPlayer.VideoAspect,flags/aspectratio/,.png] + + + 45 + auto + left + center + + font30_bold + grey + Integer.IsGreater(Playlist.Length(video),1) + + + 100 + 50 + 0 + keep + $INFO[VideoPlayer.AudioCodec,flags/audiocodec/,.png] + + + 100 + 50 + 0 + keep + $INFO[VideoPlayer.AudioChannels,flags/audiochannel/,.png] + + + 100 + + 100 + 50 + center + center + + font_flag + grey + + + + + + + + + + 235 + 270 + 1660 + 5 + left + scale + dialogs/separator-grey.png + OpenClose_Left + + + 1680 + 50 + left + horizontal + 20 + + 50 + 310 + + font30_bold + grey + left + center + + + 50 + auto + left + center + + font30 + + + + + + + + + DepthOSD+ + 20 + 20 + 250 + keep + $VAR[NowPlayingPosterVar] + OpenClose_Left + !String.IsEmpty(Player.Art(poster)) | !String.IsEmpty(Player.Art(tvshow.poster)) + + + Conditional + DepthOSD+ + 20 + 20 + 250 + keep + $VAR[NowPlayingPosterVar] + OpenClose_Left + !VideoPlayer.Content(LiveTV) + String.IsEmpty(Player.Art(poster)) + String.IsEmpty(Player.Art(tvshow.poster)) + + + DepthOSD+ + 20 + 15 + 250 + 250 + scale + $VAR[NowPlayingPosterVar] + OpenClose_Left + VideoPlayer.Content(LiveTV) + + + + + + + + + + + diff --git a/xml/DialogSettings.xml b/xml/DialogSettings.xml index c0ebca0..b5addb0 100644 --- a/xml/DialogSettings.xml +++ b/xml/DialogSettings.xml @@ -49,7 +49,7 @@ separator image 3 - dialogs/separator-grey.png + dialogs/separator-grey.png DefaultSettingButton diff --git a/xml/DialogSlider.xml b/xml/DialogSlider.xml index 6f85c18..87b04cd 100644 --- a/xml/DialogSlider.xml +++ b/xml/DialogSlider.xml @@ -25,7 +25,7 @@ 20 center font14 - button_focus + blue Slider Value diff --git a/xml/DialogSubtitles.xml b/xml/DialogSubtitles.xml index 449a4fd..71d6717 100644 --- a/xml/DialogSubtitles.xml +++ b/xml/DialogSubtitles.xml @@ -151,7 +151,7 @@ 0 0 0 - lists/focus.png + colors/white.png Control.HasFocus(120) @@ -237,7 +237,7 @@ center font30_title top - button_focus + blue black true diff --git a/xml/DialogTextViewer.xml b/xml/DialogTextViewer.xml index 71d81e2..e3d88f8 100644 --- a/xml/DialogTextViewer.xml +++ b/xml/DialogTextViewer.xml @@ -64,7 +64,7 @@ grey right center - + true Integer.IsGreater(Container(5).NumPages,1) diff --git a/xml/DialogVideoInfo.xml b/xml/DialogVideoInfo.xml index 912a531..ac77dda 100644 --- a/xml/DialogVideoInfo.xml +++ b/xml/DialogVideoInfo.xml @@ -129,7 +129,7 @@ 25 670 363 - + Skin.HasSetting(AutoScroll) Integer.IsGreater(Container(4000).NumItems,0) @@ -155,7 +155,7 @@ 140 - + @@ -165,7 +165,7 @@ - + @@ -175,85 +175,85 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -663,7 +663,7 @@ - + diff --git a/xml/EventLog.xml b/xml/EventLog.xml index 20294c9..feb74d1 100644 --- a/xml/EventLog.xml +++ b/xml/EventLog.xml @@ -69,7 +69,7 @@ 0 0 0 - lists/focus.png + colors/white.png Control.HasFocus(50) @@ -115,7 +115,7 @@ DepthContentPanel OpenClose_Left - + vertical diff --git a/xml/FileBrowser.xml b/xml/FileBrowser.xml index 553d364..0921c6a 100644 --- a/xml/FileBrowser.xml +++ b/xml/FileBrowser.xml @@ -98,7 +98,7 @@ 0 71 Control.HasFocus(450) - lists/focus.png + colors/white.png 10 @@ -156,7 +156,7 @@ 0 71 Control.HasFocus(451) - lists/focus.png + colors/white.png 10 diff --git a/xml/FileManager.xml b/xml/FileManager.xml index 315d45d..ce0f119 100644 --- a/xml/FileManager.xml +++ b/xml/FileManager.xml @@ -17,14 +17,14 @@ 0 OpenClose_Left - + - + 80 @@ -39,30 +39,30 @@ - 818 + 860 0 OpenClose_Right - + - + - + - 800 - Conditional + 854 80 12 80 21 21 - conditional + conditional + Conditional vertical diff --git a/xml/Font.xml b/xml/Font.xml index 8ff2aac..769cb8a 100644 --- a/xml/Font.xml +++ b/xml/Font.xml @@ -6,26 +6,138 @@ font10 NotoSans-Regular.ttf 23 - font12 NotoSans-Regular.ttf 25 - font13 NotoSans-Regular.ttf 30 - font14 NotoSans-Regular.ttf 33 - + + font18 + NotoSans-Regular.ttf + 18 + + + font20 + NotoSans-Regular.ttf + 20 + + + font21 + NotoSans-Regular.ttf + 21 + + + font22 + NotoSans-Regular.ttf + 22 + + + font24 + NotoSans-Regular.ttf + 24 + + + font25 + NotoSans-Regular.ttf + 25 + + + font26 + NotoSans-Regular.ttf + 26 + + + font27 + NotoSans-Regular.ttf + 27 + + + font28 + NotoSans-Regular.ttf + 28 + + + font30 + NotoSans-Regular.ttf + 30 + + + font32 + NotoSans-Regular.ttf + 32 + + + font33 + NotoSans-Regular.ttf + 33 + + + font34 + NotoSans-Regular.ttf + 34 + + + font36 + NotoSans-Regular.ttf + 36 + + + font37 + NotoSans-Regular.ttf + 37 + + + font38 + NotoSans-Regular.ttf + 38 + + + font40 + NotoSans-Regular.ttf + 40 + + + font44 + NotoSans-Regular.ttf + 44 + + + font45 + NotoSans-Regular.ttf + 45 + + + font46 + NotoSans-Regular.ttf + 46 + + + font60 + NotoSans-Regular.ttf + 60 + + + font70 + NotoSans-Regular.ttf + 70 + + + font_clock + Roboto-Thin.ttf + 70 + + font23_narrow NotoSans-Regular.ttf @@ -41,40 +153,144 @@ 0.8 - font27 + font27_narrow NotoSans-Regular.ttf 27 + 0.8 + - font27_narrow + font18_bold + NotoSans-Regular.ttf + 18 + + + + font20_bold + NotoSans-Regular.ttf + 20 + + + + font21_bold + NotoSans-Regular.ttf + 21 + + + + font22_bold + NotoSans-Regular.ttf + 22 + + + + font24_bold + NotoSans-Regular.ttf + 24 + + + + font25_bold + NotoSans-Regular.ttf + 25 + + + + font26_bold + NotoSans-Regular.ttf + 26 + + + + font27_bold NotoSans-Regular.ttf 27 - - 0.8 + - font37 + font28_bold + NotoSans-Regular.ttf + 28 + + + + font30_bold + NotoSans-Regular.ttf + 30 + + + + font32_bold + NotoSans-Regular.ttf + 32 + + + + font33_bold + NotoSans-Regular.ttf + 33 + + + + font34_bold + NotoSans-Regular.ttf + 34 + + + + font36_bold + NotoSans-Regular.ttf + 36 + + + + font37_bold NotoSans-Regular.ttf 37 - + - font45 + font38_bold + NotoSans-Regular.ttf + 38 + + + + font40_bold + NotoSans-Regular.ttf + 40 + + + + font44_bold + NotoSans-Regular.ttf + 44 + + + + font45_bold NotoSans-Regular.ttf 45 - + - font60 + font46_bold + NotoSans-Regular.ttf + 46 + + + + font60_bold NotoSans-Regular.ttf 60 - + - font_clock - Roboto-Thin.ttf + font70_bold + NotoSans-Regular.ttf 70 + @@ -89,12 +305,36 @@ 20 + + font21_title + NotoSans-Regular.ttf + 21 + + + + font24_title + NotoSans-Regular.ttf + 24 + + font25_title NotoSans-Regular.ttf 25 + + font27_title + NotoSans-Regular.ttf + 27 + + + + font28_title + NotoSans-Regular.ttf + 28 + + font30_title NotoSans-Regular.ttf @@ -107,6 +347,12 @@ 32 + + font33_title + NotoSans-Regular.ttf + 33 + + font36_title NotoSans-Regular.ttf diff --git a/xml/GameOSD.xml b/xml/GameOSD.xml index e94c671..f403a7b 100644 --- a/xml/GameOSD.xml +++ b/xml/GameOSD.xml @@ -136,7 +136,7 @@ - lists/focus.png + colors/white.png Control.HasFocus(1103) @@ -168,7 +168,7 @@ - lists/focus.png + colors/white.png Control.HasFocus(1103) diff --git a/xml/Home.xml b/xml/Home.xml index 36b3e34..4eb10d6 100644 --- a/xml/Home.xml +++ b/xml/Home.xml @@ -33,7 +33,7 @@ Conditional - 462 + 500 @@ -45,6 +45,8 @@ OpenClose_Right String.IsEqual(Container(9000).ListItem.Property(id),movies) + 0 + 10 @@ -839,81 +841,72 @@ DepthContentPanel OpenClose_Left - + 0 - 240 - 462 - -10 - 7 + 180 + 480 + 90 + 8 0 ClearProperty(listposition,home) SetFocus($INFO[Container(9000).ListItem.Property(menu_id)]) 700 700 500 - + - UnFocus - 0 + 90 0 - 462 - 95 - lists/focus.png - Conditional - - - -3 - 1 - 95 - 95 - $INFO[ListItem.Art(thumb)] - Focus + 480 + 90 + colors/white.png + Conditional 0 - 0 - 95 - 95 - colors/black.png - Conditional + 0 + 90 + 90 + colors/white.png + Conditional -3 1 - 95 - 95 + 90 + 90 $INFO[ListItem.Art(thumb)] 104 0 - 95 + 90 560 center - font37 + font36_title text_shadow - + -3 1 - 95 - 95 - $INFO[ListItem.Art(thumb)] + 90 + 90 + $INFO[ListItem.Art(thumb)] 104 0 - 95 + 90 560 center - font37 + font36_title text_shadow @@ -1032,11 +1025,11 @@ horizontal - 0 - -8 + -20 + 0 480 - 110 - 100 + 90 + 90 SetFocus(9000,99,absolute) SetFocus(9000,0,absolute) 2000 @@ -1088,8 +1081,8 @@ font12 1 - button_focus - button_focus + blue + blue text_shadow FFC0C0C0 Skin.HasSetting(hide_mediaflags) | !ControlGroup(2000).HasFocus @@ -1104,14 +1097,13 @@ conditional WindowOpen WindowClose - 30 - 90 + 10 + 20 - 4 0 - keep + keep 192 - 56 + 40 special://xbmc/media/vendor_logo.png diff --git a/xml/Includes.xml b/xml/Includes.xml index cf87b34..a2d13f3 100644 --- a/xml/Includes.xml +++ b/xml/Includes.xml @@ -8,12 +8,13 @@ + - + @@ -32,8 +33,8 @@ 0.10 79 -20 - 0 - 80 + 90 + 60 Window.IsActive(musicinformation) | Window.IsActive(songinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo) | Window.IsVisible(script-embuary-video.xml) | Window.IsVisible(script-embuary-person.xml) | Window.IsVisible(script-embuary-image.xml) ControlGroup(9000).HasFocus | Control.HasFocus(6130) | Control.HasFocus(6131) @@ -51,10 +52,10 @@ 0 0 13 - 50 - 55 - 50 - 55 + 50 + 55 + 50 + 55 vertical Visible @@ -104,16 +105,16 @@ VisibleChange - + - + - !String.IsEmpty($PARAM[infolabel]) + !String.IsEmpty($PARAM[blue]) 3 -3 @@ -130,17 +131,17 @@ 44 44 font20_title - + - $INFO[ListItem.Year,[COLOR button_focus],[/COLOR] - ]$INFO[ListItem.Label] + $INFO[ListItem.Year,[COLOR blue],[/COLOR] - ]$INFO[ListItem.Label] $VAR[InfoListPathVar] 40 100 1152 5000 - font13 + font27 ascending true @@ -189,7 +190,7 @@ 40 center - button_focus + blue auto @@ -225,7 +226,7 @@ 0 0 0 - lists/focus.png + colors/white.png Control.HasFocus($PARAM[list_id]) @@ -251,7 +252,7 @@ 0 40 40 - $PARAM[icon] + $PARAM[icon] 50 @@ -260,6 +261,7 @@ center font12 + grey @@ -273,7 +275,7 @@ $PARAM[height] 0 keep - $PARAM[texture] + $PARAM[texture] $PARAM[visible] @@ -317,6 +319,7 @@ center font_flag + grey @@ -390,7 +393,7 @@ 0 0 0 - lists/focus.png + colors/white.png Conditional @@ -771,7 +774,7 @@ - $INFO[Container.SortMethod,$LOCALIZE[31022]: , ∙ ]$INFO[Container.CurrentItem,, / ]$INFO[Container.NumItems] + $INFO[Container.SortMethod,$LOCALIZE[31022]: , ∙ ]$INFO[Container.CurrentItem,, / ]$INFO[Container.NumItems] conditional @@ -781,192 +784,114 @@ 0 0 110% - 130 - frame/InfoBar.png + 90 + colors/white.png WindowClose - - 900 - - - - Player.HasMedia - - - 1800 - - - - !Player.HasMedia - - - 0 - 200 - 100 - - Action(Back) - !Window.IsActive(home) - - - - - 50 - - 35 - text_shadow - 100 - 900 - WindowOpen - WindowClose - Conditional - 0 - right - 20 - 200 - horizontal - 900 - 10 - !Window.IsVisible(extendedprogressdialog) + !Window.IsActive(fullscreenvideo) - VisibleChange - - 600 - !Control.IsVisible(503) + Player.HasMedia + String.IsEmpty(Window(Videos).Property(PlayingBackgroundMedia)) - VisibleChange - - -75 - horizontal - 38 - 14 - right - 660 - 5 - true - - 4 - 32 - 32 - keep - $VAR[NowPlayingIconVar] - - - - font27 - text_shadow - 35 - auto - + 20 + 85 + 1500 + vertical + 0 + + 45 + horizontal + 1500 + + + BreadcrumbsLabel - - - -44 - 44 - font12 - grey - text_shadow - 25 - 630 - right - true + + + BreadcrumbsLabel + !String.IsEmpty(Container.ShowTitle) + !String.IsEqual(Container.ShowTitle,Container.FolderName) - - - Integer.IsGreater(System.ProfileCount,1) + !Player.HasMedia - - Skin.HasSetting(show_profileavatar) - 25 - -70 - 50 - 50 - WindowClose - $INFO[System.ProfileThumb] - scale + + + BreadcrumbsLabel + ![Container.Content() + Window.IsActive(videos)] + ![Window.IsActive(MyPVRChannels.xml) | Window.IsActive(MyPVRTimers.xml) | Window.IsActive(MyPVRRecordings.xml) | Window.IsActive(MyPVRSearch.xml)] - Skin.HasSetting(show_profilename) - font45 - right - -630 - text_shadow - center - 110 - auto - WindowClose - + + BreadcrumbsLabel + !String.isempty(Container.PluginCategory) + + + + BreadcrumbsLabel + !String.IsEqual(Control.GetLabel(10),$LOCALIZE[16100]) + Window.IsActive(videos) + + + 10 + + BreadcrumbsLabel + Container.Filtered - - font_clock + + 30 + + font26 text_shadow - 200 - auto - WindowClose - - 10 - 70 - 800 - 100 - right - 5 - horizontal - true - - 50 - auto - center - -8 - - System.HasAlarm(shutdowntimer) - - - 16 - 40 - 22 - 300 - keep - icons/power.png - System.HasAlarm(shutdowntimer) + 0 + 20 + 80 + 235 + vertical + 0 + + 235 + 45 + right + 10 + horizontal + true + + 80 + 50 + 300 + keep + dialogs/volume/mute.png + Player.Muted + + + 5 + 40 + 40 + keep + icons/infodialogs/timer.png + + + 50 + auto + font32_bold + + - 50 + 30 auto - center - - Skin.HasSetting(show_weatherinfo) + Weather.IsFetched + ![String.IsEqual(Weather.FanartCode,na)] - - - 1 - 50 - 50 - 300 - keep - $INFO[Weather.FanartCode,weather/small/,.png] - Skin.HasSetting(show_weatherinfo) + Weather.IsFetched + ![String.IsEqual(Weather.FanartCode,na)] - - - 8 - -20 - 74 - 40 - 300 - keep - dialogs/volume/mute.png - Player.Muted + right + + font26 + text_shadow 0 0 - font_MainMenu + font45_title 100% 80 center - !System.HasActiveModalDialog + !System.HasActiveModalDialog + !Window.IsActive(home) Container.Scrolling !Container.Content(seasons) Container.SortMethod(1) | Container.SortMethod(4) | Container.SortMethod(12) | Container.SortMethod(10) | Container.SortMethod(7) | Container.SortMethod(29) | Container.SortMethod(17) @@ -978,10 +903,10 @@ - 35 + 20 Left side of top bar - -7 - 100 + 0 + 40 horizontal true WindowOpen @@ -989,31 +914,37 @@ Conditional Conditional + font32_bold BreadcrumbsLabel + font32_bold BreadcrumbsLabel !String.IsEmpty(Container.ShowTitle) + !String.IsEqual(Container.ShowTitle,Container.FolderName) + font32_bold BreadcrumbsLabel ![Container.Content() + Window.IsActive(videos)] ![Window.IsActive(MyPVRChannels.xml) | Window.IsActive(MyPVRTimers.xml) | Window.IsActive(MyPVRRecordings.xml) | Window.IsActive(MyPVRSearch.xml)] + font32_bold BreadcrumbsLabel !String.isempty(Container.PluginCategory) + font32_bold BreadcrumbsLabel !String.IsEqual(Control.GetLabel(10),$LOCALIZE[16100]) + Window.IsActive(videos) + font32_bold 10 BreadcrumbsLabel @@ -1021,10 +952,10 @@ - font45 + font32_bold text_shadow - 7 - 100 + 0 + 40 auto @@ -1057,11 +988,6 @@ FullScreenDimensions conditional - - Conditional - WindowOpen - ColoredBackgroundImages - ![Player.HasVideo | [Player.HasAudio + Visualisation.Enabled + !String.IsEmpty(Visualisation.Name)]] | !String.IsEmpty(Window(Videos).Property(PlayingBackgroundMedia)) DepthBackground @@ -1073,9 +999,21 @@ scale 400 VisibleChange - $VAR[MediaFanartVar] + $VAR[MediaFanartVar] !Control.IsVisible(502) | $EXP[infodialog_active] + + false + + + + FullScreenDimensions + scale + 400 + VisibleChange + special://skin/extras/backgrounds/background.jpg + String.IsEqual(Control.GetLabel(32112),EMPTY) + -3 0 @@ -1085,14 +1023,27 @@ 400 OpenClose_Left VisibleChange - $VAR[PosterVar] + $VAR[PosterVar] !Control.IsVisible(32111) + + FullScreenDimensions + Conditional + WindowOpen + scale + 400 + VisibleChange + colors/white.png + + 110% + 0 + 0 + 90 False @@ -1102,11 +1053,11 @@ WindowOpen 0 - 0 - 0 - 110% - 115 - frame/InfoBar.png + $PARAM[left] + $PARAM[bottom] + $PARAM[width] + $PARAM[height] + colors/white.png $PARAM[info_visible] @@ -1151,6 +1102,83 @@ TouchButtons + + 0 + left + 200 + 80 + horizontal + 600 + 10 + !Window.IsVisible(extendedprogressdialog) + !Window.IsActive(fullscreenvideo) + VisibleChange + + 600 + !Control.IsVisible(503) + Player.HasMedia + String.IsEmpty(Window(Videos).Property(PlayingBackgroundMedia)) + VisibleChange + + 0 + horizontal + 40 + 5 + left + 600 + 5 + true + + 4 + 32 + 32 + keep + $VAR[NowPlayingIconVar] + + + + font25 + text_shadow + 35 + auto + + + + + 10 + 44 + font21 + grey + text_shadow + 25 + 600 + left + true + + + + Integer.IsGreater(System.ProfileCount,1) + !Player.HasMedia + + Skin.HasSetting(show_profileavatar) + 25 + -70 + 50 + 50 + WindowClose + $INFO[System.ProfileThumb] + scale + + + Skin.HasSetting(show_profilename) + font36_title + right + -630 + text_shadow + center + 110 + auto + WindowClose + + + + @@ -1271,17 +1299,15 @@ - 500 - -40 + 460 + 0 - -10% - 120% + 0 + 100% false - lists/panel.png - overlays/shadow.png - 20 + colors/white.png $PARAM[width] $PARAM[left] $PARAM[right] @@ -1419,7 +1445,7 @@ -5 410 270 - dialogs/dialog-bg-nobo.png + colors/white.png overlays/shadow.png 20 @@ -1445,27 +1471,19 @@ DepthContentPopout - + - + -5 410 270 - dialogs/dialog-bg-nobo.png + colors/white.png overlays/shadow.png 20 - - -5 - 410 - 270 - colors/grey.png - 20 - Animation_FocusTextureFade - 50% 30 diff --git a/xml/Includes_Buttons.xml b/xml/Includes_Buttons.xml index 167dc2e..1b89479 100644 --- a/xml/Includes_Buttons.xml +++ b/xml/Includes_Buttons.xml @@ -7,12 +7,12 @@ $PARAM[texture] $PARAM[texture] $PARAM[texture] - osd/fullscreen/buttons/button-fo.png - 76 - Focus - 76 - 74 - 74 + osd/fullscreen/buttons/button-fo.png + 50 + Focus + 50 + 48 + 48 1 @@ -46,7 +46,7 @@ - 70 + 65 40 $PARAM[textoffsetx] @@ -55,7 +55,7 @@ center invalid selected - lists/focus.png + colors/white.png @@ -69,18 +69,18 @@ center invalid selected - lists/focus.png - colors/white.png + colors/white.png + colors/white.png 0 0 - 75 + 30 center center - font25_title + font28 grey @@ -97,7 +97,7 @@ font12 30 10 - button_focus + blue 300 @@ -122,15 +122,38 @@ + + 300 + 100 + false + font25_title + + true + + + $PARAM[width] + $PARAM[height] + + font30_bold + 20 + $PARAM[onclick] + $PARAM[wrapmultiline] + center + colors/white.png + buttons/dialogbutton-nofo.png + $PARAM[visible] + + + - 120 - 120 - 27 - buttons/roundbutton-fo.png + 60 + 60 + 0 + colors/white.png center - top - font45 + center + font30_bold 100% @@ -151,11 +174,11 @@ - 120 + 90 true - 120 + 90 $PARAM[height] center center @@ -163,9 +186,9 @@ $PARAM[onclick_2] - buttons/roundbutton-fo.png + colors/white.png - 40 + 25 0 40 40 diff --git a/xml/Includes_DialogSelect.xml b/xml/Includes_DialogSelect.xml index 7219755..9b2d1fe 100644 --- a/xml/Includes_DialogSelect.xml +++ b/xml/Includes_DialogSelect.xml @@ -80,7 +80,7 @@ 0 0 0 - lists/focus.png + colors/white.png Control.HasFocus(6) diff --git a/xml/Includes_Home.xml b/xml/Includes_Home.xml index 4164bcf..fe0e0eb 100644 --- a/xml/Includes_Home.xml +++ b/xml/Includes_Home.xml @@ -14,8 +14,8 @@ 0 - 55 - 80 + 0 + 90 900 90 @@ -31,7 +31,7 @@ 16 670 225 - dialogs/dialog-bg.png + colors/white.png 55 @@ -225,10 +225,10 @@ 70 5 - + - + @@ -286,10 +286,10 @@ DepthContentPopout 70 - + - + @@ -336,7 +336,7 @@ 316 200 - dialogs/dialog-bg-nobo.png + colors/white.png overlays/shadow.png 20 @@ -366,22 +366,22 @@ DepthContentPopout 70 - + - + 316 200 - dialogs/dialog-bg-nobo.png + colors/white.png overlays/shadow.png 20 316 200 - colors/grey.png + colors/white.png 20 Animation_FocusTextureFade @@ -743,6 +743,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/Includes_MediaMenu.xml b/xml/Includes_MediaMenu.xml index 52a577c..a8f4ae0 100644 --- a/xml/Includes_MediaMenu.xml +++ b/xml/Includes_MediaMenu.xml @@ -8,9 +8,9 @@ 370 center invalid - lists/focus.png + colors/white.png - lists/focus.png + colors/white.png @@ -258,7 +258,7 @@ 300 font25_title top - button_focus + blue OpenClose_Left @@ -278,9 +278,9 @@ 0 0 - 520 + 470 100% - lists/panel-mediamenu.png + colors/white.png 0 @@ -351,6 +351,7 @@ 9000 50 55 + 55 9000 50 @@ -363,6 +364,7 @@ [B]$INFO[Container.Viewmode][/B] Integer.IsGreater(Container.ViewCount,1) Container.NextViewMode + red MediaMenuItemsCommon @@ -380,7 +382,7 @@ MediaMenuSearchButton - Container.CanFilter + !Container.CanFilterAdvanced + Container.CanFilter | Container.CanFilterAdvanced MediaMenuItemsCommon right @@ -388,7 +390,7 @@ Container.CanFilterAdvanced MediaMenuItemsCommon - + right Filter diff --git a/xml/Includes_PVR.xml b/xml/Includes_PVR.xml index ca54c8c..ac73c68 100644 --- a/xml/Includes_PVR.xml +++ b/xml/Includes_PVR.xml @@ -11,14 +11,14 @@ 70 center center - button_focus + blue auto 70 center center - button_focus + blue @@ -66,7 +66,7 @@ 0 0 0 - lists/focus.png + colors/white.png Control.HasFocus($PARAM[list_id]) @@ -105,75 +105,29 @@ VisibleChange !Player.ChannelPreviewActive - - Player.SeekEnabled | VideoPlayer.HasEPG - Player.ShowInfo | Window.IsActive(fullscreeninfo) | Player.ShowTime | Window.IsActive(videoosd) | Window.IsActive(musicosd) | Window.IsActive(playerprocessinfo) | !String.IsEmpty(Player.SeekNumeric) | !String.IsEmpty(PVR.ChannelNumberInput) | Window.IsActive(pvrosdchannels) | Window.IsActive(pvrchannelguide) - - 22 - 20 - 400 - 50 - right - center - font13 - - - - 22 - 20 - 400 - 50 - left - center - font13 - - - - 22 - 20 - 20 - 50 - center - center - font13 - - PVR.IsTimeShift - - VideoPlayer.HasEPG 0 - $PARAM[epg_bar_top] + 60 100% - $PARAM[epg_bar_height] - PVR.TimeshiftProgressEpgStart - PVR.TimeshiftProgressPlayPos - colors/white50.png - colors/white.png + 28 + PVR.TimeshiftProgressBufferStart + PVR.TimeshiftProgressBufferEnd + colors/white50.png + colors/white50.png 0 - $PARAM[epg_bar_top] + 67 100% - $PARAM[epg_bar_height] - PVR.TimeshiftProgressPlayPos - PVR.TimeshiftProgressEpgEnd - colors/white50.png - colors/white50.png + 14 + PVR.TimeshiftProgressEpgStart + PVR.TimeshiftProgressPlayPos + colors/white50.png + colors/white.png - - 0 - $PARAM[ts_bar_top] - 100% - $PARAM[ts_bar_height] - PVR.TimeshiftProgressBufferStart - PVR.TimeshiftProgressBufferEnd - colors/white50.png - colors/white70.png - Player.SeekEnabled - VisibleChange @@ -182,10 +136,10 @@ 0 70 100% - 16 + 5 PVR.EpgEventProgress - colors/white50.png - colors/white.png + colors/white50.png + colors/white.png @@ -209,6 +163,7 @@ 262 font45 + blue 60 @@ -230,14 +185,14 @@ 50 12 - 88FFFFFF + green ListItem.Progress 200 12 - 88FFFFFF + green ListItem.PercentPlayed Integer.IsGreater(ListItem.PercentPlayed,0) @@ -338,7 +293,7 @@ 40 center - button_focus + blue auto @@ -388,7 +343,7 @@ 45 font13 - button_focus + blue center center @@ -400,7 +355,7 @@ font12 10 - button_focus + blue @@ -432,7 +387,7 @@ 60 font32_title - button_focus + blue center center @@ -442,7 +397,7 @@ 60 font13 - button_focus + blue center 10 @@ -485,7 +440,7 @@ 2 54 54 - lists/focus.png + colors/white.png Control.HasFocus($PARAM[control_id]) diff --git a/xml/Includes_Views.xml b/xml/Includes_Views.xml new file mode 100644 index 0000000..8afcbd1 --- /dev/null +++ b/xml/Includes_Views.xml @@ -0,0 +1,584 @@ + + + + 0 + 0 + font28 + font28_bold + + + $PARAM[left] + $PARAM[right] + list_y_offset + list_y_offset + 5 + 6 + 500 + vertical + $PARAM[list_id]600 + 9000 + $PARAM[list_id]600 + $PARAM[list_id] + $PARAM[list_id] + list + + + 0 + 0 + 0 + 0 + colors/white.png + Conditional + + + 20 + 50% + 30 + 30 + $VAR[ListWatchedIconVar] + Focus + + + 20 + 50% + 30 + 30 + $VAR[ListWatchedIconVar] + Focus + VisibleChange + !Control.HasFocus($PARAM[list_id]) + + + 70 + 70 + 0 + 0 + center + true + $PARAM[font_focus] + blue + + text_shadow + + + 0 + 0 + 100 + 20 + right + center + $PARAM[font_focus] + blue + + Focus + text_shadow + + + + + 20 + 50% + 30 + 30 + $VAR[ListWatchedIconVar] + + + 70 + 70 + 0 + 0 + center + $PARAM[font] + + text_shadow + + + 20 + 20 + 0 + 0 + right + center + $PARAM[font] + + text_shadow + + + + + 0 + 0 + 0 + 0 + colors/white.png + Conditional + + + 20 + 50% + 30 + 30 + $VAR[AddonsListIconVar] + + + 75 + 60 + 40 + center + true + font28 + blue + + + + 75 + 70 + right + center + font28 + blue + + true + + + 20 + 50% + 30 + 30 + $VAR[AddonsOriginVar] + !ListItem.IsFolder + + + + + 20 + 50% + 30 + 30 + center + $VAR[AddonsListIconVar] + + + 70 + 40 + center + font28 + + + + 70 + 70 + right + center + font28 + + grey + text_shadow + + + 20 + 50% + 32 + 32 + $VAR[AddonsOriginVar] + !ListItem.IsFolder + + + + + + + 0 + + + + DepthContentPanel + $PARAM[left] + $PARAM[right] + + + + + 30 + 105 + 540 + 450 + keep + 300 + $VAR[IconWallThumbVar] + !String.IsEqual(ListItem.DbType,episode) + !String.IsEqual(ListItem.DBType,song) + !Container.Content(albums) + + + 30 + 105 + 540 + 470 + keep + colors/black.png + String.IsEqual(ListItem.AddonLifecycleType,$LOCALIZE[24170]) | String.IsEqual(ListItem.AddonLifecycleType,$LOCALIZE[24171]) + + + 30 + 105 + 540 + 330 + keep + 300 + $INFO[ListItem.Icon] + String.IsEqual(ListItem.DbType,episode) + + + 75 + 105 + 450 + 450 + keep + 300 + $VAR[IconWallThumbVar] + String.IsEqual(ListItem.DBType,song) | String.IsEqual(ListItem.DBType,album) + + + !Container.Content() + 20 + + 560 + 560 + 100 + !System.HasModalDialog + Skin.HasSetting(AutoScroll) + + !String.IsEqual(ListItem.DbType,episode) + !String.IsEqual(ListItem.DBType,song) + + + 30 + 105 + 540 + 470 + center + center + + font32_title + String.IsEqual(ListItem.AddonLifecycleType,$LOCALIZE[24170]) | String.IsEqual(ListItem.AddonLifecycleType,$LOCALIZE[24171]) + + + 450 + 560 + 105 + !System.HasModalDialog + Skin.HasSetting(AutoScroll) + + String.IsEqual(ListItem.DbType,episode) + + + 570 + 560 + 105 + !System.HasModalDialog + Skin.HasSetting(AutoScroll) + + String.IsEqual(ListItem.DBType,song) + + + + 20 + 640 + ListItem.IsCollection + String.IsEmpty(ListItem.Plot) + + + + + + + + + + !ListItem.IsCollection + String.IsEmpty(Control.GetLabel(15500)) + Control.IsVisible(15500) + + 30 + 460 + 540 + 413 + center + center + font27 + 80FFFFFF + + !ListItem.IsParentFolder + !Integer.IsGreater(Container(42000).NumItems,0) + !Integer.IsGreater(Container(43000).NumItems,0) + !Container.Content() | !String.isempty(ListItem.Plot) + + + 20 + 570 + !String.IsEmpty(ListItem.DBID) + + + + + + + + + + + + + + + + + + + + + + + + + + + DepthContentPanel + OpenClose_Right + Visible_Right + + 0 + 920 + + + + + + + + String.IsEqual(ListItem.DbType,movie) + !String.IsEmpty(Listitem.Art(poster)) + 20 + + 550 + 105 + 20 + 450 + keep + 300 + $INFO[Listitem.Art(poster)] + + + 370 + 105 + 460 + !System.HasModalDialog + + + + 580 + 20 + 110 + !System.HasModalDialog + + + + + + + String.IsEmpty(Listitem.Art(poster)) + ![String.IsEqual(ListItem.DBType,album) | String.IsEqual(ListItem.DBType,song)] + 20 + + 20 + 105 + 20 + 280 + keep + 300 + $INFO[ListItem.thumb] + + + 20 + 400 + 420 + !System.HasModalDialog + + String.IsEqual(ListItem.DbType,episode) + + + 730 + 20 + 105 + !System.HasModalDialog + + String.IsEqual(ListItem.DbType,episode) + + + + + + String.IsEqual(ListItem.DBType,album) | String.IsEqual(ListItem.DBType,song) + 20 + + 105 + 20 + 350 + 350 + keep + 300 + $INFO[ListItem.Icon] + !String.IsEmpty(ListItem.Property(album_description) + String.IsEqual(ListItem.DBType,album) + + + 20 + 105 + 20 + 350 + keep + 300 + $INFO[ListItem.Icon] + String.IsEmpty(ListItem.Property(album_description) | String.IsEqual(ListItem.DBType,song) + + + 105 + 370 + 350 + !System.HasModalDialog + + + + 0 + 20 + 490 + 105 + !System.HasModalDialog + Skin.HasSetting(AutoScroll) + + String.IsEqual(ListItem.DBType,song) + + + + + + 20 + 640 + ListItem.IsCollection + String.IsEmpty(ListItem.Plot) + + + + + + + + + + !ListItem.IsCollection + + 20 + 490 + 0 + 20 + String.IsEqual(ListItem.DBType,album) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DepthContentPanel + + + + + + !Container.Content(songs) + + DepthContentPopout + 40 + 120 + 20 + 850 + 124 + 200 + keep + $VAR[InfoWallThumbVar] + + + 291 + 950 + + + + + + + Control.IsVisible(503) + Window.IsActive(musicplaylist) + + 58 + 110 + 540 + 470 + keep + 300 + $INFO[Player.Icon] + + + 301 + 560 + + VisibleChange + + + + + + + + + + Player.HasAudio + Window.IsActive(musicplaylist) + 58 + 600 + 540 + 70 + !System.HasModalDialog + Skin.HasSetting(AutoScroll) + + + + !Player.HasAudio + Window.IsActive(musicplaylist) + 58 + 640 + 540 + 70 + !System.HasModalDialog + Skin.HasSetting(AutoScroll) + + + + + + + + + diff --git a/xml/Includes_new.xml b/xml/Includes_new.xml new file mode 100644 index 0000000..9fec7ed --- /dev/null +++ b/xml/Includes_new.xml @@ -0,0 +1,1523 @@ + + + + + + + + + + + + + + + + + + + + + + + 0.50 + 0.52 + 0.48 + 0.54 + 0.40 + 0.44 + 0.10 + 0.05 + 0.12 + -0.80 + 0.10 + 79 + -20 + 90 + 60 + Window.IsActive(musicinformation) | Window.IsActive(songinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo) | Window.IsVisible(script-embuary-video.xml) | Window.IsVisible(script-embuary-person.xml) | Window.IsVisible(script-embuary-image.xml) + ControlGroup(9000).HasFocus | Control.HasFocus(6130) | Control.HasFocus(6131) + + + WindowClose + Conditional + WindowOpen + + 0 + 80 + 60 + 80 + + 0 + 0 + 0 + 13 + 50 + 55 + 50 + 55 + vertical + + Visible + Hidden + conditional + Control.IsVisible(52) | Control.IsVisible(500) | Control.IsVisible(55) | Control.IsVisible(501) | Control.IsVisible(54) + + + + 0 + 0 + 0 + 100% + 60 + + 0 + 0 + 100% + 12 + + 50 + 50 + horizontal + Control.IsVisible(51) | Control.IsVisible(53) + conditional + Visible + Hidden + conditional + + + + + + + -3000 + -3000 + 1 + 1 + + + + + + + False + + + VisibleChange + + + + + + + + + + + !String.IsEmpty($PARAM[blue]) + + 3 + -3 + 44 + 44 + keep + overlays/badge.png + + + 3 + -3 + center + center + 44 + 44 + font20_title + + + + + $INFO[ListItem.Year,[COLOR blue],[/COLOR] - ]$INFO[ListItem.Label] + $VAR[InfoListPathVar] + 40 + 100 + 1152 + 5000 + font27 + + ascending + true + + + 0 + $PARAM[width] + $PARAM[bottom] + vertical + $PARAM[visible] + + + 10 + $PARAM[item_height] + $PARAM[width] + center + + text_shadow + $PARAM[font] + + + + + 10 + $PARAM[item_height] + $PARAM[width] + center + + text_shadow + $PARAM[font] + + + $PARAM[path] + + + + + + !String.IsEmpty($PARAM[value]) + 45 + horizontal + 570 + 10 + + auto + 40 + center + + blue + + + auto + 40 + right + center + + + + + + left + 70 + font13 + grey + + + + 20 + 0 + 20 + 0 + $PARAM[align] + $PARAM[font] + center + $PARAM[fontcolor] + + + + + + 0 + 0 + 0 + 0 + colors/white.png + Control.HasFocus($PARAM[list_id]) + + + 20 + 0 + 20 + 0 + $PARAM[align] + $PARAM[font] + center + + true + + + + + + + 180 + $PARAM[visible] + + -3 + 0 + 40 + 40 + $PARAM[icon] + + + 50 + 180 + 35 + center + font12 + + + + + + 115 + 60 + true + + + $PARAM[width] + $PARAM[height] + 0 + keep + $PARAM[texture] + $PARAM[visible] + + + + + + $VAR[ResolutionFlagVar] + + + horizontal + 20 + 0 + 70 + right + 10 + 1900 + true + + 150 + System.AddonIsEnabled(resource.images.studios.white) + !String.IsEmpty($PARAM[infolabel_prefix]ListItem.Studio) + + + + + + 10 + 200 + !String.IsEmpty($PARAM[infolabel_prefix]ListItem.Premiered) + + + + + + + 115 + !String.IsEmpty($PARAM[infolabel_prefix]ListItem.Duration) + + 115 + 60 + center + center + + font_flag + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 268 + !String.IsEmpty($PARAM[label]) + + 50 + 60 + 60 + $PARAM[texture] + + + 68 + 160 + 63 + font27_narrow + center + center + + + + + + + + + + 0 + list_y_offset + list_y_offset + $PARAM[right] + $PARAM[width] + 4 + 3 + $PARAM[onleft_id] + $PARAM[onright_id] + $PARAM[list_id] + $PARAM[list_id] + $PARAM[scrollbar_id] + 200 + + + 0 + 0 + 0 + 0 + colors/white.png + Conditional + + + 15 + 0 + 32 + 0 + keep + $VAR[ListWatchedIconVar] + + + 65 + 0 + 0 + 20 + center + true + + text_shadow + + + 0 + 30 + 0 + 0 + 0 + right + center + + text_shadow + + + + + 15 + 0 + 32 + 0 + keep + $VAR[ListWatchedIconVar] + + + 65 + 0 + 0 + 20 + center + + text_shadow + + + 0 + 30 + 0 + 0 + 0 + right + center + + grey + text_shadow + + + + + + + DefaultFolder.png + + + + + + String.IsEqual(Container(9000).ListItem.Property(id),$PARAM[id]) + + Integer.IsGreater(Container($PARAM[group_id]50).NumItems,0) | Container($PARAM[group_id]50).IsUpdating + + 540 + 0 + 50 + 100% + 9000 + $PARAM[group_id]30 + $PARAM[group_id]50 + $PARAM[group_id]50 + 2 + $PARAM[group_id]30 + 500 + + + 150 + + + + + + + + 150 + Focus + UnFocus + + + + + + + $PARAM[container_path] + + + 0 + 80 + 12 + 920 + vertical + + conditional + $PARAM[group_id]50 + noop + + + + 462 + + + + + + + + + + + + + + + 33333 + + + 20 + 5 + WindowOpen + WindowClose + 1400 + 80 + 0 + vertical + + 1400 + + font30_title + text_shadow + 35 + true + Conditional + + + + font12 + 85 + text_shadow + 100 + 1400 + + + + + + 33333 + 20 + + + 100 + 100 + $PARAM[posy] + WindowOpen + WindowClose + 150 + 0 + vertical + + 100% + + font52_title + text_shadow + 65 + center + true + Conditional + + + + 85 + text_shadow + center + 100 + 100% + + + + + + 134 + 910 + 936 + true + + + $PARAM[posx] + $PARAM[down_posy] + 48 + 24 + overlays/arrowdown.png + overlays/arrowdown.png + VisibleChange + WindowOpen + WindowClose + SetFocus($PARAM[container_id]) + PageDown + Container($PARAM[container_id]).HasNext + Control.IsVisible($PARAM[container_id]) + $PARAM[visible] + + + $PARAM[posx] + $PARAM[up_posy] + 48 + 24 + overlays/arrowdown.png + overlays/arrowdown.png + VisibleChange + WindowOpen + WindowClose + SetFocus($PARAM[container_id]) + PageUp + Container($PARAM[container_id]).HasPrevious + Control.IsVisible($PARAM[container_id]) + $PARAM[visible] + + + + + 445 + 1843 + 936 + !System.HasActiveModalDialog + + + $PARAM[left_posx] + $PARAM[posy] + 28 + 28 + overlays/arrowright.png + VisibleChange + WindowOpen + WindowClose + Control.IsVisible($PARAM[list_id]) + Container($PARAM[list_id]).HasPrevious + $PARAM[visible] + + + $PARAM[right_posx] + $PARAM[posy] + 28 + 28 + overlays/arrowright.png + VisibleChange + WindowOpen + WindowClose + Control.IsVisible($PARAM[list_id]) + Container($PARAM[list_id]).HasNext + $PARAM[visible] + + + $PARAM[left_posx] + $PARAM[posy] + 28 + 28 + + + Control.Move($PARAM[list_id],-1) + Container($PARAM[list_id]).HasPrevious + [Control.HasFocus($PARAM[list_id]) | Control.HasFocus($PARAM[list_id]500)] + + + $PARAM[right_posx] + $PARAM[posy] + 28 + 28 + + + Control.Move($PARAM[list_id],1) + Container($PARAM[list_id]).HasNext + [Control.HasFocus($PARAM[list_id]) | Control.HasFocus($PARAM[list_id]501)] + + + + + + -2000 + -2000 + 6000 + 6000 + VisibleChange + WindowOpen + WindowClose + colors/black.png + $PARAM[darken_bg] + + + -2000 + -2000 + 6000 + 6000 + + + Action(close) + + + $PARAM[width] + $PARAM[height] + + 0 + 0 + 0 + 0 + colors/white.png + + + 0 + 0 + 0 + 70 + colors/white70.png + + + 40 + 0 + 100 + 70 + font32_title + + center + black + + + button overlay to avoid closing in dialog area + 0 + 0 + 0 + 0 + + + noop + + + 10 + 11 + 48 + 48 + 48 + 48 + + + + dialogs/close.png + special://xbmc/media/vendor_icon.png + dialogs/close.png + special://xbmc/media/vendor_icon.png + Action(close) + !Skin.HasSetting(touchmode) + + + 10 + 11 + 48 + 48 + dialogs/close.png + dialogs/close.png + Action(close) + Skin.HasSetting(touchmode) + + + + + $INFO[Container.SortMethod,$LOCALIZE[31022]: , ∙ ]$INFO[Container.CurrentItem,, / ]$INFO[Container.NumItems] + + + conditional + DepthBars + WindowOpen + + 0 + 0 + 110% + 90 + colors/white.png + WindowClose + + + 0 + 20 + 85 + 1500 + vertical + 0 + + 45 + horizontal + 1500 + + + BreadcrumbsLabel + + + + BreadcrumbsLabel + !String.IsEmpty(Container.ShowTitle) + !String.IsEqual(Container.ShowTitle,Container.FolderName) + + + + BreadcrumbsLabel + ![Container.Content() + Window.IsActive(videos)] + ![Window.IsActive(MyPVRChannels.xml) | Window.IsActive(MyPVRTimers.xml) | Window.IsActive(MyPVRRecordings.xml) | Window.IsActive(MyPVRSearch.xml)] + + + + BreadcrumbsLabel + !String.isempty(Container.PluginCategory) + + + + BreadcrumbsLabel + !String.IsEqual(Control.GetLabel(10),$LOCALIZE[16100]) + Window.IsActive(videos) + + + 10 + + BreadcrumbsLabel + Container.Filtered + + + + 30 + + font26 + text_shadow + + + + 0 + 20 + 80 + 900 + vertical + 0 + + 900 + 45 + right + 10 + horizontal + true + + 15 + auto + center + + font27 + text_shadow + System.HasAlarm(shutdowntimer) + + + 15 + center + 40 + 25 + 300 + keep + icons/power.png + System.HasAlarm(shutdowntimer) + + + 5 + center + 60 + 45 + 300 + keep + dialogs/volume/mute.png + Player.Muted + + + auto + + font32_bold + text_shadow + + + + 30 + auto + right + + font26 + text_shadow + + + + 0 + 0 + + font45_title + 100% + 80 + center + !System.HasActiveModalDialog + Container.Scrolling + !Container.Content(seasons) + Container.SortMethod(1) | Container.SortMethod(4) | Container.SortMethod(12) | Container.SortMethod(10) | Container.SortMethod(7) | Container.SortMethod(29) | Container.SortMethod(17) + VisibleChange + WindowClose + + + TouchBackButton + + + + 20 + Left side of top bar + 0 + 40 + horizontal + true + WindowOpen + WindowClose + Conditional + Conditional + + font32_bold + + BreadcrumbsLabel + + + font32_bold + + BreadcrumbsLabel + !String.IsEmpty(Container.ShowTitle) + !String.IsEqual(Container.ShowTitle,Container.FolderName) + + + font32_bold + + BreadcrumbsLabel + ![Container.Content() + Window.IsActive(videos)] + ![Window.IsActive(MyPVRChannels.xml) | Window.IsActive(MyPVRTimers.xml) | Window.IsActive(MyPVRRecordings.xml) | Window.IsActive(MyPVRSearch.xml)] + + + font32_bold + + BreadcrumbsLabel + !String.isempty(Container.PluginCategory) + + + font32_bold + + BreadcrumbsLabel + !String.IsEqual(Control.GetLabel(10),$LOCALIZE[16100]) + Window.IsActive(videos) + + + font32_bold + 10 + + BreadcrumbsLabel + Container.Filtered + + + + font32_bold + text_shadow + 0 + 40 + auto + + + + DepthBackground + FullScreenDimensions + scale + special://skin/extras/backgrounds/primary.jpg + + + DepthBackground + FullScreenDimensions + scale + $INFO[Skin.String(background_overlay),special://skin/extras/backgrounds/pattern,.jpg] + + + + + + DepthBackground + FullScreenDimensions + Player.HasVideo + !Slideshow.IsActive + + + FullScreenDimensions + !Slideshow.IsActive + Player.HasAudio + String.IsEmpty(Window(Videos).Property(PlayingBackgroundMedia)) + Visualisation.Enabled + + + FullScreenDimensions + conditional + + ![Player.HasVideo | [Player.HasAudio + Visualisation.Enabled + !String.IsEmpty(Visualisation.Name)]] | !String.IsEmpty(Window(Videos).Property(PlayingBackgroundMedia)) + DepthBackground + WindowOpen + WindowClose + VisibleChange + + FullScreenDimensions + scale + 400 + VisibleChange + $VAR[MediaFanartVar] + !Control.IsVisible(502) | $EXP[infodialog_active] + + + false + + + + FullScreenDimensions + scale + 400 + VisibleChange + special://skin/extras/backgrounds/background.jpg + String.IsEqual(Control.GetLabel(32112),EMPTY) + + + -3 + 0 + 1193 + 100% + scale + 400 + OpenClose_Left + VisibleChange + $VAR[PosterVar] + !Control.IsVisible(32111) + + + + FullScreenDimensions + Conditional + WindowOpen + scale + 400 + VisibleChange + colors/white.png + + + + + + False + + + conditional + DepthBars + WindowClose + WindowOpen + 0 + + 0 + 0 + 110% + 90 + colors/white.png + + + $PARAM[info_visible] + !System.HasActiveModalDialog + !Skin.HasSetting(touchmode) + VisibleChange + WindowOpen + WindowClose + + 20 + 12 + 36 + 36 + Conditional + frame/menu-nofo.png + frame/menu-nofo.png + VisibleChange + SetFocus(9000) + !Control.IsVisible(6160) + + + 20 + 12 + 36 + 36 + icons/menu.png + icons/menu.png + VisibleChange + SetFocus(9000) + Window.IsActive(MyPVRGuide.xml) + + + 16 + 64 + 300 + 44 + text_shadow + + SetFocus(9000) + + + + + TouchButtons + + 0 + left + 200 + 80 + horizontal + 600 + 10 + !Window.IsVisible(extendedprogressdialog) + !Window.IsActive(fullscreenvideo) + VisibleChange + + 600 + !Control.IsVisible(503) + Player.HasMedia + String.IsEmpty(Window(Videos).Property(PlayingBackgroundMedia)) + VisibleChange + + 0 + horizontal + 40 + 5 + left + 600 + 5 + true + + 4 + 32 + 32 + keep + $VAR[NowPlayingIconVar] + + + + font25 + text_shadow + 35 + auto + + + + + 10 + 44 + font21 + grey + text_shadow + 25 + 600 + left + true + + + + Integer.IsGreater(System.ProfileCount,1) + !Player.HasMedia + + Skin.HasSetting(show_profileavatar) + 25 + -70 + 50 + 50 + WindowClose + $INFO[System.ProfileThumb] + scale + + + Skin.HasSetting(show_profilename) + font36_title + right + -630 + text_shadow + center + 110 + auto + WindowClose + + + + + + + + + + WindowOpen + WindowClose + + horizontal + right + 0 + 65 + 10 + 24 + 1200 + + auto + 48 + center + right + text_shadow + + + + 54 + 44 + keep + frame/item-count.png + + + + horizontal + 0 + 65 + 24 + 1200 + 10 + + 54 + 44 + keep + frame/item-count.png + + + auto + 48 + center + right + text_shadow + + + + + + + 0 + 0 + 100% + 100% + + + 100% + 200 + + + WindowClose + 0 + $PARAM[width] + 15 + Player.ProgressCache + colors/white50.png + colors/white50.png + Conditional + + + WindowClose + 0 + $PARAM[width] + 15 + Player.Progress + colors/white50.png + colors/white.png + + + HiddenObject + $PARAM[onunfocus_id] + PlayerControl(Play) + $PARAM[onunfocus_id] + PlayerControl(Forward) + PlayerControl(Rewind) + Player.SeekEnabled + PlayerControl(Play) + + + -5 + 0 + $PARAM[width] + 25 + osd/progress/nub_leftright.png + osd/progress/nub_leftright.png + osd/progress/nub_leftright.png + Player.Progress + seek + !Control.HasFocus(87) + Player.SeekEnabled + + + -5 + 0 + $PARAM[width] + 25 + osd/progress/nub_leftright.png + osd/progress/nub_leftright.png + osd/progress/nub_leftright.png + Player.Progress + seek + Control.HasFocus(87) + Player.SeekEnabled + + + + + 460 + 0 + + -10% + 120% + false + + + colors/white.png + $PARAM[width] + $PARAM[left] + $PARAM[right] + $PARAM[top] + $PARAM[height] + + + + + + horizontal + Skin.HasSetting(touchmode) + !Window.IsActive(home) + !Window.IsActive(filemanager) + WindowOpen + WindowClose + 0 + -8 + 480 + 110 + 0 + noop + 9000 + 2000 + justify + true + + + + + + + + + + + + + + + + 120 + + 0 + 120 + 120 + + ActivateWindow(1103) + buttons/roundbutton-fo.png + + + + 34 + 34 + 52 + 52 + $VAR[VolumeIconVar] + + + + + + + + + + + + + -10 + -10 + 120 + 120 + center + center + Action(Back) + WindowOpen + WindowClose + buttons/roundbutton-fo.png + + 30 + 60 + 60 + icons/back.png + icons/back.png + icons/back.png + icons/back.png + + + + + -10 + -10 + 120 + 120 + center + center + Dialog.Close(all,true) + Action(FullScreen) + buttons/roundbutton-fo.png + + 30 + 60 + 60 + icons/back.png + icons/back.png + icons/back.png + icons/back.png + Animation_TopSlide + + + + + -10 + -10 + 120 + 120 + center + center + Action(Back) + buttons/roundbutton-fo.png + + 30 + 60 + 60 + icons/back.png + icons/back.png + icons/back.png + icons/back.png + !Window.IsVisible(PictureInfo) + + + + + + -5 + 410 + 270 + dialogs/dialog-bg-nobo.png + overlays/shadow.png + 20 + + + 50% + 30 + 240 + 160 + $INFO[ListItem.Icon] + center + scale + + + 25 + 190 + 350 + 400 + + center + + + + + DepthContentPopout + + + + + + + + -5 + 410 + 270 + dialogs/dialog-bg-nobo.png + overlays/shadow.png + 20 + + + -5 + 410 + 270 + colors/grey.png + 20 + Animation_FocusTextureFade + + + 50% + 30 + 240 + 160 + $INFO[ListItem.Icon] + center + scale + + + 25 + 190 + 350 + 400 + + center + + + + + diff --git a/xml/MediaInfo.xml b/xml/MediaInfo.xml new file mode 100644 index 0000000..f0c9b3e --- /dev/null +++ b/xml/MediaInfo.xml @@ -0,0 +1,22 @@ + + + + + OpenClose_Left + Control.IsVisible(505) + Visible_Left + + + + + + + + + OpenClose_Right + Control.IsVisible(505) + Visible_Right + ListInfoPanel + + + diff --git a/xml/MusicOSD.xml b/xml/MusicOSD.xml index 8093bb6..7402e44 100644 --- a/xml/MusicOSD.xml +++ b/xml/MusicOSD.xml @@ -16,10 +16,10 @@ TouchBackOSDButton - Animation_BottomSlide - 0 - 120 - Animation_BottomSlide + Animation_TopSlide + 0 + 150 + Animation_TopSlide !Window.IsActive(osdaudiosettings) + !Window.IsActive(osdvideosettings) + !Window.IsActive(playerprocessinfo) @@ -31,7 +31,7 @@ 20 - 30 + 5 100% 135 10 @@ -40,7 +40,7 @@ 87 noop 70048 - 70040 + 600 @@ -56,17 +56,17 @@ Player.SeekEnabled - 76 - 76 + 50 + 50 Player.PauseEnabled 0 0 - 74 - 74 + 48 + 48 - osd/fullscreen/buttons/button-fo.png + osd/fullscreen/buttons/button-fo.png 601 603 @@ -77,9 +77,9 @@ 0 0 - 74 - 74 - Conditional + 48 + 48 + Conditional $VAR[PlayerControlsPlayImageVar] @@ -108,12 +108,12 @@ osd/fullscreen/buttons/record-white.png osd/fullscreen/buttons/record.png osd/fullscreen/buttons/record.png - osd/fullscreen/buttons/button-fo.png - 76 - Focus - 76 - 74 - 74 + osd/fullscreen/buttons/button-fo.png + 50 + Focus + 50 + 48 + 48 1 @@ -123,7 +123,111 @@ PVR.CanRecordPlayingChannel MusicPlayer.Content(livetv) + + + + + Dialog.Close(MusicOSD) + ActivateWindow(PVROSDChannels) + MusicPlayer.Content(LiveTV) + + + + + + Dialog.Close(MusicOSD) + ActivateWindow(PVRChannelGuide) + MusicPlayer.Content(LiveTV) + VideoPlayer.HasEPG + + + + + + Dialog.Close(MusicOSD) + ActivateWindow(PVRRadioRDSInfo) + MusicPlayer.Content(LiveTV) + RDS.HasRadiotext + + + + + + Dialog.Close(all, true) + ActivateWindow(musicplaylist) + Integer.IsGreater(Playlist.Length(music),0) + + + + + + SetRating + + + 50 + 50 + ![MusicPlayer.Content(LiveTV) | MusicPartyMode.Enabled] + + 0 + 0 + 48 + 48 + + + osd/fullscreen/buttons/button-fo.png + + 70052 + 70054 + 87 + noop + PlayerControl(Repeat) + + + 0 + 0 + 48 + 48 + Conditional + $VAR[PlayerControlsRepeatImageVar] + + + + osd/fullscreen/buttons/random-on.png + osd/fullscreen/buttons/random-on.png + osd/fullscreen/buttons/random-off.png + osd/fullscreen/buttons/random-off.png + osd/fullscreen/buttons/random-on.png + osd/fullscreen/buttons/random-off.png + osd/fullscreen/buttons/button-fo.png + 59 + Focus + 50 + 48 + 48 + + + 1 + 0 + Playlist.IsRandom + ![MusicPlayer.Content(LiveTV) | MusicPartyMode.Enabled] + PlayerControl(Random) + + + + + + Close + RunScript($INFO[Skin.String(LyricScript_Path)]) + Skin.SetAddon(LyricScript_Path,xbmc.python.lyrics) + Close + RunScript($INFO[Skin.String(LyricScript_Path)]) + + + + + + ActivateWindow(1105) + + conditional - 20 - -60 - center - right + 20 + 130 + left 1000 50 @@ -254,22 +358,8 @@ - 0 + 0 120 - - - - - - - - - - - - - - HiddenObject 200 @@ -279,7 +369,7 @@ 0 - -5 + 60 100% 26 8010 @@ -295,7 +385,7 @@ 0 - -5 + 60 100% 26 8010 @@ -311,7 +401,7 @@ 0 - -5 + 60 100% 26 8010 @@ -327,7 +417,7 @@ 0 - -5 + 60 100% 26 8010 diff --git a/xml/MusicVisualisation.xml b/xml/MusicVisualisation.xml index 23a2da5..3359e38 100644 --- a/xml/MusicVisualisation.xml +++ b/xml/MusicVisualisation.xml @@ -34,27 +34,34 @@ !Visualisation.Enabled + [[String.IsEmpty(Player.Art(fanart)) + String.IsEmpty(Window(Visualisation).Property(ArtistSlideshow.Image))] | Skin.HasSetting(hide_background_fanart)] - ColoredBackgroundImages + + scale + 400 + WindowOpen + WindowClose + special://skin/extras/home-images/music.jpg + - [Player.ShowInfo | Window.IsActive(musicosd)] + !MusicPlayer.Content(livetv) + Player.ShowInfo + !MusicPlayer.Content(livetv) 460 + 0 OpenClose_Left Visible_Left - 0 + 0 0 120% - 280 - dialogs/dialog-bg-nobo.png + 230 + colors/white.png 20 - -140 + 20 Visible_Left - [Player.ShowInfo | Window.IsActive(musicosd)] + !MusicPlayer.Content(livetv) - 400 - 400 + Player.ShowInfo + !MusicPlayer.Content(livetv) + 280 + 280 400 keep $INFO[MusicPlayer.Cover] @@ -62,87 +69,294 @@ 4 - [Player.ShowInfo | Window.IsActive(musicosd)] + ![Window.IsActive(playerprocessinfo) | MusicPlayer.Content(livetv)] + Player.ShowInfo + ![Window.IsActive(playerprocessinfo) | MusicPlayer.Content(livetv)] Visible_Left - 440 - 10 - 10 - 1450 - 50 + 320 + 180 + 300 + 40 center - - font45 + + blue + font30_title black true - 65 - 1450 - 50 - center - - font45 - black - true - - - 120 - 1450 + 300 + 1140 + 180 40 left - horizontal - 20 + + font30_title + black + + + 170 + 320 + 1660 + 5 + left + scale + dialogs/separator-grey.png + OpenClose_Left + + + 10 + 1120 + 5 + 220 + left + scale + dialogs/vertical-separator.png + OpenClose_Left + + + 320 + 20 + 780 + 300 + right + vertical + 5 - 90 + 780 40 - - font37 + center + + font30_title black + true + + + 780 + 30 center + + font12 + black + true + + + 780 + 30 left - !String.IsEmpty(MusicPlayer.Year) + horizontal + 20 + + 100 + 30 + + font12 + black + center + left + !String.IsEmpty(MusicPlayer.Year) + + + auto + 30 + + font12 + black + center + left + true + !String.IsEmpty(MusicPlayer.Genre) + + + 190 + 30 + $INFO[MusicPlayer.UserRating,flags/starrating/,.png] + keep + - auto - 40 - - font37 - black + 780 + 30 center - left + + font12 + black true - !String.IsEmpty(MusicPlayer.Genre) - - 190 - 40 - $INFO[MusicPlayer.UserRating,flags/starrating/,.png] - keep - center - left + + + + 1140 + 20 + 760 + 140 + left + vertical + 0 + + 35 + horizontal + 5 + + auto + 30 + + font24 + black + !String.IsEmpty(MusicPlayer.offset(1).PlaylistPosition) + + + auto + 35 + true + + font24 + black + !String.IsEmpty(MusicPlayer.offset(1).PlaylistPosition) + + + auto + 35 + true + + font24 + black + String.IsEmpty(MusicPlayer.offset(1).PlaylistPosition) + + + + 35 + horizontal + 5 + + auto + + font24 + black + Integer.IsGreater(Playlist.Length(music),1) + + + auto + true + + font24 + black + Integer.IsGreater(Playlist.Length(music),1) + + + + 35 + horizontal + 5 + + auto + + font24 + black + Integer.IsGreater(Playlist.Length(music),1) + + + auto + true + + font24 + black + Integer.IsGreater(Playlist.Length(music),1) + + + + 35 + horizontal + 5 + + auto + + font24 + black + Integer.IsGreater(Playlist.Length(music),1) + + + auto + true + + font24 + black + Integer.IsGreater(Playlist.Length(music),1) + - - 165 - 1450 - 40 - center - - font37 - black - true + + + + + + diff --git a/xml/MyGames.xml b/xml/MyGames.xml index c440c41..e3baeda 100644 --- a/xml/MyGames.xml +++ b/xml/MyGames.xml @@ -13,7 +13,7 @@ View_52_IconWall View_53_Shift View_54_InfoWall - View_55_WideList + View_55_MediaInfo View_500_Wall CommonScrollbars diff --git a/xml/MyMusicNav.xml b/xml/MyMusicNav.xml index c83c429..ecc48f6 100644 --- a/xml/MyMusicNav.xml +++ b/xml/MyMusicNav.xml @@ -3,23 +3,19 @@ 50 background 9000 - 50,52,53,54,55,500 + 50,52,53,54,55,500,510 DefaultBackground Conditional View_50_List - View_52_IconWall View_53_Shift - View_54_InfoWall - View_55_WideList - View_500_Wall + View_55_MediaInfo CommonScrollbars OpenClose_Left - Control.Isvisible(54) | Control.IsVisible(55) + Control.Isvisible(54) Visible_Left - ListThumbInfoPanel diff --git a/xml/MyMusicPlaylistEditor.xml b/xml/MyMusicPlaylistEditor.xml index 2d8cf25..1944b6e 100644 --- a/xml/MyMusicPlaylistEditor.xml +++ b/xml/MyMusicPlaylistEditor.xml @@ -92,7 +92,7 @@ - + BottomBar diff --git a/xml/MyPVRChannels.xml b/xml/MyPVRChannels.xml index 5698f1b..9ec96de 100644 --- a/xml/MyPVRChannels.xml +++ b/xml/MyPVRChannels.xml @@ -32,7 +32,7 @@ 0 0 0 - lists/focus.png + colors/white.png Control.hasFocus(50) @@ -175,7 +175,7 @@ 0 0 0 - lists/focus.png + colors/white.png Control.hasFocus(51) @@ -282,10 +282,9 @@ 870 0 - - + + - -50 diff --git a/xml/MyPVRGuide.xml b/xml/MyPVRGuide.xml index c84b51c..915ce8f 100644 --- a/xml/MyPVRGuide.xml +++ b/xml/MyPVRGuide.xml @@ -194,7 +194,7 @@ 30% 30 right - + 35 diff --git a/xml/MyPVRRecordings.xml b/xml/MyPVRRecordings.xml index 3b9d5d1..63c69b0 100644 --- a/xml/MyPVRRecordings.xml +++ b/xml/MyPVRRecordings.xml @@ -29,7 +29,7 @@ 0 0 80 - lists/focus.png + colors/white.png Conditional diff --git a/xml/MyPVRSearch.xml b/xml/MyPVRSearch.xml index c244593..9034a7e 100644 --- a/xml/MyPVRSearch.xml +++ b/xml/MyPVRSearch.xml @@ -72,7 +72,7 @@ 0 0 101 - lists/focus.png + colors/white.png Control.HasFocus(50) diff --git a/xml/MyPVRTimers.xml b/xml/MyPVRTimers.xml index 0584669..ee18bc3 100644 --- a/xml/MyPVRTimers.xml +++ b/xml/MyPVRTimers.xml @@ -98,7 +98,7 @@ 0 0 101 - lists/focus.png + colors/white.png Control.HasFocus(50) diff --git a/xml/MyPics.xml b/xml/MyPics.xml index ba8ef9b..f500116 100644 --- a/xml/MyPics.xml +++ b/xml/MyPics.xml @@ -15,7 +15,7 @@ 50 View_54_InfoWall - View_55_WideList + View_55_MediaInfo View_500_Wall CommonScrollbars diff --git a/xml/MyPlaylist.xml b/xml/MyPlaylist.xml index 8ec447e..bf44968 100644 --- a/xml/MyPlaylist.xml +++ b/xml/MyPlaylist.xml @@ -3,18 +3,18 @@ 55 background 9000 - 55,503 + 50,55,503 DefaultBackground Conditional - View_55_WideList + View_50_List + View_55_MediaInfo View_503_NowPlaying CommonScrollbars OpenClose_Left Visible_Left - ListThumbInfoPanel diff --git a/xml/MyPrograms.xml b/xml/MyPrograms.xml index 4386cd5..ac4d3e4 100644 --- a/xml/MyPrograms.xml +++ b/xml/MyPrograms.xml @@ -10,7 +10,7 @@ Conditional View_50_List View_52_IconWall - View_55_WideList + View_55_MediaInfo View_500_Wall OpenClose_Left diff --git a/xml/MyVideoNav.xml b/xml/MyVideoNav.xml index e69fb9e..cb9bb5b 100644 --- a/xml/MyVideoNav.xml +++ b/xml/MyVideoNav.xml @@ -2,82 +2,16 @@ 50 background - 50,51,52,53,54,55,500,501,502 + 50,53,55,501 9000 DefaultBackground Conditional View_50_List - View_51_Poster - View_52_IconWall View_53_Shift - View_54_InfoWall - View_55_WideList - View_500_Wall + View_55_MediaInfo View_501_Banner - View_502_FanArt - - DepthContentPanel - OpenClose_Left - Control.IsVisible(55) - Visible_Left - ListThumbInfoPanel - - - DepthContentPanel - OpenClose_Left - Control.IsVisible(50) | Control.Isvisible(54) | [Control.IsVisible(501) + String.IsEqual(Skin.AspectRatio,21:9)] - Visible_Left - - - - - 550 - - 120 - 30 - 550 - center - 110 - font36_title - - - - 30 - 240 - 525 - 100 - ![ListItem.IsCollection + String.IsEmpty(ListItem.Plot)] - - Skin.HasSetting(autoscroll) - - - 30 - 360 - 530 - 413 - center - center - font27 - 80FFFFFF - - String.IsEmpty(Listitem.Plot) + String.IsEmpty(Listitem.Tagline) + !ListItem.IsCollection + !ListItem.IsParentFolder - - - 20 - 245 - ListItem.IsCollection + String.IsEmpty(ListItem.Plot) - - - - - - - - - - diff --git a/xml/PlayerControls.xml b/xml/PlayerControls.xml index bf1aca8..c0bbb65 100644 --- a/xml/PlayerControls.xml +++ b/xml/PlayerControls.xml @@ -24,7 +24,7 @@ font45 black - button_focus + blue true @@ -34,7 +34,7 @@ font37 black - button_focus + blue true diff --git a/xml/Settings.xml b/xml/Settings.xml index fa63b17..aa57a7a 100644 --- a/xml/Settings.xml +++ b/xml/Settings.xml @@ -24,7 +24,7 @@ 0 0 - 420 + 400 400 center @@ -33,7 +33,7 @@ 0 100% - 120 + 100 300 noop Control.SetFocus(9001,$INFO[Container(9000).Position],absolute) @@ -64,7 +64,7 @@ 0 0 - 470 + 450 0 Control.SetFocus(9000,$INFO[Container(9001).Position],absolute) noop diff --git a/xml/SettingsCategory.xml b/xml/SettingsCategory.xml index 6ab8649..35caeac 100644 --- a/xml/SettingsCategory.xml +++ b/xml/SettingsCategory.xml @@ -19,60 +19,50 @@ OpenClose_Right control area - 133 + 100 470 60 0 - 137 + 180 3 60 5 5 - - 470 - 130 - 0 - 2 - dialogs/separator-grey.png - - - 470 - 135 - 0 - 2 - dialogs/separator-grey.png - + 60 Default Button DefaultSettingButton + 60 Default RadioButton DefaultSettingButton + 60 Default SpinControlex DefaultSettingButton center + 60 Default Slider DefaultSettingButton center separator image - 3 - dialogs/separator-grey.png + 5 + dialogs/separator-grey.png Default Label 1450 45 0 - 50 + 60 center center @@ -84,13 +74,13 @@ DepthContentPanel OpenClose_Left - + button area 0 - 130 - 470 + 90 + 490 810 true 5 @@ -101,19 +91,19 @@ Default Category Button 0 - 85 + 90 470 40 center - font37 - lists/focus.png + font36 + colors/white.png 0 - 133 - 137 + 90 + 180 60 0 @@ -135,20 +125,22 @@ - BottomBar + + + DepthContentPanel OpenClose_Left 470 0 - 70 + 0 90 center SettingsLevelChange 100 0 - colors/white.png + colors/white.png 40 0 @@ -169,12 +161,12 @@ description area 510 - 25 - 60 - 102 + 20 + 20 + 140 font12 justify - button_focus + blue true diff --git a/xml/SettingsProfile.xml b/xml/SettingsProfile.xml index 27c10f4..cdf95b9 100644 --- a/xml/SettingsProfile.xml +++ b/xml/SettingsProfile.xml @@ -23,13 +23,13 @@ 130 0 3 - dialogs/separator-grey.png + dialogs/separator-grey.png 134 0 3 - dialogs/separator-grey.png + dialogs/separator-grey.png 148 @@ -204,7 +204,7 @@ 0 0 - lists/focus.png + colors/white.png Conditional diff --git a/xml/SettingsSystemInfo.xml b/xml/SettingsSystemInfo.xml index a0bec86..51bbae2 100644 --- a/xml/SettingsSystemInfo.xml +++ b/xml/SettingsSystemInfo.xml @@ -17,12 +17,12 @@ 40 - 133 + 95 OpenClose_Right 420 30 - 550 + 470 vertical 47 @@ -84,7 +84,7 @@ 420 50 30 - 347 + 390 60 !Control.HasFocus(60) @@ -92,7 +92,7 @@ 0 0 12 - 340 + 370 vertical conditional @@ -104,13 +104,6 @@ WindowOpen WindowClose - - 380 - -3 - 0 - 3 - dialogs/separator-grey.png - 0 @@ -118,7 +111,7 @@ DepthContentPanel OpenClose_Left - + 0 @@ -191,16 +184,17 @@ BottomBar - 0 40 - 370 + 680 + 80 OpenClose_Right 380 30 0 - 3 - dialogs/separator-grey.png + 5 + scale + dialogs/separator-grey.png 420 @@ -273,7 +267,7 @@ 40 font12 - button_focus + blue black @@ -298,7 +292,7 @@ 40 font12 - button_focus + blue black @@ -322,7 +316,7 @@ auto 40 font12 - button_focus + blue black diff --git a/xml/SkinSettings.xml b/xml/SkinSettings.xml index 3e81afb..1ade467 100644 --- a/xml/SkinSettings.xml +++ b/xml/SkinSettings.xml @@ -21,7 +21,7 @@ 470 OpenClose_Right - 133 + 90 0 0 140 @@ -137,10 +137,10 @@ - 133 + 90 0 0 - 140 + 90 9000 60 610 @@ -175,6 +175,7 @@ + 60 DefaultSettingButton ActivateWindow(programs,plugin://plugin.library.node.editor/?ltype=video,return) EnableAddon(plugin.library.node.editor) @@ -188,6 +189,7 @@ Skin.ToggleSetting(HomeMenuNoMusicButton) + 60 DefaultSettingButton ActivateWindow(programs,plugin://plugin.library.node.editor/?ltype=music,return) @@ -251,34 +253,18 @@ Skin.ToggleSetting(HomeMenuNoWeatherButton) - - Dialog Header image - 0 - 130 - 0 - 3 - dialogs/separator-grey.png - - - Dialog Header image - 0 - 134 - 0 - 3 - dialogs/separator-grey.png - DepthContentPanel 0 OpenClose_Left - + button area 0 - 130 + 90 470 700 10000 @@ -299,7 +285,7 @@ 470 85 - lists/focus.png + colors/white.png Conditional @@ -358,12 +344,12 @@ OpenClose_Right description area 510 - 27 + 0 1350 - 100 + 80 font12 justify - button_focus + blue true diff --git a/xml/Variables.xml b/xml/Variables.xml index a52382e..67fe7a2 100644 --- a/xml/Variables.xml +++ b/xml/Variables.xml @@ -85,26 +85,26 @@ $INFO[ListItem.Plot] - $INFO[ListItem.Property(description),,[CR]]$INFO[ListItem.PictureDatetime,[COLOR button_focus]$LOCALIZE[552]: [/COLOR],[CR]]$INFO[ListItem.PictureResolution,[COLOR button_focus]$LOCALIZE[169]: [/COLOR],[CR]]$INFO[ListItem.PictureCamMake,[COLOR button_focus]$LOCALIZE[31041]: [/COLOR],[CR]]$INFO[ListItem.PictureCamModel,[COLOR button_focus]$LOCALIZE[21823]: [/COLOR],[CR]] - $INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Property(Artist_YearsActive),[COLOR button_focus]$LOCALIZE[21898]: [/COLOR],[CR]]$INFO[ListItem.Property(Artist_Style),[COLOR button_focus]$LOCALIZE[736]: [/COLOR],[CR]] - $INFO[ListItem.Year,[COLOR button_focus]$LOCALIZE[345]: [/COLOR],[CR]]$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Property(album_label),[COLOR button_focus]$LOCALIZE[21899]: [/COLOR],[CR]]$INFO[ListItem.Property(album_style),[COLOR button_focus]$LOCALIZE[736]: [/COLOR],[CR]] - $INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Premiered,[COLOR button_focus]$LOCALIZE[20416]: [/COLOR]] - $INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Director,[COLOR button_focus]$LOCALIZE[20339]: [/COLOR],[CR]]$INFO[ListItem.Writer,[COLOR button_focus]$LOCALIZE[20417]: [/COLOR],[CR]]$INFO[ListItem.Premiered,[COLOR button_focus]$LOCALIZE[20416]: [/COLOR]] + $INFO[ListItem.Property(description),,[CR]]$INFO[ListItem.PictureDatetime,[COLOR blue]$LOCALIZE[552]: [/COLOR],[CR]]$INFO[ListItem.PictureResolution,[COLOR blue]$LOCALIZE[169]: [/COLOR],[CR]]$INFO[ListItem.PictureCamMake,[COLOR blue]$LOCALIZE[31041]: [/COLOR],[CR]]$INFO[ListItem.PictureCamModel,[COLOR blue]$LOCALIZE[21823]: [/COLOR],[CR]] + $INFO[ListItem.Genre,[COLOR blue]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Property(Artist_YearsActive),[COLOR blue]$LOCALIZE[21898]: [/COLOR],[CR]]$INFO[ListItem.Property(Artist_Style),[COLOR blue]$LOCALIZE[736]: [/COLOR],[CR]] + $INFO[ListItem.Year,[COLOR blue]$LOCALIZE[345]: [/COLOR],[CR]]$INFO[ListItem.Genre,[COLOR blue]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Property(album_label),[COLOR blue]$LOCALIZE[21899]: [/COLOR],[CR]]$INFO[ListItem.Property(album_style),[COLOR blue]$LOCALIZE[736]: [/COLOR],[CR]] + $INFO[ListItem.Genre,[COLOR blue]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Premiered,[COLOR blue]$LOCALIZE[20416]: [/COLOR]] + $INFO[ListItem.Genre,[COLOR blue]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Director,[COLOR blue]$LOCALIZE[20339]: [/COLOR],[CR]]$INFO[ListItem.Writer,[COLOR blue]$LOCALIZE[20417]: [/COLOR],[CR]]$INFO[ListItem.Premiered,[COLOR blue]$LOCALIZE[20416]: [/COLOR]] - $INFO[ListItem.Size,[COLOR button_focus]$LOCALIZE[289]: [/COLOR],[CR]]$INFO[ListItem.PictureAperture,[COLOR button_focus]$LOCALIZE[21826]: [/COLOR],[CR]]$INFO[ListItem.PictureFocalLen,[COLOR button_focus]$LOCALIZE[21827]: [/COLOR],[CR]]$INFO[ListItem.PictureExpTime,[COLOR button_focus]$LOCALIZE[21830]: [/COLOR],[CR]]$INFO[ListItem.Date,[COLOR button_focus]$LOCALIZE[552]: [/COLOR],[CR]] + $INFO[ListItem.Size,[COLOR blue]$LOCALIZE[289]: [/COLOR],[CR]]$INFO[ListItem.PictureAperture,[COLOR blue]$LOCALIZE[21826]: [/COLOR],[CR]]$INFO[ListItem.PictureFocalLen,[COLOR blue]$LOCALIZE[21827]: [/COLOR],[CR]]$INFO[ListItem.PictureExpTime,[COLOR blue]$LOCALIZE[21830]: [/COLOR],[CR]]$INFO[ListItem.Date,[COLOR blue]$LOCALIZE[552]: [/COLOR],[CR]] $INFO[ListItem.Property(artist_description)] $INFO[ListItem.Property(album_description)] $INFO[ListItem.PlotOutline] $INFO[ListItem.Plot] - [COLOR=button_focus]$INFO[Container(3).NumItems][/COLOR] $LOCALIZE[31036] - [COLOR=button_focus]$INFO[Container(3).CurrentPage]/$INFO[Container(3).NumPages][/COLOR] - [COLOR=button_focus]$INFO[Container(6).NumItems][/COLOR] $LOCALIZE[31036] - [COLOR=button_focus]$INFO[Container(6).CurrentPage]/$INFO[Container(6).NumPages][/COLOR] + [COLOR=blue]$INFO[Container(3).NumItems][/COLOR] $LOCALIZE[31036] - [COLOR=blue]$INFO[Container(3).CurrentPage]/$INFO[Container(3).NumPages][/COLOR] + [COLOR=blue]$INFO[Container(6).NumItems][/COLOR] $LOCALIZE[31036] - [COLOR=blue]$INFO[Container(6).CurrentPage]/$INFO[Container(6).NumPages][/COLOR] - [COLOR=button_focus]$INFO[Container(450).NumItems][/COLOR] $LOCALIZE[31036] - [COLOR=button_focus]$INFO[Container(450).CurrentPage]/$INFO[Container(450).NumPages][/COLOR] - [COLOR=button_focus]$INFO[Container(451).NumItems][/COLOR] $LOCALIZE[31036] - [COLOR=button_focus]$INFO[Container(451).CurrentPage]/$INFO[Container(451).NumPages][/COLOR] + [COLOR=blue]$INFO[Container(450).NumItems][/COLOR] $LOCALIZE[31036] - [COLOR=blue]$INFO[Container(450).CurrentPage]/$INFO[Container(450).NumPages][/COLOR] + [COLOR=blue]$INFO[Container(451).NumItems][/COLOR] $LOCALIZE[31036] - [COLOR=blue]$INFO[Container(451).CurrentPage]/$INFO[Container(451).NumPages][/COLOR] DefaultBackBanner.png @@ -120,15 +120,15 @@ $INFO[ListItem.Addonnews] $INFO[ListItem.AddonDescription] $INFO[ListItem.Property(album_description)] - $INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Plot] + $INFO[ListItem.Genre,[COLOR blue]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Plot] $INFO[ListItem.Property(artist_description)] $INFO[ListItem.PlotOutline] $INFO[ListItem.Plot] - $VAR[MusicTrackInfo,[COLOR button_focus]$LOCALIZE[554]: [/COLOR],[CR]]$INFO[ListItem.Artist,[COLOR button_focus]$LOCALIZE[557]: [/COLOR],[CR]]$INFO[listitem.Album,[COLOR button_focus]$LOCALIZE[558]: [/COLOR],[CR]]$VAR[InfoDiscVar,[COLOR button_focus]$LOCALIZE[427]: [/COLOR],[CR]]$INFO[ListItem.Year,[COLOR button_focus]$LOCALIZE[345]: [/COLOR],[CR]]$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Duration,[COLOR button_focus]$LOCALIZE[180]: [/COLOR],[CR]]$INFO[ListItem.Playcount,[COLOR button_focus]$LOCALIZE[567]: [/COLOR],[CR]]$INFO[ListItem.LastPlayed,[COLOR button_focus]$LOCALIZE[568]: [/COLOR],] - $INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]] + $VAR[MusicTrackInfo,[COLOR blue]$LOCALIZE[554]: [/COLOR],[CR]]$INFO[ListItem.Artist,[COLOR blue]$LOCALIZE[557]: [/COLOR],[CR]]$INFO[listitem.Album,[COLOR blue]$LOCALIZE[558]: [/COLOR],[CR]]$VAR[InfoDiscVar,[COLOR blue]$LOCALIZE[427]: [/COLOR],[CR]]$INFO[ListItem.Year,[COLOR blue]$LOCALIZE[345]: [/COLOR],[CR]]$INFO[ListItem.Genre,[COLOR blue]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Duration,[COLOR blue]$LOCALIZE[180]: [/COLOR],[CR]]$INFO[ListItem.Playcount,[COLOR blue]$LOCALIZE[567]: [/COLOR],[CR]]$INFO[ListItem.LastPlayed,[COLOR blue]$LOCALIZE[568]: [/COLOR],] + $INFO[ListItem.Genre,[COLOR blue]$LOCALIZE[515]: [/COLOR],[CR]] - $INFO[MusicPlayer.Title,[COLOR button_focus]$LOCALIZE[554]: [/COLOR],[CR]]$INFO[MusicPlayer.Artist,[COLOR button_focus]$LOCALIZE[557]: [/COLOR],[CR]]$INFO[MusicPlayer.Album,[COLOR button_focus]$LOCALIZE[558]: [/COLOR],[CR]]$VAR[MultiDiscVar,[COLOR button_focus]$LOCALIZE[427]: [/COLOR],[CR]]$INFO[MusicPlayer.Year,[COLOR button_focus]$LOCALIZE[345]: [/COLOR],[CR]]$INFO[MusicPlayer.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[MusicPlayer.Time,[COLOR button_focus]$LOCALIZE[180]: [/COLOR],/]$INFO[MusicPlayer.Duration,,[CR]] + $INFO[MusicPlayer.Title,[COLOR blue]$LOCALIZE[554]: [/COLOR],[CR]]$INFO[MusicPlayer.Artist,[COLOR blue]$LOCALIZE[557]: [/COLOR],[CR]]$INFO[MusicPlayer.Album,[COLOR blue]$LOCALIZE[558]: [/COLOR],[CR]]$VAR[MultiDiscVar,[COLOR blue]$LOCALIZE[427]: [/COLOR],[CR]]$INFO[MusicPlayer.Year,[COLOR blue]$LOCALIZE[345]: [/COLOR],[CR]]$INFO[MusicPlayer.Genre,[COLOR blue]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[MusicPlayer.Time,[COLOR blue]$LOCALIZE[180]: [/COLOR],/]$INFO[MusicPlayer.Duration,,[CR]] $INFO[listitem.TrackNumber] @@ -166,8 +166,8 @@ $LOCALIZE[16018] - [COLOR button_focus]$LOCALIZE[24170][/COLOR][CR]$INFO[ListItem.AddonLifecycleDesc] - [COLOR button_focus]$LOCALIZE[24171][/COLOR][CR]$INFO[ListItem.AddonLifecycleDesc] + [COLOR blue]$LOCALIZE[24170][/COLOR][CR]$INFO[ListItem.AddonLifecycleDesc] + [COLOR blue]$LOCALIZE[24171][/COLOR][CR]$INFO[ListItem.AddonLifecycleDesc] icons/addonstatus/disable.png @@ -227,8 +227,8 @@ 32x - [COLOR button_focus]$LOCALIZE[773][/COLOR] $INFO[Player.SeekStepSize] - [COLOR button_focus]$LOCALIZE[773][/COLOR] $INFO[Player.SeekOffset] + [COLOR gey]$LOCALIZE[773][/COLOR] $INFO[Player.SeekStepSize] + [COLOR grey]$LOCALIZE[773][/COLOR] $INFO[Player.SeekOffset] $LOCALIZE[112] $LOCALIZE[31039] $VAR[VideoPlayerForwardRewindVar] $LOCALIZE[31038] $VAR[VideoPlayerForwardRewindVar] @@ -238,7 +238,8 @@ [B]$INFO[Player.SeekNumeric(hh:mm:ss)][/B] $INFO[PVR.EpgEventSeekTime]$INFO[PVR.EpgEventDuration, / ] $INFO[Player.SeekTime]$INFO[Player.Duration, / ] - $INFO[PVR.EpgEventElapsedTime]$INFO[PVR.EpgEventDuration, / ] + $INFO[PVR.EpgEventElapsedTime]$INFO[PVR.EpgEventDuration, / ] + $INFO[PVR.EpgEventElapsedTime]$INFO[PVR.EpgEventDuration, / ][COLOR grey]$INFO[PVR.TimeshiftOffset, (Behind live ,)][/COLOR] $INFO[Player.Time]$INFO[Player.Duration, / ] @@ -295,7 +296,7 @@ $INFO[ListItem.Title] - $INFO[ListItem.TVShowTitle]$INFO[ListItem.Year, ([COLOR grey],[/COLOR])] + $INFO[ListItem.TVShowTitle]$INFO[ListItem.Year, (,)]$INFO[ListItem.Season, - S]$INFO[ListItem.Episode,E,: ]$INFO[ListItem.Title] $INFO[ListItem.Title]$INFO[ListItem.Year, ([COLOR grey],[/COLOR])] $INFO[ListItem.Label]$INFO[ListItem.Year, ([COLOR grey],[/COLOR])] @@ -320,6 +321,7 @@ $INFO[SlideShow.EXIFtime] $INFO[ListItem.PictureDateTime] + + + $INFO[VideoPlayer.Title]$INFO[VideoPlayer.EpisodeName, - ] + $INFO[VideoPlayer.TVShowTitle]$INFO[VideoPlayer.Year, (,)]$INFO[VideoPlayer.Season, - S]$INFO[VideoPlayer.Episode,E]$INFO[VideoPlayer.Title, - ] + $INFO[VideoPlayer.Title] + - $LOCALIZE[554] $INFO[Playlist.Position] / $INFO[Playlist.Length] - $VAR[NowPlayingSublabelVar,,[CR]]$INFO[player.chapter,[COLOR button_focus]$LOCALIZE[21396]: [/COLOR]]$INFO[Player.ChapterCount,/]$INFO[Player.ChapterName, - ] - $INFO[VideoPlayer.Season,[COLOR button_focus][CAPITALIZE]$LOCALIZE[36906][/CAPITALIZE]:[/COLOR] S]$INFO[VideoPlayer.Episode,E,: ]$INFO[VideoPlayer.Title] - $INFO[VideoPlayer.Season,[COLOR button_focus][CAPITALIZE]$LOCALIZE[36906][/CAPITALIZE]:[/COLOR] S]$INFO[VideoPlayer.Episode,E, - ]$INFO[VideoPlayer.Title,,[CR]]$INFO[player.chapter,[COLOR button_focus]$LOCALIZE[21396]:[/COLOR] ]$INFO[Player.ChapterCount,/]$INFO[Player.ChapterName, - ] - $INFO[VideoPlayer.ChannelNumberLabel,([COLOR button_focus],[/COLOR]) ]$INFO[VideoPlayer.ChannelName] $INFO[VideoPlayer.EpisodeName, - ] - $INFO[player.chapter,[COLOR button_focus]$LOCALIZE[21396]:[/COLOR] ]$INFO[Player.ChapterCount,/]$INFO[Player.ChapterName, - ] + [COLOR blue]$LOCALIZE[554][/COLOR] $INFO[Playlist.Position] / $INFO[Playlist.Length] + $VAR[NowPlayingSublabelVar,,[CR]]$INFO[player.chapter,[COLOR blue]$LOCALIZE[21396]: [/COLOR]]$INFO[Player.ChapterCount,/]$INFO[Player.ChapterName, - ] + $INFO[VideoPlayer.Season,[COLOR blue][CAPITALIZE]$LOCALIZE[36906][/CAPITALIZE]:[/COLOR] S]$INFO[VideoPlayer.Episode,E,: ]$INFO[VideoPlayer.Title] + $INFO[VideoPlayer.Season,[COLOR blue][CAPITALIZE]$LOCALIZE[36906][/CAPITALIZE]:[/COLOR] S]$INFO[VideoPlayer.Episode,E, - ]$INFO[VideoPlayer.Title,,[CR]]$INFO[player.chapter,[COLOR blue]$LOCALIZE[21396]:[/COLOR] ]$INFO[Player.ChapterCount,/]$INFO[Player.ChapterName, - ] + $INFO[VideoPlayer.ChannelNumberLabel,([COLOR blue],[/COLOR]) ]$INFO[VideoPlayer.ChannelName] $INFO[VideoPlayer.EpisodeName, - ] + $INFO[player.chapter,[COLOR blue]$LOCALIZE[21396]:[/COLOR] ]$INFO[Player.ChapterCount,/]$INFO[Player.ChapterName, - ] $INFO[VideoPlayer.Genre] + + [COLOR blue]$LOCALIZE[554][/COLOR] $INFO[Playlist.Position] / $INFO[Playlist.Length] + $INFO[player.chapter,[COLOR blue]$LOCALIZE[21396]:[/COLOR] ]$INFO[Player.ChapterCount,/]$INFO[Player.ChapterName, - ] + - $INFO[MusicPlayer.offset(1).Title,[COLOR button_focus]$LOCALIZE[19031]: [/COLOR]]$INFO[MusicPlayer.offset(1).Artist, - ]$INFO[MusicPlayer.offset(1).Album, - ]$INFO[MusicPlayer.offset(1).Year, (,)] - $INFO[VideoPlayer.offset(1).Title,[COLOR button_focus]$LOCALIZE[19031]: [/COLOR]]$INFO[VideoPlayer.offset(1).Artist, - ]$INFO[VideoPlayer.offset(1).Album, - ]$INFO[VideoPlayer.offset(1).Year, (,)] - $INFO[VideoPlayer.NextStartTime,[COLOR button_focus]$LOCALIZE[19031]: [/COLOR]]$INFO[VideoPlayer.NextEndTime, - ]$INFO[VideoPlayer.NextTitle,: ] - $INFO[VideoPlayer.offset(1).TVShowtitle,[COLOR button_focus]$LOCALIZE[19031]: [/COLOR]]$INFO[VideoPlayer.offset(1).Season, - S,]$INFO[VideoPlayer.offset(1).Episode,E]$INFO[VideoPlayer.offset(1).Title, - ] - $INFO[VideoPlayer.offset(1).Title,[COLOR button_focus]$LOCALIZE[19031]: [/COLOR]]$INFO[VideoPlayer.offset(1).Year, (,)] + $INFO[MusicPlayer.offset(1).Title,[COLOR blue]$LOCALIZE[19031]: [/COLOR]]$INFO[MusicPlayer.offset(1).Artist, - ]$INFO[MusicPlayer.offset(1).Album, - ]$INFO[MusicPlayer.offset(1).Year, (,)] + $INFO[VideoPlayer.offset(1).Title,[COLOR blue]$LOCALIZE[19031]: [/COLOR]]$INFO[VideoPlayer.offset(1).Artist, - ]$INFO[VideoPlayer.offset(1).Album, - ]$INFO[VideoPlayer.offset(1).Year, (,)] + $INFO[VideoPlayer.NextStartTime,[COLOR blue]$LOCALIZE[19031]: [/COLOR]]$INFO[VideoPlayer.NextEndTime, - ]$INFO[VideoPlayer.NextTitle,: ] + $INFO[VideoPlayer.offset(1).TVShowtitle]$INFO[VideoPlayer.offset(1).Season, - S,]$INFO[VideoPlayer.offset(1).Episode,E]$INFO[VideoPlayer.offset(1).Title, - ] + $INFO[VideoPlayer.offset(1).Title,[COLOR blue]$LOCALIZE[19031]: [/COLOR]]$INFO[VideoPlayer.offset(1).Year, (,)] $INFO[Player.Art(tvshow.clearlogo)] @@ -368,13 +380,14 @@ - $INFO[Window(home).Property(infobackground)] - $INFO[Skin.String(MovieGenreFanart.path)]$INFO[ListItem.Label]$INFO[Skin.String(MovieGenreFanart.ext)] - $INFO[ListItem.FolderPath] + $INFO[Window(home).Property(infobackground)] + $INFO[Skin.String(MovieGenreFanart.path)]$INFO[ListItem.Label]$INFO[Skin.String(MovieGenreFanart.ext)] + $INFO[ListItem.FolderPath] $INFO[ListItem.Art(fanart)] $INFO[Container.Art(tvshow.fanart)] $INFO[Container.Art(artist.fanart)] - $INFO[Container.Art(fanart)] + $INFO[Container.Art(fanart)] + EMPTY $INFO[Skin.String(WeatherFanart.path)]$INFO[Container.ListItem.Property(FanartCode)]$INFO[Skin.String(WeatherFanart.ext)] @@ -398,6 +411,48 @@ windows/pvr/archive.png $INFO[ListItem.Overlay] + + $INFO[VideoPlayer.ChannelGroup] + + + + $INFO[VideoPlayer.ChannelNumberLabel]$INFO[VideoPlayer.ChannelName, - ] + Playing $INFO[videoplayer.Playlistposition,]$INFO[videoplayer.Playlistlength,/] + Playing $INFO[Playlist.Position] / $INFO[Playlist.Length] + Playing... + + + Live + Timeshifting + + + + $INFO[VideoPlayer.Title]$INFO[VideoPlayer.EpisodeName, - ] + $INFO[VideoPlayer.TVShowTitle]$INFO[VideoPlayer.Year, (,)]$INFO[VideoPlayer.Season, - S]$INFO[VideoPlayer.Episode,E]$INFO[VideoPlayer.Title, - ] + $INFO[VideoPlayer.Title] + + + $INFO[VideoPlayer.Genre] + $INFO[VideoPlayer.Director,[B]Director:[/B] , | ]$INFO[VideoPlayer.Studio, [B]Studio:[/B] , | ]$INFO[VideoPlayer.Genre,[B]Genre:[/B] ] + + + $INFO[MusicPlayer.offset(1).Title,[COLOR grey]$LOCALIZE[19031]: [/COLOR]]$INFO[MusicPlayer.offset(1).Artist, - ]$INFO[MusicPlayer.offset(1).Album, - ]$INFO[MusicPlayer.offset(1).Year, (,)] + $INFO[VideoPlayer.offset(1).Title,[COLOR grey]$LOCALIZE[19031]: [/COLOR]]$INFO[VideoPlayer.offset(1).Artist, - ]$INFO[VideoPlayer.offset(1).Album, - ]$INFO[VideoPlayer.offset(1).Year, (,)] + $INFO[VideoPlayer.NextTitle][COLOR grey]$INFO[VideoPlayer.NextGenre, [B]|[/B] ][/COLOR] + $INFO[VideoPlayer.offset(1).TVShowtitle]$INFO[VideoPlayer.offset(1).Season, - S,]$INFO[VideoPlayer.offset(1).Episode,E]$INFO[VideoPlayer.offset(1).Title, - ] + $INFO[VideoPlayer.offset(1).Title,,]$INFO[VideoPlayer.offset(1).Year, (,)] + $INFO[Player.offset(1).Filename] + + + + $INFO[VideoPlayer.StartTime]$INFO[VideoPlayer.EndTime, - ] + Now + + + $INFO[VideoPlayer.NextStartTime]$INFO[VideoPlayer.NextEndTime, - ] + Next + + $LOCALIZE[20342] @@ -504,20 +559,20 @@ $INFO[ListItem.Premiered,[COLOR grey]$LOCALIZE[20416]:[/COLOR] ,[CR]] - [B][COLOR button_focus]$LOCALIZE[838][/COLOR][/B] - [B][COLOR button_focus]$LOCALIZE[849][/COLOR][/B] - [B][COLOR button_focus]$LOCALIZE[839][/COLOR][/B] - [B][COLOR button_focus]$LOCALIZE[842][/COLOR][/B] + [B][COLOR blue]$LOCALIZE[838][/COLOR][/B] + [B][COLOR blue]$LOCALIZE[849][/COLOR][/B] + [B][COLOR blue]$LOCALIZE[839][/COLOR][/B] + [B][COLOR blue]$LOCALIZE[842][/COLOR][/B] - [B][COLOR button_focus]$LOCALIZE[838][/COLOR][/B] - [B][COLOR button_focus]$LOCALIZE[838][/COLOR][/B] - - [B][COLOR button_focus]$LOCALIZE[849][/COLOR][/B] - [B][COLOR button_focus]$LOCALIZE[849][/COLOR][/B] - - [B][COLOR button_focus]$LOCALIZE[839][/COLOR][/B] - [B][COLOR button_focus]$LOCALIZE[839][/COLOR][/B] - - [B][COLOR button_focus]$LOCALIZE[842][/COLOR][/B] - [B][COLOR button_focus]$LOCALIZE[842][/COLOR][/B] - + [B][COLOR blue]$LOCALIZE[838][/COLOR][/B] + [B][COLOR blue]$LOCALIZE[838][/COLOR][/B] - + [B][COLOR blue]$LOCALIZE[849][/COLOR][/B] + [B][COLOR blue]$LOCALIZE[849][/COLOR][/B] - + [B][COLOR blue]$LOCALIZE[839][/COLOR][/B] + [B][COLOR blue]$LOCALIZE[839][/COLOR][/B] - + [B][COLOR blue]$LOCALIZE[842][/COLOR][/B] + [B][COLOR blue]$LOCALIZE[842][/COLOR][/B] - $INFO[ListItem.Date,[COLOR grey]$LOCALIZE[552]:[/COLOR] ,[CR]]$INFO[ListItem.Duration,[COLOR grey]$LOCALIZE[180]:[/COLOR] ,[CR]] diff --git a/xml/VideoFullScreen.xml b/xml/VideoFullScreen.xml index ad2f55d..fa36d1d 100644 --- a/xml/VideoFullScreen.xml +++ b/xml/VideoFullScreen.xml @@ -73,5 +73,21 @@ font13 + diff --git a/xml/VideoOSD.xml b/xml/VideoOSD.xml index 8927a1a..2ae27ee 100644 --- a/xml/VideoOSD.xml +++ b/xml/VideoOSD.xml @@ -16,36 +16,34 @@ TouchBackOSDButton - Animation_BottomSlide - 0 - 180 + 0 + 150 ![Window.IsVisible(SliderDialog) | Window.IsVisible(1110) | Window.IsVisible(osdaudiosettings) | Window.IsVisible(osdvideosettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(playerprocessinfo) | Window.IsVisible(osdcmssettings) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(pvrchannelguide)] - VisibleChange - conditional - 20 - 0 - right - center + 20 + 130 + left + top 1000 50 + font26_bold black - Animation_BottomSlide + Animation_TopSlide 20 - 90 - 100% - 135 + 0 + 700 + 50 10 200 horizontal - 87 + noop noop 70048 - 804 + 600 @@ -61,30 +59,30 @@ Player.SeekEnabled + !VideoPlayer.Content(livetv) - 76 - 76 + 50 + 50 Player.PauseEnabled 0 0 - 74 - 74 + 50 + 50 - osd/fullscreen/buttons/button-fo.png + osd/fullscreen/buttons/button-fo.png 601 603 - 87 + noop noop PlayerControl(Play) 0 0 - 74 - 74 - Conditional + 50 + 50 + Conditional $VAR[PlayerControlsPlayImageVar] @@ -114,11 +112,11 @@ osd/fullscreen/buttons/record.png osd/fullscreen/buttons/record.png osd/fullscreen/buttons/button-fo.png - 76 - Focus - 76 - 74 - 74 + 50 + Focus + 50 + 48 + 48 1 @@ -128,22 +126,6 @@ PVR.CanRecordPlayingChannel VideoPlayer.Content(livetv) - - - 20 - 90 - 1800 - 135 - right - 10 - 200 - horizontal - 87 - 11104 - 12104 - 13103 - 608 - 600 @@ -179,7 +161,7 @@ - Info + ActivateWindow(1111) @@ -222,88 +204,6 @@ - - 60 - - - - - - - - - - - - - - - Player.SeekEnabled - - HiddenObject - 200 - 200 - StepBack - StepForward - PlayerControl(FrameAdvance(1)) - - - -5 - 0 - 100% - 26 - osd/progress/nub_leftright.png - osd/progress/nub_leftright.png - osd/progress/nub_leftright.png - Player.Progress - 200 - 200 - seek - !Control.HasFocus(87) + !VideoPlayer.Content(LiveTV) - - - -5 - 0 - 100% - 26 - osd/progress/nub_leftright.png - osd/progress/nub_leftright.png - osd/progress/nub_leftright.png - Player.Progress - 200 - 200 - seek - Control.HasFocus(87) + !VideoPlayer.Content(LiveTV) - - - -5 - 0 - 100% - 26 - osd/progress/nub_leftright.png - osd/progress/nub_leftright.png - osd/progress/nub_leftright.png - PVR.TimeshiftProgressPlayPos - 200 - 200 - pvr.seek - !Control.HasFocus(87) + VideoPlayer.Content(LiveTV) - - - -5 - 0 - 100% - 26 - osd/progress/nub_leftright.png - osd/progress/nub_leftright.png - osd/progress/nub_leftright.png - PVR.TimeshiftProgressPlayPos - 200 - 200 - pvr.seek - Control.HasFocus(87) + VideoPlayer.Content(LiveTV) - - diff --git a/xml/View_502_FanArt.xml b/xml/View_502_FanArt.xml index ceee70e..0ce5c61 100644 --- a/xml/View_502_FanArt.xml +++ b/xml/View_502_FanArt.xml @@ -19,9 +19,9 @@ Visible_Right -20 - 1235 + 1200 - + diff --git a/xml/View_503_NowPlaying.xml b/xml/View_503_NowPlaying.xml index 8e80bbd..0d48ede 100644 --- a/xml/View_503_NowPlaying.xml +++ b/xml/View_503_NowPlaying.xml @@ -3,30 +3,35 @@ OpenClose_Right - 596 + 590 Control.IsVisible(503) Visible_Right - + + font26 + font26_bold DepthContentPanel - -20 - 634 - - - - - - + -590 + 590 + + + OpenClose_Right + Visible_Right + + + + + diff --git a/xml/View_50_List.xml b/xml/View_50_List.xml index 2983621..edc35d5 100644 --- a/xml/View_50_List.xml +++ b/xml/View_50_List.xml @@ -2,353 +2,24 @@ - OpenClose_Right - 596 + OpenClose_Left Control.IsVisible(50) - Visible_Right + Visible_Left + + - - + - - DepthContentPanel - - -20 - 634 - - - - - - - - - - - - - - DepthContentPanel - - -32 - - - - - - - - !Container.Content(songs) - - DepthContentPopout - 48 - 120 - 540 - 850 - 124 - 200 - keep - $VAR[InfoWallThumbVar] - - - 291 - 950 - - - - - - - Control.IsVisible(503) + Window.IsActive(musicplaylist) - - 58 - 110 - 540 - 470 - keep - 300 - $INFO[Player.Icon] - - - 301 - 560 - - VisibleChange - - - - - - - - - - Player.HasAudio + Window.IsActive(musicplaylist) - 58 - 600 - 540 - 70 - !System.HasModalDialog + Skin.HasSetting(AutoScroll) - - - - !Player.HasAudio + Window.IsActive(musicplaylist) - 58 - 640 - 540 - 70 - !System.HasModalDialog + Skin.HasSetting(AutoScroll) - - - - - - - 20 - list_y_offset - 12 - list_y_offset - $PARAM[list_id] - $PARAM[list_id] - vertical - conditional + OpenClose_Right + Control.IsVisible(50) + Visible_Right + + + + - - 0 - 0 - - - $PARAM[left] - $PARAM[right] - list_y_offset - list_y_offset - 5 - 6 - 500 - vertical - $PARAM[list_id]600 - 9000 - $PARAM[list_id]600 - $PARAM[list_id] - $PARAM[list_id] - list - Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(games) | Window.IsActive(videoplaylist) | Window.IsActive(musicplaylist) - - - 0 - 0 - 0 - 0 - lists/focus.png - Control.HasFocus($PARAM[list_id]) - - - 70 - 70 - 0 - 0 - center - true - font27 - - text_shadow - - - 0 - 0 - 100 - 20 - right - center - font12 - - Focus - text_shadow - - - 21 - 50% - 32 - 32 - $VAR[ListWatchedIconVar] - Focus - - - 21 - 50% - 32 - 32 - $VAR[ListWatchedIconVar] - Focus - VisibleChange - !Control.HasFocus($PARAM[list_id]) - - - - - 70 - 70 - 0 - 0 - center - font27 - - text_shadow - - - 20 - 20 - 0 - 0 - right - center - font12 - - grey - text_shadow - - - 21 - 50% - 32 - 32 - $VAR[ListWatchedIconVar] - - - - - - - - false - - - DepthContentPanel - - - - - - 30 - 110 - 540 - 470 - keep - 300 - $VAR[IconWallThumbVar] - !String.IsEqual(ListItem.DbType,episode) + !String.IsEqual(ListItem.DBType,song) - - - 30 - 110 - 540 - 330 - keep - 300 - $INFO[ListItem.Icon] - String.IsEqual(ListItem.DbType,episode) - - - 30 - 110 - 540 - 470 - keep - 300 - $VAR[IconWallThumbVar] - String.IsEqual(ListItem.DBType,song) - - - 273 - 560 - RatingCircle - conditional - - - !Container.Content() | !String.isempty(ListItem.Plot) - 30 - - 600 - 540 - 70 - !System.HasModalDialog + Skin.HasSetting(AutoScroll) - - !String.IsEqual(ListItem.DbType,episode) + !String.IsEqual(ListItem.DBType,song) - - - 465 - 540 - 70 - !System.HasModalDialog + Skin.HasSetting(AutoScroll) - - String.IsEqual(ListItem.DbType,episode) - - - 600 - 540 - 70 - !System.HasModalDialog + Skin.HasSetting(AutoScroll) - - String.IsEqual(ListItem.DBType,song) - - - - 20 - 640 - ListItem.IsCollection + String.IsEmpty(ListItem.Plot) - - - - - - - - - - !ListItem.IsCollection + String.IsEmpty(Control.GetLabel(15500)) + Control.IsVisible(15500) - - 30 - 460 - 540 - 413 - center - center - font27 - 80FFFFFF - - !ListItem.IsParentFolder - !Integer.IsGreater(Container(42000).NumItems,0) + !Integer.IsGreater(Container(43000).NumItems,0) - !Container.Content() | !String.isempty(ListItem.Plot) - - - 20 - 640 - !String.IsEmpty(ListItem.DBID) - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xml/View_53_Shift - Copy.xml b/xml/View_53_Shift - Copy.xml new file mode 100644 index 0000000..7c15ee0 --- /dev/null +++ b/xml/View_53_Shift - Copy.xml @@ -0,0 +1,201 @@ + + + + + Poster Viewtype + 50% + 0 + 880 + + Control.IsVisible(53) + WindowOpen + WindowClose + VisibleChange + + 0 + 760 + 100% + 110 + dialogs/dialog-bg-nobo.png + + + 0 + 35 + 100% + 190 + dialogs/dialog-bg-nobo.png + + + + Control.IsVisible(53) + Visible_Right + OpenClose_Right + 160 + + 600 + 600 + 340 + 110 + Control.HasFocus(53) + VisibleChange + colors/grey.png + Conditional + Conditional + Conditional + Conditional + + + -150 + 0 + 111% + 695 + 1 + 0 + 5199 + 500 + horizontal + Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(musicvideos) | Container.Content(artists) | Container.Content(albums) | Container.Content(mixed) | Container.Content(images) | Container.Content(videos) | Container.Content(games) + 53 + 9000 + 5199 + 53 + 1 + icon + + + DepthContentPopout + 0 + 90 + 370 + 480 + keep + $VAR[ShiftThumbVar] + overlays/shadow.png + 20 + + + 20 + 603 + 330 + 105 + center + center + + + + 169 + 560 + 32 + 32 + $VAR[WallWatchedIconVar] + + + 158 + 92 + RatingCircle + + + + + DepthContentPopout + 0 + 90 + 370 + 480 + keep + $VAR[ShiftThumbVar] + overlays/shadow.png + 20 + + + 20 + 603 + 330 + 105 + center + center + + True + + + 169 + 560 + 32 + 32 + $VAR[WallWatchedIconVar] + + + 158 + 92 + RatingCircle + + + + + + Control.IsVisible(53) + Visible_Right + OpenClose_Right + + 50% + + + + + + + 50% + 50% + + + + + + + 20 + 48 + 1880 + 180 + horizontal + ListItem.IsCollection + VisibleChange + + + 10 + 40 + 628 + center + + text_shadow + + + + + 10 + 40 + 628 + center + + text_shadow + + + $VAR[InfoListPathVar] + + + + + + + Conditional + Conditional + + 30 + 45 + 30 + 163 + + text_shadow + + + + diff --git a/xml/View_53_Shift.xml b/xml/View_53_Shift.xml index c537f32..73a75d0 100644 --- a/xml/View_53_Shift.xml +++ b/xml/View_53_Shift.xml @@ -13,16 +13,16 @@ VisibleChange 0 - 760 + 10 100% 110 dialogs/dialog-bg-nobo.png 0 - 35 + 620 100% - 190 + 250 dialogs/dialog-bg-nobo.png @@ -30,11 +30,12 @@ Control.IsVisible(53) Visible_Right OpenClose_Right - 160 + 10 + - -150 + 0 0 - 111% + 100% 695 - 1 + 2 0 5199 500 @@ -61,12 +63,12 @@ 53 1 icon - + DepthContentPopout 0 - 90 - 370 + 120 + 384 480 keep $VAR[ShiftThumbVar] @@ -75,8 +77,8 @@ 20 - 603 - 330 + 0 + 344 105 center center @@ -95,22 +97,29 @@ RatingCircle - + DepthContentPopout 0 - 90 - 370 + 120 + 384 480 keep $VAR[ShiftThumbVar] overlays/shadow.png 20 + + 0 + 0 + 384 + 110 + colors/grey.png + 20 - 603 - 330 + 0 + 344 105 center center @@ -165,7 +174,7 @@ 40 628 center - + text_shadow @@ -175,7 +184,7 @@ 40 628 center - + text_shadow @@ -190,9 +199,9 @@ Conditional 30 - 45 + 630 30 - 163 + 210 text_shadow diff --git a/xml/View_54_InfoWall.xml b/xml/View_54_InfoWall.xml index d157ba5..1d60bf9 100644 --- a/xml/View_54_InfoWall.xml +++ b/xml/View_54_InfoWall.xml @@ -54,7 +54,7 @@ 0 316 386 - dialogs/dialog-bg-nobo.png + colors/white.png overlays/shadow.png 20 @@ -63,7 +63,7 @@ -4 324 394 - colors/grey.png + colors/white.png overlays/shadow.png 20 $PARAM[focused] @@ -130,7 +130,7 @@ 10 316 288 - dialogs/dialog-bg-nobo.png + colors/white.png overlays/shadow.png 20 @@ -139,7 +139,7 @@ -4 324 296 - colors/grey.png + colors/white.png overlays/shadow.png 20 $PARAM[focused] @@ -239,7 +239,7 @@ -10 290 400 - dialogs/dialog-bg-nobo.png + colors/white.png overlays/shadow.png 20 @@ -248,7 +248,7 @@ -10 290 400 - colors/grey.png + colors/white.png 20 $PARAM[focused] Animation_FocusTextureFade @@ -279,18 +279,18 @@ !String.IsEmpty(ListItem.Art(poster)) 11 - -14 - 298 - 408 - colors/grey.png + -10 + 310 + 420 + colors/white.png overlays/shadow.png 20 $PARAM[focused] Animation_FocusTextureFade - 15 - -10 + 20 + 0 290 400 $INFO[ListItem.Art(poster)] diff --git a/xml/View_54_InfoWall_mod.xml b/xml/View_54_InfoWall_mod.xml new file mode 100644 index 0000000..330edd8 --- /dev/null +++ b/xml/View_54_InfoWall_mod.xml @@ -0,0 +1,430 @@ + + + + false + + + -10 + 376 + 380 + dialogs/dialog-bg-nobo.png + overlays/shadow.png + 20 + + + -14 + -4 + 384 + 388 + colors/grey.png + overlays/shadow.png + 20 + $PARAM[focused] + Animation_FocusTextureFade + + + 20 + 10 + 336 + 300 + $VAR[InfoWallThumbVar] + keep + + + 20 + 318 + 338 + 20 + 20 + center + center + font12 + + + + + + DefaultFolder.png + $INFO[ListItem.Artist] + $INFO[ListItem.Title] + $INFO[ListItem.Label] + false + + + 0 + 0 + 280 + 370 + colors/white.png + overlays/shadow.png + 20 + + + -10 + -10 + 300 + 380 + colors/white.png + overlays/shadow.png + 20 + $PARAM[focused] + Animation_FocusTextureFade + + + 0 + 0 + 280 + 280 + $VAR[InfoWallThumbVar] + scale + 20 + + + 25 + 270 + 230 + 75 + font20 + center + center + + !String.IsEqual(ListItem.DBType,album) + + + String.IsEqual(ListItem.DBType,album) + + 25 + 270 + 75 + 230 + + font18 + text_shadow + $PARAM[focused] + center + center + + + + 133 + 2 + RatingCircle + + + + + $INFO[ListItem.Title] + $INFO[ListItem.TVShowTitle] + $INFO[ListItem.Season,,x]$INFO[ListItem.Episode] + DefaultTVShows.png + false + + + 10 + 316 + 288 + colors/white.png + overlays/shadow.png + 20 + + + 6 + -4 + 324 + 296 + colors/white.png + overlays/shadow.png + 20 + $PARAM[focused] + Animation_FocusTextureFade + + + 0 + 10 + 316 + 218 + $VAR[InfoWallThumbVar] + scale + 20 + + + 20 + 138 + 276 + 70 + overlays/overlayfade.png + !ListItem.IsParentFolder + + + 31 + 178 + 260 + + font20_title + text_shadow + right + + + 20 + 175 + 32 + 32 + $VAR[WallWatchedIconVar] + + + 28 + 202 + 262 + 80 + font12 + center + center + + Window.IsActive(videos) + + + !Window.IsActive(videos) + + 29 + 210 + 260 + + font12 + text_shadow + $PARAM[focused] + center + + + 29 + 240 + 260 + + font10 + text_shadow + $PARAM[focused] + center + + + + 20 + 258 + 276 + 1 + + progress/texturebg_alt_white.png + ListItem.PercentPlayed + !Integer.IsEqual(ListItem.PercentPlayed,0) + + + 134 + 8 + RatingCircle + + + + + false + + + String.IsEmpty(ListItem.Art(poster)) + + 20 + -10 + 200 + 290 + colors/white.png + overlays/shadow.png + 20 + + + 10 + -10 + 220 + 310 + colors/white.png + 20 + $PARAM[focused] + Animation_FocusTextureFade + + + 45 + 180 + 145 + 70 + font25 + center + center + + $PARAM[focused] + !ListItem.IsParentFolder + + + 25 + 5 + 190 + 190 + $INFO[ListItem.Icon] + scale + 20 + + + + !String.IsEmpty(ListItem.Art(poster)) + + 10 + -10 + 220 + 310 + colors/white.png + overlays/shadow.png + 20 + $PARAM[focused] + Animation_FocusTextureFade + + + 20 + 0 + 200 + 290 + $INFO[ListItem.Art(poster)] + scale + overlays/shadow.png + 20 + + + + String.IsEqual(ListItem.DBtype,tvshow) + 320 + + 35 + 0 + 250 + 50 + overlays/overlayfade.png + !String.IsEmpty(ListItem.Art(poster)) + + + 0 + 20 + 244 + + font20_title + text_shadow + right + + + 254 + 23 + 24 + 24 + lists/played-total.png + + + + + + + OpenClose_Right + 100 + 0 + Control.IsVisible(54) + Visible_Right + + 490 + 0 + 15 + 100% + 9000 + 531 + 54 + 9000 + 54 + icon + 2 + 531 + 500 + Container.Content(artists) | Container.Content(albums) | Container.Content(sets) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(musicvideos) | Container.Content(images) | Container.Content(videos) | Container.Content(games) + + + 30 + 120 + InfoWallMovieLayout + + + + + DepthContentPopout + 30 + Focus + UnFocus + 120 + + + + + + + + 64 + 110 + + + + + + + + + DepthContentPopout + Focus + UnFocus + 64 + 110 + + + + + + + + + 150 + 40 + InfoWallMusicLayout + + + + + DepthContentPopout + Focus + UnFocus + 150 + 40 + + + + + + + + 0 + 150 + InfoWallPictureLayout + + + + + DepthContentPopout + 0 + 150 + Focus + UnFocus + + + + + + + + + diff --git a/xml/View_55_MediaInfo.xml b/xml/View_55_MediaInfo.xml new file mode 100644 index 0000000..63b17f1 --- /dev/null +++ b/xml/View_55_MediaInfo.xml @@ -0,0 +1,22 @@ + + + + + OpenClose_Left + Control.IsVisible(55) + Visible_Left + + + + + + + + + OpenClose_Right + Control.IsVisible(55) + Visible_Right + ListInfoPanel + + + diff --git a/xml/View_55_WideList.xml b/xml/View_55_WideList.xml index 4e63a26..b244c45 100644 --- a/xml/View_55_WideList.xml +++ b/xml/View_55_WideList.xml @@ -1,20 +1,26 @@ + + DepthContentPanel + OpenClose_Left + Control.IsVisible(55) + Visible_Left + OpenClose_Right Control.IsVisible(55) Visible_Right - 594 + 590 list_y_offset list_y_offset 0 500 vertical 531 - 5 - 6 + 7 + 7 9000 531 55 @@ -25,8 +31,8 @@ 0 0 0 - lists/focus.png - Control.HasFocus(55) + colors/white.png + Conditional 35 @@ -42,6 +48,7 @@ 40 center true + font28_bold text_shadow @@ -52,6 +59,7 @@ 40 right center + font28_bold text_shadow @@ -89,7 +97,7 @@ 0 0 0 - lists/focus.png + colors/white.png Control.HasFocus(55) @@ -153,7 +161,7 @@ 0 0 0 - lists/focus.png + colors/white.png Control.HasFocus(55) @@ -200,37 +208,39 @@ - + 0 0 - 80 - lists/focus.png + 60 + colors/white.png> Control.hasFocus(55) 35 - 80 + 60 40 center true + font28_bold text_shadow 35 - 80 + 60 40 right center + font28_bold text_shadow - + 35 - 80 + 60 40 center @@ -238,23 +248,22 @@ 35 - 80 + 60 40 right center - grey text_shadow - + 0 0 - 80 - lists/focus.png + 60 + colors/white.png Control.hasFocus(55) @@ -266,7 +275,7 @@ 75 - 80 + 60 40 center true @@ -274,7 +283,7 @@ 75 - 80 + 60 90 right center @@ -291,7 +300,7 @@ !ListItem.IsFolder - + 20 25 @@ -301,14 +310,14 @@ 75 - 80 + 60 40 center 75 - 80 + 60 90 right center diff --git a/xml/WideList.xml b/xml/WideList.xml new file mode 100644 index 0000000..63b17f1 --- /dev/null +++ b/xml/WideList.xml @@ -0,0 +1,22 @@ + + + + + OpenClose_Left + Control.IsVisible(55) + Visible_Left + + + + + + + + + OpenClose_Right + Control.IsVisible(55) + Visible_Right + ListInfoPanel + + + diff --git a/xml/archive/View_50_List_old.xml b/xml/archive/View_50_List_old.xml new file mode 100644 index 0000000..984763a --- /dev/null +++ b/xml/archive/View_50_List_old.xml @@ -0,0 +1,27 @@ + + + + + OpenClose_Right + 590 + Control.IsVisible(5_0) + Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) + Visible_Right + + + + + + + DepthContentPanel + + 0 + 590 + + + + + + + + diff --git a/xml/archive/View_510_LeftList_old.xml b/xml/archive/View_510_LeftList_old.xml new file mode 100644 index 0000000..ec2037e --- /dev/null +++ b/xml/archive/View_510_LeftList_old.xml @@ -0,0 +1,180 @@ + + + + + OpenClose_Left + Control.IsVisible(50) + Visible_Left + + + + + + + + + DepthContentPanel + OpenClose_Right + Control.IsVisible(50) + Visible_Right + + 0 + 920 + + + + + + + 550 + 105 + 20 + 450 + keep + 300 + $VAR[IconWallThumbVar] + !String.IsEqual(ListItem.DbType,episode) + !String.IsEqual(ListItem.DBType,song) + !Container.Content(albums) + + + 20 + 105 + 20 + 280 + keep + 300 + $INFO[ListItem.thumb] + String.IsEqual(ListItem.DbType,episode) + + + 550 + 105 + 20 + 350 + 350 + keep + 300 + $VAR[IconWallThumbVar] + String.IsEqual(ListItem.DBType,album) + !String.IsEmpty(ListItem.Property(album_description) + + + 20 + 105 + 20 + 350 + keep + 300 + $INFO[ListItem.Icon] + [String.IsEqual(ListItem.DBType,album) + String.IsEmpty(ListItem.Property(album_description)] | String.IsEqual(ListItem.DBType,song) + + + !Container.Content() | !String.isempty(ListItem.Plot) + 20 + + 30 + 370 + 105 + 420 + !System.HasModalDialog + + !String.IsEqual(ListItem.DBType,song) + !String.IsEqual(ListItem.DBType,album) + !String.IsEqual(ListItem.DbType,episode) + + + 105 + 370 + 350 + !System.HasModalDialog + + + + 560 + 20 + 105 + !System.HasModalDialog + + !String.IsEqual(ListItem.DbType,episode) + !String.IsEqual(ListItem.DBType,song) + + + 20 + 400 + 420 + !System.HasModalDialog + + String.IsEqual(ListItem.DbType,episode) + + + 730 + 20 + 105 + !System.HasModalDialog + + String.IsEqual(ListItem.DbType,episode) + + + 0 + 20 + 490 + 105 + !System.HasModalDialog + Skin.HasSetting(AutoScroll) + + String.IsEqual(ListItem.DBType,song) + + + + 20 + 640 + ListItem.IsCollection + String.IsEmpty(ListItem.Plot) + + + + + + + + + + !ListItem.IsCollection + String.IsEmpty(Control.GetLabel(15500)) + Control.IsVisible(15500) + + 30 + 460 + 540 + 413 + center + center + font27 + 80FFFFFF + + !ListItem.IsParentFolder + !Integer.IsGreater(Container(42000).NumItems,0) + !Integer.IsGreater(Container(43000).NumItems,0) + !Container.Content() | !String.isempty(ListItem.Plot) + + + 20 + 490 + 0 + 20 + String.IsEqual(ListItem.DBType,album) + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/archive/View_55_WideList_old.xml b/xml/archive/View_55_WideList_old.xml new file mode 100644 index 0000000..8660c89 --- /dev/null +++ b/xml/archive/View_55_WideList_old.xml @@ -0,0 +1,353 @@ + + + + + DepthContentPanel + OpenClose_Left + Control.IsVisible(5_5) + Visible_Left + + + OpenClose_Right + Control.IsVisible(5_5) + Visible_Right + + 590 + list_y_offset + list_y_offset + 0 + 500 + vertical + 531 + 7 + 7 + 9000 + 531 + 55 + 55 + list + + + 0 + 0 + 0 + colors/white.png + Conditional + + + 35 + 50% + 32 + 32 + $VAR[ListWatchedIconVar] + + + 105 + 0 + 0 + 40 + center + true + font28_bold + blue + + text_shadow + + + 105 + 0 + 0 + 40 + right + center + font28_bold + blue + + text_shadow + + + + + 35 + 50% + 32 + 32 + $VAR[ListWatchedIconVar] + + + 105 + 0 + 0 + 40 + center + font28_bold + + blue + text_shadow + + + 105 + 0 + 0 + 40 + right + center + font28_bold + + blue + text_shadow + + + + + 0 + 0 + 0 + colors/white.png + Control.HasFocus(55) + + + 35 + 50% + 32 + 32 + $VAR[ListWatchedIconVar] + + + 105 + 0 + 0 + 40 + center + true + + font28_bold + blue + text_shadow + + + 105 + 0 + 0 + 40 + right + center + + font28_bold + blue + text_shadow + + + + + 35 + 50% + 32 + 32 + $VAR[ListWatchedIconVar] + + + 105 + 0 + 0 + 40 + center + + text_shadow + + + 105 + 0 + 0 + 40 + right + center + + text_shadow + + + + + 0 + 0 + 0 + colors/white.png + Control.HasFocus(55) + + + 20 + 10 + 60 + 10 + keep + $INFO[ListItem.Icon] + + + 105 + 0 + 0 + 100 + center + true + + font28_bold + blue + text_shadow + + + + + 20 + 10 + 60 + 10 + keep + $INFO[ListItem.Icon] + + + 105 + 0 + 0 + 100 + center + + text_shadow + + + SongsListLayout + AddonsListLayout + + + + + + + 0 + 0 + 60 + colors/white.png> + Control.hasFocus(55) + + + 35 + 60 + 40 + center + true + font28_bold + + blue + text_shadow + + + 35 + 60 + 40 + right + center + font28_bold + + blue + text_shadow + + + + + 35 + 60 + 40 + center + + text_shadow + + + 35 + 60 + 40 + right + center + + text_shadow + + + + + + + 0 + 0 + 60 + colors/white.png + Control.hasFocus(55) + + + 20 + 25 + 32 + 32 + $VAR[AddonsListIconVar] + + + 75 + 60 + 40 + center + true + + + + 75 + 60 + 90 + right + center + font27 + + true + + + 40 + 25 + 32 + 32 + $VAR[AddonsOriginVar] + !ListItem.IsFolder + + + + + 20 + 25 + 32 + 32 + $VAR[AddonsListIconVar] + + + 75 + 60 + 40 + center + + + + 75 + 60 + 90 + right + center + font27 + + grey + text_shadow + + + 40 + 25 + 32 + 32 + $VAR[AddonsOriginVar] + !ListItem.IsFolder + + + + diff --git a/xml/temp.xml b/xml/temp.xml new file mode 100644 index 0000000..3693c51 --- /dev/null +++ b/xml/temp.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file