Skip to content

Commit

Permalink
Bugfixing
Browse files Browse the repository at this point in the history
  • Loading branch information
gade01 committed Oct 9, 2014
1 parent 2701efc commit 761c33f
Show file tree
Hide file tree
Showing 59 changed files with 543 additions and 363 deletions.
2 changes: 2 additions & 0 deletions 720p/Defaults.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
<disabledcolor>DisabledColor</disabledcolor>
<shadowcolor>ShadowColor</shadowcolor>
<textoffsetx>8</textoffsetx>
<radioposx>-</radioposx>
<radioposy>-</radioposy>
<aligny>center</aligny>
<radiowidth>50</radiowidth>
<radioheight>20</radioheight>
Expand Down
1 change: 0 additions & 1 deletion 720p/DialogContextMenu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<posy>0</posy>
<width>344</width>
<height max="720">auto</height>
<height>2</height>
<texture border="40,2,40,2">gui/context-menu-middle.png</texture>
</control>

Expand Down
1 change: 1 addition & 0 deletions 720p/DialogFullScreenInfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
<include>MediaFlagFadeAnim</include>
<include>PlayerVideoMediaFlags</include>
<include>PlayerAudioMediaFlags</include>
<include>PlayerAspectMediaFlags</include>
<include>PlayerRatingMediaFlags</include>
</control>
</control>
Expand Down
12 changes: 5 additions & 7 deletions 720p/DialogSeekBar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,14 @@
<visible>!Player.Seeking</visible>
</control>
<control type="label">
<description>Caching</description>
<posy>18</posy>
<description>SeekbarLabels</description>
<posy>5</posy>
<width min="0" max="250">auto</width>
<font>OSDFont</font>
<textcolor>DisabledColor</textcolor>
<textcolor>SelectedColor2</textcolor>
<textoffsetx>5</textoffsetx>
<aligny>center</aligny>
<label>$INFO[Player.CacheLevel]%</label>
<visible>[Player.Paused + Player.Caching] + !Player.Seeking</visible>
<label>$VAR[SeekbarLabels]</label>
</control>
<include>SeekSpeedLabels</include>
</control>

<control type="grouplist">
Expand Down
12 changes: 5 additions & 7 deletions 720p/MusicOSD.xml
Original file line number Diff line number Diff line change
Expand Up @@ -370,16 +370,14 @@
<visible>!Player.Seeking</visible>
</control>
<control type="label">
<description>Caching</description>
<posy>18</posy>
<description>SeekbarLabels</description>
<posy>5</posy>
<width min="0" max="250">auto</width>
<font>OSDFont</font>
<textcolor>DisabledColor</textcolor>
<textcolor>SelectedColor2</textcolor>
<textoffsetx>5</textoffsetx>
<aligny>center</aligny>
<label>$INFO[Player.CacheLevel]%</label>
<visible>[Player.Paused + Player.Caching] + !Player.Seeking</visible>
<label>$VAR[SeekbarLabels]</label>
</control>
<include>SeekSpeedLabels</include>
</control>

<control type="grouplist">
Expand Down
10 changes: 5 additions & 5 deletions 720p/MyWeather.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<window id="2600">
<defaultcontrol always="true">850</defaultcontrol>
<allowoverlay>yes</allowoverlay>
<onload condition="StringCompare(Weather.Plugin,weather.weatherplus) + IsEmpty(Skin.String(WeatherPlus))">Skin.SetString(WeatherPlus,1)</onload>
<onload condition="StringCompare(Weather.Plugin,weather.wunderground) + IsEmpty(Skin.String(WeatherUnderground))">Skin.SetString(WeatherUnderground,1)</onload>
<onload condition="System.HasAddon(script.artistslideshow) + Skin.HasSetting(UseFanartForMusicPlayingBG) + Skin.HasSetting(EnableArtistFanartSlideshow)">RunScript(script.artistslideshow)</onload>

<controls>
Expand Down Expand Up @@ -45,15 +45,15 @@
<visible>IsEmpty(Weather.Plugin)</visible>
</control>

<include condition="!StringCompare(Weather.Plugin,weather.weatherplus) + !IsEmpty(Weather.Plugin)">WeatherStandard</include>
<include condition="StringCompare(Weather.Plugin,weather.weatherplus)">WeatherPlus</include>
<include condition="!StringCompare(Weather.Plugin,weather.wunderground) + !IsEmpty(Weather.Plugin)">WeatherStandard</include>
<include condition="StringCompare(Weather.Plugin,weather.wunderground)">WeatherUnderground</include>

<control type="group" id="505">
<posy>MenuBarOffsetY</posy>
<include>MenuBarImage</include>
<include>MenuBarOpenCloseAnim2</include>
<include condition="!StringCompare(Weather.Plugin,weather.weatherplus)">MyWeatherMenuBar</include>
<include condition="StringCompare(Weather.Plugin,weather.weatherplus)">MyWeatherPlusMenuBar</include>
<include condition="!StringCompare(Weather.Plugin,weather.wunderground)">MyWeatherMenuBar</include>
<include condition="StringCompare(Weather.Plugin,weather.wunderground)">MyWeatherUndergroundMenuBar</include>
<visible>!IsEmpty(Weather.Plugin)</visible>
</control>

Expand Down
1 change: 1 addition & 0 deletions 720p/VideoFullScreen.xml
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@
<include>MediaFlagFadeAnim</include>
<include>PlayerVideoMediaFlags</include>
<include>PlayerAudioMediaFlags</include>
<include>PlayerAspectMediaFlags</include>
<include>PlayerRatingMediaFlags</include>
</control>
</control>
Expand Down
12 changes: 5 additions & 7 deletions 720p/VideoOSD.xml
Original file line number Diff line number Diff line change
Expand Up @@ -505,16 +505,14 @@
<visible>!Player.Seeking</visible>
</control>
<control type="label">
<description>Caching</description>
<posy>18</posy>
<description>SeekbarLabels</description>
<posy>5</posy>
<width min="0" max="250">auto</width>
<font>OSDFont</font>
<textcolor>DisabledColor</textcolor>
<textcolor>SelectedColor2</textcolor>
<textoffsetx>5</textoffsetx>
<aligny>center</aligny>
<label>$INFO[Player.CacheLevel]%</label>
<visible>[Player.Paused + Player.Caching] + !Player.Seeking</visible>
<label>$VAR[SeekbarLabels]</label>
</control>
<include>SeekSpeedLabels</include>
</control>

<control type="grouplist">
Expand Down
130 changes: 16 additions & 114 deletions 720p/includes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,22 @@
<value condition="Substring(ListItem.Path),BDMV">$INFO[ListItem.Path,../,logo.png]</value>
<value>$INFO[ListItem.Path,,logo.png]</value>
</variable>

<variable name="SeekbarLabels">
<value condition="[Player.Paused + !Player.Caching] + !Player.Seeking + !Player.DisplayAfterSeek">[UPPERCASE]$LOCALIZE[112][/UPPERCASE]</value>
<value condition="[Player.Paused + Player.Caching] + !Player.Seeking">$INFO[Player.CacheLevel,,%]</value>
<value condition="Player.Forwarding2x + !Player.Seeking">+2X</value>
<value condition="Player.Forwarding4x + !Player.Seeking">+4X</value>
<value condition="Player.Forwarding8x + !Player.Seeking">+8X</value>
<value condition="Player.Forwarding16x + !Player.Seeking">+16X</value>
<value condition="Player.Forwarding32x + !Player.Seeking">+32X</value>
<value condition="Player.Rewinding2x + !Player.Seeking">-2X</value>
<value condition="Player.Rewinding4x + !Player.Seeking">-4X</value>
<value condition="Player.Rewinding8x + !Player.Seeking">-8X</value>
<value condition="Player.Rewinding16 + !Player.Seeking">-16X</value>
<value condition="Player.Rewinding32x + !Player.Seeking">-32X</value>
<value condition="Player.DisplayAfterSeek + ![player.forwarding | player.rewinding] + !IsEmpty(Player.SeekOffset)">[UPPERCASE]$INFO[Player.SeekOffset][/UPPERCASE]</value>
</variable>

<include name="ScreenSize">
<width>ScreenWidth</width>
Expand Down Expand Up @@ -576,120 +592,6 @@
<shadowcolor>ShadowColor</shadowcolor>
<align>center</align>
</include>

<include name="SeekSpeedLabels">
<!-- Forwarding -->
<control type="label">
<description>2X</description>
<posy>18</posy>
<font>OSDFont</font>
<textcolor>DefaultColor3</textcolor>
<textoffsetx>5</textoffsetx>
<aligny>center</aligny>
<label>+2X</label>
<visible>Player.Forwarding2x + !Player.Seeking</visible>
</control>

<control type="label">
<description>4X</description>
<posy>18</posy>
<font>OSDFont</font>
<textcolor>DefaultColor3</textcolor>
<textoffsetx>5</textoffsetx>
<aligny>center</aligny>
<label>+4X</label>
<visible>Player.Forwarding4x + !Player.Seeking</visible>
</control>

<control type="label">
<description>8X</description>
<posy>18</posy>
<font>OSDFont</font>
<textcolor>DefaultColor3</textcolor>
<textoffsetx>5</textoffsetx>
<aligny>center</aligny>
<label>+8X</label>
<visible>Player.Forwarding8x + !Player.Seeking</visible>
</control>

<control type="label">
<description>16X</description>
<posy>18</posy>
<font>OSDFont</font>
<textcolor>DefaultColor3</textcolor>
<textoffsetx>5</textoffsetx>
<aligny>center</aligny>
<label>+16X</label>
<visible>Player.Forwarding16x + !Player.Seeking</visible>
</control>

<control type="label">
<description>32X</description>
<posy>18</posy>
<font>OSDFont</font>
<textcolor>DefaultColor3</textcolor>
<textoffsetx>5</textoffsetx>
<aligny>center</aligny>
<label>+32X</label>
<visible>Player.Forwarding32x + !Player.Seeking</visible>
</control>

<!-- Rewinding -->
<control type="label">
<description>2X</description>
<posy>18</posy>
<font>OSDFont</font>
<textcolor>DefaultColor3</textcolor>
<textoffsetx>5</textoffsetx>
<aligny>center</aligny>
<label>-2X</label>
<visible>Player.Rewinding2x + !Player.Seeking</visible>
</control>

<control type="label">
<description>4X</description>
<posy>18</posy>
<font>OSDFont</font>
<textcolor>DefaultColor3</textcolor>
<textoffsetx>5</textoffsetx>
<aligny>center</aligny>
<label>-4X</label>
<visible>Player.Rewinding4x + !Player.Seeking</visible>
</control>

<control type="label">
<description>8X</description>
<posy>18</posy>
<font>OSDFont</font>
<textcolor>DefaultColor3</textcolor>
<textoffsetx>5</textoffsetx>
<aligny>center</aligny>
<label>-8X</label>
<visible>Player.Rewinding8x + !Player.Seeking</visible>
</control>

<control type="label">
<description>16X</description>
<posy>18</posy>
<font>OSDFont</font>
<textcolor>DefaultColor3</textcolor>
<textoffsetx>5</textoffsetx>
<aligny>center</aligny>
<label>-16X</label>
<visible>Player.Rewinding16x + !Player.Seeking</visible>
</control>

<control type="label">
<description>32X</description>
<posy>18</posy>
<font>OSDFont</font>
<textcolor>DefaultColor3</textcolor>
<textoffsetx>5</textoffsetx>
<aligny>center</aligny>
<label>-32X</label>
<visible>Player.Rewinding32x + !Player.Seeking</visible>
</control>
</include>

<include name="FSMediaInfoBackgroundDim">
<control type="image">
Expand Down
37 changes: 35 additions & 2 deletions 720p/includes_Animations.xml
Original file line number Diff line number Diff line change
Expand Up @@ -243,21 +243,54 @@
<animation effect="fade" end="4" condition="true">Conditional</animation>
</include>

<include name="WeatherPlusFadeAnim">
<include name="WeatherUndergroundFadeAnim">
<animation type="Conditional" reversible="false" condition="true" loop="true">
<effect type="fade" start="0" end="100" time="500" delay="0" />
<effect type="fade" start="100" end="0" time="500" delay="10000" />
<effect type="fade" start="100" end="0" time="500" delay="20000" />
</animation>
</include>

<include name="WeatherPlusFadeAnim2">
<include name="WeatherUndergroundFadeAnim2">
<animation type="Conditional" reversible="false" condition="true" loop="true">
<effect type="fade" start="0" end="100" time="500" delay="10500" />
<effect type="fade" start="100" end="0" time="500" delay="20000" />
</animation>
</include>

<include name="NextAiredFadeAnim">
<animation type="Conditional" reversible="false" condition="Container(850).HasFocus(4) + IntegerGreaterThan(Window(Home).Property(NextAired.TodayTotal),6)" loop="true">
<effect type="fade" start="0" end="100" time="500" delay="0" />
<effect type="fade" start="100" end="0" time="500" delay="5000" />
<effect type="fade" start="100" end="0" time="500" delay="10000" />
</animation>
<animation type="Conditional" reversible="false" condition="Container(850).HasFocus(4) + IntegerGreaterThan(Window(Home).Property(NextAired.TodayTotal),12)" loop="true">
<effect type="fade" start="0" end="100" time="500" delay="0" />
<effect type="fade" start="100" end="0" time="500" delay="5000" />
<effect type="fade" start="100" end="0" time="500" delay="10000" />
<effect type="fade" start="100" end="0" time="500" delay="15000" />
</animation>
</include>

<include name="NextAiredFadeAnim2">
<animation type="Conditional" reversible="false" condition="Container(850).HasFocus(4) + IntegerGreaterThan(Window(Home).Property(NextAired.TodayTotal),6)" loop="true">
<effect type="fade" start="0" end="100" time="500" delay="5500" />
<effect type="fade" start="100" end="0" time="500" delay="10000" />
</animation>
<animation type="Conditional" reversible="false" condition="Container(850).HasFocus(4) + IntegerGreaterThan(Window(Home).Property(NextAired.TodayTotal),12)" loop="true">
<effect type="fade" start="0" end="100" time="500" delay="5500" />
<effect type="fade" start="100" end="0" time="500" delay="10000" />
<effect type="fade" start="100" end="0" time="500" delay="15000" />
</animation>
</include>

<include name="NextAiredFadeAnim3">
<animation type="Conditional" reversible="false" condition="Container(850).HasFocus(4) + IntegerGreaterThan(Window(Home).Property(NextAired.TodayTotal),12)" loop="true">
<effect type="fade" start="0" end="100" time="500" delay="10500" />
<effect type="fade" start="100" end="0" time="500" delay="15000" />
</animation>
</include>

<include name="InfoPaneLabelFadeAnim">
<animation effect="fade" end="65" condition="true">Conditional</animation>
</include>
Expand Down
Loading

0 comments on commit 761c33f

Please sign in to comment.