[PVR] Split Timer window containing both timers and timer rules into separate "Timer rules" and "Timers" windows

4 files changed, 56 insertions, 9 deletions

diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index adce230dc2..c4844076b8 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -9045,7 +9045,11 @@ msgctxt "#19137"
 msgid "No groups defined. Please create a group first"
 msgstr ""
 
-#empty string with id 19138
+#. Label of timer rules tv/radio home submenu item
+#: skin.confluence
+msgctxt "#19138"
+msgid "Timer rules"
+msgstr ""
 
 msgctxt "#19139"
 msgid "Name of the new group"
diff --git a/addons/skin.confluence/720p/IncludesHomeMenuItems.xml b/addons/skin.confluence/720p/IncludesHomeMenuItems.xml
index 30346dce9f..533635b046 100644
--- a/addons/skin.confluence/720p/IncludesHomeMenuItems.xml
+++ b/addons/skin.confluence/720p/IncludesHomeMenuItems.xml
@@ -268,15 +268,20 @@
 		</control>
 		<control type="button" id="90146">
 			<include>ButtonHomeSubCommonValues</include>
+			<label>19138</label>
+			<onclick>ActivateWindow(TVTimerRules)</onclick>
+		</control>
+		<control type="button" id="90147">
+			<include>ButtonHomeSubCommonValues</include>
 			<label>19040</label>
 			<onclick>ActivateWindow(TVTimers)</onclick>
 		</control>
-		<control type="button" id="90147">
+		<control type="button" id="90148">
 			<include>ButtonHomeSubCommonValues</include>
 			<label>137</label>
 			<onclick>ActivateWindow(TVSearch)</onclick>
 		</control>
-		<control type="image" id="90148">
+		<control type="image" id="90149">
 			<width>35</width>
 			<height>35</height>
 			<texture border="0,0,0,3">HomeSubEnd.png</texture>
@@ -305,15 +310,20 @@
 		</control>
 		<control type="button" id="90246">
 			<include>ButtonHomeSubCommonValues</include>
+			<label>19138</label>
+			<onclick>ActivateWindow(RadioTimerRules)</onclick>
+		</control>
+		<control type="button" id="90247">
+			<include>ButtonHomeSubCommonValues</include>
 			<label>19040</label>
 			<onclick>ActivateWindow(RadioTimers)</onclick>
 		</control>
-		<control type="button" id="90247">
+		<control type="button" id="90248">
 			<include>ButtonHomeSubCommonValues</include>
 			<label>137</label>
 			<onclick>ActivateWindow(RadioSearch)</onclick>
 		</control>
-		<control type="image" id="90248">
+		<control type="image" id="90249">
 			<width>35</width>
 			<height>35</height>
 			<texture border="0,0,0,3">HomeSubEnd.png</texture>
diff --git a/addons/skin.confluence/720p/IncludesPVR.xml b/addons/skin.confluence/720p/IncludesPVR.xml
index 92bb15a85a..a73440eebf 100644
--- a/addons/skin.confluence/720p/IncludesPVR.xml
+++ b/addons/skin.confluence/720p/IncludesPVR.xml
@@ -47,6 +47,11 @@
 				</control>
 				<control type="label">
 					<include>WindowTitleCommons</include>
+					<label>[COLOR=blue] - [/COLOR]$LOCALIZE[19138]</label>
+					<visible>Window.IsActive(TVTimerRules) | Window.IsActive(RadioTimerRules)</visible>
+				</control>
+				<control type="label">
+					<include>WindowTitleCommons</include>
 					<label>[COLOR=blue] - [/COLOR]$LOCALIZE[19040]</label>
 					<visible>Window.IsActive(TVTimers) | Window.IsActive(RadioTimers)</visible>
 				</control>
@@ -123,6 +128,14 @@
 					<onclick condition="IsEmpty(Window.Property(IsRadio))">ActivateWindow(TVRecordings)</onclick>
 					<onclick condition="!IsEmpty(Window.Property(IsRadio))">ActivateWindow(RadioRecordings)</onclick>
 				</control>
+				<control type="button" id="105">
+					<description>Timer Rules</description>
+					<textwidth>235</textwidth>
+					<include>ButtonCommonValues</include>
+					<label>19138</label>
+					<onclick condition="IsEmpty(Window.Property(IsRadio))">ActivateWindow(TVTimerRules)</onclick>
+					<onclick condition="!IsEmpty(Window.Property(IsRadio))">ActivateWindow(RadioTimerRules)</onclick>
+				</control>
 				<control type="button" id="103">
 					<description>Timers</description>
 					<textwidth>235</textwidth>
@@ -228,7 +241,7 @@
 					<textwidth>235</textwidth>
 					<include>ButtonCommonValues</include>
 					<label>19077</label>
-					<visible>Window.IsActive(TVTimers) | Window.IsActive(RadioTimers)</visible>
+					<visible>Window.IsActive(TVTimers) | Window.IsActive(RadioTimers) | Window.IsActive(TVTimerRules) | Window.IsActive(RadioTimerRules)</visible>
 				</control>
 				<!-- Playback controls -->
 				<include>CommonNowPlaying_Controls</include>
diff --git a/addons/skin.confluence/720p/MyPVRTimers.xml b/addons/skin.confluence/720p/MyPVRTimers.xml
index 87ca26bb81..e6ac977f3f 100644
--- a/addons/skin.confluence/720p/MyPVRTimers.xml
+++ b/addons/skin.confluence/720p/MyPVRTimers.xml
@@ -132,7 +132,8 @@
 					<height>330</height>
 					<onup>50</onup>
 					<ondown>50</ondown>
-					<onleft>103</onleft>
+					<onleft condition="Window.IsActive(TVTimers) | Window.IsActive(RadioTimers)">103</onleft>
+					<onleft condition="Window.IsActive(TVTimerRules) | Window.IsActive(RadioTimerRules)">105</onleft>
 					<onright>73</onright>
 					<pagecontrol>73</pagecontrol>
 					<scrolltime>200</scrolltime>
@@ -323,7 +324,8 @@
 					<textureslidernib>ScrollBarNib.png</textureslidernib>
 					<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
 					<onleft>50</onleft>
-					<onright>103</onright>
+					<onright condition="Window.IsActive(TVTimers) | Window.IsActive(RadioTimers)">103</onright>
+					<onright condition="Window.IsActive(TVTimerRules) | Window.IsActive(RadioTimerRules)">105</onright>
 					<showonepage>false</showonepage>
 					<orientation>vertical</orientation>
 				</control>
@@ -422,7 +424,24 @@
 			<control type="label">
 				<depth>DepthFooter</depth>
 				<animation effect="slide" start="0,0" end="-90,0" time="0" condition="system.getbool(input.enablemouse)">Conditional</animation>
-				<description>Page Count Label</description>
+				<description>Page Count Label for Timer Rules</description>
+				<right>40</right>
+				<top>53r</top>
+				<width>500</width>
+				<height>20</height>
+				<font>font12</font>
+				<textcolor>grey</textcolor>
+				<scroll>false</scroll>
+				<align>right</align>
+				<aligny>center</aligny>
+				<label>([COLOR=blue]$INFO[Container(50).NumItems][/COLOR]) $LOCALIZE[19138] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(50).CurrentPage]/$INFO[Container(50).NumPages][/COLOR])</label>
+				<visible>Window.IsActive(TVTimerRules) | Window.IsActive(RadioTimerRules)</visible>
+				<include>Window_OpenClose_Animation</include>
+			</control>
+			<control type="label">
+				<depth>DepthFooter</depth>
+				<animation effect="slide" start="0,0" end="-90,0" time="0" condition="system.getbool(input.enablemouse)">Conditional</animation>
+				<description>Page Count Label for Timers</description>
 				<right>40</right>
 				<top>53r</top>
 				<width>500</width>
@@ -433,6 +452,7 @@
 				<align>right</align>
 				<aligny>center</aligny>
 				<label>([COLOR=blue]$INFO[Container(50).NumItems][/COLOR]) $LOCALIZE[19040] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(50).CurrentPage]/$INFO[Container(50).NumPages][/COLOR])</label>
+				<visible>Window.IsActive(TVTimers) | Window.IsActive(RadioTimers)</visible>
 				<include>Window_OpenClose_Animation</include>
 			</control>
 		</control>