updated search timer editing to match epgsearch-0.9.25.beta7 (recommended, but not required)

25 files changed, 109 insertions, 8 deletions

diff --git a/epgsearch.cpp b/epgsearch.cpp
index 352a3f0..11892de 100644
--- a/epgsearch.cpp
+++ b/epgsearch.cpp
@@ -76,7 +76,7 @@ void SearchTimer::Init()
 	m_avoidrepeats = false;
 	m_allowedrepeats = 0;
 	m_compareTitle = false;
-	m_compareSubtitle = false;
+	m_compareSubtitle = 0;
 	m_compareSummary = false;
 	m_repeatsWithinDays = 0;
 	m_blacklistmode = 0;
@@ -129,7 +129,7 @@ SearchTimer::SearchTimer( string const& data )
 			case 28: m_avoidrepeats = lexical_cast< bool >( *part ); break;
 			case 29: m_allowedrepeats = lexical_cast< int >( *part ); break;
 			case 30: m_compareTitle = lexical_cast< bool >( *part ); break;
-			case 31: m_compareSubtitle = lexical_cast< bool >( *part ); break;
+			case 31: m_compareSubtitle = lexical_cast< int >( *part ); break;
 			case 32: m_compareSummary = lexical_cast< bool >( *part ); break;
 			case 33: m_catvaluesAvoidRepeat = lexical_cast< long >( *part ); break;
 			case 34: m_repeatsWithinDays = lexical_cast< int >( *part ); break;
@@ -246,7 +246,7 @@ std::string SearchTimer::ToText()
       << (m_avoidrepeats?1:0) << ":"
       << m_allowedrepeats << ":"
       << (m_compareTitle?1:0) << ":"
-      << (m_compareSubtitle?1:0) << ":"
+      << m_compareSubtitle << ":"
       << (m_compareSummary?1:0) << ":"
       << m_catvaluesAvoidRepeat << ":"
       << m_repeatsWithinDays << ":"
diff --git a/epgsearch.h b/epgsearch.h
index 6cb3cec..2f1f6a7 100644
--- a/epgsearch.h
+++ b/epgsearch.h
@@ -108,8 +108,8 @@ public:
 	void SetRepeatsWithinDays(int repeatsWithinDays) { m_repeatsWithinDays = repeatsWithinDays; }
 	bool CompareTitle() const { return m_compareTitle; }
 	void SetCompareTitle(bool compareTitle) { m_compareTitle = compareTitle; }
-	bool CompareSubtitle() const { return m_compareSubtitle; }
-	void SetCompareSubtitle(bool compareSubtitle) { m_compareSubtitle = compareSubtitle; }
+	int CompareSubtitle() const { return m_compareSubtitle; }
+	void SetCompareSubtitle(int compareSubtitle) { m_compareSubtitle = compareSubtitle; }
 	bool CompareSummary() const { return m_compareSummary; }
 	void SetCompareSummary(bool compareSummary) { m_compareSummary = compareSummary; }
 	unsigned long CompareCategories() const { return m_catvaluesAvoidRepeat; }
@@ -177,7 +177,7 @@ private:
 	bool m_avoidrepeats;
 	int m_allowedrepeats;
 	bool m_compareTitle;
-	bool m_compareSubtitle;
+	int m_compareSubtitle;
 	bool m_compareSummary;
 	int m_repeatsWithinDays;
 	int m_blacklistmode;
diff --git a/i18n-generated.h b/i18n-generated.h
index c907ef5..b6ee0e3 100644
--- a/i18n-generated.h
+++ b/i18n-generated.h
@@ -3546,6 +3546,41 @@ const tI18nPhrase Phrases[] = {
     "",
 #endif
   },
+  { "if present",
+    "wenn vorhanden",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "jos olemassa",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+#if VDRVERSNUM >= 10302
+    "",
+#endif
+#if VDRVERSNUM >= 10307
+    "",
+#endif
+#if VDRVERSNUM >= 10313
+    "",
+#endif
+#if VDRVERSNUM >= 10316
+    "",
+#endif
+#if VDRVERSNUM >= 10342
+    "",
+#endif
+#if VDRVERSNUM >= 10502
+    "",
+#endif
+  },
   { "Compare summary",
     "Vergleiche Beschreibung",
     "",
diff --git a/pages/edit_searchtimer.ecpp b/pages/edit_searchtimer.ecpp
index 88f3718..fbd2cce 100644
--- a/pages/edit_searchtimer.ecpp
+++ b/pages/edit_searchtimer.ecpp
@@ -67,7 +67,7 @@ using namespace vdrlive;
 	int allowedrepeats = 0;
 	int repeatswithindays = 0;
 	bool comparetitle = false;
-	bool comparesubtitle = false;
+	int comparesubtitle = 0;
 	bool comparesummary = false;
 	unsigned avoidrepeatscatselected[];
 	int priority = 0;
@@ -808,7 +808,10 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 
 														<tr>
 															<td class="label"><div class="withmargin"><$ tr("Compare subtitle" ) $>:</div></td>
-															<td><input type="checkbox" name="comparesubtitle" value="1" <{ CHECKIF(comparesubtitle) }>/>
+															<td><select name="comparesubtitle" size="1" id="comparesubtitle">
+										<option value="0" <{ SELECTIF(comparesubtitle == 0) }> ><$ trVDR("no") $></option>
+										<option value="1" <{ SELECTIF(comparesubtitle == 1) }> ><$ trVDR("yes") $></option>
+										<option value="2" <{ SELECTIF(comparesubtitle == 2) }> ><$ tr("if present") $></option></select>
 														</tr>
 
 														<tr>
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 3fdc543..35cbc87 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -321,6 +321,9 @@ msgstr ""
 msgid "Compare subtitle"
 msgstr ""
 
+msgid "if present"
+msgstr ""
+
 msgid "Compare summary"
 msgstr ""
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 5bb310a..5d9fa35 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -319,6 +319,9 @@ msgstr ""
 msgid "Compare subtitle"
 msgstr ""
 
+msgid "if present"
+msgstr ""
+
 msgid "Compare summary"
 msgstr ""
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 61b9519..27f6ec1 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -319,6 +319,9 @@ msgstr ""
 msgid "Compare subtitle"
 msgstr ""
 
+msgid "if present"
+msgstr ""
+
 msgid "Compare summary"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 3bc0504..eb5629e 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -321,6 +321,9 @@ msgstr "Vergleiche Titel"
 msgid "Compare subtitle"
 msgstr "Vergleiche Untertitel"
 
+msgid "if present"
+msgstr "wenn vorhanden"
+
 msgid "Compare summary"
 msgstr "Vergleiche Beschreibung"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index d1e5e91..47ad8fc 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -319,6 +319,9 @@ msgstr ""
 msgid "Compare subtitle"
 msgstr ""
 
+msgid "if present"
+msgstr ""
+
 msgid "Compare summary"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 58e4393..c27fb06 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -319,6 +319,9 @@ msgstr ""
 msgid "Compare subtitle"
 msgstr ""
 
+msgid "if present"
+msgstr ""
+
 msgid "Compare summary"
 msgstr ""
 
diff --git a/po/et_EE.po b/po/et_EE.po
index b998197..e32d205 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -319,6 +319,9 @@ msgstr ""
 msgid "Compare subtitle"
 msgstr ""
 
+msgid "if present"
+msgstr ""
+
 msgid "Compare summary"
 msgstr ""
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 47b600c..59e47a9 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -319,6 +319,9 @@ msgstr "Vertaa nimeä"
 msgid "Compare subtitle"
 msgstr "Vertaa jakson nimeä"
 
+msgid "if present"
+msgstr "jos olemassa"
+
 msgid "Compare summary"
 msgstr "Vertaa kuvausta"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 211075d..3786e2f 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -325,6 +325,9 @@ msgstr "Comparer titres"
 msgid "Compare subtitle"
 msgstr "Comparer les sous-titres"
 
+msgid "if present"
+msgstr ""
+
 msgid "Compare summary"
 msgstr "Comparer les descriptions"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 8af236a..7bfb204 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -320,6 +320,9 @@ msgstr ""
 msgid "Compare subtitle"
 msgstr ""
 
+msgid "if present"
+msgstr ""
+
 msgid "Compare summary"
 msgstr ""
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 25b8c72..0291ddd 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -320,6 +320,9 @@ msgstr ""
 msgid "Compare subtitle"
 msgstr ""
 
+msgid "if present"
+msgstr ""
+
 msgid "Compare summary"
 msgstr ""
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 4d293a1..191af01 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -322,6 +322,9 @@ msgstr "Confronta titoli"
 msgid "Compare subtitle"
 msgstr "Confronta sottotitoli"
 
+msgid "if present"
+msgstr ""
+
 msgid "Compare summary"
 msgstr "Confronta descrizione"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 751cd17..1f42565 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -325,6 +325,9 @@ msgstr ""
 msgid "Compare subtitle"
 msgstr ""
 
+msgid "if present"
+msgstr ""
+
 msgid "Compare summary"
 msgstr ""
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 9ad2992..7a561d2 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -320,6 +320,9 @@ msgstr ""
 msgid "Compare subtitle"
 msgstr ""
 
+msgid "if present"
+msgstr ""
+
 msgid "Compare summary"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 9916ef0..4a34a30 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -319,6 +319,9 @@ msgstr ""
 msgid "Compare subtitle"
 msgstr ""
 
+msgid "if present"
+msgstr ""
+
 msgid "Compare summary"
 msgstr ""
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index f327a03..898505f 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -319,6 +319,9 @@ msgstr ""
 msgid "Compare subtitle"
 msgstr ""
 
+msgid "if present"
+msgstr ""
+
 msgid "Compare summary"
 msgstr ""
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index a0c00e1..9c45183 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -320,6 +320,9 @@ msgstr ""
 msgid "Compare subtitle"
 msgstr ""
 
+msgid "if present"
+msgstr ""
+
 msgid "Compare summary"
 msgstr ""
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 244823f..7a25c51 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -319,6 +319,9 @@ msgstr ""
 msgid "Compare subtitle"
 msgstr ""
 
+msgid "if present"
+msgstr ""
+
 msgid "Compare summary"
 msgstr ""
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index dbec589..c8fbdad 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -320,6 +320,9 @@ msgstr ""
 msgid "Compare subtitle"
 msgstr ""
 
+msgid "if present"
+msgstr ""
+
 msgid "Compare summary"
 msgstr ""
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 7ece58a..65c146f 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -320,6 +320,9 @@ msgstr ""
 msgid "Compare subtitle"
 msgstr ""
 
+msgid "if present"
+msgstr ""
+
 msgid "Compare summary"
 msgstr ""
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 7c783e5..397b123 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -320,6 +320,9 @@ msgstr ""
 msgid "Compare subtitle"
 msgstr ""
 
+msgid "if present"
+msgstr ""
+
 msgid "Compare summary"
 msgstr ""