diff --git a/1080i/DialogSubtitles.xml b/1080i/DialogSubtitles.xml index 5959eee..f0dc02b 100644 --- a/1080i/DialogSubtitles.xml +++ b/1080i/DialogSubtitles.xml @@ -34,7 +34,7 @@ 20-col-gutter 2-row dialogTitle - + textActive diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml index a1540fc..d21e93b 100644 --- a/1080i/DialogVideoInfo.xml +++ b/1080i/DialogVideoInfo.xml @@ -43,6 +43,7 @@ ffffffff stretch + diff --git a/1080i/DialogYesNo.xml b/1080i/DialogYesNo.xml index 0971db4..f5f833e 100644 --- a/1080i/DialogYesNo.xml +++ b/1080i/DialogYesNo.xml @@ -26,7 +26,7 @@ 0 2-row 8-col - 2-row + 78 textbox textActive diff --git a/1080i/Font.xml b/1080i/Font.xml index 44323f1..4565e9d 100644 --- a/1080i/Font.xml +++ b/1080i/Font.xml @@ -9,6 +9,12 @@ 144 0.8 + + veryLargeLight + roboto/light.ttf + 96 + 0.8 + large roboto/regular.ttf diff --git a/1080i/Home.xml b/1080i/Home.xml index 130832f..dc7d620 100644 --- a/1080i/Home.xml +++ b/1080i/Home.xml @@ -187,7 +187,7 @@ 8-col 3-row - 8-col + 12-col 4-row right Large diff --git a/1080i/Includes_animations.xml b/1080i/Includes_animations.xml index db35ae6..961c5d8 100644 --- a/1080i/Includes_animations.xml +++ b/1080i/Includes_animations.xml @@ -62,7 +62,7 @@ - + diff --git a/1080i/Includes_hubMenu.xml b/1080i/Includes_hubMenu.xml index b6adedb..4f329e5 100644 --- a/1080i/Includes_hubMenu.xml +++ b/1080i/Includes_hubMenu.xml @@ -47,7 +47,7 @@ center textActive - - + @@ -167,7 +167,7 @@ center textActive - - + diff --git a/1080i/Includes_hubMenuItems.xml b/1080i/Includes_hubMenuItems.xml index e752b50..87dafee 100644 --- a/1080i/Includes_hubMenuItems.xml +++ b/1080i/Includes_hubMenuItems.xml @@ -271,6 +271,7 @@ ActivateWindow(musicfiles) RunAddon($INFO[Skin.String(customMusicAddon1)]) ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon1)],return) + PlayerControl(play) setfocus(51) @@ -282,6 +283,7 @@ ActivateWindow(musicfiles) RunAddon($INFO[Skin.String(customMusicAddon2)]) ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon2)],return) + PlayerControl(play) setfocus(51) @@ -293,6 +295,7 @@ ActivateWindow(musicfiles) RunAddon($INFO[Skin.String(customMusicAddon3)]) ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon3)],return) + PlayerControl(play) setfocus(51) @@ -304,6 +307,7 @@ ActivateWindow(musicfiles) RunAddon($INFO[Skin.String(customMusicAddon4)]) ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon4)],return) + PlayerControl(play) setfocus(51) @@ -315,6 +319,7 @@ ActivateWindow(musicfiles) RunAddon($INFO[Skin.String(customMusicAddon5)]) ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon5)],return) + PlayerControl(play) setfocus(51) @@ -326,6 +331,7 @@ ActivateWindow(musicfiles) RunAddon($INFO[Skin.String(customMusicAddon6)]) ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon6)],return) + PlayerControl(play) setfocus(51) @@ -337,6 +343,7 @@ ActivateWindow(musicfiles) RunAddon($INFO[Skin.String(customMusicAddon7)]) ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon7)],return) + PlayerControl(play) setfocus(51) @@ -348,6 +355,7 @@ ActivateWindow(musicfiles) RunAddon($INFO[Skin.String(customMusicAddon8)]) ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon8)],return) + PlayerControl(play) setfocus(51) diff --git a/1080i/Includes_hubMenuSubItems.xml b/1080i/Includes_hubMenuSubItems.xml index 91ff455..0eacfdf 100644 --- a/1080i/Includes_hubMenuSubItems.xml +++ b/1080i/Includes_hubMenuSubItems.xml @@ -172,36 +172,6 @@ UpdateLibrary(music) right - - Shuffle - 2-row - col-7-begin - menuTitle - textActive - highlight - menuDisabled - colors/white.png - - - - - - - col-1-begin - - - - Party Mode!! - 2-row - col-7-begin - menuTitle - textActive - highlight - menuDisabled - colors/white.png - - - - - - - col-1-begin - - diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml index 22192bf..e8439e5 100644 --- a/1080i/Includes_variables.xml +++ b/1080i/Includes_variables.xml @@ -30,12 +30,11 @@ $LOCALIZE[14022] - $INFO[container.Numitems,, $LOCALIZE[31014]] - $INFO[container.Numitems,, $LOCALIZE[31014]] + $INFO[container.Numitems,, $LOCALIZE[31014]] $VAR[unwatchedOnly] + $INFO[container.Numitems,, $LOCALIZE[31014]] $VAR[unwatchedOnly] $INFO[Window(Home).Property(Music.AlbumsCount)] $LOCALIZE[31037] $INFO[container.Numitems,, $LOCALIZE[31014]] - $INFO[Listitem.duration,, $LOCALIZE[31018]] @@ -55,6 +54,10 @@ $LOCALIZE[596] $LOCALIZE[595] + + + $LOCALIZE[31213] + $INFO[videoplayer.tvshowtitle] $INFO[videoplayer.title] diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml index 7715614..5db5bbe 100644 --- a/1080i/MyPVRGuide.xml +++ b/1080i/MyPVRGuide.xml @@ -98,6 +98,7 @@ selected - + true diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml index c22572b..e3ad396 100644 --- a/1080i/SkinSettings.xml +++ b/1080i/SkinSettings.xml @@ -194,14 +194,6 @@ Skin.ToggleSetting(DebugInfo) Skin.HasSetting(DebugInfo) - - Container(8000).Hasfocus(1) - Autostart music visualisation on playback - 14-col - - Skin.ToggleSetting(startVisualiserOnPlayback) - Skin.HasSetting(startVisualiserOnPlayback) - Container(8000).Hasfocus(1) Disable fanart animation effect @@ -211,6 +203,14 @@ ReloadSkin() Skin.HasSetting(lowPowerMode) + + Container(8000).Hasfocus(1) + Enable Artist Slideshow + 14-col + + Skin.ToggleSetting(artistSlideshowActive) + Skin.HasSetting(artistSlideshowActive) + diff --git a/1080i/Startup.xml b/1080i/Startup.xml index 42164a9..82544b4 100644 --- a/1080i/Startup.xml +++ b/1080i/Startup.xml @@ -4,9 +4,6 @@ yes Skin.Reset(DebugInfo) Skin.Reset(DebugGrid) - Skin.SetString(videoHomeItemsMoviesSource,recentmovies) - Skin.SetString(videoHomeItemsEpisodesSource,recentepisodes) - Skin.SetString(musicHomeItemsSource,recentalbums) Skin.SetString(homeBackground,special://skin/extras/backgrounds/background001.jpg) 15 diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml index b763680..295bac9 100644 --- a/1080i/VideoOSD.xml +++ b/1080i/VideoOSD.xml @@ -19,7 +19,7 @@ 0 - 24-row + 23-row fullscreenWidth 2-row colors/white.png @@ -28,7 +28,7 @@ col-1-begin - 24-row + 23-row 16-col 2-row pageTitle @@ -37,7 +37,7 @@ 96 - 24-row + 23-row 8-col 2-row pageTitle @@ -48,41 +48,32 @@ 0 - 26-row + 25-row fullscreenWidth - 4-row + 5-row colors/black.png textboxInactive stretch col-1-begin - 26-row + 910 textbox 24-col textActive - 3-row + 76 - - - 0 - 0 - fullscreenWidth - 2-row - stretch - colors/black.png - textboxInactive - + col-1-begin - 0 + 1006 24-col 8-row 0 horizontal - + 0 0 @@ -90,20 +81,10 @@ 2-row center center - symbol + symbolLarge textActive - - 1-col-indent - -1 - 3-col-gutter - 2-row - center - buttonTitle - textActive - - @@ -131,7 +112,7 @@ 2-row center center - symbol + symbolLarge textActive - @@ -167,14 +148,14 @@ Audio Settings - + - ActivateWindow(124) Video Settings - + - ActivateWindow(123) diff --git a/1080i/View_LiveTVChannels.xml b/1080i/View_LiveTVChannels.xml index 3219e0e..e515e77 100644 --- a/1080i/View_LiveTVChannels.xml +++ b/1080i/View_LiveTVChannels.xml @@ -117,6 +117,7 @@ textActive - + true 4-col-gutter diff --git a/1080i/View_MusicRecentItems.xml b/1080i/View_MusicRecentItems.xml index 0a7f6da..383e9f7 100644 --- a/1080i/View_MusicRecentItems.xml +++ b/1080i/View_MusicRecentItems.xml @@ -34,51 +34,24 @@ colors/black.png ccffffff - - 0 - row-20-begin - fullscreenWidth - 6 - stretch - colors/white.png - highlight - - - - - - - - - !controlgroup(9000).hasfocus - col-16-begin - row-4-begin + col-1-begin + row-6-begin - 0 + 24-col 0 - 8-col - 4-row - largeStrong - textActive + 24-col + 8-row + right + veryLargeLight + 66ffffff - true - - - - 0 - 5-row - textbox - 8-col-gutter - left - textActive - 268 - - + @@ -88,58 +61,46 @@ 72 - row-18-begin + 672 24-col 78 9000 9998 horizontal - - - !controlgroup(9000).hasfocus - 0 - 0 - 6-col - 2-row - colors/black.png - ccffffff - stretch - + 12 0 - 6-col-gutter + 4-col 2-row buttonTitle center textActive - - + - + 0 - 0 - 6-col - 84 + 56 + 4-col-textbox + 9 colors/white.png highlight stretch - - - + Conditional 12 0 - 6-col-gutter + 4-col 2-row buttonTitle center textActive - - + diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml index 2ec2817..653f8d5 100644 --- a/1080i/View_Seasons.xml +++ b/1080i/View_Seasons.xml @@ -84,11 +84,46 @@ 0 4-col-gutter 396 - scale - $INFO[ListItem.thumb] + stretch + colors/black.png + colors/white.png + 3 + textboxInactive + + + !controlgroup(9000).hasfocus + 12 + 4-row + 240 + 2-row + center + center + regularStrong + disabled + + + + !controlgroup(9000).hasfocus + 12 + 5-row + 240 + 2-row + center + center + buttonTitle + disabled + + + + 0 + 0 + 4-col-gutter + 396 + stretch + $INFO[ListItem.thumb] colors/white.png 3 - ffFFFFFF + ffffffff diff --git a/1080i/View_VideoRecentItems.xml b/1080i/View_VideoRecentItems.xml index c251f75..91fffe8 100644 --- a/1080i/View_VideoRecentItems.xml +++ b/1080i/View_VideoRecentItems.xml @@ -34,15 +34,6 @@ colors/black.png ccffffff - - 0 - row-20-begin - fullscreenWidth - 6 - stretch - colors/white.png - highlight - @@ -55,68 +46,35 @@ !controlgroup(9000).hasfocus - col-17-begin - row-5-begin + col-1-begin + row-12-begin Container(9123).HasFocus(1) - 0 + 24-col 0 - 8-col - 2-row - largeStrong - textActive - - - - - - Container(9123).HasFocus(2) - 8-col - 4-row - 8-col - 2-row + 24-col + 8-row right - largeStrong - textActive + veryLargeLight + 66ffffff - - + true + - - Container(9123).HasFocus(1) - 0 - 2-row - 8-col - 1-row - itemTitle - textActive - - - - Container(9123).HasFocus(2) - 8-col - 6-row - 8-col - 1-row + 24-col + 0 + 24-col + 8-row right - itemTitle - textActive + veryLargeLight + 66ffffff - - - - - - Container(9123).HasFocus(1) - 0 - 3-row - textbox - 8-col-gutter - left - textActive - 268 - - + true + @@ -126,58 +84,46 @@ 72 - row-18-begin + 672 24-col 84 9000 9998 horizontal - - - !controlgroup(9000).hasfocus - 0 - 0 - 6-col - 2-row - colors/black.png - ccffffff - stretch - + 12 0 - 6-col-gutter + 4-col 2-row buttonTitle center textActive - - + - + 0 - 0 - 6-col - 78 + 56 + 4-col-textbox + 9 colors/white.png highlight stretch - - - + Conditional 12 0 - 6-col-gutter + 4-col 2-row buttonTitle center textActive - - + diff --git a/1080i/custom_musicFullscreenEnabler.xml b/1080i/custom_musicFullscreenEnabler.xml deleted file mode 100644 index af0ddef..0000000 --- a/1080i/custom_musicFullscreenEnabler.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - no - FullScreen - Player.HasAudio + skin.hassetting(startVisualiserOnPlayback) - - \ No newline at end of file diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml index e2dfbb5..1b3111d 100644 --- a/1080i/custom_musicPlayerFullscreen.xml +++ b/1080i/custom_musicPlayerFullscreen.xml @@ -1,9 +1,8 @@ - 8002 + 9876 no - RunScript(script.artistslideshow) - AlarmClock(controlDialog,setfocus(9876),00:05,silent) + RunScript(script.artistslideshow) activateWindow(MusicLibrary) Skin.SetString(showRecentMusicItems,true) control.setfocus(9000) @@ -14,7 +13,7 @@ - isempty(Window(Visualisation).Property(ArtistSlideshow)) + !Skin.HasSetting(artistSlideshowActive) 0 0 dimensionsFullscreen @@ -149,121 +148,115 @@ - + - 0 - 0 - - - + + + - + + 0 0 - fullscreenWidth - 2-row + col-7-begin + fullscreenHeight + colors/white.png + highlight stretch - colors/black.png - textboxInactive - - - col-1-begin + + col-7-begin 0 - 24-col - 2-row - 0 - horizontal - 9876 - 9876 - + 3 + fullscreenHeight + colors/black.png + 33ffffff + stretch + + + + + col-1-begin + row-1-begin + 1-col + 1-col + symbolVeryLarge + center + textActive + - + + + + + 0 + row-4-begin + 8-col + 24-row + vertical + 9002 + 9876 + activateWindow(home) + - 0 + col-1-begin 0 - 1-col + 7-col 2-row - center + menuTitle center - symbol - textActive - - - - 1-col-indent - -1 - 3-col-gutter - 2-row - center - buttonTitle textActive + - - + 0 0 - 1-col-textbox + col-7-begin 2-row - stretch colors/white.png - highlight - spinFocusIcon - - - 1-col - 0 - 3-col-textbox - 2-row + textActive stretch - colors/white.png - 0 + col-1-begin 0 - 1-col + 8-col 2-row - center + menuTitle center - symbol - textActive - + highlight - - - - 1-col-indent - -1 - 5-col-gutter - 2-row - center - buttonTitle - black - - + + Playlist + + - + Dialog.Close(all,true) + activateWindow(musicplaylist) + Repeat - - PlayerControl(Repeat) Shuffle - - PlayerControl(Random) Visualisation - - activateWindow(musicOSD) @@ -271,7 +264,6 @@ visualisation.enabled Visualisation Settings - - Addon.Default.OpenSettings(xbmc.player.musicviz) @@ -286,11 +278,9 @@ -100 1-col 1-col - 8002 - 8002 - decreaseRating - increaseRating - control.setfocus(8002) + increaseRating + decreaseRating + 8765 DebugGrid diff --git a/addon.xml b/addon.xml index ff76bc2..d748feb 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + diff --git a/language/English/strings.po b/language/English/strings.po index ad2e299..ba5816c 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -57,6 +57,10 @@ msgctxt "#31007" msgid "System Info" msgstr "" +msgctxt "#31008" +msgid "Enable Artist Slideshow" +msgstr "" + msgctxt "#31010" msgid "Add-ons" msgstr "" @@ -126,7 +130,7 @@ msgid "Albums" msgstr "" msgctxt "#31041" -msgid "Menu Shortcuts" +msgid "Edit Menu Shortcuts" msgstr "" msgctxt "#31042" @@ -441,10 +445,6 @@ msgctxt "#31165" msgid "Recordings" msgstr "" -msgctxt "#31171" -msgid "Start music visualisation immediately upon playback" -msgstr "" - msgctxt "#31175" msgid "Set Latest Content" msgstr "" @@ -486,7 +486,7 @@ msgid "View" msgstr "" msgctxt "#31187" -msgid "Most Played Albums" +msgid "Most Played" msgstr "" msgctxt "#31188" @@ -510,11 +510,11 @@ msgid "Duration" msgstr "" msgctxt "#31195" -msgid "Show watched items" +msgid "Hide watched items" msgstr "" msgctxt "#31196" -msgid "Hide watched items" +msgid "Show watched items" msgstr "" msgctxt "#31197" @@ -571,4 +571,8 @@ msgstr "" msgctxt "#31212" msgid "5 Day Forecast for" +msgstr "" + +msgctxt "#31213" +msgid "(Showing unwatched items only)" msgstr "" \ No newline at end of file diff --git a/sounds/back.wav b/sounds/back.wav deleted file mode 100644 index 75839ff..0000000 Binary files a/sounds/back.wav and /dev/null differ diff --git a/sounds/click.wav b/sounds/click.wav deleted file mode 100644 index 3151dee..0000000 Binary files a/sounds/click.wav and /dev/null differ diff --git a/sounds/cursor.wav b/sounds/cursor.wav deleted file mode 100644 index 105a57e..0000000 Binary files a/sounds/cursor.wav and /dev/null differ diff --git a/sounds/notify.wav b/sounds/notify.wav deleted file mode 100644 index b8670b0..0000000 Binary files a/sounds/notify.wav and /dev/null differ diff --git a/sounds/out.wav b/sounds/out.wav deleted file mode 100644 index af089a7..0000000 Binary files a/sounds/out.wav and /dev/null differ diff --git a/sounds/shutter.wav b/sounds/shutter.wav deleted file mode 100644 index d5ac1e2..0000000 Binary files a/sounds/shutter.wav and /dev/null differ diff --git a/sounds/sounds.xml b/sounds/sounds.xml deleted file mode 100644 index 12369a7..0000000 --- a/sounds/sounds.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - left - cursor.wav - - - - right - cursor.wav - - - - up - cursor.wav - - - - down - cursor.wav - - - - select - click.wav - - - - parentdir - back.wav - - - - previousmenu - back.wav - - - - screenshot - shutter.wav - - - - - - - - - infodialog - notify.wav - out.wav - - - - startup - - - - - -