Skip to content

Commit

Permalink
Merge branch 'omega'
Browse files Browse the repository at this point in the history
  • Loading branch information
@realcopacetic
realcopacetic committed May 15, 2024
2 parents 326d848 + 93a1439 commit f714dcf
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 25 deletions.
12 changes: 6 additions & 6 deletions 16x9/Content_Viewtype_501_Billboard.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@
</item>
<!-- Sets -->
<item>
<description>Set logos/ Off</description>
<description>Set logos / Off</description>
<label>$VAR[Copacetic_Chevron_Left] $LOCALIZE[591] $VAR[Copacetic_Chevron_Right]</label>
<label2>$LOCALIZE[31023] / $LOCALIZE[591]</label2>
<onclick>SetFocus(501)</onclick>
Expand All @@ -340,7 +340,7 @@
<visible>$PARAM[visible] + $EXP[BillboardView_Logo_Off_Sets]</visible>
</item>
<item>
<description>Set logos/ On</description>
<description>Set logos / On</description>
<label>$VAR[Copacetic_Chevron_Left] $LOCALIZE[34222] $VAR[Copacetic_Chevron_Right]</label>
<label2>$LOCALIZE[31023] / $LOCALIZE[34222]</label2>
<onclick>SetFocus(501)</onclick>
Expand All @@ -350,7 +350,7 @@
</item>
<!-- TV shows -->
<item>
<description>TV show logos/ Off</description>
<description>TV show logos / Off</description>
<label>$VAR[Copacetic_Chevron_Left] $LOCALIZE[591] $VAR[Copacetic_Chevron_Right]</label>
<label2>$LOCALIZE[31023] / $LOCALIZE[591]</label2>
<onclick>SetFocus(501)</onclick>
Expand All @@ -359,7 +359,7 @@
<visible>$PARAM[visible] + $EXP[BillboardView_Logo_Off_TVShows]</visible>
</item>
<item>
<description>TV show logos/ On</description>
<description>TV show logos / On</description>
<label>$VAR[Copacetic_Chevron_Left] $LOCALIZE[34222] $VAR[Copacetic_Chevron_Right]</label>
<label2>$LOCALIZE[31023] / $LOCALIZE[34222]</label2>
<onclick>SetFocus(501)</onclick>
Expand All @@ -369,7 +369,7 @@
</item>
<!-- Artists -->
<item>
<description>Artist logos/ Off</description>
<description>Artist logos / Off</description>
<label>$VAR[Copacetic_Chevron_Left] $LOCALIZE[591] $VAR[Copacetic_Chevron_Right]</label>
<label2>$LOCALIZE[31023] / $LOCALIZE[591]</label2>
<onclick>SetFocus(501)</onclick>
Expand All @@ -378,7 +378,7 @@
<visible>$PARAM[visible] + $EXP[BillboardView_Logo_Off_Artists]</visible>
</item>
<item>
<description>Artist logos/ On</description>
<description>Artist logos / On</description>
<label>$VAR[Copacetic_Chevron_Left] $LOCALIZE[34222] $VAR[Copacetic_Chevron_Right]</label>
<label2>$LOCALIZE[31023] / $LOCALIZE[34222]</label2>
<onclick>SetFocus(501)</onclick>
Expand Down
8 changes: 4 additions & 4 deletions 16x9/Content_Viewtype_502_Showcase.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -928,7 +928,7 @@
</item>
<!-- Artists -->
<item>
<description>Artist logos/ Off</description>
<description>Artist logos / Off</description>
<label>$VAR[Copacetic_Chevron_Left] $LOCALIZE[591] $VAR[Copacetic_Chevron_Right]</label>
<label2>$LOCALIZE[31023] / $LOCALIZE[591]</label2>
<onclick>SetFocus(502)</onclick>
Expand All @@ -937,7 +937,7 @@
<visible>$PARAM[visible] + $EXP[ShowcaseView_Logo_Off_Artists]</visible>
</item>
<item>
<description>Artist logos/ On</description>
<description>Artist logos / On</description>
<label>$VAR[Copacetic_Chevron_Left] $LOCALIZE[34222] $VAR[Copacetic_Chevron_Right]</label>
<label2>$LOCALIZE[31023] / $LOCALIZE[34222]</label2>
<onclick>SetFocus(502)</onclick>
Expand All @@ -947,7 +947,7 @@
</item>
<!-- Programs_Files -->
<item>
<description>Artist logos/ Off</description>
<description>Artist logos / Off</description>
<label>$VAR[Copacetic_Chevron_Left] $LOCALIZE[591] $VAR[Copacetic_Chevron_Right]</label>
<label2>$LOCALIZE[31023] / $LOCALIZE[591]</label2>
<onclick>SetFocus(502)</onclick>
Expand All @@ -956,7 +956,7 @@
<visible>$PARAM[visible] + $EXP[ShowcaseView_Logo_Off_Programs_Files]</visible>
</item>
<item>
<description>Artist logos/ On</description>
<description>Artist logos / On</description>
<label>$VAR[Copacetic_Chevron_Left] $LOCALIZE[34222] $VAR[Copacetic_Chevron_Right]</label>
<label2>$LOCALIZE[31023] / $LOCALIZE[34222]</label2>
<onclick>SetFocus(502)</onclick>
Expand Down
16 changes: 8 additions & 8 deletions 16x9/Content_Viewtype_504_Strip.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1295,7 +1295,7 @@
<!-- Off -->
<!-- Title -->
<item id="2">
<description>Artist logos/ Off</description>
<description>Artist logos / Off</description>
<label>$VAR[Copacetic_Chevron_Left] $LOCALIZE[591] $VAR[Copacetic_Chevron_Right]</label>
<label2>$LOCALIZE[31023] / $LOCALIZE[591]</label2>
<onclick>SetFocus(504)</onclick>
Expand All @@ -1305,7 +1305,7 @@
</item>
<!-- !Title -->
<item>
<description>Artist logos/ Off</description>
<description>Artist logos / Off</description>
<label>$VAR[Copacetic_Chevron_Left] $LOCALIZE[591] $VAR[Copacetic_Chevron_Right]</label>
<label2>$LOCALIZE[31023] / $LOCALIZE[591]</label2>
<onclick>SetFocus(504)</onclick>
Expand All @@ -1316,7 +1316,7 @@
<!-- On -->
<!-- Title -->
<item id="2">
<description>Artist logos/ On</description>
<description>Artist logos / On</description>
<label>$VAR[Copacetic_Chevron_Left] $LOCALIZE[34222] $VAR[Copacetic_Chevron_Right]</label>
<label2>$LOCALIZE[31023] / $LOCALIZE[34222]</label2>
<onclick>SetFocus(504)</onclick>
Expand All @@ -1326,7 +1326,7 @@
</item>
<!-- !Title -->
<item>
<description>Artist logos/ On</description>
<description>Artist logos / On</description>
<label>$VAR[Copacetic_Chevron_Left] $LOCALIZE[34222] $VAR[Copacetic_Chevron_Right]</label>
<label2>$LOCALIZE[31023] / $LOCALIZE[34222]</label2>
<onclick>SetFocus(504)</onclick>
Expand All @@ -1338,7 +1338,7 @@
<!-- Off -->
<!-- Title -->
<item id="2">
<description>Artist logos/ Off</description>
<description>Artist logos / Off</description>
<label>$VAR[Copacetic_Chevron_Left] $LOCALIZE[591] $VAR[Copacetic_Chevron_Right]</label>
<label2>$LOCALIZE[31023] / $LOCALIZE[591]</label2>
<onclick>SetFocus(504)</onclick>
Expand All @@ -1348,7 +1348,7 @@
</item>
<!-- !Title -->
<item>
<description>Artist logos/ Off</description>
<description>Artist logos / Off</description>
<label>$VAR[Copacetic_Chevron_Left] $LOCALIZE[591] $VAR[Copacetic_Chevron_Right]</label>
<label2>$LOCALIZE[31023] / $LOCALIZE[591]</label2>
<onclick>SetFocus(504)</onclick>
Expand All @@ -1359,7 +1359,7 @@
<!-- On -->
<!-- Title -->
<item id="2">
<description>Artist logos/ On</description>
<description>Artist logos / On</description>
<label>$VAR[Copacetic_Chevron_Left] $LOCALIZE[34222] $VAR[Copacetic_Chevron_Right]</label>
<label2>$LOCALIZE[31023] / $LOCALIZE[34222]</label2>
<onclick>SetFocus(504)</onclick>
Expand All @@ -1369,7 +1369,7 @@
</item>
<!-- !Title -->
<item>
<description>Artist logos/ On</description>
<description>Artist logos / On</description>
<label>$VAR[Copacetic_Chevron_Left] $LOCALIZE[34222] $VAR[Copacetic_Chevron_Right]</label>
<label2>$LOCALIZE[31023] / $LOCALIZE[34222]</label2>
<onclick>SetFocus(504)</onclick>
Expand Down
7 changes: 0 additions & 7 deletions 16x9/Home.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,5 @@
<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
</include>
</control>
<control type="image">
<texture>views/white_100.png</texture>
<right>0</right>
<height>90</height>
<width>90</width>
<visible>[[!Skin.HasSetting(Widget1_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight),8) + System.IdleTime(8)] | [Skin.HasSetting(Widget1_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight),2) + Skin.TimerIsRunning(trailer_autoplay_home) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(trailer_autoplay_home),2)]] + !Player.HasVideo + !Window.IsVisible(movieinformation) + !Window.IsVisible(shutdownmenu) + !Window.IsVisible(busydialog)</visible>
</control>
</controls>
</window>

0 comments on commit f714dcf

Please sign in to comment.