trailer autoplay bug fix

realcopacetic · Aug 4, 2024 · 3bc908a · 3bc908a
1 parent f578965
commit 3bc908a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/16x9/Font.xml b/16x9/Font.xml
@@ -292,6 +292,11 @@
 			<size>13</size>
 		</font>
 		<!-- PVR -->
+		<font>
+			<name>PVR_Guide</name>
+			<filename>Inter/Inter-ExtraLight.ttf</filename>
+			<size>27</size>
+		</font>
 		<font>
 			<name>PVR_Channel</name>
 			<filename>Inter/Inter-Regular.ttf</filename>

diff --git a/16x9/Templates_MyWindows.xml b/16x9/Templates_MyWindows.xml
@@ -444,7 +444,7 @@
 					<scrolltime tween="sine" easing="inout">360</scrolltime>
 					<timeblocks>30</timeblocks>
 					<rulerunit>6</rulerunit>
-					<progresstexture border="0,92,3,0" colordiffuse="$VAR[Accent_Color]">pvr/tvguide_progress_indicator.png</progresstexture>
+					<!-- <progresstexture border="0,92,3,0" colordiffuse="$VAR[Accent_Color]">pvr/tvguide_progress_indicator.png</progresstexture> -->
 					<orientation>vertical</orientation>
 					<onup>11</onup>
 					<ondown>SetFocus(3000,0,absolute)</ondown>
@@ -474,6 +474,7 @@
 						</control>
 						<control type="label" id="1">
 							<label>$INFO[ListItem.Label]</label>
+							<font>PVR_Guide</font>
 							<width>450</width>
 							<left>90</left>
 							<textoffsetx>30</textoffsetx>
@@ -495,6 +496,7 @@
 						</control>
 						<control type="label" id="1">
 							<label>$INFO[ListItem.Label]</label>
+							<font>PVR_Guide</font>
 							<textcolor>$VAR[epggrid_Focused_Color]</textcolor>
 							<left>90</left>
 							<width>450</width>
@@ -505,6 +507,7 @@
 					<itemlayout width="45" height="90">
 						<control type="label" id="1">
 							<label>$INFO[ListItem.Label]</label>
+							<font>PVR_Guide</font>
 							<textoffsetx>15</textoffsetx>
 							<scroll>false</scroll>
 						</control>
@@ -517,6 +520,7 @@
 						<control type="label" id="1">
 							<textcolor>$VAR[epggrid_Focused_Color]</textcolor>
 							<label>$INFO[ListItem.Label]</label>
+							<font>PVR_Guide</font>
 							<textoffsetx>15</textoffsetx>
 							<scroll>false</scroll>
 						</control>

diff --git a/16x9/Timers.xml b/16x9/Timers.xml
@@ -37,7 +37,7 @@
   </timer>
   <timer>
     <name>trailer_autoplay</name>
-    <start reset="true">Window.Is(videos) + Skin.HasSetting(Trailer_Autoplay) + [[Skin.String(Trailer_Autoplay_Movies_Enabled,true) + Container.Content(movies)] | [Skin.String(Trailer_Autoplay_TVShows_Enabled,true) + !Container.Content(tvshows)]] + Window.IsVisible(1160) + !Player.HasMedia</start>
+    <start reset="true">Window.Is(videos) + Skin.HasSetting(Trailer_Autoplay) + [[Skin.String(Trailer_Autoplay_Movies_Enabled,true) + Container.Content(movies)] | [Skin.String(Trailer_Autoplay_TVShows_Enabled,true) + Container.Content(tvshows)]] + Window.IsVisible(1160) + !Player.HasMedia</start>
     <reset>Player.HasVideo | Window.IsVisible(movieinformation) | Window.IsVisible(shutdownmenu) | Window.IsVisible(busydialog)</reset>
     <stop>!String.IsEmpty(ListItem.Trailer) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !Player.HasVideo</stop>
     <onstart condition="[Control.HasFocus(50) | Control.HasFocus(501) | Control.HasFocus(502) | Control.HasFocus(504)] + !String.IsEmpty(ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>

diff --git a/README.md b/README.md
@@ -20,6 +20,9 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc
 
 ### Changelog
 ---
+**2.6.0**
+- Fixed typo in trailer autoplay preventing tvshow trailers from autoplaying in videos window unless container content was NOT tvshows. 
+
 **2.5.9**
 - Switched OSD idle timer from custom window to skin timer
 

diff --git a/addon.xml b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.copacetic" version="2.5.10" name="Copacetic" provider-name="realcopacetic">
+<addon id="skin.copacetic" version="2.6.0" name="Copacetic" provider-name="realcopacetic">
 	<requires>
 		<import addon="xbmc.gui" version="5.17.0" />
 		<import addon="script.copacetic.helper" version="1.1.0" />

diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
@@ -1598,12 +1598,12 @@ msgstr ""
 
 #/16x9/Content_Settings.xml
 msgctxt "#31568"
-msgid "Autoplay autoplay can be quickly toggled on/off from the options menu within the video library."
+msgid "Autoplay can be quickly toggled on/off from the options menu within the video library."
 msgstr ""
 
 #/16x9/Content_Settings.xml
 msgctxt "#31469"
-msgid "Play trailers for tv shows in video library"
+msgid "Autoplay trailers for tv shows in video library"
 msgstr ""