Skip to content

Commit

Permalink
Test for changes for new skins
Browse files Browse the repository at this point in the history
  • Loading branch information
@RayW1986
RayW1986 committed Oct 8, 2015
1 parent 651c3af commit f42d7ce
Show file tree
Hide file tree
Showing 70 changed files with 2,804 additions and 449 deletions.
15 changes: 10 additions & 5 deletions gui.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ class TVGuide(xbmcgui.WindowXML):
C_MAIN_DESCRIPTION = 4022
C_MAIN_IMAGE = 4023
C_MAIN_LOGO = 4024
C_MAIN_START_TIME = 4025
C_MAIN_TIMEBAR = 4100
C_MAIN_LOADING = 4200
C_MAIN_LOADING_PROGRESS = 4201
Expand All @@ -119,7 +120,7 @@ class TVGuide(xbmcgui.WindowXML):
C_MAIN_OSD_DESCRIPTION = 6003
C_MAIN_OSD_CHANNEL_LOGO = 6004
C_MAIN_OSD_CHANNEL_TITLE = 6005
C_START_TIME = 4025
C_MAIN_OSD_START_TIME = 6006

def __new__(cls):
return super(TVGuide, cls).__new__(cls, 'script-tvguide-main.xml', ADDON.getAddonInfo('path'), SKIN)
Expand Down Expand Up @@ -423,7 +424,7 @@ def _showContextMenu(self, program):
self.close()

elif buttonClicked == PopupMenu.C_POPUP_LIBMOV:
xbmc.executebuiltin('XBMC.RunAddon(script.tvguidetecbox)')
xbmc.executebuiltin('ActivateWindow(Videos,videodb://movies/titles/)')

elif buttonClicked == PopupMenu.C_POPUP_LIBTV:
xbmc.executebuiltin('ActivateWindow(Videos,videodb://tvshows/titles/)')
Expand Down Expand Up @@ -465,10 +466,10 @@ def onFocus(self, controlId):
else:
self.setControlLabel(self.C_MAIN_TIME, '')
if program.startDate:
self.setControlLabel(self.C_START_TIME,
self.setControlLabel(self.C_MAIN_START_TIME,
'[B]%s[/B]' % (self.formatTime(program.startDate)))
else:
self.setControlLabel(self.C_START_TIME, '')
self.setControlLabel(self.C_MAIN_START_TIME, '')
if program.description:
description = program.description
else:
Expand Down Expand Up @@ -607,6 +608,11 @@ def _showOsd(self):
self.formatTime(self.osdProgram.startDate), self.formatTime(self.osdProgram.endDate)))
else:
self.setControlLabel(self.C_MAIN_OSD_TIME, '')
if self.osdProgram.startDate:
self.setControlLabel(self.C_MAIN_OSD_START_TIME, '[B]%s[/B]' % (
self.formatTime(self.osdProgram.startDate)))
else:
self.setControlLabel(self.C_MAIN_OSD_START_TIME, '')
self.setControlText(self.C_MAIN_OSD_DESCRIPTION, self.osdProgram.description)
self.setControlLabel(self.C_MAIN_OSD_CHANNEL_TITLE, self.osdChannel.title)
if self.osdProgram.channel.logo is not None:
Expand Down Expand Up @@ -1047,7 +1053,6 @@ def onClick(self, controlId):

else:
self.buttonClicked = controlId
self.close()

def onFocus(self, controlId):
pass
Expand Down
6 changes: 5 additions & 1 deletion resources/language/English/strings.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ msgid "[B]Edit channel order and visibility[/B]"
msgstr ""

msgctxt "#30501"
msgid "Press left to pull a channel out, then move it up or down. When in place, press right again to set. Pressing on a channel in the list will enable or disable it.[CR]On touch devices long press on a channel to pull it out, move the list to the desired place and then long press on the pulled out channel to put it in its new place."
msgid "Press left to pull a channel out, then move it up or down. When in place, press right again to set. Pressing on a channel in the list will enable or disable it.[CR][CR]On touch devices long press on a channel to pull it out, move the list to the desired place and then long press on the pulled out channel to put it in its new place."
msgstr ""

msgctxt "#30502"
Expand Down Expand Up @@ -457,6 +457,10 @@ msgctxt "#31002"
msgid "Current local data will be kept for now..."
msgstr ""

msgctxt "#31003"
msgid "Video On-Demand"
msgstr ""

msgctxt "#80000"
msgid "My Movies"
msgstr ""
Expand Down
12 changes: 12 additions & 0 deletions resources/skins/(Kodi Skin) Eminence/720p/script-tvguide-main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,18 @@
<font>Font-ListInfo-Small</font>
<align>left</align>
<aligny>center</aligny>
</control>
<control type="label" id="4025">
<description>Program time</description>
<posx>15</posx>
<posy>65</posy>
<width>340</width>
<height>50</height>
<textcolor>ff6c99ca</textcolor>
<font>font13</font>
<align>left</align>
<aligny>center</aligny>
<visible>false</visible>
</control>
<control type="textbox" id="4022">
<description>Program description</description>
Expand Down
119 changes: 71 additions & 48 deletions resources/skins/Default/720p/script-tvguide-channels.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,47 @@
<posx>0</posx>
<posy>0</posy>
</coordinates>

<animation effect="slide" start="0,-720" end="0,0" time="600" delay="600">WindowOpen</animation>
<animation effect="slide" start="0,0" end="0,-720" time="600" delay="600">WindowClose</animation>

<controls>
<control type="label" id="6001">
<description>visibility marker for selection box</description>
</control>


<control type="image">
<posx>150</posx>
<posy>100</posy>
<width>1010</width>
<height>510</height>
<texture>menu-stream.png</texture>
<posx>0</posx>
<posy>0</posy>
<width>1280</width>
<height>3280</height>
<texture>menu-fade.png</texture>
</control>
<control type="image">
<posx>150</posx>
<posy>100</posy>
<width>1010</width>
<height>510</height>
<texture>menu-stream.png</texture>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>1280</width>
<height>720</height>
<texture>tvguide-background-settings.jpg</texture>
</control>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>1280</width>
<height>63</height>
<texture>menu-fade.png</texture>
</control>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>1280</width>
<height>720</height>
<texture>menu.png</texture>
</control>

<control type="group">
<posx>200</posx>
<posx>50</posx>
<posy>435</posy>
<width>560</width>
<height>38</height>
Expand All @@ -46,14 +64,7 @@
<posy>20</posy>
<width>400</width>
<height>40</height>
<texture>tvguide-glasspane.png</texture>
</control>
<control type="image">
<posx>0</posx>
<posy>20</posy>
<width>400</width>
<height>40</height>
<texture>tvguide-glasspane.png</texture>
<texture>menu-fade.png</texture>
</control>

<control type="image">
Expand All @@ -78,7 +89,7 @@
<font>font13</font>
<textcolor>ffffffff</textcolor>
<label>text</label>
<texturefocus>tvguide-program-grey-focus.png</texturefocus>
<texturefocus>tvguide-program-grey-focus-2.png</texturefocus>
<texturenofocus>tvguide-program-grey.png</texturenofocus>
</control>
<control type="label">
Expand All @@ -94,21 +105,21 @@
</control>

<control type="label">
<posx>90</posx>
<posy>112</posy>
<posx>30</posx>
<posy>15</posy>
<width>520</width>
<height>40</height>
<align>center</align>
<align>left</align>
<aligny>center</aligny>
<font>font13</font>
<textcolor>ffffffff</textcolor>
<label>$ADDON[script.ftvguide 30500]</label>
</control>
<control type="label">
<description>Help and Tips</description>
<posx>180</posx>
<posx>40</posx>
<posy>160</posy>
<width>400</width>
<width>330</width>
<height>400</height>
<textcolor>ffffffff</textcolor>
<font>font13</font>
Expand All @@ -118,8 +129,17 @@
<autoscroll time="3600" delay="6000" repeat="6000">true</autoscroll>
<label>$ADDON[script.ftvguide 30501]</label>
</control>

<control type="image">
<posx>450</posx>
<posy>170</posy>
<width>530</width>
<height>360</height>
<texture>menu-fade.png</texture>
</control>

<control type="fixedlist" id="6000">
<posx>600</posx>
<posx>455</posx>
<posy>175</posy>
<width>520</width>
<height>350</height>
Expand All @@ -133,7 +153,7 @@
<posy>0</posy>
<width>520</width>
<height>38</height>
<texture>tvguide-program-grey.png</texture>
<texture></texture>
</control>
<control type="label">
<posx>16</posx>
Expand All @@ -142,7 +162,7 @@
<height>38</height>
<aligny>center</aligny>
<font>font13</font>
<textcolor>ffffffff</textcolor>
<textcolor>ffaaaaaa</textcolor>
<info>ListItem.Label</info>
</control>
<control type="image">
Expand Down Expand Up @@ -177,6 +197,7 @@
<aligny>center</aligny>
<font>font13</font>
<textcolor>ffffffff</textcolor>
<focusedcolor>ff028bb1</focusedcolor>
<label>[B]$INFO[ListItem.Label][/B]</label>
</control>
<control type="image">
Expand All @@ -189,38 +210,40 @@
</focusedlayout>
</control>

<control type="button" id="6003">
<posx>736</posx>
<posy>550</posy>
<control type="button" id="6003"><!-- SAVE -->
<posx>1000</posx>
<posy>465</posy>
<width>200</width>
<height>40</height>
<height>30</height>
<align>center</align>
<aligny>center</aligny>
<font>font13</font>
<textcolor>ffffffff</textcolor>
<textcolor>ffaaaaaa</textcolor>
<focusedcolor>ffffffff</focusedcolor>
<label>$ADDON[script.ftvguide 30502]</label>
<texturefocus>menu-grey-focus.png</texturefocus>
<texturenofocus>menu-grey.png</texturenofocus>
<texturefocus>tvguide-program-grey-focus-2.png</texturefocus>
<texturenofocus>tvguide-program-grey.png</texturenofocus>
<onleft>6000</onleft>
<onright>6004</onright>
<onup>6000</onup>
<ondown>6004</ondown>
</control>
<control type="button" id="6004">
<posx>937</posx>
<posy>550</posy>
<control type="button" id="6004"><!-- CANCEL -->
<posx>1000</posx>
<posy>500</posy>
<width>200</width>
<height>40</height>
<height>30</height>
<align>center</align>
<aligny>center</aligny>
<font>font13</font>
<textcolor>ffffffff</textcolor>
<textcolor>ffaaaaaa</textcolor>
<focusedcolor>ffffffff</focusedcolor>
<label>$ADDON[script.ftvguide 30503]</label>
<texturefocus>menu-grey-focus.png</texturefocus>
<texturenofocus>menu-grey.png</texturenofocus>
<onleft>6003</onleft>
<onright>6000</onright>
<onup>6000</onup>
<texturefocus>tvguide-program-grey-focus-2.png</texturefocus>
<texturenofocus>tvguide-program-grey.png</texturenofocus>
<onleft>6000</onleft>
<onup>6003</onup>
</control>



</controls>
</window>
Loading

0 comments on commit f42d7ce

Please sign in to comment.