Merge pull request #455 from Ch1llb0/MergeFixes

Merge addition of new default widgets and inital info dialog button f…

Changelog.md

@@ -10,6 +10,7 @@ _New_
 - add new video OSD audio and subtitle selection
 - add missing PVR guide controls dialog
 - use new OSMC specific video width and height info for media flags
+- add new default widgets to movies, tv shows and music home screen items
 
 _Improved_
 - improve inital info dialog button focus behaviour
@@ -453,6 +454,7 @@ _add new Coordinates_SettingsScreenCalibration.xml file_
 _add new Includes_GameControllers.xml file_
 _remove deprecates Coordinates_script-skin_helper_service-ColorPicker.xml and script-skin_helper_service-ColorPicker.xml files_
 _add new DialogPVRGuideControls.xml and Coordinates_DialogPVRGuideControls.xml files_
+_rename music and videos template files for skinshortcuts script_
 
 strings.po:
 - update localizes for new colour picker (31026, 31037, 31050, 31060, 31295, 31297, 31298, 31299, 31300, 31405, 31407, 31435)
@@ -464,8 +466,22 @@ Textures.xbt:
 mainmenu.DATA.xml:
 - adjust default favourites main menu link to point to new favourites window
 
+movies-1.DATA.xml:
+- add new recently added movies widget entry
+
+music-1.DATA.xml:
+- add new recently added albums widget entry
+
 overrides.xml:
 - adjust favourites main menu entry template to point to new favourites window
+- add new default recently added movies, recently added albums and in-progress tv shows widget entries
+- fix default program add-ons widget entry
+
+programs-1.DATA.xml:
+- fix name label of program add-ons widget
+
+tvhsows-1.DATA.xml:
+- add new in-progress tv shows widget entry
 
 Coordinates_DialogButtonMenu.xml:
 - rework coordinates for new power menu structure
@@ -503,6 +519,8 @@ Defaults.xml:
 DialogAddonInfo.xml:
 - remove deprecated WindowDialogFocus include
 - remove deprecated button grouplist defaultcontrol tag
+- add new AddonInfoDialogButtonFocus include for proper inital info dialog button focus behaviour
+- revert button order to former default
 
 DialogButtonMenu.xml:
 - rework power menu to match new PVR guide controls dialog
@@ -516,20 +534,25 @@ DialogKeyboard.xml:
 DialogMusicInfo.xml:
 - remove deprecated WindowDialogFocus include
 - remove deprecated button grouplist defaultcontrol tag
+- add new MusicInfoDialogButtonFocus include for proper inital info dialog button focus behaviour
 
 DialogPlayerProcessInfo.xml:
 - add new video scan type info label
 
 DialogPVRInfo.xml:
 - remove deprecated WindowDialogFocus include
 - remove deprecated button grouplist defaultcontrol tag
+- add new PVRInfoDialogButtonFocus include for proper inital info dialog button focus behaviour
+- revert button order to former default
 
 DialogSeekBar.xml:
 - replace deprecated Player.DisplayAfterSeek by new Player.HasPerformedSeek(3) built-in
 
 DialogVideoInfo.xml:
 - remove deprecated WindowDialogFocus include
 - remove deprecated button grouplist defaultcontrol tag
+- add new VideoInfoDialogButtonFocus include for proper inital info dialog button focus behaviour
+- revert button order to former default
 
 GameOSD.xml:
 - adjust visibility conditions with new game controller ports window condition
@@ -549,9 +572,12 @@ Includes_SubMenu.xml:
 
 Includes_Windows_Dialogs.xml:
 - remove deprecated WindowDialogFocus include
+- add new AddonInfoDialogButtonFocus, MusicInfoDialogButtonFocus, PVRInfoDialogButtonFocus and VideoInfoDialogButtonFocus includes
 
 script-skinshortcuts-static.xml:
 - adjust default favourites main menu link to point to new favourites window
+- add new default recently added movies, recently added albums and in-progress tv shows widget entries
+- fix name label and default layout of program add-ons widget
 
 SettingsCategory.xml:
 - add new default color button

addon.xml

@@ -17,6 +17,6 @@
 			<icon>resources/icon.png</icon>
 			<fanart>resources/fanart.jpg</fanart>
 		</assets>
-		<news>[B]New[/B][CR]- Support Nexus skin engine features[CR]- remove Skin Helper Service ColorPicker support[CR]- add new video OSD audio and subtitle selection[CR]- add missing PVR guide controls dialog[CR]- use new OSMC specific video width and height info for media flags[CR][CR][B]Improved[/B][CR]- improve inital info dialog button focus behaviour[CR][CR][B]Fixed[/B][CR]- fix view type button supression behaviour in video media window while video addon force view setting is enabled</news>
+		<news>[B]New[/B][CR]- Support Nexus skin engine features[CR]- remove Skin Helper Service ColorPicker support[CR]- add new video OSD audio and subtitle selection[CR]- add missing PVR guide controls dialog[CR]- use new OSMC specific video width and height info for media flags[CR]- add new default widgets to movies, tv shows and music home screen items[CR][CR][B]Improved[/B][CR]- improve inital info dialog button focus behaviour[CR][CR][B]Fixed[/B][CR]- fix view type button supression behaviour in video media window while video addon force view setting is enabled</news>
 	</extension>
 </addon>

shortcuts/mainmenu.DATA.xml

@@ -38,7 +38,7 @@
 	<shortcut>
 		<label>15016</label>
 		<label2>31397</label2>
-		<icon>DefaultGameAddons.png</icon>
+		<icon>DefaultAddonGame.png</icon>
 		<thumb />
 		<action>ActivateWindow(Games)</action>
 	</shortcut>
@@ -52,7 +52,7 @@
 	<shortcut>
 		<label>10001</label>
 		<label2>31397</label2>
-		<icon>DefaultProgram.png</icon>
+		<icon>DefaultAddonProgram.png</icon>
 		<thumb />
 		<action>ActivateWindow(Programs,Addons,return)</action>
 	</shortcut>

shortcuts/movies-1.DATA.xml

@@ -7,4 +7,11 @@
 		<thumb />
 		<action>noop</action>
 	</shortcut>
+	<shortcut>
+		<label>31179</label>
+		<label2>31160</label2>
+		<icon>DefaultMovies.png</icon>
+		<thumb />
+		<action>noop</action>
+	</shortcut>
 </shortcuts>

shortcuts/2-1.DATA.xml → shortcuts/music-1.DATA.xml

@@ -7,4 +7,11 @@
 		<thumb />
 		<action>noop</action>
 	</shortcut>
+	<shortcut>
+		<label>31207</label>
+		<label2>31160</label2>
+		<icon>DefaultMusicAlbums.png</icon>
+		<thumb />
+		<action>noop</action>
+	</shortcut>
 </shortcuts>

shortcuts/overrides.xml

@@ -109,38 +109,50 @@
 			<shortcut label="$LOCALIZE[31236]" icon="DefaultFolder.png" condition="System.HasAddon(script.extendedinfo) + System.AddonIsEnabled(script.extendedinfo)">||BROWSE||script.skin.helper.service/?action=widgets&amp;path=extendedinfo</shortcut>
 		</node>
 	</groupings>
-
+	
 	<!-- Additional widgets -->
 	<widget label="$LOCALIZE[10508]" type="custom" path="$INCLUDE[weather-widget]">WeatherWidget</widget>
 	<widget label="$LOCALIZE[31091]" type="custom" path="$INCLUDE[osmc-widget]">OSMCWidget</widget>
 	<widget label="$LOCALIZE[35049]" type="custom" path="addons://sources/game/">GameWidget</widget>
-
-	<!-- Default properties -->
-	<widgetdefault labelID="10508" group="weather.1">WeatherWidget</widgetdefault>
-
-	<widgetdefault labelID="31091" group="31091.1">OSMCWidget</widgetdefault>
-	<propertydefault labelID="31091" group="31091.1" property="layout">square-small</propertydefault>
 
-	<widgetdefault labelID="35049" group="15016.1">GameWidget</widgetdefault>
-	<propertydefault labelID="35049" group="15016.1" property="layout">square-small</propertydefault>
-
+	<!-- Default properties -->
 	<widgetdefaultnode labelID="31054" group="movies.1" label="$LOCALIZE[31054]" type="movies" path="special://skin/extras/playlists/movies_random.xsp" target="videos">library</widgetdefaultnode>
 	<propertydefault labelID="31054" group="movies.1" property="widgetArt">Art(poster)</propertydefault>
-
+
+	<widgetdefaultnode labelID="31179" group="movies.1" label="$LOCALIZE[31179]" type="movies" path="special://skin/extras/playlists/movies_recentlyadded.xsp" target="videos">library</widgetdefaultnode>
+	<propertydefault labelID="31179" group="movies.1" property="widgetArt">Art(poster)</propertydefault>
+	<propertydefault labelID="31179" group="movies.1" property="widgetSortBy">dateAdded</propertydefault>
+	<propertydefault labelID="31179" group="movies.1" property="widgetSortDirection">descending</propertydefault>
+
 	<widgetdefaultnode labelID="31118" group="tvshows.1" label="$LOCALIZE[31118]" type="tvshows" path="special://skin/extras/playlists/tvshows_random.xsp" target="videos">library</widgetdefaultnode>
 	<propertydefault labelID="31118" group="tvshows.1" property="widgetArt">Art(poster)</propertydefault>
-
-	<widgetdefaultnode labelID="31056" group="2.1" label="$LOCALIZE[31056]" type="albums" path="special://skin/extras/playlists/albums_random.xsp" target="music">music</widgetdefaultnode>
-	<propertydefault labelID="31056" group="2.1" property="layout">square-small</propertydefault>
-
+
+	<widgetdefaultnode labelID="31193" group="tvshows.1" label="$LOCALIZE[31193]" type="tvshows" path="library://video/tvshows/inprogressshows.xml" target="videos">library</widgetdefaultnode>
+	<propertydefault labelID="31193" group="tvshows.1" property="widgetArt">Art(poster)</propertydefault>
+	<propertydefault labelID="31193" group="tvshows.1" property="widgetSortBy">lastplayed</propertydefault>
+	<propertydefault labelID="31193" group="tvshows.1" property="widgetSortDirection">descending</propertydefault>
+
+	<widgetdefaultnode labelID="31056" group="music.1" label="$LOCALIZE[31056]" type="albums" path="special://skin/extras/playlists/albums_random.xsp" target="music">music</widgetdefaultnode>
+	<propertydefault labelID="31056" group="music.1" property="layout">square-small</propertydefault>
+
+	<widgetdefaultnode labelID="31207" group="music.1" label="$LOCALIZE[31207]" type="albums" path="musicdb://recentlyaddedalbums/" target="music">music</widgetdefaultnode>
+	<propertydefault labelID="31207" group="music.1" property="layout">square-small</propertydefault>
+	<propertydefault labelID="31207" group="music.1" property="widgetSortBy">dateAdded</propertydefault>
+	<propertydefault labelID="31207" group="music.1" property="widgetSortDirection">descending</propertydefault>
+
+	<widgetdefault labelID="35049" group="15016.1">GameWidget</widgetdefault>
+	<propertydefault labelID="35049" group="15016.1" property="layout">square-small</propertydefault>
+
+	<widgetdefaultnode labelID="1043" group="programs.1" label="$LOCALIZE[1043]" type="program" path="addons://sources/executable/" target="programs">addon</widgetdefaultnode>
+	<propertydefault labelID="1043" group="programs.1" property="layout">square-small</propertydefault>
+
+	<widgetdefault labelID="10508" group="weather.1">WeatherWidget</widgetdefault>
+
 	<widgetdefaultnode labelID="19217" group="14204.1" label="$LOCALIZE[19217]" type="pvr" path="pvr://channels/tv/*/" target="video">pvr</widgetdefaultnode>
 	<propertydefault labelID="19217" group="14204.1" property="layout">square</propertydefault>
-
+	
 	<widgetdefaultnode labelID="19216" group="19021.1" label="$LOCALIZE[19216]" type="pvr" path="pvr://channels/radio/*/" target="video">pvr</widgetdefaultnode>
 	<propertydefault labelID="19216" group="19021.1" property="layout">square</propertydefault>
-
-	<widgetdefaultnode labelID="10001" group="programs.1" label="$LOCALIZE[10001]" type="program" path="addons://sources/executable" target="programs">addon</widgetdefaultnode>
-	<propertydefault labelID="10001" group="programs.1" property="layout">square-small</propertydefault>
 
 	<!-- Widget Grouping -->
 	<widget-groupings>

shortcuts/programs-1.DATA.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <shortcuts>
 	<shortcut>
-		<label>10001</label>
+		<label>1043</label>
 		<label2>31160</label2>
 		<icon>DefaultAddonProgram.png</icon>
 		<thumb />

shortcuts/tvshows-1.DATA.xml

@@ -7,4 +7,11 @@
 		<thumb />
 		<action>noop</action>
 	</shortcut>
+	<shortcut>
+		<label>31193</label>
+		<label2>31160</label2>
+		<icon>DefaultTVShows.png</icon>
+		<thumb />
+		<action>noop</action>
+	</shortcut>
 </shortcuts>

xml/DialogAddonInfo.xml

@@ -215,7 +215,14 @@
 				<align>center</align>
 				<itemgap>30</itemgap>
 				<onup>50</onup>
+				<include>AddonInfoDialogButtonFocus</include>
 
+				<!-- Launch Addon Button -->
+				<control type="button" id="12">
+					<width>Auto</width>
+					<label>518</label>
+					<visible>Control.IsEnabled(12)</visible>
+				</control>
 				<!-- Extended info Button -->
 				<control type="togglebutton" id="15">
 					<width>Auto</width>
@@ -226,12 +233,6 @@
 					<usealttexture>String.IsEmpty(Window(10146).Property(description)) + String.IsEqual(Skin.String(infodialogfirstpage),Details) | !String.IsEmpty(Window(10146).Property(description)) + String.IsEqual(Skin.String(infodialogfirstpage),Description)</usealttexture>
 					<visible>!String.IsEmpty(ListItem.AddonDescription) + !String.IsEmpty(ListItem.AddonNews)</visible>
 				</control>
-				<!-- Launch Addon Button -->
-				<control type="button" id="12">
-					<width>Auto</width>
-					<label>518</label>
-					<visible>Control.IsEnabled(12)</visible>
-				</control>
 				<!-- Configure Addon Button -->
 					<control type="button" id="9">
 					<width>Auto</width>

xml/DialogMusicInfo.xml

@@ -860,6 +860,7 @@
 				<orientation>horizontal</orientation>
 				<align>center</align>
 				<itemgap>30</itemgap>
+				<include>MusicInfoDialogButtonFocus</include>
 
 				<!-- Extended info Button -->
 				<control type="togglebutton" id="14">

xml/DialogPVRInfo.xml

@@ -193,7 +193,20 @@
 				<orientation>horizontal</orientation>
 				<align>center</align>
 				<itemgap>30</itemgap>
+				<include>PVRInfoDialogButtonFocus</include>
 
+				<!-- Switch to Channel -->
+				<control type="button" id="5">
+					<width>auto</width>
+					<label>19165</label>
+					<visible>Window.IsActive(PVRGuideInfo)</visible>
+				</control>
+				<!-- Play recorded programme -->
+				<control type="button" id="10">
+					<width>auto</width>
+					<label>19190</label>
+					<visible>Window.IsActive(PVRGuideInfo)</visible>
+				</control>
 				<!-- Extended info Button -->
 				<control type="togglebutton" id="14">
 					<width>Auto</width>
@@ -211,18 +224,6 @@
 					<width>auto</width>
 					<label>19003</label>
 				</control>
-				<!-- Switch to Channel -->
-				<control type="button" id="5">
-					<width>auto</width>
-					<label>19165</label>
-					<visible>Window.IsActive(PVRGuideInfo)</visible>
-				</control>
-				<!-- Play recorded programme -->
-				<control type="button" id="10">
-					<width>auto</width>
-					<label>19190</label>
-					<visible>Window.IsActive(PVRGuideInfo)</visible>
-				</control>
 				<!-- Record Button -->
 				<control type="button" id="6">
 					<width>auto</width>

xml/DialogPictureInfo.xml

@@ -82,7 +82,7 @@
 				<align>center</align>
 				<itemgap>30</itemgap>
 				<onup>5</onup>
-				<defaultcontrol always="true">0</defaultcontrol>
+				<defaultcontrol always="true">9001</defaultcontrol>
 
 				<!-- Close button -->
 				<control type="button" id="9001">

xml/DialogVideoInfo.xml

@@ -789,7 +789,15 @@
 				<align>center</align>
 				<itemgap>30</itemgap>
 				<onup condition="!String.IsEmpty(Window(12003).Property(cast)) | [String.IsEmpty(Window(12003).Property(extended)) + String.IsEqual(Skin.String(infodialogfirstpage),Details) | !String.IsEmpty(Window(12003).Property(extended)) + String.IsEqual(Skin.String(infodialogfirstpage),Description)] + String.IsEqual(ListItem.DBTYPE,set)">50</onup>
+				<include>VideoInfoDialogButtonFocus</include>
 
+				<!-- Play/Browse Button -->
+				<control type="togglebutton" id="8">
+					<width>Auto</width>
+					<label>208</label>
+					<altlabel>1024</altlabel>
+					<usealttexture>String.IsEqual(ListItem.DBTYPE,tvshow) | String.IsEqual(ListItem.DBTYPE,season) | String.IsEqual(ListItem.DBTYPE,set)</usealttexture>
+				</control>
 				<!-- Extended info Button -->
 				<control type="togglebutton" id="15">
 					<width>Auto</width>