Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[confluence] [PVR] small adjustments #9112

Closed
wants to merge 4 commits into from
Closed

[confluence] [PVR] small adjustments #9112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef90396
[confluence] fix aspect ratio
Glenn-1990 Feb 11, 2016
55732dd
[confluence] fix visible condition
Glenn-1990 Feb 11, 2016
8fc531d
[confluence] bring timer label more in line with timer icon
Glenn-1990 Feb 11, 2016
d4697c8
[confluence] fix overlappig time and icon
Glenn-1990 Feb 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions addons/skin.confluence/720p/DialogPVRGuideOSD.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,37 +100,37 @@
<label>$INFO[ListItem.StartTime]</label>
</control>
<control type="image">
<left>60</left>
<top>7</top>
<width>16</width>
<height>16</height>
<left>380</left>
<top>5</top>
<width>20</width>
<height>20</height>
<texture>$VAR[PVRTimerIcon]</texture>
</control>
<control type="label">
<left>100</left>
<left>110</left>
<top>0</top>
<width>300</width>
<width>290</width>
<height>30</height>
<font>font12</font>
<textcolor>grey2</textcolor>
<selectedcolor>selected</selectedcolor>
<align>right</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Label]</label>
<visible>IsEmpty($VAR[PVRTimerIcon])</visible>
<visible>![ListItem.HasTimer | ListItem.HasRecording | ListItem.IsRecording]</visible>
</control>
<control type="label">
<left>150</left>
<left>110</left>
<top>0</top>
<width>250</width>
<width>260</width>
<height>30</height>
<font>font12</font>
<textcolor>grey2</textcolor>
<selectedcolor>selected</selectedcolor>
<align>right</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Label]</label>
<visible>!IsEmpty($VAR[PVRTimerIcon])</visible>
<visible>ListItem.HasTimer | ListItem.HasRecording | ListItem.IsRecording</visible>
</control>
</itemlayout>
<focusedlayout height="35" width="410">
Expand Down Expand Up @@ -165,37 +165,37 @@
<label>$INFO[ListItem.StartTime]</label>
</control>
<control type="image">
<left>60</left>
<top>7</top>
<width>16</width>
<height>16</height>
<left>380</left>
<top>5</top>
<width>20</width>
<height>20</height>
<texture>$VAR[PVRTimerIcon]</texture>
</control>
<control type="label">
<left>100</left>
<left>110</left>
<top>0</top>
<width>300</width>
<width>290</width>
<height>30</height>
<font>font12</font>
<textcolor>grey2</textcolor>
<selectedcolor>selected</selectedcolor>
<align>right</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Label]</label>
<visible>IsEmpty($VAR[PVRTimerIcon])</visible>
<visible>![ListItem.HasTimer | ListItem.HasRecording | ListItem.IsRecording]</visible>
</control>
<control type="label">
<left>150</left>
<left>110</left>
<top>0</top>
<width>250</width>
<width>260</width>
<height>30</height>
<font>font12</font>
<textcolor>grey2</textcolor>
<selectedcolor>selected</selectedcolor>
<align>right</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Label]</label>
<visible>!IsEmpty($VAR[PVRTimerIcon])</visible>
<visible>ListItem.HasTimer | ListItem.HasRecording | ListItem.IsRecording</visible>
</control>
</focusedlayout>
</control>
Expand Down
4 changes: 2 additions & 2 deletions addons/skin.confluence/720p/MyPVRChannels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
<control type="image">
<left>5</left>
<top>37</top>
<width>30</width>
<width>20</width>
<height>20</height>
<texture>PVR-IsRecording.png</texture>
<visible>ListItem.IsRecording</visible>
Expand Down Expand Up @@ -387,7 +387,7 @@
<control type="image">
<left>5</left>
<top>37</top>
<width>30</width>
<width>20</width>
<height>20</height>
<texture>PVR-IsRecording.png</texture>
<visible>ListItem.IsRecording</visible>
Expand Down
2 changes: 2 additions & 0 deletions addons/skin.confluence/720p/includes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@
</variable>
<variable name="PVRTimerLabel">
<value condition="ListItem.IsRecording">$LOCALIZE[19043]</value>
<value condition="ListItem.HasTimer + [ListItem.TimerHasError | ListItem.TimerHasConflict]">$LOCALIZE[31510]</value>
<value condition="ListItem.HasRecording">$LOCALIZE[31512]</value>
<value condition="ListItem.HasTimer + !ListItem.TimerIsActive">$LOCALIZE[19057]</value>
<value condition="ListItem.HasTimer">$LOCALIZE[31510]</value>
</variable>
Expand Down
6 changes: 5 additions & 1 deletion addons/skin.confluence/language/resource.language.en_gb/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,11 @@ msgctxt "#31511"
msgid "Channel options"
msgstr ""

#empty strings from id 31512 to 31900
msgctxt "#31512"
msgid "Recording present"
msgstr ""

#empty strings from id 31513 to 31900
#Weather plugin

msgctxt "#31901"
Expand Down