summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pages/recordings.ecpp4
-rw-r--r--pages/setup.ecpp9
-rw-r--r--po/ca_ES.po3
-rw-r--r--po/cs_CZ.po3
-rw-r--r--po/da_DK.po3
-rw-r--r--po/de_DE.po3
-rw-r--r--po/el_GR.po3
-rw-r--r--po/es_ES.po3
-rw-r--r--po/et_EE.po3
-rw-r--r--po/fi_FI.po3
-rw-r--r--po/fr_FR.po3
-rw-r--r--po/hr_HR.po3
-rw-r--r--po/hu_HU.po3
-rw-r--r--po/it_IT.po3
-rw-r--r--po/lt_LT.po3
-rw-r--r--po/nl_NL.po3
-rw-r--r--po/nn_NO.po3
-rw-r--r--po/pl_PL.po3
-rw-r--r--po/pt_PT.po3
-rw-r--r--po/ro_RO.po3
-rw-r--r--po/ru_RU.po3
-rw-r--r--po/sl_SI.po3
-rw-r--r--po/sv_SE.po3
-rw-r--r--po/tr_TR.po3
-rw-r--r--setup.cpp3
-rw-r--r--setup.h3
26 files changed, 83 insertions, 2 deletions
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index 801435f..b5272b9 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -141,7 +141,7 @@ for (iter = recordingsTree->begin(path); iter != end; ++iter) {
if (!recItem->IsDir()) {
string day(FormatDateTime("%a,", recItem->StartTime()));
string dayLen(lexical_cast<string, int>(day.length() - 1) + ".25em;");
- string duration(lexical_cast<string, int>(recItem->Duration()) + "'");
+ string duration(LiveSetup().GetShowRecDuration() ? "(" + lexical_cast<string, int>(recItem->Duration()) + "')" : "");
string shortDescr(recItem->RecInfo()->ShortText() ? recItem->RecInfo()->ShortText() : "");
string hint(tr("Click to view details.")); if (!shortDescr.empty()) hint = shortDescr + "<br />" + hint;
</%cpp>
@@ -229,7 +229,7 @@ for (iter = recordingsTree->begin(path); iter != end; ++iter) {
<div class="recording_imgs"><%cpp> reply.out() << StringRepeat(level + 1, "<img src=\"img/transparent.png\" alt=\"\" width=\"16px\" height=\"16px\" />"); </%cpp><%cpp> if (!archived.empty()) { </%cpp><img src="<$ LiveSetup().GetThemedLink("img", "on_dvd.png") $>" alt="on_dvd" <& tooltip.hint text=(archived) &> /><%cpp> } else { </%cpp><img src="<$ LiveSetup().GetThemedLink("img", "movie.png") $>" alt="movie" /><%cpp> } </%cpp></div>
<div class="recording_spec">
<div class="recording_day"><$ FormatDateTime(recFormatStr, startTime) $></div>
- <div class="recording_duration">(<$ duration $>)</div>
+ <div class="recording_duration"><$ duration $></div>
<div class="recording_name"><a <& tooltip.hint text=(hint) &><& tooltip.display domId=(id) &>><$ name $><br /><%cpp>if ((name != shortDescr) && (!shortDescr.empty())) {</%cpp><span><$ shortDescr $></span><%cpp> } else { </%cpp><span>&nbsp;</span><%cpp> } </%cpp></a></div>
</div>
<div class="recording_actions">
diff --git a/pages/setup.ecpp b/pages/setup.ecpp
index b59d1bb..e62d821 100644
--- a/pages/setup.ecpp
+++ b/pages/setup.ecpp
@@ -21,6 +21,7 @@ using namespace std;
string startscreen;
string theme;
string localnetmask;
+ string showRecDuration;
string showLogo;
string useAjax;
string showInfoBox;
@@ -64,6 +65,7 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP))
LiveSetup().SetScheduleDuration(scheduleDuration);
LiveSetup().SetStartScreen(startscreen);
LiveSetup().SetTheme(theme);
+ LiveSetup().SetShowRecDuration(!showRecDuration.empty());
LiveSetup().SetShowLogo(!showLogo.empty());
LiveSetup().SetUseAjax(!useAjax.empty());
if (LiveSetup().GetUseAjax()) {
@@ -94,6 +96,7 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP))
startscreen = LiveSetup().GetStartScreen();
theme = LiveSetup().GetTheme();
localnetmask = LiveSetup().GetLocalNetMask();
+ showRecDuration = LiveSetup().GetShowRecDuration() ? "1" : "";
showLogo = LiveSetup().GetShowLogo() ? "1" : "";
useAjax = LiveSetup().GetUseAjax() ? "1" : "";
showInfoBox = LiveSetup().GetShowInfoBox() ? "1" : "";
@@ -180,6 +183,12 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP))
</td>
</tr>
<tr>
+ <td class="label leftcol"><div class="withmargin"><$ tr("Show duration in 'Recordings'") $>:</div></td>
+ <td class="rightcol">
+ <input type="checkbox" name="showRecDuration" id="showRecDuration" value="1" <%cpp> CHECKIF(!showRecDuration.empty()); </%cpp>/>
+ </td>
+ </tr>
+ <tr>
<td class="label leftcol"><div class="withmargin"><$ tr("Use ajax technology") $>:</div></td>
<td class="rightcol">
<input type="checkbox" name="useAjax" id="useAjax" value="1" <%cpp> CHECKIF(!useAjax.empty()); </%cpp> onclick="changeduseajax(this)"/>
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 52106ef..3833a40 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -750,6 +750,9 @@ msgstr ""
msgid "Show live logo image"
msgstr ""
+msgid "Show duration in 'Recordings'"
+msgstr ""
+
msgid "Use ajax technology"
msgstr ""
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 69de7c4..0df69ad 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -748,6 +748,9 @@ msgstr ""
msgid "Show live logo image"
msgstr ""
+msgid "Show duration in 'Recordings'"
+msgstr ""
+
msgid "Use ajax technology"
msgstr ""
diff --git a/po/da_DK.po b/po/da_DK.po
index f56d3a9..eda9629 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -748,6 +748,9 @@ msgstr ""
msgid "Show live logo image"
msgstr ""
+msgid "Show duration in 'Recordings'"
+msgstr ""
+
msgid "Use ajax technology"
msgstr ""
diff --git a/po/de_DE.po b/po/de_DE.po
index df79751..6cd9347 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -750,6 +750,9 @@ msgstr "Lokales Netz (keine Anmeldung notwendig)"
msgid "Show live logo image"
msgstr "Zeige das Live Logo"
+msgid "Show duration in 'Recordings'"
+msgstr ""
+
msgid "Use ajax technology"
msgstr "Verwende AJAX Technologie"
diff --git a/po/el_GR.po b/po/el_GR.po
index 37c6879..948cace 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -748,6 +748,9 @@ msgstr ""
msgid "Show live logo image"
msgstr ""
+msgid "Show duration in 'Recordings'"
+msgstr ""
+
msgid "Use ajax technology"
msgstr ""
diff --git a/po/es_ES.po b/po/es_ES.po
index 12e9a0c..8c94267 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -748,6 +748,9 @@ msgstr ""
msgid "Show live logo image"
msgstr ""
+msgid "Show duration in 'Recordings'"
+msgstr ""
+
msgid "Use ajax technology"
msgstr ""
diff --git a/po/et_EE.po b/po/et_EE.po
index c26cfa0..8969d1e 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -748,6 +748,9 @@ msgstr ""
msgid "Show live logo image"
msgstr ""
+msgid "Show duration in 'Recordings'"
+msgstr ""
+
msgid "Use ajax technology"
msgstr ""
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 0911870..c3ec1e7 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -748,6 +748,9 @@ msgstr "Paikallinen verkko (ei autentikointia)"
msgid "Show live logo image"
msgstr "Näytä Live-logo"
+msgid "Show duration in 'Recordings'"
+msgstr "Näytä kestoajat 'Tallenteet'-sivulla"
+
msgid "Use ajax technology"
msgstr "Käytä AJAX-tekniikkaa"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index d093eca..e875bd5 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -770,6 +770,9 @@ msgstr "Réseau local (non requis)"
msgid "Show live logo image"
msgstr "Afficher l'image du logo de live"
+msgid "Show duration in 'Recordings'"
+msgstr ""
+
msgid "Use ajax technology"
msgstr "Utilisez la technologie Ajax"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index bbcfbc2..394579d 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -749,6 +749,9 @@ msgstr ""
msgid "Show live logo image"
msgstr ""
+msgid "Show duration in 'Recordings'"
+msgstr ""
+
msgid "Use ajax technology"
msgstr ""
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 4dd36ae..9e22a49 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -749,6 +749,9 @@ msgstr ""
msgid "Show live logo image"
msgstr ""
+msgid "Show duration in 'Recordings'"
+msgstr ""
+
msgid "Use ajax technology"
msgstr ""
diff --git a/po/it_IT.po b/po/it_IT.po
index 2f0c30d..a3623e5 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -754,6 +754,9 @@ msgstr "Rete locale (nessun accesso richiesto)"
msgid "Show live logo image"
msgstr "Mostra logo immagine Live"
+msgid "Show duration in 'Recordings'"
+msgstr ""
+
msgid "Use ajax technology"
msgstr "Utilizza tecnologia Ajax"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 500fcbf..37363f3 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -749,6 +749,9 @@ msgstr "Vietinis tinklas (nereikalingas prisijungimas)"
msgid "Show live logo image"
msgstr "Rodyti live įskiepo logotipą"
+msgid "Show duration in 'Recordings'"
+msgstr ""
+
msgid "Use ajax technology"
msgstr "Naudoti AJAX"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 811504c..af1b1f3 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -766,6 +766,9 @@ msgstr ""
msgid "Show live logo image"
msgstr ""
+msgid "Show duration in 'Recordings'"
+msgstr ""
+
msgid "Use ajax technology"
msgstr ""
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 6be7d4b..6bd33ed 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -749,6 +749,9 @@ msgstr ""
msgid "Show live logo image"
msgstr ""
+msgid "Show duration in 'Recordings'"
+msgstr ""
+
msgid "Use ajax technology"
msgstr ""
diff --git a/po/pl_PL.po b/po/pl_PL.po
index f04ee69..507e3c9 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -748,6 +748,9 @@ msgstr ""
msgid "Show live logo image"
msgstr ""
+msgid "Show duration in 'Recordings'"
+msgstr ""
+
msgid "Use ajax technology"
msgstr ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 0c6ed4e..e45a915 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -748,6 +748,9 @@ msgstr ""
msgid "Show live logo image"
msgstr ""
+msgid "Show duration in 'Recordings'"
+msgstr ""
+
msgid "Use ajax technology"
msgstr ""
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 067e978..deb06e4 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -749,6 +749,9 @@ msgstr ""
msgid "Show live logo image"
msgstr ""
+msgid "Show duration in 'Recordings'"
+msgstr ""
+
msgid "Use ajax technology"
msgstr ""
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 75bb5fb..8fe10cf 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -748,6 +748,9 @@ msgstr ""
msgid "Show live logo image"
msgstr ""
+msgid "Show duration in 'Recordings'"
+msgstr ""
+
msgid "Use ajax technology"
msgstr ""
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 4ebaf08..8428983 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -749,6 +749,9 @@ msgstr ""
msgid "Show live logo image"
msgstr ""
+msgid "Show duration in 'Recordings'"
+msgstr ""
+
msgid "Use ajax technology"
msgstr ""
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 875e2f0..e57739e 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -749,6 +749,9 @@ msgstr ""
msgid "Show live logo image"
msgstr ""
+msgid "Show duration in 'Recordings'"
+msgstr ""
+
msgid "Use ajax technology"
msgstr ""
diff --git a/po/tr_TR.po b/po/tr_TR.po
index a500dca..fd49593 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -749,6 +749,9 @@ msgstr ""
msgid "Show live logo image"
msgstr ""
+msgid "Show duration in 'Recordings'"
+msgstr ""
+
msgid "Use ajax technology"
msgstr ""
diff --git a/setup.cpp b/setup.cpp
index 5737378..be61b1e 100644
--- a/setup.cpp
+++ b/setup.cpp
@@ -41,6 +41,7 @@ Setup::Setup():
m_theme("marine"),
m_lastwhatsonlistmode("detail"),
m_tntnetloglevel("WARN"),
+ m_showRecDuration(1),
m_showLogo(1),
m_useAjax(1),
m_showInfoBox(1),
@@ -128,6 +129,7 @@ bool Setup::ParseSetupEntry( char const* name, char const* value )
else if ( strcmp( name, "Theme" ) == 0 ) m_theme = value;
else if ( strcmp( name, "LocalNetMask" ) == 0 ) { m_localnetmask = value; }
else if ( strcmp( name, "LastWhatsOnListMode" ) == 0 ) { m_lastwhatsonlistmode = value; }
+ else if ( strcmp( name, "ShowRecDuration" ) == 0 ) { m_showRecDuration = atoi(value); }
else if ( strcmp( name, "ShowLogo" ) == 0 ) { m_showLogo = atoi(value); }
else if ( strcmp( name, "UseAjax" ) == 0 ) { m_useAjax = atoi(value); }
else if ( strcmp( name, "ShowInfoBox" ) == 0 ) { m_showInfoBox = atoi(value); }
@@ -295,6 +297,7 @@ bool Setup::SaveSetup()
liveplugin->SetupStore("StartPage", m_startscreen.c_str());
liveplugin->SetupStore("Theme", m_theme.c_str());
liveplugin->SetupStore("LastWhatsOnListMode", m_lastwhatsonlistmode.c_str());
+ liveplugin->SetupStore("ShowRecDuration", m_showRecDuration);
liveplugin->SetupStore("ShowLogo", m_showLogo);
liveplugin->SetupStore("UseAjax", m_useAjax);
liveplugin->SetupStore("ShowInfoBox", m_showInfoBox);
diff --git a/setup.h b/setup.h
index a22051e..0fcbd17 100644
--- a/setup.h
+++ b/setup.h
@@ -54,6 +54,7 @@ class Setup
bool GetIsLocalNet() const { return m_islocalnet; };
std::string const GetLastWhatsOnListMode() const { return m_lastwhatsonlistmode; }
std::string const GetTntnetLogLevel() const { return m_tntnetloglevel; }
+ bool GetShowRecDuration() const { return m_showRecDuration != 0; }
bool GetShowLogo() const { return m_showLogo != 0; }
bool GetUseAjax() const { return m_useAjax != 0; }
bool GetShowInfoBox() const { return m_showInfoBox != 0; }
@@ -77,6 +78,7 @@ class Setup
void SetLocalNetMask(std::string const & localnetmask) { m_localnetmask = localnetmask; }
void SetIsLocalNet(bool islocalnet) { m_islocalnet = islocalnet; }
void SetLastWhatsOnListMode(std::string const & mode) { m_lastwhatsonlistmode = mode; SaveSetup(); }
+ void SetShowRecDuration(bool show) { m_showRecDuration = show ? 1 : 0; }
void SetShowLogo(bool show) { m_showLogo = show ? 1 : 0; }
void SetUseAjax(bool use) { m_useAjax = use ? 1 : 0; }
void SetShowInfoBox(bool show) { m_showInfoBox = show ? 1 : 0; }
@@ -131,6 +133,7 @@ class Setup
bool m_islocalnet;
std::string m_lastwhatsonlistmode;
std::string m_tntnetloglevel;
+ int m_showRecDuration;
int m_showLogo;
int m_useAjax;
int m_showInfoBox;
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-18 21:40:45 +0000