Permalink
Browse files

updated: Multiplex -> Multiplex Mk 2 (initial commit)

Feature-wise, the same as the original but with a consistent Aeon style and colour scheme. Old Multiplex isn't available with this update, though that may change. Watched/Unwatched overlays haven't been added yet, though they'll arrive soon. This is something of a rush release so expect a problem or two.
  • Loading branch information...
1 parent 2cdcb52 commit 8963c8e7c71340923fa8f8e9fb6d2bac6ee9e459 @djh committed May 31, 2009
Showing with 551 additions and 812 deletions.
  1. +1 −1 720p/Customisation.xml
  2. +6 −6 720p/Font.xml
  3. +18 −2 720p/Includes_Animations.xml
  4. +40 −2 720p/Includes_Furniture.xml
  5. +6 −249 720p/Includes_MediaFlags.xml
  6. +1 −11 720p/Includes_Objects.xml
  7. +1 −2 720p/MyVideoNav.xml
  8. +472 −506 720p/Viewtype_Multiplex.xml
  9. +5 −32 720p/Viewtype_Showcase.xml
  10. +1 −1 language/English/strings.xml
  11. BIN media/720p (1280x720) Optimised.xpr
  12. BIN media/768p (1366x768) Optimised.xpr
  13. BIN media/multiplex/lite/multiplex_full_base.png
  14. BIN media/multiplex/lite/multiplex_full_basetv.png
  15. BIN media/multiplex/lite/multiplex_full_infobigthumb.png
  16. BIN media/multiplex/lite/multiplex_full_infoplot.png
  17. BIN media/multiplex/lite/multiplex_full_infotv.png
  18. BIN media/multiplex/multiplex_arrow.png
  19. BIN media/multiplex/multiplex_arrow2.png
  20. BIN media/multiplex/multiplex_border.png
  21. BIN media/multiplex/multiplex_frame.png
  22. BIN media/multiplex/multiplex_full_base.png
  23. BIN media/multiplex/multiplex_full_basetv.png
  24. BIN media/multiplex/multiplex_full_infobigthumb.png
  25. BIN media/multiplex/multiplex_full_infoplot.png
  26. BIN media/multiplex/multiplex_full_infoplotandcast.png
  27. BIN media/multiplex/multiplex_full_infotv.png
  28. BIN media/multiplex/multiplex_glass.png
  29. BIN media/multiplex/multiplex_gradient.png
  30. BIN media/multiplex/multiplex_gradienttv.png
  31. BIN media/multiplex/multiplex_iconframe.png
  32. BIN media/multiplex/multiplex_iconframetv.png
  33. BIN media/multiplex/multiplex_labelblock.png
  34. BIN media/multiplex/multiplex_lite_base.png
  35. BIN media/multiplex/multiplex_mask.png
  36. BIN media/multiplex/multiplex_maskreflect.png
  37. BIN media/multiplex/multiplex_seasongradient.png
  38. BIN media/multiplex/multiplex_tablet.png
  39. BIN media/multiplex/multiplex_tablet_bigthumb.png
  40. BIN media/multiplex/multiplex_tvborder.png
  41. BIN media/multiplex/multiplex_tvglass.png
  42. BIN media/multiplex/multiplex_tvmask.png
  43. BIN media/multiplex/multiplex_tvmaskreflect.png
  44. BIN media/multiplex/multiplex_tvtablet.png
View
@@ -79,7 +79,7 @@
<label>UNLOCK ALL VIEWS FOR TV SHOWS</label>
<onclick>Skin.ToggleSetting(unlockTVviews)</onclick>
<selected>Skin.HasSetting(unlockTVviews)</selected>
- </control>
+ </control>
</control>
View
@@ -352,21 +352,21 @@
<font>
<name>Font_MultiplexPlot</name>
- <filename>aeon_sublist_cy.ttf</filename>
+ <filename>aeon_player.ttf</filename>
<size>19</size>
- <linespacing>1</linespacing>
+ <linespacing>1.28</linespacing>
</font>
<font>
<name>Font_MultiplexInfoLabel</name>
- <filename>aeon_multiplex.ttf</filename>
- <size>16</size>
+ <filename>aeon_rss.ttf</filename>
+ <size>15</size>
</font>
<font>
<name>Font_MultiplexInfoValue</name>
- <filename>aeon_multiplex.ttf</filename>
- <size>17</size>
+ <filename>aeon_rss.ttf</filename>
+ <size>16</size>
</font>
<!-- Fullscreen Info pages -->
@@ -206,8 +206,8 @@
</include>
<include name="Animation_BackgroundFade">
- <animation effect="fade" time="500" condition="!Window.Previous(4)">WindowOpen</animation>
- <animation effect="fade" time="200" condition="!Window.Next(4)">WindowClose</animation>
+ <animation effect="fade" time="500" condition="![Window.Previous(4) + Container(300).HasFocus(9)]">WindowOpen</animation>
+ <animation effect="fade" time="200" condition="![Window.Next(4) + Container(300).HasFocus(9)]">WindowClose</animation>
<animation effect="fade" time="800">Visible</animation>
<animation effect="fade" delay = "300" time="800" condition="![Window.IsActive(2001) | Window.IsActive(2003)]">Hidden</animation>
</include>
@@ -271,5 +271,21 @@
<animation effect="fade" time="200">Visible</animation>
<animation effect="fade" time="200">Hidden</animation>
</include>
+
+<include name="Animation_MultiplexFocusZoom">
+ <animation effect="zoom" center="56,80" start="100" end="110" time="200" tween="cubic" easing="inout">Focus</animation>
+ <animation effect="zoom" center="56,80" start="110" end="100" time="200" tween="cubic" easing="inout">Unfocus</animation>
+</include>
+
+<include name="Animation_MultiplexTVFocusZoom">
+ <animation effect="zoom" center="106,50" start="100" end="110" time="200" tween="cubic" easing="inout">Focus</animation>
+</include>
+<include name="Animation_MultiplexTVFocusZoomLabel">
+ <animation type="Focus">
+ <effect type="zoom" center="106,50" start="100" end="110" time="200" tween="cubic" easing="inout" />
+ <effect type="fade" start="100" end="0" time="100" />
+ </animation>
+</include>
+
</includes>
@@ -685,6 +685,43 @@
<visible>Control.IsVisible(57)</visible>
<include>Animation_CommonFade</include>
<include>Animation_HideShowcase</include>
+ <include>Animation_HideMultiplex</include>
+ </control>
+
+ <control type="image">
+ <posx>0</posx>
+ <posy>315</posy>
+ <width>1280</width>
+ <height>405</height>
+ <texture>showcase/lite/showcase_floor.png</texture>
+ <visible>Control.IsVisible(52)</visible>
+ <include>Animation_CommonFade</include>
+ <include>Animation_HideShowcase</include>
+ <include>Animation_HideMultiplex</include>
+ </control>
+
+ <control type="image">
+ <posx>144</posx>
+ <posy>583</posy>
+ <width>993</width>
+ <height>137</height>
+ <include condition="!Skin.HasSetting(darkshowcase)">ShowcaseSpotLight</include>
+ <include condition="Skin.HasSetting(darkshowcase)">ShowcaseSpotNight</include>
+ <include>Animation_CommonFade</include>
+ <include>Animation_HideShowcase</include>
+ <include>Animation_HideMultiplex</include>
+ <visible>Control.IsVisible(57) | Control.IsVisible(52)</visible>
+ </control>
+
+ <control type="image">
+ <posx>144</posx>
+ <posy>583</posy>
+ <width>993</width>
+ <height>137</height>
+ <include>ShowcaseSpotLight</include>
+ <include>Animation_CommonFade</include>
+ <include>Animation_HideShowcase</include>
+ <visible>Control.IsVisible(50)</visible>
</control>
<control type="image">
@@ -697,6 +734,7 @@
<colordiffuse>c7FFFFFF</colordiffuse>
<include>Animation_CommonFade</include>
<include>Animation_HideShowcase</include>
+ <include>Animation_HideMultiplex</include>
</control>
<control type="image">
@@ -705,7 +743,7 @@
<width>464</width>
<height>720</height>
<texture>showcase/showcase_vignette.png</texture>
- <visible>[Control.IsVisible(57) | Control.IsVisible(50)] + ![Control.HasFocus(94) | Control.HasFocus(320) | Control.HasFocus(321) | Control.HasFocus(322)]</visible>
+ <visible>[Control.IsVisible(57) | Control.IsVisible(50) | Control.IsVisible(52)] + ![Control.HasFocus(94) | Control.HasFocus(197) | Control.HasFocus(320) | Control.HasFocus(321) | Control.HasFocus(322)]</visible>
<animation type="Visible">
<effect type="fade" start="0" end="100" time="400" easing="inout" tween="cubic" />
<effect type="slide" start="-464,0" end="0,0" time="400" easing="inout" tween="cubic" />
@@ -730,7 +768,7 @@
<width>464</width>
<height>720</height>
<texture flipx="true">showcase/showcase_vignette.png</texture>
- <visible>[Control.IsVisible(57) | Control.IsVisible(50)] + ![Control.HasFocus(94) | Control.HasFocus(320) | Control.HasFocus(321) | Control.HasFocus(322)]</visible>
+ <visible>[Control.IsVisible(57) | Control.IsVisible(50) | Control.IsVisible(52)] + ![Control.HasFocus(94) | Control.HasFocus(197) | Control.HasFocus(320) | Control.HasFocus(321) | Control.HasFocus(322)]</visible>
<animation type="Visible">
<effect type="fade" start="0" end="100" time="400" easing="inout" tween="cubic" />
<effect type="slide" start="464,0" end="0,0" time="400" easing="inout" tween="cubic" />
Oops, something went wrong.

0 comments on commit 8963c8e

Please sign in to comment.