Skip to content
This repository has been archived by the owner on Apr 15, 2023. It is now read-only.

Commit

Permalink
Merge pull request #316 from margro/Gotham-series-rec
Browse files Browse the repository at this point in the history
[MediaPortal] Allow configuration of series recording settings (Gotham backport)
  • Loading branch information
Lars Op den Kamp committed Jul 13, 2014
2 parents 18c52bb + 89fdd49 commit de7b632
Show file tree
Hide file tree
Showing 33 changed files with 2,227 additions and 182 deletions.
2 changes: 2 additions & 0 deletions addons/pvr.mediaportal.tvserver/Makefile.am
Expand Up @@ -19,8 +19,10 @@ INCLUDES+=-Isrc
libmediaportal_addon_la_SOURCES = src/Cards.cpp \
src/channels.cpp \
src/client.cpp \
src/DateTime.cpp \
src/epg.cpp \
src/GenreTable.cpp \
src/GUIDialogRecordSettings.cpp \
src/pvrclient-mediaportal.cpp \
src/recordings.cpp \
src/Socket.cpp \
Expand Down
2 changes: 1 addition & 1 deletion addons/pvr.mediaportal.tvserver/addon/addon.xml.in
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="pvr.mediaportal.tvserver"
version="1.9.13"
version="1.9.14"
name="MediaPortal PVR Client"
provider-name="Marcel Groothuis">
<requires>
Expand Down
4 changes: 4 additions & 0 deletions addons/pvr.mediaportal.tvserver/addon/changelog.txt
@@ -1,3 +1,7 @@
v1.9.14
- Added: Series recording support (requires skin specific dialog)
- Fixed: [TSReader] Direct playback of recordings that are stored on a network share

v1.9.13
- Added: Live TV/Recordings: Report "permission denied" errors on SMB access failures
- Changed: [Settings] enable fast channel switching by default
Expand Down
Expand Up @@ -176,3 +176,98 @@ msgstr ""
msgctxt "#30075"
msgid "No PMT found"
msgstr ""

#empty strings from id 30076 to 30099

# Schedule settings dialog
msgctxt "#30100"
msgid "Schedule settings"
msgstr ""

msgctxt "#30101"
msgid "Frequency"
msgstr ""

msgctxt "#30102"
msgid "Airtime"
msgstr ""

msgctxt "#30103"
msgid "Channels"
msgstr ""

msgctxt "#30104"
msgid "Keep"
msgstr ""

msgctxt "#30105"
msgid "Record minutes before start"
msgstr ""

msgctxt "#30106"
msgid "Record minutes after end"
msgstr ""

# Frequency:
msgctxt "#30110"
msgid "Record Once"
msgstr ""

msgctxt "#30111"
msgid "Record Daily (This program)"
msgstr ""

msgctxt "#30112"
msgid "Record Weekly"
msgstr ""

msgctxt "#30113"
msgid "Record Weekends"
msgstr ""

msgctxt "#30114"
msgid "Record Week Days"
msgstr ""

# Airtime:
msgctxt "#30120"
msgid "This time"
msgstr ""

msgctxt "#30121"
msgid "Anytime"
msgstr ""

# Channel:
msgctxt "#30125"
msgid "This Channel"
msgstr ""

msgctxt "#30126"
msgid "Any Channel"
msgstr ""

# Keep:
msgctxt "#30130"
msgid "Until space needed"
msgstr ""

msgctxt "#30131"
msgid "Until Watched"
msgstr ""

msgctxt "#30132"
msgid "Days"
msgstr ""

msgctxt "#30133"
msgid "Always"
msgstr ""

msgctxt "#30135"
msgid "Backend default"
msgstr ""

msgctxt "#30136"
msgid "XBMC default"
msgstr ""
@@ -0,0 +1,207 @@
<window type="dialog">
<defaultcontrol always="true">10</defaultcontrol>
<coordinates>
<system>1</system>
</coordinates>
<controls>
<control type="group">
<include>Animation_DialogPopup</include>
<!-- Standard dialog background //-->
<control type="image">
<posx>110</posx>
<posy>0</posy>
<width>30</width>
<height>720</height>
<texture flipx="true">shadow.png</texture>
<colordiffuse>C3FFFFFF</colordiffuse>
</control>
<control type="image">
<posx>1140</posx>
<posy>0</posy>
<width>30</width>
<height>720</height>
<texture>shadow.png</texture>
<colordiffuse>C3FFFFFF</colordiffuse>
</control>
<control type="image">
<posx>140</posx>
<posy>0</posy>
<width>1000</width>
<height>720</height>
<texture>darkgrey.png</texture>
<colordiffuse>$VAR[value_texturecolor]</colordiffuse>
<include>Animation_DefaultGlass</include>
</control>
<control type="image">
<posx>140</posx>
<posy>0</posy>
<width>1000</width>
<height>80</height>
<texture>black.png</texture>
<colordiffuse>90FFFFFF</colordiffuse>
</control>
<!-- Heading label -->
<control type="label">
<description>header label</description>
<posx>215</posx>
<posy>23</posy>
<width>852</width>
<height>30</height>
<font>Font_32</font>
<label>$ADDON[pvr.mediaportal.tvserver 30100]</label>
<textcolor>FFFFFAF0</textcolor>
<align>center</align>
<aligny>center</aligny>
<include>Animation_Fade</include>
</control>
<control type="image">
<posx>215</posx>
<posy>130</posy>
<width>825</width>
<height>2</height>
<align>left</align>
<texture flipx="true">divider.png</texture>
</control>

<!-- Dialog specific controls //-->
<control type="label" description="Program title" id="20">
<posx>215</posx>
<posy>90</posy>
<width>852</width>
<height>30</height>
<align>center</align>
<aligny>center</aligny>
<textcolor>$VAR[value_headercolor]</textcolor>
<font>Font_30</font>
<!--<label>filled in by code</label>-->
<scroll>true</scroll>
</control>
<control type="group">
<posx>215</posx>
<posy>143</posy>
<control type="label" description="Program start time" id="21">
<posx>0</posx>
<posy>0</posy>
<width>852</width>
<height>25</height>
<font>Font_19</font>
<!--<label>filled in by code</label>-->
<align>center</align>
<aligny>center</aligny>
<textcolor>FFFFFAF0</textcolor>
</control>
<control type="label" description="Program channel" id="22">
<posx>0</posx>
<posy>35</posy>
<width>852</width>
<height>25</height>
<font>Font_19</font>
<!--<label>filled in by code</label>-->
<align>center</align>
<aligny>center</aligny>
<textcolor>FFFFFAF0</textcolor>
</control>
</control>
<control type="image">
<posx>215</posx>
<posy>200</posy>
<width>825</width>
<height>2</height>
<align>left</align>
<texture flipx="true">divider.png</texture>
</control>
<control type="grouplist" description="spincontrols" id="23">
<posx>140</posx>
<posy>210</posy>
<itemgap>0</itemgap>
<width>1000</width>
<height>290</height>
<onup>9001</onup>
<ondown>9001</ondown>

<control type="spincontrolex" id="10">
<description>Frequency</description>
<label>$ADDON[pvr.mediaportal.tvserver 30101]</label>
<onright>10</onright>
<onleft>10</onleft>
</control>

<control type="spincontrolex" id="11">
<description>Airtime</description>
<label>$ADDON[pvr.mediaportal.tvserver 30102]</label>
<onright>11</onright>
<onleft>11</onleft>
</control>

<control type="spincontrolex" id="12">
<description>Channels</description>
<label>$ADDON[pvr.mediaportal.tvserver 30103]</label>
<onright>12</onright>
<onleft>12</onleft>
</control>

<control type="image" id="24">
<description>Separator</description>
<align>left</align>
<texture flipx="true">divider.png</texture>
</control>

<control type="spincontrolex" id="13">
<description>Keep</description>
<label>$ADDON[pvr.mediaportal.tvserver 30104]</label>
<onright>13</onright>
<onleft>13</onleft>
</control>

<control type="spincontrolex" id="14">
<description>Record minutes before start</description>
<label>$ADDON[pvr.mediaportal.tvserver 30105]</label>
<onright>14</onright>
<onleft>14</onleft>
</control>

<control type="spincontrolex" id="15">
<description>Record minutes after end</description>
<label>$ADDON[pvr.mediaportal.tvserver 30106]</label>
<onright>15</onright>
<onleft>15</onleft>
</control>
</control>

<!-- Dialog Ok/Cancel buttons //-->
<control type="image">
<posx>140</posx>
<posy>600</posy>
<height>40</height>
<width>1000</width>
<texture>black.png</texture>
<colordiffuse>90FFFFFF</colordiffuse>
</control>
<control type="grouplist" id="9001">
<posx>140</posx>
<posy>600</posy>
<onup>15</onup>
<ondown>10</ondown>
<orientation>horizontal</orientation>
<itemgap>0</itemgap>
<control type="button" id="1">
<description>Ok Button</description>
<width>500</width>
<include>SettingsBottomButton</include>
<label>186</label>
<onleft>2</onleft>
<onright>2</onright>
</control>
<control type="button" id="2">
<description>Cancel Button</description>
<width>500</width>
<include>SettingsBottomButton</include>
<label>222</label>
<font>font12_title</font>
<onleft>1</onleft>
<onright>1</onright>
</control>
</control>
</control>
</controls>
</window>

0 comments on commit de7b632

Please sign in to comment.