Merge pull request #295 from manuelm/master-pull

dvbviewer: update to 1.9.15
opdenkamp · May 6, 2014 · 10c441e · 10c441e
2 parents 38cfdcf + fddb3f4
commit 10c441e
Show file tree

Hide file tree

Showing 10 changed files with 354 additions and 151 deletions.
diff --git a/addons/pvr.dvbviewer/addon/addon.xml.in b/addons/pvr.dvbviewer/addon/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.dvbviewer"
-  version="1.9.14"
+  version="1.9.15"
   name="DVBViewer Client"
   provider-name="jdembski, A600, Manuel Mausz, Portisch">
   <requires>

diff --git a/addons/pvr.dvbviewer/addon/changelog.txt b/addons/pvr.dvbviewer/addon/changelog.txt
@@ -1,3 +1,11 @@
+1.9.15
+
+[updated] Speed up timeshift startup time
+[added] If available add genre to EPG
+[added] Support for grouping recordings. Grouping can be by rec. directory,
+        rec. date, first letter, tv channel or series
+[fixed] Another timezone offsets fix
+
 1.9.14
 
 [updated] Require DVB Viewer Recording Service 1.26.0 or later

diff --git a/addons/pvr.dvbviewer/addon/resources/language/English/strings.po b/addons/pvr.dvbviewer/addon/resources/language/English/strings.po
@@ -71,6 +71,36 @@ msgid "Enable low performance mode (disables logos & thumbnails)"
 msgstr ""
 
 #empty strings from id 30041 to 30099
+
+msgctxt "#30050"
+msgid "Group recordings"
+msgstr ""
+
+msgctxt "#30051"
+msgid "disabled"
+msgstr ""
+
+msgctxt "#30052"
+msgid "by recording directory"
+msgstr ""
+
+msgctxt "#30053"
+msgid "by recording date"
+msgstr ""
+
+msgctxt "#30054"
+msgid "by first letter"
+msgstr ""
+
+msgctxt "#30055"
+msgid "by tv channel"
+msgstr ""
+
+msgctxt "#30056"
+msgid "by series"
+msgstr ""
+
+#empty strings from id 30057 to 30099
 #sections
 
 msgctxt "#30100"
@@ -81,7 +111,11 @@ msgctxt "#30101"
 msgid "Advanced"
 msgstr ""
 
-#empty strings from id 30102 to 30499
+msgctxt "#30102"
+msgid "Recordings"
+msgstr ""
+
+#empty strings from id 30103 to 30499
 #notifications
 
 msgctxt "#30500"

diff --git a/addons/pvr.dvbviewer/addon/resources/settings.xml b/addons/pvr.dvbviewer/addon/resources/settings.xml
@@ -13,14 +13,18 @@
     <setting label="30012" id="favouritesfile"    type="file" default="" enable="eq(-1,true)" />
   </category>
 
+  <category label="30102">
+    <setting label="30050" id="grouprecordings" type="enum" lvalues="30051|30052|30053|30054|30055|30056" default="30051" />
+  </category>
+
   <category label="30101">
     <setting label="30020" id="usetimeshift"  type="bool"   default="false" />
     <setting label="30021" id="timeshiftpath" type="folder" default="special://userdata/addon_data/pvr.dvbviewer" option="writeable" enable="eq(-1,true)" />
 
-    <setting id="sep2" type="sep" />
+    <setting id="sep3" type="sep" />
     <setting label="30030" id="usertsp" type="bool" default="false" enable="eq(-3,false)" />
 
-    <setting id="sep3" type="sep" />
+    <setting id="sep4" type="sep" />
     <setting label="30040" id="lowperformance" type="bool" default="false" />
   </category>
 </settings>