Index: mythtv.new/i18n/mythfrontend_zh_tw.ts
===================================================================
--- mythtv.new/i18n/mythfrontend_zh_tw.ts (revision 15597)
+++ mythtv.new/i18n/mythfrontend_zh_tw.ts (working copy)
@@ -1086,6 +1086,10 @@
+
+
+
+
@@ -3185,6 +3189,10 @@
+
+
+
+
Index: mythtv.new/i18n/mythfrontend_nb.ts
===================================================================
--- mythtv.new/i18n/mythfrontend_nb.ts (revision 15597)
+++ mythtv.new/i18n/mythfrontend_nb.ts (working copy)
@@ -1159,6 +1159,10 @@
Alle programmer
+
+
+
+
Det er %1 opptak i denne gruppen
@@ -3923,6 +3927,10 @@
Alle programmer
+
+
+
+
Start i tittelvelgeren
Index: mythtv.new/i18n/mythfrontend_pt_br.ts
===================================================================
--- mythtv.new/i18n/mythfrontend_pt_br.ts (revision 15597)
+++ mythtv.new/i18n/mythfrontend_pt_br.ts (working copy)
@@ -1271,6 +1271,10 @@
Todos Programas
+
+
+
+
Neste grupo de vídeo existem %1 gravações
@@ -4174,6 +4178,10 @@
Todos Programas
+
+
+
+
Aplicar filtro de grupo padrão na tela de visualização de Gravações
Index: mythtv.new/i18n/mythfrontend_fr.ts
===================================================================
--- mythtv.new/i18n/mythfrontend_fr.ts (revision 15597)
+++ mythtv.new/i18n/mythfrontend_fr.ts (working copy)
@@ -1289,6 +1289,10 @@
Toutes les émissions
+
+
+
+
Vous avez terminé de visionner:
@@ -4005,6 +4009,10 @@
Toutes émissions
+
+
+
+
Voir les résumés de groupes
Index: mythtv.new/i18n/mythfrontend_et.ts
===================================================================
--- mythtv.new/i18n/mythfrontend_et.ts (revision 15597)
+++ mythtv.new/i18n/mythfrontend_et.ts (working copy)
@@ -1361,6 +1361,10 @@
Kõik programmid
+
+
+
+
Näidatavas grupis on %1 salvestist
@@ -4345,6 +4349,10 @@
Kõik programmid
+
+
+
+
Alusta pealkirjade sektsioonis
Index: mythtv.new/i18n/mythfrontend_nl.ts
===================================================================
--- mythtv.new/i18n/mythfrontend_nl.ts (revision 15597)
+++ mythtv.new/i18n/mythfrontend_nl.ts (working copy)
@@ -1172,6 +1172,10 @@
Alle Programma 's
+
+
+
+
U bent klaar met het kijken naar:
@@ -3651,6 +3655,10 @@
Alle programma's
+
+
+
+
Hoeveel terugspringen na "Reclame overslaan"
Index: mythtv.new/i18n/mythfrontend_en_gb.ts
===================================================================
--- mythtv.new/i18n/mythfrontend_en_gb.ts (revision 15597)
+++ mythtv.new/i18n/mythfrontend_en_gb.ts (working copy)
@@ -1106,6 +1106,10 @@
All Programmes
+
+
+
+
@@ -4268,6 +4272,10 @@
All Programmes
+
+
+
+
Index: mythtv.new/i18n/mythfrontend_pl.ts
===================================================================
--- mythtv.new/i18n/mythfrontend_pl.ts (revision 15597)
+++ mythtv.new/i18n/mythfrontend_pl.ts (working copy)
@@ -1101,6 +1101,10 @@
+
+
+
+
@@ -4318,6 +4322,10 @@
+
+
+
+
Index: mythtv.new/i18n/mythfrontend_it.ts
===================================================================
--- mythtv.new/i18n/mythfrontend_it.ts (revision 15597)
+++ mythtv.new/i18n/mythfrontend_it.ts (working copy)
@@ -1134,6 +1134,10 @@
Tutte le Reg.
+
+
+
+
% usato
@@ -3555,6 +3559,10 @@
Tutte le Reg.
+
+
+
+
Index: mythtv.new/i18n/mythfrontend_cz.ts
===================================================================
--- mythtv.new/i18n/mythfrontend_cz.ts (revision 15597)
+++ mythtv.new/i18n/mythfrontend_cz.ts (working copy)
@@ -1309,6 +1309,10 @@
Všechny programy
+
+
+
+
V této skupině zobrazení je %1 nahrávek
@@ -4068,6 +4072,10 @@
Všechny programy
+
+
+
+
Index: mythtv.new/i18n/mythfrontend_ca.ts
===================================================================
--- mythtv.new/i18n/mythfrontend_ca.ts (revision 15597)
+++ mythtv.new/i18n/mythfrontend_ca.ts (working copy)
@@ -1097,6 +1097,10 @@
Tots
+
+
+
+
Heu acavat de veure:
@@ -3490,6 +3494,10 @@
Tots
+
+
+
+
Index: mythtv.new/i18n/mythfrontend_pt.ts
===================================================================
--- mythtv.new/i18n/mythfrontend_pt.ts (revision 15597)
+++ mythtv.new/i18n/mythfrontend_pt.ts (working copy)
@@ -1097,6 +1097,10 @@
Todos os Programas
+
+
+
+
Acabou de ver:
@@ -3478,6 +3482,10 @@
Todos os Programas
+
+
+
+
Index: mythtv.new/i18n/mythfrontend_tr.ts
===================================================================
--- mythtv.new/i18n/mythfrontend_tr.ts (revision 15597)
+++ mythtv.new/i18n/mythfrontend_tr.ts (working copy)
@@ -1315,6 +1315,10 @@
Tüm Programlar
+
+
+
+
Bu gösterge grubunda %1 kayıt var
@@ -4765,6 +4769,10 @@
Tüm Programlar
+
+
+
+
Kayıtları Görüntüle ekranında uygulanacak varsayılan grup filtresi.
Index: mythtv.new/i18n/mythfrontend_de.ts
===================================================================
--- mythtv.new/i18n/mythfrontend_de.ts (revision 15597)
+++ mythtv.new/i18n/mythfrontend_de.ts (working copy)
@@ -1328,6 +1328,10 @@
Alle Sendungen
+
+
+
+
Wiedergabe beendet von:
@@ -3850,6 +3854,10 @@
Alle Sendungen
+
+
+
+
Werbeblock Sprunglänge
Index: mythtv.new/i18n/mythfrontend_sv.ts
===================================================================
--- mythtv.new/i18n/mythfrontend_sv.ts (revision 15597)
+++ mythtv.new/i18n/mythfrontend_sv.ts (working copy)
@@ -1097,6 +1097,10 @@
Alla program
+
+
+
+
Är du säker på att du vill ta bort:
@@ -3436,6 +3440,10 @@
Alla program
+
+
+
+
Tillbakaspolning vid reklamöverhoppning
Index: mythtv.new/i18n/mythfrontend_ja.ts
===================================================================
--- mythtv.new/i18n/mythfrontend_ja.ts (revision 15597)
+++ mythtv.new/i18n/mythfrontend_ja.ts (working copy)
@@ -1277,6 +1277,10 @@
全番組
+
+
+
+
済み:
@@ -3817,6 +3821,10 @@
全番組
+
+
+
+
CMスキップ自動巻き戻し量
Index: mythtv.new/i18n/mythfrontend_fi.ts
===================================================================
--- mythtv.new/i18n/mythfrontend_fi.ts (revision 15597)
+++ mythtv.new/i18n/mythfrontend_fi.ts (working copy)
@@ -1297,6 +1297,10 @@
Kaikki Ohjelmat
+
+
+
+
Katsomasi ohjelma on loppunut:
@@ -3834,6 +3838,10 @@
Kaikki Ohjelmat
+
+
+
+
Mainosten Ohituksen Automaattisenkelauksen Määrä
Index: mythtv.new/i18n/mythfrontend_dk.ts
===================================================================
--- mythtv.new/i18n/mythfrontend_dk.ts (revision 15597)
+++ mythtv.new/i18n/mythfrontend_dk.ts (working copy)
@@ -1329,6 +1329,10 @@
Alle programmer
+
+
+
+
Du er færdig med at se:
@@ -3852,6 +3856,10 @@
Alle programmer
+
+
+
+
Reklame skip Auto-Tilbage mængde
Index: mythtv.new/i18n/mythfrontend_es.ts
===================================================================
--- mythtv.new/i18n/mythfrontend_es.ts (revision 15597)
+++ mythtv.new/i18n/mythfrontend_es.ts (working copy)
@@ -1342,6 +1342,10 @@
Todas
+
+
+
+
Ha acabado de ver:
@@ -3878,6 +3882,10 @@
Todas
+
+
+
+
Cantidad de salto atrás después del salto de anuncios
Index: mythtv.new/i18n/mythfrontend_is.ts
===================================================================
--- mythtv.new/i18n/mythfrontend_is.ts (revision 15597)
+++ mythtv.new/i18n/mythfrontend_is.ts (working copy)
@@ -1305,6 +1305,10 @@
Allir dagskrárliðir
+
+
+
+
Þú hefur lokið að horfa á:
@@ -3805,6 +3809,10 @@
Alle programmer
+
+
+
+
Index: mythtv.new/i18n/mythfrontend_si.ts
===================================================================
--- mythtv.new/i18n/mythfrontend_si.ts (revision 15597)
+++ mythtv.new/i18n/mythfrontend_si.ts (working copy)
@@ -1259,6 +1259,10 @@
Vsi programi
+
+
+
+
Samo 1% posnetkov je v tej skupini
@@ -3460,6 +3464,10 @@
Vsi programi
+
+
+
+
Začni z naslovom
Index: mythtv.new/i18n/mythfrontend_ru.ts
===================================================================
--- mythtv.new/i18n/mythfrontend_ru.ts (revision 15597)
+++ mythtv.new/i18n/mythfrontend_ru.ts (working copy)
@@ -1167,6 +1167,10 @@
Все программы
+
+
+
+
%1 записей в этой группе
@@ -4517,6 +4521,10 @@
Всем программам
+
+
+
+
Фильтр по умолчанию для группы применяемый на экране Просмотр записей.
Index: mythtv.new/libs/libmythtv/programinfo.cpp
===================================================================
--- mythtv.new/libs/libmythtv/programinfo.cpp (revision 15597)
+++ mythtv.new/libs/libmythtv/programinfo.cpp (working copy)
@@ -4031,7 +4031,7 @@
{
QString result = QString("");
- if (group == "All Programs")
+ if ((group == "All Programs") || (group == "Unwatched"))
{
result = gContext->GetSetting("AllRecGroupPassword");
}
Index: mythtv.new/programs/mythfrontend/playbackbox.cpp
===================================================================
--- mythtv.new/programs/mythfrontend/playbackbox.cpp (revision 15597)
+++ mythtv.new/programs/mythfrontend/playbackbox.cpp (working copy)
@@ -336,7 +336,8 @@
if ((recGroup == "All Programs") ||
(recGroup == "Default") ||
(recGroup == "LiveTV") ||
- (recGroup == "Deleted"))
+ (recGroup == "Deleted") ||
+ (recGroup == "Unwatched"))
{
groupDisplayName = tr(recGroup);
}
@@ -1842,12 +1843,14 @@
{
progsInDB++;
p = *i;
+ bool watched = (p->programflags & FL_WATCHED);
+ bool allUnwatched = ((recGroup == "Unwatched") && !watched);
if (p->title == "")
p->title = tr("_NO_TITLE_");
if ((((p->recgroup == recGroup) ||
- ((recGroup == "All Programs") &&
+ (((recGroup == "All Programs") || allUnwatched) &&
(p->recgroup != "Deleted") &&
(p->recgroup != "LiveTV" || LiveTVInAllPrograms))) &&
(recGroupPassword == curGroupPassword)) ||
@@ -1868,7 +1871,7 @@
if ((viewMask & VIEW_TITLES) && // Show titles
((p->recgroup != "LiveTV") ||
(recGroup == "LiveTV") ||
- ((recGroup == "All Programs") &&
+ (((recGroup == "All Programs") || allUnwatched) &&
((viewMask & VIEW_LIVETVGRP) == 0))))
{
sTitle = sortTitle(p->title, viewMask, titleSort,
@@ -1909,7 +1912,7 @@
}
if ((LiveTVInAllPrograms) &&
- (recGroup == "All Programs") &&
+ ((recGroup == "All Programs") || allUnwatched) &&
(viewMask & VIEW_LIVETVGRP) &&
(p->recgroup == "LiveTV"))
{
@@ -1927,7 +1930,7 @@
VERBOSE(VB_FILE, QString("Auto-expire off: %1")
.arg(p->title));
}
- else if (p->programflags & FL_WATCHED)
+ else if (watched)
{
p->recpriority2 = wlWatched;
VERBOSE(VB_FILE, QString("Marked as 'watched': %1")
@@ -4957,7 +4960,7 @@
SLOT(toggleSearchView(bool)));
recGroupPopup->addWidget(checkBox, false);
- if ((recGroup == "All Programs") &&
+ if (((recGroup == "All Programs") || (recGroup == "Unwatched"))&&
(gContext->GetNumSetting("LiveTVInAllPrograms",0)))
{
checkBox = new MythCheckBox(tr("Show LiveTV as a Group"),
@@ -5018,6 +5021,7 @@
QString saveRecGroup = recGroup;
int items;
int totalItems = 0;
+ int unwatched = 0;
bool liveTVInAll = gContext->GetNumSetting("LiveTVInAllPrograms",0);
recGroupType.clear();
@@ -5026,7 +5030,7 @@
// Find each recording group, and the number of recordings in each
query.prepare(
- "SELECT recgroup, COUNT(title) "
+ "SELECT recgroup, COUNT(title), SUM(watched) "
"FROM recorded "
"WHERE deletepending = 0 "
"GROUP BY recgroup");
@@ -5042,6 +5046,8 @@
(dispGroup != "Deleted"))
totalItems += items;
+ unwatched += (items - query.value(2).toInt());
+
dispGroup = (dispGroup == "Default") ? tr("Default") : dispGroup;
dispGroup = (dispGroup == "Deleted") ? tr("Deleted") : dispGroup;
dispGroup = (dispGroup == "LiveTV") ? tr("LiveTV") : dispGroup;
@@ -5059,6 +5065,12 @@
.arg(totalItems).arg(itemStr));
recGroupType["All Programs"] = "recgroup";
+ // Create and add the "Unwatched" entry
+ itemStr = (unwatched == 1) ? tr("item") : tr("items");
+ recGroupListBox->insertItem(QString("%1 [%2 %3]").arg(tr("Unwatched"))
+ .arg(unwatched).arg(itemStr));
+ recGroupType["Unwatched"] = "recgroup";
+
// Add the group entries
recGroupListBox->insertItem(QString("------- %1 -------")
.arg(tr("Groups")));
@@ -5130,6 +5142,8 @@
dispGroup = tr("LiveTV");
else if (recGroup == "Deleted")
dispGroup = tr("Deleted");
+ else if (recGroup == "Unwatched")
+ dispGroup = tr("Unwatched");
else
dispGroup = recGroup;
@@ -5198,6 +5212,8 @@
recGroup = "LiveTV";
else if (recGroup == tr("Deleted"))
recGroup = "Deleted";
+ else if (recGroup == tr("Unwatched"))
+ recGroup = "Unwatched";
recGroupPassword = getRecGroupPassword(recGroup);
@@ -5586,7 +5602,8 @@
grid->addWidget(label, 0, 0, Qt::AlignLeft);
if ((recGroup == "Default") || (recGroup == "All Programs") ||
- (recGroup == "LiveTV") || (recGroup == "Deleted"))
+ (recGroup == "LiveTV") || (recGroup == "Deleted") ||
+ (recGroup == "Unwatched"))
label = new QLabel(tr(recGroup), recGroupPopup);
else
label = new QLabel(recGroup, recGroupPopup);
@@ -5659,7 +5676,7 @@
return;
}
- if (recGroup == "All Programs")
+ if ((recGroup == "All Programs") || (recGroup == "Unwatched"))
{
gContext->SaveSetting("AllRecGroupPassword", newPassword);
}
Index: mythtv.new/programs/mythfrontend/globalsettings.cpp
===================================================================
--- mythtv.new/programs/mythfrontend/globalsettings.cpp (revision 15597)
+++ mythtv.new/programs/mythfrontend/globalsettings.cpp (working copy)
@@ -251,6 +251,7 @@
gc->setLabel(QObject::tr("Default group filter to apply"));
gc->addSelection(QObject::tr("All Programs"), QString("All Programs"));
+ gc->addSelection(QObject::tr("Unwatched"), QString("Unwatched"));
gc->addSelection(QObject::tr("Default"), QString("Default"));
MSqlQuery query(MSqlQuery::InitCon());