diff --git a/1080i/DialogMusicInfo.xml b/1080i/DialogMusicInfo.xml
index b2c6ad9..1950f0a 100644
--- a/1080i/DialogMusicInfo.xml
+++ b/1080i/DialogMusicInfo.xml
@@ -31,7 +31,7 @@
12-col
12-col
stretch
- $INFO[Listitem.thumb]
+ $INFO[Listitem.thumb]
windowOpen
diff --git a/1080i/DialogSelect.xml b/1080i/DialogSelect.xml
index 4857168..57f6999 100644
--- a/1080i/DialogSelect.xml
+++ b/1080i/DialogSelect.xml
@@ -292,6 +292,16 @@
-
SendClick(2000,5)
+ -
+ Artwork downloader
+
+
+ -
+ XBMC.RunScript(script.artwork.downloader, mediatype=tvshow, dbid=$INFO[ListItem.DBID])
+ XBMC.RunScript(script.artwork.downloader, mediatype=movie, dbid=$INFO[ListItem.DBID])
+ XBMC.RunScript(script.artwork.downloader, mediatype=musicvideos, dbid=$INFO[ListItem.DBID])
+ [Container.Content(tvshows)|Container.Content(movies)|Container.Content(musicvideos)]+system.hasaddon(script.artwork.downloader)
+
-
Cancel Button
diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml
index 079c46e..73e7d8b 100644
--- a/1080i/DialogVideoInfo.xml
+++ b/1080i/DialogVideoInfo.xml
@@ -37,6 +37,39 @@
stretch
kenBurnsey
+
+ container.content(musicvideos)
+ 3-col
+ 2-row
+
+ 0
+ 0
+ 12-col
+ 12-col
+ stretch
+ $INFO[Listitem.thumb]
+ windowOpen
+
+
+
+
+
+
+ 0
+ 12-col
+ 12-col
+ 2-col
+ scale
+ $INFO[Listitem.thumb]
+
+
+
+
+
+
+
+
+
dimensionsFullscreen
vignette.png
@@ -52,7 +85,7 @@
keep
-
+
!Substring(Container.folderpath,plugin) + !container.content(episodes)
1200
diff --git a/1080i/Home.xml b/1080i/Home.xml
index ce519cb..895b0c5 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -3,8 +3,6 @@
9999
RunScript(script.skinshortcuts,type=buildxml&mainmenuID=9001&group=mainmenu|videosubmenu|musicsubmenu|picturessubmenu)
PlayerControl(stop)
- WindowClose
- WindowOpen
globalBackground
@@ -13,10 +11,11 @@
modalDialogContentShift
+ WindowOpen
dimensionsFullscreen
$VAR[homeBackgroundLocation]
45000
- 1000
+ 0
10000
true
yes
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index 7929c3b..a62c395 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -21,8 +21,25 @@
+
+
+
+
+ container.content(files) | isempty(container.content) | container.content(playlists) | container.content(addons)
+ container.content(movies) + [Substring(container.folderpath,videodb://) | Substring(container.folderpath,special://profile/playlists/video)]
+ container.content(tvshows) + [Substring(container.folderpath,videodb://) | Substring(container.folderpath,special://profile/playlists/video)]
+ container.content(seasons) + Substring(container.folderpath,videodb://)
+ container.content(episodes) + !Substring(Container.folderpath,plugin)
+ container.content(musicvideos) + !Substring(Container.folderpath,plugin)
+
diff --git a/1080i/Includes_animations.xml b/1080i/Includes_animations.xml
index 0a7bb84..06a5222 100644
--- a/1080i/Includes_animations.xml
+++ b/1080i/Includes_animations.xml
@@ -17,6 +17,10 @@
+
+
+
+
diff --git a/1080i/Includes_hubMenu.xml b/1080i/Includes_hubMenu.xml
index 3d09781..87f799d 100644
--- a/1080i/Includes_hubMenu.xml
+++ b/1080i/Includes_hubMenu.xml
@@ -94,8 +94,8 @@
skinshortcuts-mainmenu
skinshortcuts-group-picturessubmenu
- skinshortcuts-group-musicsubmenu
- skinshortcuts-group-videosubmenu
+ skinshortcuts-group-musicsubmenu
+ skinshortcuts-group-videosubmenu
diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml
index af67b7d..ac805d6 100644
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@@ -4,23 +4,23 @@
$LOCALIZE[31012]
+ $LOCALIZE[20389] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE]
+ [CAPITALIZE]$INFO[container.foldername][/CAPITALIZE] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE]
$INFO[container.foldername] $INFO[ListItem.TVShowTitle,- ,] $INFO[ListItem.season,$LOCALIZE[31011] ,]
- $LOCALIZE[20342] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR]
- $LOCALIZE[31216] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR]
+ $LOCALIZE[20342] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE]
+ $LOCALIZE[31216] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE]
$LOCALIZE[20343]
$INFO[container.foldername]
$LOCALIZE[31012]
+ [CAPITALIZE]$INFO[container.foldername][/CAPITALIZE] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE]
$LOCALIZE[31058]
$INFO[container.foldername]
- $LOCALIZE[31037] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR]
- $LOCALIZE[31024] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR]
+ $LOCALIZE[31038] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE]
+ $LOCALIZE[31024] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE]
$LOCALIZE[31182]
$LOCALIZE[31199] [COLOR highlight]$INFO[container.foldername][/COLOR]
$INFO[container.foldername]
$LOCALIZE[31053]
-
$INFO[container.Numitems,, $LOCALIZE[31014]] $VAR[unwatchedOnly]
diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml
index f4346a2..06ddabb 100644
--- a/1080i/MyVideoNav.xml
+++ b/1080i/MyVideoNav.xml
@@ -15,11 +15,12 @@
contentOpen
+ videofiles
movies
tvshows
- videofiles
seasons
episodes
+ musicvideos
@@ -70,7 +71,7 @@
DebugGrid
WindowID
-
+
diff --git a/1080i/SmartPlaylistEditor.xml b/1080i/SmartPlaylistEditor.xml
index 71e4dc0..5de08e9 100644
--- a/1080i/SmartPlaylistEditor.xml
+++ b/1080i/SmartPlaylistEditor.xml
@@ -110,7 +110,7 @@
24
textActive
black
-
+
9002
17
18
diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml
index 996ac71..9d1231b 100644
--- a/1080i/VideoOSD.xml
+++ b/1080i/VideoOSD.xml
@@ -67,7 +67,7 @@
3-col-gutter
256
scale
- $INFO[Player.Art(tvshow.poster)]
+ $INFO[Player.Art(tvshow.poster)]
colors/black.png
6
ffffffff
@@ -79,7 +79,7 @@
3-col-gutter
256
scale
- $INFO[Player.Art(poster)]
+ $INFO[Player.Art(poster)]
colors/black.png
6
ffffffff
@@ -91,7 +91,7 @@
3-col-gutter
3-col-gutter
stretch
- $INFO[Player.Art(thumb)]
+ $INFO[Player.Art(thumb)]
colors/black.png
6
ffffffff
diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml
index 180bb4b..0da9c51 100644
--- a/1080i/View_Episodes.xml
+++ b/1080i/View_Episodes.xml
@@ -1,13 +1,11 @@
-
Substring(container.folderpath,videodb://) + !isempty(container.folderpath) + container.content(episodes) + !Substring(Container.folderpath,plugin)
0
0
-
!isempty(container.art(season.poster))
0
@@ -23,7 +21,6 @@
-
isempty(container.art(season.poster))
-966
@@ -39,7 +36,6 @@
-
1068
@@ -56,7 +52,6 @@
stretch
-
Substring(container.folderpath,videodb://) + !isempty(container.folderpath) + container.content(episodes) + !Substring(Container.folderpath,plugin)
@@ -79,7 +74,6 @@
highlight
-
col-13-begin
@@ -96,12 +90,11 @@
-
- Substring(container.folderpath,videodb://) + !isempty(container.folderpath) + container.content(episodes) + !Substring(Container.folderpath,plugin)
+ $EXP[isEpisode]
954
row-8-begin
12-col
diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml
index e7b14e7..48e4bb6 100644
--- a/1080i/View_Movies.xml
+++ b/1080i/View_Movies.xml
@@ -1,11 +1,10 @@
- window.isactive(Videos,videodb://movies/titles/)
- container.content(movies) | container.content(tvshows)
+ $EXP[isMovie]
dimensionsFullscreen
stretch
@@ -16,7 +15,7 @@
kenBurnsey
- Library.HasContent(movies) + !container.content(files) + !isempty(container.foldername) + !StringCompare(container.foldername,files) + Substring(container.folderpath,videodb://) + !StringCompare(container.foldername,Video Playlists) + !container.content(tvshows) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons)
+ $EXP[isMovie]
90
row-5-begin
1800
diff --git a/1080i/View_MusicVideos.xml b/1080i/View_MusicVideos.xml
new file mode 100644
index 0000000..953a94c
--- /dev/null
+++ b/1080i/View_MusicVideos.xml
@@ -0,0 +1,99 @@
+
+
+
+
+
+ $EXP[isMusicVideo]
+ col-1-begin
+ row-5-begin
+ 1800
+ 25-row
+ 9000
+ 60
+ 50
+ 50
+ 9000
+ 600
+ 60
+
+
+ 0
+ 0
+ 6-col-gutter
+ 4-col-gutter
+ scale
+ DefaultPoster.png
+ colors/black.png
+ 6
+ 44FFFFFF
+
+
+ 0
+ 0
+ 6-col-gutter
+ 4-col-gutter
+ scale
+ $INFO[Listitem.thumb]
+ colors/black.png
+ 6
+ ffffffff
+
+
+ 12
+ 268
+ 384
+ 1-row
+ center
+ thumbTitle
+ textActive
+
+
+
+ 12
+ 292
+ 384
+ 1-row
+ center
+ thumbTitle
+ textDisabled
+
+
+
+
+
+ focusThumb
+
+ 0
+ 0
+ 6-col-gutter
+ 4-col-gutter
+ scale
+ $INFO[Listitem.thumb]
+ colors/white.png
+ 6
+
+
+ 12
+ 268
+ 384
+ 1-row
+ center
+ thumbTitle
+ textActive
+
+
+
+ 12
+ 292
+ 384
+ 1-row
+ center
+ thumbTitle
+ textActive
+
+
+
+
+
+
+
diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml
index 774af0d..36144a5 100644
--- a/1080i/View_Seasons.xml
+++ b/1080i/View_Seasons.xml
@@ -63,7 +63,7 @@
- !isempty(container.folderpath) + !StringCompare(container.foldername,files) + !container.content(episodes) + !Substring(Container.folderpath,plugin) + !container.content(addons)
+ $EXP[isSeason]
col-1-begin
624
1836
diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml
index 940c7d2..6848cf6 100644
--- a/1080i/View_TVShows.xml
+++ b/1080i/View_TVShows.xml
@@ -1,22 +1,21 @@
- window.isactive(Videos,videodb://tvshows/titles/)
- Substring(Container.folderpath,plugin)
+ $EXP[isTVShow]
dimensionsFullscreen
stretch
$INFO[Listitem.art(fanart)]
500
- 99ffffff
+ 22ffffff
kenBurnsey
- Substring(container.folderpath,videodb://) + Library.HasContent(tvshows) + !isempty(container.foldername) + !StringCompare(container.foldername,files) + !container.content(movies) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons) + !container.content(files)
+ $EXP[isTVShow]
90
row-5-begin
1800
diff --git a/1080i/View_VideoFiles.xml b/1080i/View_VideoFiles.xml
index e0197aa..8c0af7a 100644
--- a/1080i/View_VideoFiles.xml
+++ b/1080i/View_VideoFiles.xml
@@ -1,8 +1,20 @@
+
+
+ Substring(Container.folderpath,plugin)
+
+ dimensionsFullscreen
+ stretch
+ $INFO[Listitem.art(fanart)]
+ 500
+ 99ffffff
+ kenBurnsey
+
+
- !isempty(container.folderpath) + !Substring(container.folderpath,videodb://) | container.content(files) | StringCompare(container.foldername,files) | Substring(container.folderpath,special://videoplaylists)
+ $EXP[isVideoList]
col-1-begin
row-5-begin
24-col
diff --git a/1080i/custom_recentContent.xml b/1080i/custom_recentContent.xml
index b914aaa..5137f59 100644
--- a/1080i/custom_recentContent.xml
+++ b/1080i/custom_recentContent.xml
@@ -1,10 +1,10 @@
- 9000
+ 9000
PlayerControl(stop)
+ fadeInOut
- fadeInOut
modalDialogContentShift
diff --git a/1080i/script-skinshortcuts-includes.xml b/1080i/script-skinshortcuts-includes.xml
index c5cbf1a..64a9a1e 100644
--- a/1080i/script-skinshortcuts-includes.xml
+++ b/1080i/script-skinshortcuts-includes.xml
@@ -43,9 +43,9 @@
favourites
- ActivateWindow(Pictures,"/Users/chrisbevan/Sync/Art & Design/CraveControl/",return)
- ActivateWindow(Pictures,"/Users/chrisbevan/Sync/Art & Design/CraveControl/",return)
- /Users/chrisbevan/Sync/Art & Design/CraveControl/
+ ActivateWindow(Videos,special://profile/playlists/video/recentMovies.xsp,return)
+ ActivateWindow(Videos,special://profile/playlists/video/recentMovies.xsp,return)
+ special://profile/playlists/video/recentMovies.xsp
StringCompare(System.ProfileName,Master user)
favourites
mainmenu
@@ -933,6 +933,24 @@
-
$NUMBER[3]
17
+
+ Custom item
+ DefaultShortcut.png
+
+ musicvideos
+
+ [Library.HasContent(MusicVideos)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)
+ control.setfocus(9999)
+ ActivateWindow(Videos,videodb://musicvideos/titles/,return)
+ ActivateWindow(Videos,videodb://musicvideos/titles/,return)
+ videodb://musicvideos/titles/
+ StringCompare(System.ProfileName,Master user)
+ musicsubmenu
+ True
+
+ -
+ $NUMBER[4]
+ 17
Music
DefaultAddon.png
@@ -947,8 +965,8 @@
musicsubmenu
True
- -
- $NUMBER[4]
+
-
+ $NUMBER[5]
17
Music
@@ -965,8 +983,8 @@
musicsubmenu
True
- -
- $NUMBER[5]
+
-
+ $NUMBER[6]
17
Music
@@ -983,8 +1001,8 @@
musicsubmenu
True
- -
- $NUMBER[6]
+
-
+ $NUMBER[7]
17
Music
@@ -1001,8 +1019,8 @@
musicsubmenu
True
- -
- $NUMBER[7]
+
-
+ $NUMBER[8]
17
Music
@@ -1019,8 +1037,8 @@
musicsubmenu
True
- -
- $NUMBER[8]
+
-
+ $NUMBER[9]
17
Music
@@ -1037,8 +1055,8 @@
musicsubmenu
True
- -
- $NUMBER[9]
+
-
+ $NUMBER[10]
17
Music
@@ -1055,8 +1073,8 @@
musicsubmenu
True
- -
- $NUMBER[10]
+
-
+ $NUMBER[11]
17
Music
@@ -1073,8 +1091,8 @@
musicsubmenu
True
- -
- $NUMBER[11]
+
-
+ $NUMBER[12]
17
Music
@@ -1090,8 +1108,8 @@
musicsubmenu
True
- -
- $NUMBER[12]
+
-
+ $NUMBER[13]
17
Music
@@ -1107,8 +1125,8 @@
musicsubmenu
True
- -
- $NUMBER[13]
+
-
+ $NUMBER[14]
17
Music
@@ -3504,6 +3522,24 @@
-
$NUMBER[3]
17
+
+ Custom item
+ DefaultShortcut.png
+
+ musicvideos
+
+ Library.HasContent(MusicVideos)
+ control.setfocus(9999)
+ ActivateWindow(Videos,videodb://musicvideos/titles/,return)
+ ActivateWindow(Videos,videodb://musicvideos/titles/,return)
+ videodb://musicvideos/titles/
+ StringCompare(System.ProfileName,Master user)
+ musicsubmenu
+ True
+
+ -
+ $NUMBER[4]
+ 17
Music
DefaultAddon.png
@@ -3518,8 +3554,8 @@
musicsubmenu
True
- -
- $NUMBER[4]
+
-
+ $NUMBER[5]
17
Music
@@ -3536,8 +3572,8 @@
musicsubmenu
True
- -
- $NUMBER[5]
+
-
+ $NUMBER[6]
17
Music
@@ -3554,8 +3590,8 @@
musicsubmenu
True
- -
- $NUMBER[6]
+
-
+ $NUMBER[7]
17
Music
@@ -3572,8 +3608,8 @@
musicsubmenu
True
- -
- $NUMBER[7]
+
-
+ $NUMBER[8]
17
Music
@@ -3590,8 +3626,8 @@
musicsubmenu
True
- -
- $NUMBER[8]
+
-
+ $NUMBER[9]
17
Music
@@ -3608,8 +3644,8 @@
musicsubmenu
True
- -
- $NUMBER[9]
+
-
+ $NUMBER[10]
17
Music
@@ -3626,8 +3662,8 @@
musicsubmenu
True
- -
- $NUMBER[10]
+
-
+ $NUMBER[11]
17
Music
@@ -3644,8 +3680,8 @@
musicsubmenu
True
- -
- $NUMBER[11]
+
-
+ $NUMBER[12]
17
Music
@@ -3661,8 +3697,8 @@
musicsubmenu
True
- -
- $NUMBER[12]
+
-
+ $NUMBER[13]
17
Music
@@ -3678,8 +3714,8 @@
musicsubmenu
True
- -
- $NUMBER[13]
+
-
+ $NUMBER[14]
17
Music
@@ -3965,6 +4001,24 @@
-
$NUMBER[3]
17
+
+ Custom item
+ DefaultShortcut.png
+
+ musicvideos
+
+ [Library.HasContent(MusicVideos)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)
+ control.setfocus(9999)
+ ActivateWindow(Videos,videodb://musicvideos/titles/,return)
+ ActivateWindow(Videos,videodb://musicvideos/titles/,return)
+ videodb://musicvideos/titles/
+ StringCompare(System.ProfileName,Master user)
+ musicsubmenu
+ True
+
+ -
+ $NUMBER[4]
+ 17
Music
DefaultAddon.png
@@ -3979,8 +4033,8 @@
musicsubmenu
True
- -
- $NUMBER[4]
+
-
+ $NUMBER[5]
17
Music
@@ -3997,8 +4051,8 @@
musicsubmenu
True
- -
- $NUMBER[5]
+
-
+ $NUMBER[6]
17
Music
@@ -4015,8 +4069,8 @@
musicsubmenu
True
- -
- $NUMBER[6]
+
-
+ $NUMBER[7]
17
Music
@@ -4033,8 +4087,8 @@
musicsubmenu
True
- -
- $NUMBER[7]
+
-
+ $NUMBER[8]
17
Music
@@ -4051,8 +4105,8 @@
musicsubmenu
True
- -
- $NUMBER[8]
+
-
+ $NUMBER[9]
17
Music
@@ -4069,8 +4123,8 @@
musicsubmenu
True
- -
- $NUMBER[9]
+
-
+ $NUMBER[10]
17
Music
@@ -4087,8 +4141,8 @@
musicsubmenu
True
- -
- $NUMBER[10]
+
-
+ $NUMBER[11]
17
Music
@@ -4105,8 +4159,8 @@
musicsubmenu
True
- -
- $NUMBER[11]
+
-
+ $NUMBER[12]
17
Music
@@ -4122,8 +4176,8 @@
musicsubmenu
True
- -
- $NUMBER[12]
+
-
+ $NUMBER[13]
17
Music
@@ -4139,8 +4193,8 @@
musicsubmenu
True
- -
- $NUMBER[13]
+
-
+ $NUMBER[14]
17
Music
diff --git a/changelog.txt b/changelog.txt
index 6a5f1d9..5645371 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -6,13 +6,19 @@
- [NEW] Polish translation (thanks Etharr)
- [FIXED] Context menu onback handling in addons (thanks Solbero)
- [FIXED] onback from music visualisation screen
-
+- [NEW] Video Playlists now display in correct content view with title
+- [NEW] Artwork downloader support
+- Various minor tweaks
[SKINNERS NOTES]
-- CANT BE FIXED?? Check content is present before assigning view (DoggZipp bug)
-- allow poster view for plugin / plex sourced movies
- expand image handling where possible
+- add filters to context menu
+
+- music video handling
+- Add music videos as a default menu item
+DONE--Folder title
+DONE--Info view
[V1.1.0]
- Various tweaks and GUI updates.
diff --git a/language/English/strings.po b/language/English/strings.po
index 198d0f6..17897dd 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -899,4 +899,9 @@ msgstr ""
msgctxt "#31218"
msgid "Enable this addon"
-msgstr ""
\ No newline at end of file
+msgstr ""
+
+msgctxt "#31219"
+msgid "Download art"
+msgstr ""
+