diff --git a/1080i/DialogGameControllers.xml b/1080i/DialogGameControllers.xml
new file mode 100644
index 0000000..9ba45d9
--- /dev/null
+++ b/1080i/DialogGameControllers.xml
@@ -0,0 +1,146 @@
+
+
+ 3
+
+
+
+ Controller types heading
+ 0
+ 0
+ 220
+ 25
+ font12
+
+ center
+ center
+ blue
+ black
+
+
+
+ 0
+ 0
+ 25
+ 405
+ 50
+ 3
+ 3
+ 3
+ false
+ vertical
+
+
+
+ Controller types grouplist
+ 0
+ 0
+ 220
+ 405
+ 30
+ 5
+ 9001
+ 9001
+ 30
+
+
+
+ Default controller types button
+ 0
+ 0
+ 40
+ 220
+ center
+ center
+ font12_title
+ white
+
+
+
+ 0
+ 0
+ 480
+ 286
+
+
+
+ Feature types heading
+ 0
+ 0
+ 220
+ 25
+ font12
+
+ center
+ center
+ blue
+ black
+
+
+
+ 0
+ 0
+ 25
+ 405
+ 5
+ 30
+ 5
+ 5
+ false
+ vertical
+
+
+
+ Feature types grouplist
+ 0
+ 0
+ 220
+ 405
+ 3
+ 50
+ 9001
+ 9001
+ 50
+
+
+
+ Default feature types button
+ 0
+ 0
+ 40
+ 220
+ center
+ center
+ font12_title
+ white
+ false
+
+
+
+
+
+ Ok Button
+
+
+
+ Reset Button
+
+
+
+ Link to install more controllers
+
+
+
+ Help button
+
+
+
+
+
+
+ DebugGrid
+
+ DialogID
+
+
+
+
\ No newline at end of file
diff --git a/1080i/Home.xml b/1080i/Home.xml
index f730000..f7f37eb 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -7,14 +7,13 @@
globalBackground
- !isempty(skin.string(homeBackground))
modalDialogContentShift
dimensionsFullscreen
- special://skin/extras/homeBackgrounds
+ $VAR[homeBackgroundLocation]
45000
1000
10000
diff --git a/1080i/Includes_animations.xml b/1080i/Includes_animations.xml
index 60c2dd0..611e900 100644
--- a/1080i/Includes_animations.xml
+++ b/1080i/Includes_animations.xml
@@ -17,6 +17,12 @@
+
+
+
+
+
+
diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml
index 0648c1c..7ffd01b 100644
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@@ -82,4 +82,9 @@
+
+
+ $INFO[Skin.String(homeBackground)]
+ special://skin/extras/homeBackgrounds
+
diff --git a/1080i/MyMusicNav.xml b/1080i/MyMusicNav.xml
index 50ca4b0..cdb8cf5 100644
--- a/1080i/MyMusicNav.xml
+++ b/1080i/MyMusicNav.xml
@@ -2,6 +2,7 @@
9999
fadeInOut
+ home
globalBackground
@@ -10,10 +11,7 @@
modalDialogContentShift
-
-
-
-
+ contentOpen
artist
diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml
index ae8b2c2..a380036 100644
--- a/1080i/MyPVRChannels.xml
+++ b/1080i/MyPVRChannels.xml
@@ -19,10 +19,7 @@
-
-
-
-
+ contentOpen
liveTVChannels
diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml
index b77c875..d918b64 100644
--- a/1080i/MyPVRGuide.xml
+++ b/1080i/MyPVRGuide.xml
@@ -14,10 +14,7 @@
-
-
-
-
+ contentOpen
EPG Grid
col-1-begin
diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml
index 3d87926..454111d 100644
--- a/1080i/MyPVRRecordings.xml
+++ b/1080i/MyPVRRecordings.xml
@@ -14,10 +14,7 @@
modalDialogContentShift
-
-
-
-
+ contentOpen
col-1-begin
row-5-begin
diff --git a/1080i/MyPVRTimers.xml b/1080i/MyPVRTimers.xml
index 554b28c..a019004 100644
--- a/1080i/MyPVRTimers.xml
+++ b/1080i/MyPVRTimers.xml
@@ -10,10 +10,7 @@
modalDialogContentShift
-
-
-
-
+ contentOpen
col-1-begin
row-5-begin
diff --git a/1080i/MyPics.xml b/1080i/MyPics.xml
index 5ed0b47..69a6973 100644
--- a/1080i/MyPics.xml
+++ b/1080i/MyPics.xml
@@ -10,10 +10,7 @@
modalDialogContentShift
-
-
-
-
+ contentOpen
9000
photos
diff --git a/1080i/MyPlaylist.xml b/1080i/MyPlaylist.xml
index 5fed307..0067ca0 100644
--- a/1080i/MyPlaylist.xml
+++ b/1080i/MyPlaylist.xml
@@ -26,10 +26,7 @@
modalDialogContentShift
-
-
-
-
+ contentOpen
viewMusicPlayList
diff --git a/1080i/MyPrograms.xml b/1080i/MyPrograms.xml
index 5bb6aa5..689ea23 100644
--- a/1080i/MyPrograms.xml
+++ b/1080i/MyPrograms.xml
@@ -14,10 +14,7 @@
-
-
-
-
+ contentOpen
78
row-5-begin
diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml
index 94c08d8..ac208ed 100644
--- a/1080i/MyVideoNav.xml
+++ b/1080i/MyVideoNav.xml
@@ -2,6 +2,7 @@
9999
fadeInOut
+ home
globalBackground
@@ -10,10 +11,7 @@
modalDialogContentShift
-
-
-
-
+ contentOpen
movies
@@ -73,7 +71,7 @@
DebugGrid
WindowID
-
+
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index 441e499..edb1cb5 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -129,6 +129,23 @@
8000
0
vertical
+
+ Container(8000).Hasfocus(1)
+ Set home background image directory
+ 14-col
+
+ $INFO[Skin.String(homeBackground)]
+ Skin.SetPath(homeBackground)
+ 8-col
+
+
+ Container(8000).Hasfocus(1)
+ Reset home background image directory
+ 14-col
+
+ Skin.Reset(homeBackground)
+ 8-col
+
Container(8000).Hasfocus(1)
Reverse power down options
diff --git a/1080i/View_VideoFiles.xml b/1080i/View_VideoFiles.xml
index 4bdd186..72f4943 100644
--- a/1080i/View_VideoFiles.xml
+++ b/1080i/View_VideoFiles.xml
@@ -12,6 +12,7 @@
50
50
60
+ home
0
@@ -31,7 +32,7 @@
textboxInactive
- 1-col-indent
+ 1-col-indent
0
22-col-gutter
2-row
@@ -78,7 +79,7 @@
highlight
- 1-col-indent
+ 1-col-indent
0
22-col-gutter
2-row
diff --git a/1080i/custom_menuSelector.xml b/1080i/custom_menuSelector.xml
new file mode 100644
index 0000000..39c3e28
--- /dev/null
+++ b/1080i/custom_menuSelector.xml
@@ -0,0 +1,7 @@
+
+
+ Dialog.Close(all,true)
+ control.setfocus(9000)
+ [Window.IsActive(videos) | window.IsActive(music)] + isempty(container.folderpath)
+
+
\ No newline at end of file
diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml
index 6e7288c..18731df 100644
--- a/1080i/custom_musicPlayerFullscreen.xml
+++ b/1080i/custom_musicPlayerFullscreen.xml
@@ -2,7 +2,7 @@
9876
activateWindow(music)
- control.setfocus(9000)
+ control.setfocus(50)
globalBackground
@@ -13,7 +13,7 @@
0
0
dimensionsFullscreen
- $INFO[player.art(fanart)]
+ $INFO[player.art(fanart)]
stretch
kenBurnsey
44ffffff
diff --git a/1080i/custom_recentContent.xml b/1080i/custom_recentContent.xml
index f16eded..56588d9 100644
--- a/1080i/custom_recentContent.xml
+++ b/1080i/custom_recentContent.xml
@@ -1,6 +1,6 @@
- 9123
+ 9000
fadeInOut
@@ -52,6 +52,9 @@
globalBackground
+
+
+
0
-48
fullscreenWidth
@@ -73,7 +76,7 @@
col-1-begin
row-8-begin
- Container(9123).HasFocus(1)
+ Container(9123).HasFocus(1) | Container(9123).HasFocus(6)
24-col
0
24-col
@@ -96,6 +99,19 @@
66ffffff
-
true
+
+
+
+ Container(9123).HasFocus(7)
+ 24-col
+ 0
+ 24-col
+ 8-row
+ right
+ veryLargeLight
+ 66ffffff
+ -
+ true
@@ -115,7 +131,7 @@
- container(9123).hasfocus(1) | container(9123).hasfocus(2)
+ container(9123).hasfocus(1) | container(9123).hasfocus(2) | container(9123).hasfocus(6) | container(9123).hasfocus(7)
72
row-20-begin
1848
@@ -392,6 +408,9 @@
+
+
+
63
654
24-col
@@ -449,6 +468,18 @@
31178
noop
+ -
+ String.IsEqual(skin.string(recentitems),video) + Library.HasContent(movies)
+
+ 31132
+ noop
+
+ -
+ String.IsEqual(skin.string(recentitems),video) + Library.HasContent(tvshows)
+
+ 31127
+ noop
+
-
String.IsEqual(skin.string(recentitems),music) + Library.HasContent(music)
diff --git a/1080i/custom_subtitleMenu.xml b/1080i/custom_subtitleMenu.xml
index b557d7d..06a9ea3 100644
--- a/1080i/custom_subtitleMenu.xml
+++ b/1080i/custom_subtitleMenu.xml
@@ -1,7 +1,6 @@
5000
-
fadeInOut
diff --git a/1080i/script-skinshortcuts.xml b/1080i/script-skinshortcuts.xml
index f60ad71..4b55295 100644
--- a/1080i/script-skinshortcuts.xml
+++ b/1080i/script-skinshortcuts.xml
@@ -13,7 +13,7 @@
dimensionsFullscreen
- special://skin/extras/homeBackgrounds
+ $VAR[homeBackgroundLocation]
45000
1000
10000
diff --git a/changelog.txt b/changelog.txt
index e9e6b37..9469ccb 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -24,29 +24,17 @@
[TODO]
-Video files node onback not working correctly
+Gamepad setup
+
+Add user option: Revise player stop on return
Recent items video: Add in progress videos node
+- check recent episodes
Check all XMLS are present
-Fix stop from fullscreen music view & Check that the fanart is working
-
-Music menu: Radio recordings??
-
-Menu overrides: select correct content list
-Make sure default view is a pagewidth single list. Change all views to 50 (except episodes / songs / seasons etc)
-
Lose .DS_Store (need to do this on the windows box)
-Gamepad setup
-
-Pictures section refresh
-
-
-
-Add user option: Revise player stop on return
-
check all active strings
Screenshots etc
diff --git a/extras/playlists/collage_RandomContent.xsp b/extras/playlists/collage_RandomContent.xsp
deleted file mode 100644
index 36327a1..0000000
--- a/extras/playlists/collage_RandomContent.xsp
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- collage_RandomContent
- all
- randomAlbums
- recentMovies
- 50
- random
-
diff --git a/extras/playlists/inprogressMovies.xsp b/extras/playlists/inprogressMovies.xsp
new file mode 100644
index 0000000..281f79d
--- /dev/null
+++ b/extras/playlists/inprogressMovies.xsp
@@ -0,0 +1,7 @@
+
+
+ In progress movies
+ all
+
+ lastplayed
+
\ No newline at end of file
diff --git a/extras/playlists/inprogressTVShows.xsp b/extras/playlists/inprogressTVShows.xsp
new file mode 100644
index 0000000..5aebef6
--- /dev/null
+++ b/extras/playlists/inprogressTVShows.xsp
@@ -0,0 +1,7 @@
+
+
+ In progress episodes
+ all
+
+ lastplayed
+
\ No newline at end of file
diff --git a/language/English/strings.po b/language/English/strings.po
index e77ba40..fbff4ec 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -482,7 +482,7 @@ msgid "Video decoder"
msgstr ""
msgctxt "#31116"
-msgid "Set Homescreen Background"
+msgid "Set Homescreen Background directory"
msgstr ""
msgctxt "#31117"
@@ -505,6 +505,10 @@ msgctxt "#31121"
msgid "My Kodi"
msgstr ""
+msgctxt "#31122"
+msgid "Reset home backgrounds to default"
+msgstr ""
+
msgctxt "#31123"
msgid "Current Playlist"
msgstr ""
@@ -517,10 +521,18 @@ msgctxt "#31126"
msgid "Settings level"
msgstr ""
+msgctxt "#31127"
+msgid "Resume TV"
+msgstr ""
+
msgctxt "#31131"
msgid "Switch to this profile now"
msgstr ""
+msgctxt "#31132"
+msgid "Resume Movie"
+msgstr ""
+
msgctxt "#31133"
msgid "Playlist shuffled"
msgstr ""
@@ -622,7 +634,7 @@ msgid "Options"
msgstr ""
msgctxt "#31180"
-msgid "Recent Albums"
+msgid "New Albums"
msgstr ""
msgctxt "#31181"