aboutsummaryrefslogtreecommitdiff
path: root/addons/skin.confluence
diff options
context:
space:
mode:
Diffstat (limited to 'addons/skin.confluence')
-rw-r--r--addons/skin.confluence/720p/DialogPVRChannelManager.xml106
-rw-r--r--addons/skin.confluence/720p/DialogPVRGuideSearch.xml1
-rw-r--r--addons/skin.confluence/addon.xml2
-rw-r--r--addons/skin.confluence/changelog.txt4
4 files changed, 34 insertions, 79 deletions
diff --git a/addons/skin.confluence/720p/DialogPVRChannelManager.xml b/addons/skin.confluence/720p/DialogPVRChannelManager.xml
index 14c1d3e811..71bdb48fbb 100644
--- a/addons/skin.confluence/720p/DialogPVRChannelManager.xml
+++ b/addons/skin.confluence/720p/DialogPVRChannelManager.xml
@@ -267,7 +267,7 @@
<left>0</left>
<top>25</top>
<width>380</width>
- <height>35</height>
+ <height>45</height>
<font>font12</font>
<textcolor>white</textcolor>
<focusedcolor>white</focusedcolor>
@@ -280,15 +280,15 @@
<label>19074</label>
<onleft>20</onleft>
<onright>9000</onright>
- <onup>33</onup>
+ <onup>30</onup>
<ondown>8</ondown>
</control>
<control type="edit" id="8">
<description>Channel name</description>
<left>0</left>
- <top>65</top>
+ <top>75</top>
<width>380</width>
- <height>35</height>
+ <height>45</height>
<font>font12</font>
<textcolor>white</textcolor>
<focusedcolor>white</focusedcolor>
@@ -304,9 +304,9 @@
<control type="button" id="9">
<description>Channel logo Button</description>
<left>0</left>
- <top>105</top>
+ <top>125</top>
<width>380</width>
- <height>35</height>
+ <height>45</height>
<font>font12</font>
<texturefocus border="5">button-focus2.png</texturefocus>
<texturenofocus border="5">button-nofocus.png</texturenofocus>
@@ -318,19 +318,19 @@
</control>
<control type="image" id="10">
<description>Current Channel Icon</description>
- <left>345</left>
- <top>107</top>
- <width>30</width>
- <height>30</height>
+ <left>337</left>
+ <top>128</top>
+ <width>39</width>
+ <height>39</height>
<aspectratio>keep</aspectratio>
<info>ListItem.Property(Icon)</info>
</control>
<control type="radiobutton" id="12">
<description>EPG activated</description>
<left>0</left>
- <top>145</top>
+ <top>175</top>
<width>380</width>
- <height>35</height>
+ <height>45</height>
<font>font12</font>
<textcolor>white</textcolor>
<focusedcolor>white</focusedcolor>
@@ -349,9 +349,9 @@
<control type="spincontrolex" id="13">
<description>EPG source</description>
<left>0</left>
- <top>185</top>
+ <top>225</top>
<width>380</width>
- <height>35</height>
+ <height>45</height>
<font>font12</font>
<texturefocus border="5">button-focus2.png</texturefocus>
<texturenofocus border="5">button-nofocus.png</texturenofocus>
@@ -364,9 +364,9 @@
<control type="radiobutton" id="14">
<description>Parental locked</description>
<left>0</left>
- <top>225</top>
+ <top>275</top>
<width>380</width>
- <height>35</height>
+ <height>45</height>
<font>font12</font>
<textcolor>white</textcolor>
<focusedcolor>white</focusedcolor>
@@ -385,7 +385,7 @@
</control>
<control type="group">
<left>490</left>
- <top>360</top>
+ <top>420</top>
<control type="label">
<description>channel options Header</description>
<left>0</left>
@@ -403,8 +403,8 @@
<description>Group Manager Button</description>
<left>0</left>
<top>25</top>
- <width>190</width>
- <height>35</height>
+ <width>380</width>
+ <height>45</height>
<font>font12</font>
<texturefocus border="5">button-focus2.png</texturefocus>
<texturenofocus border="5">button-nofocus.png</texturenofocus>
@@ -413,14 +413,14 @@
<onleft>20</onleft>
<onright>34</onright>
<onup>14</onup>
- <ondown>31</ondown>
+ <ondown>7</ondown>
</control>
<control type="button" id="34">
<description>TV/Radio Button</description>
- <left>195</left>
- <top>25</top>
- <width>185</width>
- <height>35</height>
+ <left>0</left>
+ <top>75</top>
+ <width>380</width>
+ <height>45</height>
<font>font12</font>
<visible>IsEmpty(Window.Property(IsRadio))</visible>
<texturefocus border="5">button-focus2.png</texturefocus>
@@ -430,14 +430,14 @@
<onleft>30</onleft>
<onright>9000</onright>
<onup>14</onup>
- <ondown>31</ondown>
+ <ondown>7</ondown>
</control>
<control type="button" id="34">
<description>TV/Radio Button</description>
- <left>195</left>
- <top>25</top>
- <width>185</width>
- <height>35</height>
+ <left>0</left>
+ <top>75</top>
+ <width>380</width>
+ <height>45</height>
<font>font12</font>
<visible>!IsEmpty(Window.Property(IsRadio))</visible>
<texturefocus border="5">button-focus2.png</texturefocus>
@@ -447,54 +447,6 @@
<onleft>30</onleft>
<onright>9000</onright>
<onup>14</onup>
- <ondown>31</ondown>
- </control>
- <control type="button" id="31">
- <description>Edit channel Button</description>
- <left>0</left>
- <top>65</top>
- <width>380</width>
- <height>35</height>
- <font>font12</font>
- <texturefocus border="5">button-focus2.png</texturefocus>
- <texturenofocus border="5">button-nofocus.png</texturenofocus>
- <align>center</align>
- <label>19203</label>
- <onleft>20</onleft>
- <onright>9000</onright>
- <onup>30</onup>
- <ondown>32</ondown>
- </control>
- <control type="button" id="32">
- <description>Delete channel Button</description>
- <left>0</left>
- <top>105</top>
- <width>380</width>
- <height>35</height>
- <font>font12</font>
- <texturefocus border="5">button-focus2.png</texturefocus>
- <texturenofocus border="5">button-nofocus.png</texturenofocus>
- <align>center</align>
- <label>19211</label>
- <onleft>20</onleft>
- <onright>9000</onright>
- <onup>31</onup>
- <ondown>33</ondown>
- </control>
- <control type="button" id="33">
- <description>New channel Button</description>
- <left>0</left>
- <top>145</top>
- <width>380</width>
- <height>35</height>
- <font>font12</font>
- <texturefocus border="5">button-focus2.png</texturefocus>
- <texturenofocus border="5">button-nofocus.png</texturenofocus>
- <align>center</align>
- <label>19204</label>
- <onleft>20</onleft>
- <onright>9000</onright>
- <onup>32</onup>
<ondown>7</ondown>
</control>
</control>
diff --git a/addons/skin.confluence/720p/DialogPVRGuideSearch.xml b/addons/skin.confluence/720p/DialogPVRGuideSearch.xml
index dedb182d10..96d0e3900a 100644
--- a/addons/skin.confluence/720p/DialogPVRGuideSearch.xml
+++ b/addons/skin.confluence/720p/DialogPVRGuideSearch.xml
@@ -36,7 +36,6 @@
<aligny>center</aligny>
<textcolor>selected</textcolor>
<shadowcolor>black</shadowcolor>
- <visible>!pvr.IsPlayingRadio</visible>
</control>
<control type="button">
<description>Close Window button</description>
diff --git a/addons/skin.confluence/addon.xml b/addons/skin.confluence/addon.xml
index 1b19cffd10..c9182de5cc 100644
--- a/addons/skin.confluence/addon.xml
+++ b/addons/skin.confluence/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="skin.confluence"
- version="2.6.0"
+ version="2.7.0"
name="Confluence"
provider-name="Jezz_X, Team Kodi">
<requires>
diff --git a/addons/skin.confluence/changelog.txt b/addons/skin.confluence/changelog.txt
index 6dbb4c6f41..f5d839e8b0 100644
--- a/addons/skin.confluence/changelog.txt
+++ b/addons/skin.confluence/changelog.txt
@@ -1,3 +1,7 @@
+[B]2.7.0[/B]
+
+- Removed new/edit/delete buttons from the channel manager dialog
+
[B]2.6.0[/B]
- Moved some context menu functionality for PVR channels to the sideblade