fix import error and new default nextupinfo

This commit is contained in:
im85288 2015-05-08 19:54:43 +01:00
parent b321dc5c00
commit 858f811362
2 changed files with 166 additions and 231 deletions

View file

@ -17,8 +17,6 @@ from PlaybackUtils import PlaybackUtils
from DownloadUtils import DownloadUtils from DownloadUtils import DownloadUtils
from ReadEmbyDB import ReadEmbyDB from ReadEmbyDB import ReadEmbyDB
from API import API from API import API
from ItemInfo import ItemInfo
from PersonInfo import PersonInfo
##### Play items via plugin://plugin.video.emby/ ##### ##### Play items via plugin://plugin.video.emby/ #####

View file

@ -4,241 +4,178 @@
<zorder>0</zorder> <zorder>0</zorder>
<controls> <controls>
<control type="group"> <control type="group">
<control type="image"> <control type="group">
<left>0</left> <animation effect="slide" start="0" end="0,-190" time="150" condition="Window.IsVisible(NextUpInfo.xml)">Conditional</animation>
<top>-150</top> <animation effect="slide" start="0,110" end="0" time="150">Visible</animation>
<width>1280</width> <animation effect="slide" start="0,110" end="0" time="150">WindowOpen</animation>
<height>256</height> <control type="image" id="3006">
<texture flipy="true" border="1">HomeNowPlayingBack.png</texture> <right>0</right>
</control> <bottom>110</bottom>
<control type="label" id="1"> <width>500</width>
<description>Clock label</description> <height>281</height>
<left>450</left> <aspectratio align="right" aligny="bottom">keep</aspectratio>
<top>5</top>
<width>800</width>
<height>25</height>
<align>right</align>
<aligny>center</aligny>
<font>font13</font>
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
<label>$INFO[System.Time]</label>
<animation effect="slide" start="0,0" end="-70,0" time="0" condition="Window.IsVisible(VideoOSD)">conditional</animation>
</control>
<control type="image">
<left>0</left>
<top>230r</top>
<width>1280</width>
<height>230</height>
<texture border="1">HomeNowPlayingBack.png</texture>
</control>
<control type="image" id="3009">
<description>cover image</description>
<left>20</left>
<top>350r</top>
<width>300</width>
<height>330</height>
</control>
<control type="image" id="3006">
<description>clearart</description>
<visible>false</visible>
</control>
<control type="group" id="1">
<left>330</left>
<top>185r</top>
<control type="label" id="1">
<description>TV Show label</description>
<left>20</left>
<top>30</top>
<width>910</width>
<height>25</height>
<align>left</align>
<font>font12</font>
<label>$INFO[Control.GetLabel(3002),Up Next... ,][COLOR=orange]$INFO[Control.GetLabel(3000), ,][/COLOR]</label>
<textcolor>grey2</textcolor>
<shadowcolor>black</shadowcolor>
<visible>VideoPlayer.Content(Episodes)</visible>
</control> </control>
<control type="label" description="episode/season info" id="3002"> <!-- buttons -->
<width>100%</width> <control type="button" id="3012">
<top>0</top> <description>Watch Now</description>
<left>175</left> <right>0</right>
<height>40</height> <bottom>40</bottom>
<visible>false</visible> <width>200</width>
<onup>3013</onup>
<ondown>3013</ondown>
<font>font14</font>
<label>Watch Now</label>
<focusedcolor>FFededed</focusedcolor>
<disabledcolor>B3dddddd</disabledcolor>
<selectedcolor>FFff4081</selectedcolor>
<height>68</height>
<textcolor>ff333333</textcolor>
</control> </control>
<control type="label" description="Title" id="3000"> <control type="button" id="3013">
<width>100%</width> <description>Cancel</description>
<left>267</left> <right>0</right>
<top>0</top> <bottom>-30</bottom>
<height>40</height> <width>200</width>
<visible>false</visible> <onup>3012</onup>
<ondown>3012</ondown>
<font>font14</font>
<label>222</label>
<focusedcolor>FFededed</focusedcolor>
<disabledcolor>B3dddddd</disabledcolor>
<selectedcolor>FFff4081</selectedcolor>
<height>68</height>
<textcolor>ff333333</textcolor>
</control> </control>
<control type="textbox" id="3001"> </control>
<description>text</description> <control type="group">
<left>30</left> <top>300r</top>
<top>62</top> <bottom>0</bottom>
<width>550</width> <width>100%</width>
<height>98</height> <animation effect="fade" start="0" end="100" delay="150" time="150">Visible</animation>
<align>left</align> <animation effect="fade" start="0" end="100" delay="150" time="150">WindowOpen</animation>
<label>-</label> <control type="group">
<font>font13</font> <left>80</left>
<autoscroll time="3000" delay="4000" repeat="5000">true</autoscroll> <right>80</right>
<visible>false</visible> <top>20</top>
</control> <bottom>20</bottom>
<control type="grouplist" id="1"> <control type="image" id="3009">
<left>20</left> <left>-70</left>
<top>60</top> <top>-226</top>
<width>910</width> <width>334</width>
<height>35</height> <height>486</height>
<itemgap>5</itemgap>
<orientation>horizontal</orientation>
<control type="label" id="3003" description="rating">
<width>100%</width>
<top>50</top>
<height>40</height>
<visible>false</visible>
</control> </control>
<control type="label" id="3004" description="year/runtime"> <control type="group">
<width>100%</width> <left>294</left>
<top>50</top> <right>0</right>
<height>40</height> <control type="label">
<scroll>false</scroll> <width>100%</width>
<visible>false</visible> <top>0</top>
</control> <height>40</height>
<control type="label" id="1"> <font>font16</font>
<width min="10" max="520">auto</width> <textcolor>B3dddddd</textcolor>
<height>30</height> <label>$INFO[Control.GetLabel(3002),Up Next... ,][COLOR=orange]$INFO[Control.GetLabel(3000), ,][/COLOR]</label>
<font>font30</font> </control>
<align>left</align> <control type="label" description="episode/season info" id="3002">
<aligny>center</aligny> <width>100%</width>
<label>$INFO[Control.GetLabel(3003)]$INFO[Control.GetLabel(3004), ,]</label> <top>0</top>
<textcolor>grey</textcolor> <left>175</left>
<scroll>true</scroll> <height>40</height>
</control> <font>font16</font>
<control type="button" id="3012"> <textcolor>B3dddddd</textcolor>
<description>Watch now button</description> <visible>false</visible>
<width>200</width> </control>
<height>40</height> <control type="label" description="Title" id="3000">
<label>Watch Now</label> <width>100%</width>
<font>font12_title</font> <left>267</left>
<onleft>3013</onleft> <top>0</top>
<onright>3013</onright> <height>40</height>
</control> <font>font16</font>
<control type="button" id="3013"> <textcolor>orange</textcolor>
<description>cancel button</description> <visible>false</visible>
<width>200</width> </control>
<height>40</height> <control type="label" id="3003" description="rating">
<label>222</label> <width>100%</width>
<font>font12_title</font> <top>50</top>
<onleft>3012</onleft> <height>40</height>
<onright>3012</onright> <font>font14</font>
<textcolor>B3dddddd</textcolor>
</control>
<control type="label" id="3004" description="year/runtime">
<left>55</left>
<width>100%</width>
<top>50</top>
<height>40</height>
<font>font14</font>
<textcolor>B3dddddd</textcolor>
<scroll>false</scroll>
<visible>Control.IsVisible(3003)</visible>
</control>
<control type="label" id="3004" description="year/runtime">
<width>100%</width>
<top>50</top>
<height>40</height>
<font>font14</font>
<textcolor>B3dddddd</textcolor>
<scroll>false</scroll>
<visible>!Control.IsVisible(3003)</visible>
</control>
<control type="textbox" description="Plot" id="3001">
<width>85%</width>
<top>105</top>
<height>68</height>
<font>font12</font>
<align>justify</align>
<left>0</left>
<textcolor>4Ddddddd</textcolor>
</control>
<control type="label" description="Next up">
<width>400</width>
<bottom>30</bottom>
<height>40</height>
<font>font12</font>
<textcolor>B3dddddd</textcolor>
<label>Press cancel to stop automatic play of next episode...</label>
</control>
<control type="label" description="Total Time">
<right>-30</right>
<align>right</align>
<width>400</width>
<bottom>30</bottom>
<height>80</height>
<font>WeatherTemp</font>
<textcolor>B3dddddd</textcolor>
<label>$INFO[Player.TimeRemaining(ss)]</label>
</control>
<control type="image">
<description>Progress Back</description>
<width>100%</width>
<bottom>10</bottom>
<height>8</height>
<texture colordiffuse="1F000000">white.png</texture>
`
</control>
<control type="progress" description="cache">
<description>Progress Bar</description>
<width>100%</width>
<bottom>10</bottom>
<height>8</height>
<info>Player.ProgressCache</info>
<visible>true</visible>
<texturebg colordiffuse="00ffffff">progress-bg.png</texturebg>
<lefttexture colordiffuse="FFff4081">progress-end.png</lefttexture>
<midtexture colordiffuse="FFff4081">progress-end.png</midtexture>
<righttexture colordiffuse="FFff4081">progress-end.png</righttexture>
</control>
<control type="progress" id="23">
<description>Progress Bar</description>
<width>100%</width>
<bottom>10</bottom>
<height>8</height>
<info>Player.Progress</info>
<visible>true</visible>
</control>
</control> </control>
</control> </control>
<control type="label" id="1">
<left>0</left>
<top>120</top>
<width>910</width>
<height>25</height>
<label>$INFO[Player.TimeRemaining(ss),Press cancel to stop automatic play of next episode , seconds remaining]</label>
<align>center</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey</textcolor>
<scroll>true</scroll>
<visible>!Window.IsVisible(VideoOSD) + !VideoPlayer.Content(LiveTV)</visible>
<animation effect="fade" time="200">VisibleChange</animation>
</control>
</control>
<control type="group" id="1">
<left>330</left>
<top>95r</top>
<visible>!VideoPlayer.Content(LiveTV) | [VideoPlayer.Content(LiveTV) + VideoPlayer.HasEpg]</visible>
<control type="label" id="1">
<visible>!VideoPlayer.Content(LiveTV)</visible>
<left>0</left>
<top>0</top>
<width>100</width>
<height>40</height>
<font>font13</font>
<align>left</align>
<aligny>center</aligny>
<label>$INFO[Player.Time(hh:mm:ss)]</label>
</control>
<control type="progress" id="1">
<description>ProgressbarCache</description>
<left>100</left>
<top>15</top>
<width>720</width>
<height>16</height>
<info>Player.ProgressCache</info>
<midtexture border="6,0,6,0">OSDProgressMidLight.png</midtexture>
</control>
<control type="progress" id="1">
<description>Progressbar</description>
<left>100</left>
<top>15</top>
<width>720</width>
<height>16</height>
<info>Player.Progress</info>
</control>
<control type="label" id="1">
<visible>!VideoPlayer.Content(LiveTV)</visible>
<left>820</left>
<top>0</top>
<width>100</width>
<height>40</height>
<font>font13</font>
<align>right</align>
<aligny>center</aligny>
<label>$INFO[Player.Duration(hh:mm:ss)]</label>
</control>
</control>
</control>
<!-- codec info -->
<control type="group" id="0">
<left>0</left>
<top>20</top>
<animation effect="fade" time="200">VisibleChange</animation>
<control type="image">
<description>media info background image</description>
<left>0</left>
<top>0</top>
<width>1280</width>
<height>160</height>
<texture>black-back.png</texture>
</control>
<control type="label" id="10">
<description>row 1 label</description>
<left>50</left>
<top>10</top>
<width>1180</width>
<height>30</height>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<label>-</label>
</control>
<control type="label" id="11">
<description>row 2 label</description>
<left>50</left>
<top>55</top>
<width>1180</width>
<height>30</height>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<label>-</label>
</control>
<control type="label" id="12">
<description>row 3 label</description>
<left>50</left>
<top>100</top>
<width>1180</width>
<height>45</height>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<label>-</label>
</control> </control>
</control> </control>
</controls> </controls>