Skip to content

Commit

Permalink
Fix for default TV logo
Browse files Browse the repository at this point in the history 
Fix for default TV logo in Titan and DefaultWideHD
  • Loading branch information
@catavolt
catavolt committed Feb 11, 2025
1 parent 727c8cd commit bdb4007
Show file tree
Hide file tree
Showing 15 changed files with 27 additions and 31 deletions.
2 changes: 1 addition & 1 deletion TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvGuideBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1170,7 +1170,7 @@ private string GetChannelLogo(string strChannel)
strLogo = Utils.GetCoverArt(Thumbs.TVChannel, "default");
if (string.IsNullOrEmpty(strLogo))
{
strLogo = "defaultVideoBig.png";
strLogo = "defaultTVlogo.png";
}
}
return strLogo;
Expand Down
Binary file removed mediaportal/MediaPortal.Base/skin/DefaultWideHD/Media/defaultTV.png
View file
Binary file not shown.
Binary file modified mediaportal/MediaPortal.Base/skin/DefaultWideHD/Media/defaulttvlogo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified mediaportal/MediaPortal.Base/skin/DefaultWideHD/Media/osd_progress_right2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 10 additions & 10 deletions mediaportal/MediaPortal.Base/skin/DefaultWideHD/PictureExifInfo.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
<id>2</id>
<type>image</type>
<posX>1410</posX>
<posY>300</posY>
<width>450</width>
<height>550</height>
<posY>260</posY>
<width>500</width>
<height>650</height>
<keepaspectratio>yes</keepaspectratio>
<centered>yes</centered>
<texture>#pictures.exif.picture</texture>
Expand All @@ -47,9 +47,9 @@
<type>image</type>
<id>555</id>
<posX>1410</posX>
<posY>300</posY>
<width>450</width>
<height>550</height>
<posY>260</posY>
<width>500</width>
<height>650</height>
<keepaspectratio>yes</keepaspectratio>
<centered>yes</centered>
<texture>#pictures.exif.additional</texture>
Expand All @@ -63,9 +63,9 @@
<onleft>3</onleft>
<onright>3</onright>
<scrollOffset>5</scrollOffset>
<posX>150</posX>
<posX>100</posX>
<posY>255</posY>
<width>1200</width>
<width>1180</width>
<height>720</height>
<textXOff>10</textXOff>
<itemWidth>40</itemWidth>
Expand All @@ -81,8 +81,8 @@
<description>EXIF Logo</description>
<type>image</type>
<id>0</id>
<posX>70</posX>
<posY>360</posY>
<posX>1350</posX>
<posY>265</posY>
<width>30</width>
<height>560</height>
<align>center</align>
Expand Down
8 changes: 2 additions & 6 deletions mediaportal/MediaPortal.Base/skin/DefaultWideHD/dialogPlayStop.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<!--version="1.0" encoding="utf-8" standalone="yes"-->
<window>
<id>102</id>
Expand All @@ -12,8 +12,6 @@
<id>10</id>
<posX>1012</posX>
<posY>680</posY>
<textXOff>73</textXOff>
<textYOff>12</textYOff>
<width>279</width>
<height>70</height>
<textureFocus>dialogue_button.png</textureFocus>
Expand All @@ -30,8 +28,6 @@
<id>11</id>
<posX>612</posX>
<posY>680</posY>
<textXOff>75</textXOff>
<textYOff>12</textYOff>
<width>279</width>
<height>70</height>
<textureFocus>dialogue_button.png</textureFocus>
Expand All @@ -52,4 +48,4 @@
<texture>warning-icon_small.png</texture>
</control>
</controls>
</window>
</window>
6 changes: 3 additions & 3 deletions mediaportal/MediaPortal.Base/skin/DefaultWideHD/mypics.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@
<id>500</id>
<type>image</type>
<posX>1410</posX>
<posY>300</posY>
<width>450</width>
<height>550</height>
<posY>260</posY>
<width>500</width>
<height>650</height>
<keepaspectratio>yes</keepaspectratio>
<centered>yes</centered>
<texture>#(iif(eq(#selecteditem,'..'),'','#selectedthumb'))</texture>
Expand Down
2 changes: 1 addition & 1 deletion mediaportal/MediaPortal.Base/skin/DefaultWideHD/mytvguide.10Lines.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
<keepaspectratio>yes</keepaspectratio>
<centered>yes</centered>
<zoom>no</zoom>
<texture>defaultlogo.png</texture>
<texture>defaultTVlogo.png</texture>
</control>
<control>
<description>channel Label template</description>
Expand Down
2 changes: 1 addition & 1 deletion mediaportal/MediaPortal.Base/skin/DefaultWideHD/mytvguide.12Lines.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
<keepaspectratio>yes</keepaspectratio>
<centered>yes</centered>
<zoom>no</zoom>
<texture>defaultlogo.png</texture>
<texture>defaultTVlogo.png</texture>
</control>
<control>
<description>channel Label template</description>
Expand Down
2 changes: 1 addition & 1 deletion mediaportal/MediaPortal.Base/skin/DefaultWideHD/mytvguide.15Lines.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
<keepaspectratio>yes</keepaspectratio>
<centered>yes</centered>
<zoom>no</zoom>
<texture>defaultlogo.png</texture>
<texture>defaultTVlogo.png</texture>
</control>
<control>
<description>channel Label template</description>
Expand Down
2 changes: 1 addition & 1 deletion mediaportal/MediaPortal.Base/skin/DefaultWideHD/mytvguide.18Lines.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
<keepaspectratio>no</keepaspectratio>
<centered>yes</centered>
<zoom>no</zoom>
<texture>defaultlogo.png</texture>
<texture>defaultTVlogo.png</texture>
</control>
<control>
<description>channel Label template</description>
Expand Down
2 changes: 1 addition & 1 deletion mediaportal/MediaPortal.Base/skin/DefaultWideHD/mytvguide.24Lines.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
<keepaspectratio>yes</keepaspectratio>
<centered>yes</centered>
<zoom>no</zoom>
<texture>defaultlogo.png</texture>
<texture>defaultTVlogo.png</texture>
</control>
<control>
<description>channel Label template</description>
Expand Down
Binary file added mediaportal/MediaPortal.Base/skin/Titan/Media/defaultTVlogo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions mediaportal/MediaPortal.Base/skin/Titan/mytvguide.11rows.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<height>36</height>
<keepaspectratio>yes</keepaspectratio>
<zoom>no</zoom>
<texture>defaultTVBig.png</texture>
<texture>defaultTVlogo.png</texture>
</control>

<!-- Timeheader background must be dedfined before Timeheader label template -->
Expand Down Expand Up @@ -150,7 +150,7 @@
<centered>yes</centered>
<zoom>no</zoom>
<keepaspectratio>yes</keepaspectratio>
<texture>defaultTVBig.png</texture>
<texture>defaultTVlogo.png</texture>
</control>

<control>
Expand Down Expand Up @@ -379,4 +379,4 @@
</control>

</controls>
</window>
</window>
6 changes: 3 additions & 3 deletions mediaportal/MediaPortal.Base/skin/Titan/mytvguide.7rows.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<height>48</height>
<keepaspectratio>yes</keepaspectratio>
<zoom>no</zoom>
<texture>defaultTVBig.png</texture>
<texture>defaultTVlogo.png</texture>
</control>
<!-- Timeheader background must be dedfined before Timeheader label template -->
<!-- b/c Timeheader is on the background and will be rendered first -->
Expand Down Expand Up @@ -138,7 +138,7 @@
<centered>yes</centered>
<zoom>no</zoom>
<keepaspectratio>yes</keepaspectratio>
<texture>defaultTVBig.png</texture>
<texture>defaultTVlogo.png</texture>
</control>
<control>
<description>channel Label template</description>
Expand Down Expand Up @@ -343,4 +343,4 @@
<visible>player.hasvideo</visible>
</control>
</controls>
</window>
</window>

0 comments on commit bdb4007

Please sign in to comment.