Merge pull request #497 from Ch1llb0/SmallFixes

Small fixes

Changelog.md

@@ -2,7 +2,20 @@
 
 ---
 
-**_v21.0.0_**
+**_v21.1.0_**
+
+_New_
+- add new notification icon
+
+_Improved_
+- add skinshortcuts script as an optional dependency to avoid removal of the addon when marked as unused
+
+_Fixed_
+- fix widget onclick options to avoid errors when widgets are pointing to addon directories
+
+---
+
+**_v21.0.0 - August 2024_**
 
 _New_
 - support Omega skin engine features
@@ -514,82 +527,20 @@ Release
 
 ---
 
-**Changelog v21.0.0**
-
-_remove deprecated favourites dialog_
-_ add new video manager dialog_
-
-Textures.xbt:
-- update textures file with new video versions image files and removed collection image files
+**Changelog v21.1.0**
 
 template.xml:
-- add new browse tag to widget content tags to prevent "More..." item from showing
-
-Coordinates_DialogGameControllers.xml:
-- adjust and add coordinates includes for new in-game player viewer dialog
-
-Coordinates_DialogSelect.xml:
-- adjust coordinates includes to show information specific to the video versions selection correctly
-- adjust coordinates includes for new savegame selection
-
-Defaults.xml:
-- add new texturesliderbardisabled and textureslidernibdisabled tags to sliderex and slider controls
-
-DialogGameControllers.xml:
-- adjust includes and include conditions for new in-game player viewer dialog
-
-DialogSeekBar.xml:
-- adjust visibility condition to incorporate new in-game save and load dialog
-- add new texturesliderbardisabled and textureslidernibdisabled tags to the slider control
-
-DialogSelect.xml:
-- adjust dialog for new savegame selection
-
-DialogVideoInfo.xml:
-- adjust video info to use new video witdth and video height info labels
-- add new video versions and extras buttons
-
-GameOSD.xml:
-- adjust visibility conditions to incorporate new in-game save and load dialog
-- add new in-game save and load button
-- remove deprecated game controller ports button
-
-Includes.xml:
-- remove deprecated favourites dialog include file
-- remove deprecated Includes_Home include file
-- add new video manager dialog include file
-
-Includes_GameControllers.xml:
-- add new player viewer dialog
-
-Includes_MediaFlags.xml:
-- adjust video info to use new video witdth and video height info labels
-- adjust visibility condition of media flags for them to show correctly independent of content type
-
-Includes_SubMenu.xml:
-- remove deprecated favourites dialog related includes
-- adjust sub menu view button to open new view type selection dialog
-- add new ViewMenu include for additional view type dialog
-- adjust sub menu indicators to not show when new view type selection dialog is visible
-
-Includes_Widgets.xml:
-- add new browse tag to widget content tags to prevent "More..." item from showin
-
-MusicOSD.xml:
-- add new texturesliderbardisabled and textureslidernibdisabled tags to the slider control
+- adjust widget onclick options to avoid errors when widgets are pointing to addon directories
 
-skinshortcuts-static.xml:
-- add new browse tag to widget content tags to prevent "More..." item from showing
+Coordinates_DialogNotification.xml:
+- add coordinates includes for new notification icon
 
-Variables.xml:
-- add new VideoManagerImages variable
-- add new variable conditions to HeadingLabelSecondary and ContentType variables for new video versions windows
-- remove deprecated ContentTypeFavourites variable
-- add new variable condition to VideoPlayerTitle, VideoInfoLabel and Label1 variables for new video versions feature
-- adjsut VideoResolution variable to only use new video witdth and video height info labels
+DialogNotification.xml:
+- add new notification icon
 
 addon.xml:
-- bump version to 21.0.0
+- bump version to 21.1.0
+- add skinshortcuts script as an optional dependency to avoid removal of the addon when marked as unused
 - update changelog
 
 Changelog.md:

addon.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.osmc" version="21.0.0" name="OSMC Skin" provider-name="OSMC">
+<addon id="skin.osmc.scope" version="21.1.0" name="OSMC Skin" provider-name="OSMC">
 	<requires>
 		<import addon="xbmc.gui" version="5.17.0"/>
+		<import addon="script.skinshortcuts" version="2.0.3" optional="true"/>
 	</requires>
 	<extension point="xbmc.gui.skin" defaultthemename="Textures.xbt" effectslowdown="1.00" debugging="false">
 		<!-- <res width="2560" height="1080" aspect="21:9" default="true" folder="xml" /> -->
@@ -17,6 +18,6 @@
 			<icon>resources/icon.png</icon>
 			<fanart>resources/fanart.jpg</fanart>
 		</assets>
-		<news>[B]New[/B][CR]- support Omega skin engine features[CR]- add new view type selection dialog</news>
+		<news>[B]New[/B][CR]- add new notification icon[CR][CR][B]Improved[/B][CR]- add skinshortcuts script as an optional dependency to avoid removal of the addon when marked as unused[CR][CR][B]Fixed[/B][CR]- fix widget onclick options to avoid errors when widgets are pointing to addon directories</news>
 	</extension>
 </addon>

shortcuts/template.xml

@@ -394,9 +394,9 @@
 				</include>
 
 				<!-- Widget onclick -->
-				<onclick condition="String.IsEqual(ListItem.DBTYPE,album)">$VAR[WidgetOnClickAlbum]</onclick>
-				<onclick condition="String.IsEqual(ListItem.DBTYPE,tvshow)">$VAR[WidgetOnClickTVShow]</onclick>
-				<onclick condition="String.IsEqual(ListItem.DBTYPE,set)">$VAR[WidgetOnClickMovieSet]</onclick>
+				<onclick condition="String.IsEqual(ListItem.DBTYPE,album) + !String.StartsWith(ListItem.FileNameAndPath,plugin://)">$VAR[WidgetOnClickAlbum]</onclick>
+				<onclick condition="String.IsEqual(ListItem.DBTYPE,tvshow) + !String.StartsWith(ListItem.FileNameAndPath,plugin://)">$VAR[WidgetOnClickTVShow]</onclick>
+				<onclick condition="String.IsEqual(ListItem.DBTYPE,set) + !String.StartsWith(ListItem.FileNameAndPath,plugin://)">$VAR[WidgetOnClickMovieSet]</onclick>
 
 				<itemlayout width="$SKINSHORTCUTS[layoutWidth]" height="$SKINSHORTCUTS[layoutHeight]">
 					<include content="$PYTHON[$SKINSHORTCUTS[primary-art]]">

xml/Coordinates_DialogNotification.xml

@@ -39,58 +39,89 @@
 		<include condition="String.IsEqual(Skin.AspectRatio,4:3)">DialogNotification_coords2_4:3</include>
 	</include>
 	<include name="DialogNotification_coords2_16:9">
+		<right>480</right>
+		<top>96</top>
+		<width>60</width>
+		<height>60</height>
+	</include>
+	<include name="DialogNotification_coords2_21:9">
+		<right>480</right>
+		<top>96</top>
+		<width>60</width>
+		<height>60</height>
+	</include>
+	<include name="DialogNotification_coords2_21:9_masked">
+		<right>480</right>
+		<top>276</top>
+		<width>60</width>
+		<height>60</height>
+	</include>
+	<include name="DialogNotification_coords2_4:3">
+		<right>480</right>
+		<top>96</top>
+		<width>60</width>
+		<height>60</height>
+	</include>
+
+	<include name="DialogNotification_coords3">
+		<include condition="$EXP[NonMaskedCoordinates]">DialogNotification_coords3_16:9</include>
+		<include condition="String.IsEqual(Skin.AspectRatio,21:9)">DialogNotification_coords3_21:9</include>
+		<include condition="$EXP[MaskedCoordinates]">DialogNotification_coords3_21:9_masked</include>
+		<include condition="String.IsEqual(Skin.AspectRatio,4:3)">DialogNotification_coords3_4:3</include>
+	</include>
+	<include name="DialogNotification_coords3_16:9">
 		<right>10</right>
 		<top>100</top>
-		<width>530</width>
+		<width>460</width>
 		<height>20</height>
 	</include>
-	<include name="DialogNotification_coords2_21:9">
+	<include name="DialogNotification_coords3_21:9">
 		<right>10</right>
 		<top>100</top>
-		<width>530</width>
+		<width>460</width>
 		<height>20</height>
 	</include>
-	<include name="DialogNotification_coords2_21:9_masked">
+	<include name="DialogNotification_coords3_21:9_masked">
 		<right>10</right>
 		<top>280</top>
-		<width>530</width>
+		<width>460</width>
 		<height>20</height>
 	</include>
-	<include name="DialogNotification_coords2_4:3">
+	<include name="DialogNotification_coords3_4:3">
 		<right>10</right>
 		<top>100</top>
-		<width>530</width>
+		<width>460</width>
 		<height>20</height>
 	</include>
 
-	<include name="DialogNotification_coords3">
-		<include condition="$EXP[NonMaskedCoordinates]">DialogNotification_coords3_16:9</include>
-		<include condition="String.IsEqual(Skin.AspectRatio,21:9)">DialogNotification_coords3_21:9</include>
-		<include condition="$EXP[MaskedCoordinates]">DialogNotification_coords3_21:9_masked</include>
-		<include condition="String.IsEqual(Skin.AspectRatio,4:3)">DialogNotification_coords3_4:3</include>
+	<include name="DialogNotification_coords4">
+		<include condition="$EXP[NonMaskedCoordinates]">DialogNotification_coords4_16:9</include>
+		<include condition="String.IsEqual(Skin.AspectRatio,21:9)">DialogNotification_coords4_21:9</include>
+		<include condition="$EXP[MaskedCoordinates]">DialogNotification_coords4_21:9_masked</include>
+		<include condition="String.IsEqual(Skin.AspectRatio,4:3)">DialogNotification_coords4_4:3</include>
 	</include>
-	<include name="DialogNotification_coords3_16:9">
+	<include name="DialogNotification_coords4_16:9">
 		<right>10</right>
 		<top>125</top>
-		<width>530</width>
+		<width>460</width>
 		<height>20</height>
 	</include>
-	<include name="DialogNotification_coords3_21:9">
+	<include name="DialogNotification_coords4_21:9">
 		<right>10</right>
 		<top>125</top>
-		<width>530</width>
+		<width>460</width>
 		<height>20</height>
 	</include>
-	<include name="DialogNotification_coords3_21:9_masked">
+	<include name="DialogNotification_coords4_21:9_masked">
 		<right>10</right>
 		<top>305</top>
-		<width>530</width>
+		<width>460</width>
 		<height>20</height>
 	</include>
-	<include name="DialogNotification_coords3_4:3">
+	<include name="DialogNotification_coords4_4:3">
 		<right>10</right>
 		<top>125</top>
-		<width>530</width>
+		<width>460</width>
 		<height>20</height>
 	</include>
 

xml/DialogNotification.xml

@@ -18,18 +18,23 @@
 				<include>DialogNotification_coords1</include>
 				<texture colordiffuse="$VAR[MenuOSDColor]">$VAR[MenuOSDBackground]</texture>
 			</control>
+
+			<!-- Default icon -->
+			<control type="image" id="400">
+				<include>DialogNotification_coords2</include>
+			</control>
 
 			<!-- Heading -->
 			<control type="label" id="401">
-				<include>DialogNotification_coords2</include>
+				<include>DialogNotification_coords3</include>
 				<align>left</align>
 				<scroll>True</scroll>
 				<font>Font27</font>
 			</control>
 
 			<!-- Details -->
 			<control type="fadelabel" id="402">
-				<include>DialogNotification_coords3</include>
+				<include>DialogNotification_coords4</include>
 				<align>left</align>
 				<aligny>top</aligny>
 				<font>Font27-light</font>