diff --git a/1080i/Defaults.xml b/1080i/Defaults.xml index 5ca3b2a..9d538f6 100644 --- a/1080i/Defaults.xml +++ b/1080i/Defaults.xml @@ -48,7 +48,7 @@ 0 0 - left + center center 2-row 4-col @@ -57,7 +57,6 @@ black colors/white.png - 24 textDisabled textDisabled false diff --git a/1080i/DialogPVRInfo.xml b/1080i/DialogPVRInfo.xml index 02d895e..5486e65 100644 --- a/1080i/DialogPVRInfo.xml +++ b/1080i/DialogPVRInfo.xml @@ -15,7 +15,7 @@ - col-7-begin + col-5-begin row-5-begin modalDialogInOut @@ -23,7 +23,7 @@ Episode title 0 0 - 12-col-gutter + 16-col-gutter 3-row left center @@ -80,7 +80,7 @@ - $INFO[ListItem.duration] + $INFO[ListItem.duration(H)]hrs $INFO[ListItem.duration(MM)]mins @@ -90,7 +90,7 @@ 0 292 textbox - 12-col + 16-col-gutter left textActive @@ -106,152 +106,41 @@ 8000 - + 0 16-row - 12-col + 16-col 2-row - 61 horizontal - - - 0 - 0 - 4-col - 2-row - stretch - colors/black.png - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - - 1-col-indent - 0 - 3-col - 2-row - center - buttonTitle - textActive - - - - - - - 0 - 0 - 1-col-textbox - 2-row - stretch - colors/white.png - highlight - spinFocusIcon - - - 1-col - 0 - 3-col - 2-row - stretch - colors/white.png - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - - 1-col-indent - 0 - 3-col - 2-row - center - buttonTitle - black - - - - - - - window.isactive(tvchannels) | window.isactive(radiochannels) | window.isactive(tvguide) - - - - sendclick(pvrguideinfo,5) - - - window.isactive(tvrecordings) | window.isactive(radiorecordings) - - - - sendclick(pvrrecordinginfo,8) - - - !window.isactive(tvrecordings) + !window.isactive(radiorecordings) - - - - SendClick(pvrguideinfo,6) - - - window.isactive(tvchannels) | window.isactive(radiochannels) | window.isactive(tvguide) - - - - SendClick(pvrguideinfo,11) - - - !window.isactive(tvrecordings) + !window.isactive(radiorecordings) + !window.isactive(tvguide) - - - - dialog.close(all,true) - ActivateWindow(TVGuide) - Control.SetFocus(10) - - - - - - - - false - - Find similar - - - - Switch to Channel - - - - Record - - - Play recording - - - - Set Reminder - + 61 + + Switch to Channel + + + + false + Find similar + + + + Record + + + Play recording + + + + Set Reminder + + + + TV Guide + + dialog.close(all,true) + ActivateWindow(TVGuide) + Control.SetFocus(10) + + diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml index 956f431..dbd85dd 100644 --- a/1080i/DialogVideoInfo.xml +++ b/1080i/DialogVideoInfo.xml @@ -88,14 +88,16 @@ - + 0 @@ -196,125 +198,38 @@ - - 12 - 25-row + + 24 + 23-row 10-col 6-row - 3 - 61 - 999981 - vertical - - - 0 - 0 - 1-col-textbox - 2-row - stretch - colors/black.png - overlay - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - - 1-col-indent - 0 - 4-col-gutter - 2-row - center - buttonTitle - textActive - - - - - - - 0 - 0 - 1-col - 2-row - stretch - colors/white.png - highlight - spinFocusIcon - - - 1-col - 0 - 3-col - 2-row - stretch - colors/white.png - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - - 1-col-indent - 0 - 4-col-gutter - 2-row - center - buttonTitle - black - - - - - - - - - - sendclick(2003,8) - - - - - - SendClick(2003,11) - - - - - - SendClick(2003,6) - - - - - - SendClick(2003,10) - - - false - - - - SendClick(2003,7) - - + horizontal + + + Play + + + + 4-col + Trailer + + + + 2-row + Choose Art + + + + 4-col + 2-row + Ratings + + + + Refresh + 4-row + + @@ -400,126 +315,21 @@ 8000 - + 0 11-row 12-col 2-row - 62 horizontal - - - 0 - 0 - 6-col - 2-row - stretch - colors/black.png - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - - 1-col-indent - 0 - 6-col - 2-row - center - buttonTitle - textActive - - - - - - - 0 - 0 - 1-col-textbox - 2-row - stretch - colors/white.png - highlight - spinFocusIcon - - - 1-col - 0 - 5-col - 2-row - stretch - colors/white.png - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - - 1-col-indent - 0 - 6-col - 2-row - center - buttonTitle - black - - - - - - - - - - sendclick(2003,8) - - - !String.Contains(Container.folderpath,plugin) - - - - SendClick(2003,6) - - + + + Play + + + - - - false - - Play - - - Refresh - - - Ratings - - - Choose Art - - - Trailer - - DebugGrid diff --git a/1080i/Home.xml b/1080i/Home.xml index 441af5b..7cac4a0 100644 --- a/1080i/Home.xml +++ b/1080i/Home.xml @@ -26,7 +26,7 @@ - col-1-begin + col-11-begin 6 7-col 2-row diff --git a/1080i/Includes_animations.xml b/1080i/Includes_animations.xml index 6b76250..e8d55e9 100644 --- a/1080i/Includes_animations.xml +++ b/1080i/Includes_animations.xml @@ -41,7 +41,7 @@ - + diff --git a/1080i/Includes_hubOptionsItems.xml b/1080i/Includes_hubOptionsItems.xml index 201f032..fc4a3d8 100644 --- a/1080i/Includes_hubOptionsItems.xml +++ b/1080i/Includes_hubOptionsItems.xml @@ -11,32 +11,6 @@ RunScript(script.globalsearch,movies=true&tvshows=true&episodes=true&livetv=true&actors=true&directors=true) - - !String.IsEmpty(Container.SortMethod) - Sort by - colors/white.png - textActive - 12-col - - sendclick(videos,3) - sendclick(tvchannels,3) - sendclick(tvrecordings,3) - sendclick(tvguide,3) - - - !String.IsEmpty(Container.SortMethod) - Sort direction - colors/white.png - colors/white.png - textActive - - 31110 - 12-col - sendclick(videos,4) - sendclick(tvchannels,4) - sendclick(tvrecordings,4) - sendclick(tvguide,4) - [Window.IsVisible(MyPVRChannels.xml) | Window.IsVisible(MyPVRRecordings.xml) | Window.IsVisible(MyPVRGuide.xml) | Window.IsVisible(MyPVRSearch.xml) | Window.IsVisible(MyPVRTimers.xml)] + PVR.HasTVChannels PVR Channel Group @@ -58,24 +32,13 @@ ActivateWindow(TVTimerRules) + !System.HasAddon(plugin.video.plexkodiconnect) colors/white.png textActive 12-col UpdateLibrary(video) - - Watched Toggle - - 12-col - colors/white.png - textActive - - - - - sendclick(videos,14) - Unlock Shares @@ -155,6 +118,7 @@ ActivateWindow(RadioTimerRules) + !System.HasAddon(plugin.video.plexkodiconnect) 12-col textActive colors/white.png diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml index 342bc9e..0d2f468 100644 --- a/1080i/Includes_variables.xml +++ b/1080i/Includes_variables.xml @@ -33,7 +33,7 @@ $LOCALIZE[31232] [LOWERCASE][COLOR highlight]$INFO[container.foldername][/COLOR][/LOWERCASE] - $INFO[Container.NumAllItems,, $LOCALIZE[31014]] $VAR[unwatchedOnly] + $INFO[Container.NumAllItems,, $LOCALIZE[31014]] $INFO[container.NumAllItems,, $LOCALIZE[31014]] $INFO[container.NumAllItems,, $LOCALIZE[31145]] $LOCALIZE[31212] $INFO[Window.Property(WeatherProvider)] diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml index 27cc3e5..660d85c 100644 --- a/1080i/MyVideoNav.xml +++ b/1080i/MyVideoNav.xml @@ -67,7 +67,7 @@ DebugGrid WindowID - + diff --git a/1080i/SettingsCategory.xml b/1080i/SettingsCategory.xml index ffbfe0d..100dfbd 100644 --- a/1080i/SettingsCategory.xml +++ b/1080i/SettingsCategory.xml @@ -56,6 +56,8 @@ 0 624 smallStrong + left + 12 colors/black.png SettingsLevelChange @@ -94,6 +96,8 @@ Default Button + left + 24 Default Label diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml index c80fc2e..3611491 100644 --- a/1080i/SkinSettings.xml +++ b/1080i/SkinSettings.xml @@ -87,9 +87,6 @@ - - - @@ -126,6 +123,8 @@ Container(8000).Hasfocus(1) Set home background image directory 14-col + left + 24 $INFO[Skin.String(homeBackground)] Skin.SetPath(homeBackground) @@ -135,6 +134,8 @@ Container(8000).Hasfocus(1) Reset home background image directory 14-col + left + 24 Skin.Reset(homeBackground) 8-col @@ -168,6 +169,8 @@ Container(8000).Hasfocus(3) Reload skin 14-col + left + 24 ReloadSkin() activateWindow(home) diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml index 17674db..5dccf49 100644 --- a/1080i/View_Movies.xml +++ b/1080i/View_Movies.xml @@ -22,56 +22,48 @@ - + col-1-begin 180 - 24-col - 2-row + horizontal 9000 9103 9000 - horizontal - true - - - 0 - 0 - 4-col - 2-row - menuTitle - center - textDisabled - - - - - - - 0 - 0 - 4-col - 2-row - menuTitle - center - textActive - - - - - - - - - - - 31176 - - - - 31127 - - - + + + + Skin.SetString(movieQuickLinkValue,special://skin/extras/playlists/recentMovies.xsp) + + + + Skin.SetString(movieQuickLinkValue,special://skin/extras/playlists/inprogressMovies.xsp) + + + Search + System.HasAddon(script.globalsearch) + colors/white.png + textActive + + RunScript(script.globalsearch,movies=true&tvshows=true&episodes=true&livetv=true&actors=true&directors=true) + + + Watched Toggle + + 4-col + textActive + + + Sort by + + + + Sort direction + textActive + + 31110 + + + 90 @@ -199,7 +191,7 @@ - $INFO[control.getlabel(9102)] + $INFO[skin.string(movieQuickLinkValue)] @@ -232,53 +224,31 @@ $EXP[isMovie] 90 - 828 + 820 1800 - 23-row + 824 9000 60 9103 9103 60 250 - - - -6 - -6 - 240 - 354 - stretch - colors/black.png - 6 - 11FFFFFF - + 0 0 - 228 - 342 - stretch + 240 + 360 + keep $INFO[ListItem.Art(poster)] - 6 99FFFFFF - - String.IsEmpty(listitem.title) - 24 - 3-row - 228 - 6-row - largeTitle - true - textActive - - !controlgroup(9000).hasfocus - 12 - 350 - 204 - 1-row + + 342 + 240 + 2-row center thumbTitle textActive @@ -287,96 +257,56 @@ String.IsEmpty(ListItem.PlayCount) conditional - 166 - 6 + 204 + 18 0 0 - 56 - 56 + 36 + 36 stretch masks/newContent.png highlight - - 28 - -4 - 36 - 36 - center - symbol - textActive - - - + focusThumb - 0 - 0 - 228 - 342 - stretch - colors/black.png - colors/white.png - 6 - FF000000 - - - 0 - 0 - 228 - 342 - stretch - $INFO[ListItem.Art(poster)] - 6 - - - String.IsEmpty(listitem.title) - 24 - 3-row - 228 - 6-row - largeTitle - true - textActive - + 0 + 0 + 240 + 360 + keep + $INFO[ListItem.Art(poster)] + colors/white.png + 6 + FFFFFFFF - 12 - 354 - 204 - 1-row - center - thumbTitle - textActive - + + 336 + 240 + 2-row + center + thumbTitle + textActive + String.IsEmpty(ListItem.PlayCount) - 166 - 6 - - 0 - 0 - 56 - 56 - stretch - masks/newContent.png - highlight - - - 28 - -4 - 36 - 36 - center - symbol - textActive - - + 198 + 24 + + 0 + 0 + 36 + 36 + stretch + masks/newContent.png + highlight + diff --git a/1080i/View_MusicPlaylist.xml b/1080i/View_MusicPlaylist.xml index 289f80e..2ea6893 100644 --- a/1080i/View_MusicPlaylist.xml +++ b/1080i/View_MusicPlaylist.xml @@ -131,7 +131,7 @@ playlistSubTitle textActive - + -36 @@ -234,7 +234,7 @@ playlistSubTitle textActive - + -36 diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml index 42596ee..3a1996d 100644 --- a/1080i/custom_musicPlayerFullscreen.xml +++ b/1080i/custom_musicPlayerFullscreen.xml @@ -22,7 +22,7 @@ !Visualisation.Enabled dimensionsFullscreen stretch - $INFO[listitem.art(fanart)] + $INFO[MusicPlayer.Property(Fanart_Image)] 500 77ffffff diff --git a/colors/defaults.xml b/colors/defaults.xml index 3ede0b4..6c99cf7 100644 --- a/colors/defaults.xml +++ b/colors/defaults.xml @@ -3,10 +3,8 @@ ff111111 ff1a1a1a ffad1e4e - - fff03c69 44ffffff - fff0f0f0 + ffd0d0d0 ff757575 aaf0f0f0 ff919191