diff -urN mythtv.bak/i18n/mythfrontend_ca.ts mythtv.new/i18n/mythfrontend_ca.ts --- mythtv.bak/i18n/mythfrontend_ca.ts 2007-11-29 16:33:43.515195000 -0600 +++ mythtv.new/i18n/mythfrontend_ca.ts 2008-01-25 15:42:17.350850012 -0600 @@ -1097,6 +1097,10 @@ Tots + Unwatched + + + You have finished watching: Heu acavat de veure: @@ -3490,6 +3494,10 @@ Tots + Unwatched + + + Commercial Skip Auto-Rewind Amount diff -urN mythtv.bak/i18n/mythfrontend_cz.ts mythtv.new/i18n/mythfrontend_cz.ts --- mythtv.bak/i18n/mythfrontend_cz.ts 2007-11-29 16:33:43.515195000 -0600 +++ mythtv.new/i18n/mythfrontend_cz.ts 2008-01-25 15:42:17.338850773 -0600 @@ -1309,6 +1309,10 @@ Všechny programy + Unwatched + + + There are %1 recordings in this display group V této skupině zobrazení je %1 nahrávek @@ -4068,6 +4072,10 @@ Všechny programy + Unwatched + + + Start in Title section diff -urN mythtv.bak/i18n/mythfrontend_de.ts mythtv.new/i18n/mythfrontend_de.ts --- mythtv.bak/i18n/mythfrontend_de.ts 2007-11-29 16:33:43.515195000 -0600 +++ mythtv.new/i18n/mythfrontend_de.ts 2008-01-25 15:42:17.382847984 -0600 @@ -1328,6 +1328,10 @@ Alle Sendungen + Unwatched + + + You have finished watching: Wiedergabe beendet von: @@ -3850,6 +3854,10 @@ Alle Sendungen + Unwatched + + + Commercial Skip Auto-Rewind Amount Werbeblock Sprunglänge diff -urN mythtv.bak/i18n/mythfrontend_dk.ts mythtv.new/i18n/mythfrontend_dk.ts --- mythtv.bak/i18n/mythfrontend_dk.ts 2007-11-29 16:33:43.515195000 -0600 +++ mythtv.new/i18n/mythfrontend_dk.ts 2008-01-25 15:42:17.482841645 -0600 @@ -1329,6 +1329,10 @@ Alle programmer + Unwatched + + + You have finished watching: Du er færdig med at se: @@ -3852,6 +3856,10 @@ Alle programmer + Unwatched + + + Commercial Skip Auto-Rewind Amount Reklame skip Auto-Tilbage mængde diff -urN mythtv.bak/i18n/mythfrontend_en_gb.ts mythtv.new/i18n/mythfrontend_en_gb.ts --- mythtv.bak/i18n/mythfrontend_en_gb.ts 2007-11-29 16:33:43.515195000 -0600 +++ mythtv.new/i18n/mythfrontend_en_gb.ts 2008-01-25 15:42:17.306852802 -0600 @@ -1106,6 +1106,10 @@ All Programmes + Unwatched + + + There are %1 recordings in this display group @@ -4268,6 +4272,10 @@ All Programmes + Unwatched + + + Always prompt for initial group filter diff -urN mythtv.bak/i18n/mythfrontend_es.ts mythtv.new/i18n/mythfrontend_es.ts --- mythtv.bak/i18n/mythfrontend_es.ts 2007-11-29 16:33:43.515195000 -0600 +++ mythtv.new/i18n/mythfrontend_es.ts 2008-01-25 15:42:17.538838095 -0600 @@ -1342,6 +1342,10 @@ Todas + Unwatched + + + You have finished watching: Ha acabado de ver: @@ -3878,6 +3882,10 @@ Todas + Unwatched + + + Commercial Skip Auto-Rewind Amount Cantidad de salto atrás después del salto de anuncios diff -urN mythtv.bak/i18n/mythfrontend_et.ts mythtv.new/i18n/mythfrontend_et.ts --- mythtv.bak/i18n/mythfrontend_et.ts 2007-11-29 16:33:43.515195000 -0600 +++ mythtv.new/i18n/mythfrontend_et.ts 2008-01-25 15:42:17.286854069 -0600 @@ -1361,6 +1361,10 @@ Kõik programmid + Unwatched + + + There are %1 recordings in this display group Näidatavas grupis on %1 salvestist @@ -4345,6 +4349,10 @@ Kõik programmid + Unwatched + + + Start in Title section Alusta pealkirjade sektsioonis diff -urN mythtv.bak/i18n/mythfrontend_fi.ts mythtv.new/i18n/mythfrontend_fi.ts --- mythtv.bak/i18n/mythfrontend_fi.ts 2007-11-29 16:33:43.515195000 -0600 +++ mythtv.new/i18n/mythfrontend_fi.ts 2008-01-25 15:42:17.470842405 -0600 @@ -1297,6 +1297,10 @@ Kaikki Ohjelmat + Unwatched + + + You have finished watching: Katsomasi ohjelma on loppunut: @@ -3834,6 +3838,10 @@ Kaikki Ohjelmat + Unwatched + + + Commercial Skip Auto-Rewind Amount Mainosten Ohituksen Automaattisenkelauksen Määrä diff -urN mythtv.bak/i18n/mythfrontend_fr.ts mythtv.new/i18n/mythfrontend_fr.ts --- mythtv.bak/i18n/mythfrontend_fr.ts 2007-11-29 16:33:43.515195000 -0600 +++ mythtv.new/i18n/mythfrontend_fr.ts 2008-01-25 15:42:17.274854830 -0600 @@ -1289,6 +1289,10 @@ Toutes les émissions + Unwatched + + + You have finished watching: Vous avez terminé de visionner: @@ -4005,6 +4009,10 @@ Toutes émissions + Unwatched + + + Show group summary Voir les résumés de groupes diff -urN mythtv.bak/i18n/mythfrontend_is.ts mythtv.new/i18n/mythfrontend_is.ts --- mythtv.bak/i18n/mythfrontend_is.ts 2007-11-29 16:33:43.515195000 -0600 +++ mythtv.new/i18n/mythfrontend_is.ts 2008-01-25 15:42:17.598834291 -0600 @@ -1305,6 +1305,10 @@ Allir dagskrárliðir + Unwatched + + + You have finished watching: Þú hefur lokið að horfa á: @@ -3805,6 +3809,10 @@ Alle programmer + Unwatched + + + Commercial Skip Auto-Rewind Amount diff -urN mythtv.bak/i18n/mythfrontend_it.ts mythtv.new/i18n/mythfrontend_it.ts --- mythtv.bak/i18n/mythfrontend_it.ts 2007-11-29 16:33:43.515195000 -0600 +++ mythtv.new/i18n/mythfrontend_it.ts 2008-01-25 15:42:17.326851534 -0600 @@ -1134,6 +1134,10 @@ Tutte le Reg. + Unwatched + + + % used % usato @@ -3555,6 +3559,10 @@ Tutte le Reg. + Unwatched + + + Commercial Skip Auto-Rewind Amount diff -urN mythtv.bak/i18n/mythfrontend_ja.ts mythtv.new/i18n/mythfrontend_ja.ts --- mythtv.bak/i18n/mythfrontend_ja.ts 2007-11-29 16:33:43.515195000 -0600 +++ mythtv.new/i18n/mythfrontend_ja.ts 2008-01-25 15:42:17.410846209 -0600 @@ -1277,6 +1277,10 @@ 全番組 + Unwatched + + + You have finished watching: 済み: @@ -3817,6 +3821,10 @@ 全番組 + Unwatched + + + Commercial Skip Auto-Rewind Amount CMスキップ自動巻き戻し量 diff -urN mythtv.bak/i18n/mythfrontend_nb.ts mythtv.new/i18n/mythfrontend_nb.ts --- mythtv.bak/i18n/mythfrontend_nb.ts 2007-11-29 16:33:43.515195000 -0600 +++ mythtv.new/i18n/mythfrontend_nb.ts 2008-01-25 15:42:17.182860662 -0600 @@ -1159,6 +1159,10 @@ Alle programmer + Unwatched + + + There are %1 recordings in this display group Det er %1 opptak i denne gruppen @@ -3923,6 +3927,10 @@ Alle programmer + Unwatched + + + Start in Title section Start i tittelvelgeren diff -urN mythtv.bak/i18n/mythfrontend_nl.ts mythtv.new/i18n/mythfrontend_nl.ts --- mythtv.bak/i18n/mythfrontend_nl.ts 2007-11-29 16:33:43.515195000 -0600 +++ mythtv.new/i18n/mythfrontend_nl.ts 2008-01-25 15:42:17.298853309 -0600 @@ -1172,6 +1172,10 @@ Alle Programma 's + Unwatched + + + You have finished watching: U bent klaar met het kijken naar: @@ -3651,6 +3655,10 @@ Alle programma's + Unwatched + + + Commercial Skip Auto-Rewind Amount Hoeveel terugspringen na "Reclame overslaan" diff -urN mythtv.bak/i18n/mythfrontend_pl.ts mythtv.new/i18n/mythfrontend_pl.ts --- mythtv.bak/i18n/mythfrontend_pl.ts 2007-11-29 16:33:43.515195000 -0600 +++ mythtv.new/i18n/mythfrontend_pl.ts 2008-01-25 15:42:17.318852041 -0600 @@ -1101,6 +1101,10 @@ + Unwatched + + + There are %1 recordings in this display group @@ -4318,6 +4322,10 @@ + Unwatched + + + Always prompt for initial group filter diff -urN mythtv.bak/i18n/mythfrontend_pt.ts mythtv.new/i18n/mythfrontend_pt.ts --- mythtv.bak/i18n/mythfrontend_pt.ts 2007-11-29 16:33:43.515195000 -0600 +++ mythtv.new/i18n/mythfrontend_pt.ts 2008-01-25 15:42:17.358849505 -0600 @@ -1097,6 +1097,10 @@ Todos os Programas + Unwatched + + + You have finished watching: Acabou de ver: @@ -3478,6 +3482,10 @@ Todos os Programas + Unwatched + + + Commercial Skip Auto-Rewind Amount diff -urN mythtv.bak/i18n/mythfrontend_pt_br.ts mythtv.new/i18n/mythfrontend_pt_br.ts --- mythtv.bak/i18n/mythfrontend_pt_br.ts 2007-11-29 16:33:43.515195000 -0600 +++ mythtv.new/i18n/mythfrontend_pt_br.ts 2008-01-25 15:42:17.262855591 -0600 @@ -1271,6 +1271,10 @@ Todos Programas + Unwatched + + + There are %1 recordings in this display group Neste grupo de vídeo existem %1 gravações @@ -4174,6 +4178,10 @@ Todos Programas + Unwatched + + + Default group filter to apply on the View Recordings screen. Aplicar filtro de grupo padrão na tela de visualização de Gravações diff -urN mythtv.bak/i18n/mythfrontend_ru.ts mythtv.new/i18n/mythfrontend_ru.ts --- mythtv.bak/i18n/mythfrontend_ru.ts 2007-11-29 16:33:43.515195000 -0600 +++ mythtv.new/i18n/mythfrontend_ru.ts 2008-01-25 15:42:17.718826684 -0600 @@ -1167,6 +1167,10 @@ Все программы + Unwatched + + + There are %1 recordings in this display group %1 записей в этой группе @@ -4517,6 +4521,10 @@ Всем программам + Unwatched + + + Default group filter to apply on the View Recordings screen. Фильтр по умолчанию для группы применяемый на экране Просмотр записей. diff -urN mythtv.bak/i18n/mythfrontend_si.ts mythtv.new/i18n/mythfrontend_si.ts --- mythtv.bak/i18n/mythfrontend_si.ts 2007-11-29 16:33:43.515195000 -0600 +++ mythtv.new/i18n/mythfrontend_si.ts 2008-01-25 15:42:17.678829220 -0600 @@ -1259,6 +1259,10 @@ Vsi programi + Unwatched + + + There are %1 recordings in this display group Samo 1% posnetkov je v tej skupini @@ -3460,6 +3464,10 @@ Vsi programi + Unwatched + + + Start in Title section Začni z naslovom diff -urN mythtv.bak/i18n/mythfrontend_sv.ts mythtv.new/i18n/mythfrontend_sv.ts --- mythtv.bak/i18n/mythfrontend_sv.ts 2007-11-29 16:33:43.515195000 -0600 +++ mythtv.new/i18n/mythfrontend_sv.ts 2008-01-25 15:42:17.394847223 -0600 @@ -1097,6 +1097,10 @@ Alla program + Unwatched + + + Are you sure you want to delete: Är du säker på att du vill ta bort: @@ -3436,6 +3440,10 @@ Alla program + Unwatched + + + Commercial Skip Auto-Rewind Amount Tillbakaspolning vid reklamöverhoppning diff -urN mythtv.bak/i18n/mythfrontend_tr.ts mythtv.new/i18n/mythfrontend_tr.ts --- mythtv.bak/i18n/mythfrontend_tr.ts 2007-11-29 16:33:43.515195000 -0600 +++ mythtv.new/i18n/mythfrontend_tr.ts 2008-01-25 15:42:17.370848744 -0600 @@ -1315,6 +1315,10 @@ Tüm Programlar + Unwatched + + + There are %1 recordings in this display group Bu gösterge grubunda %1 kayıt var @@ -4765,6 +4769,10 @@ Tüm Programlar + Unwatched + + + Default group filter to apply on the View Recordings screen. Kayıtları Görüntüle ekranında uygulanacak varsayılan grup filtresi. diff -urN mythtv.bak/i18n/mythfrontend_zh_tw.ts mythtv.new/i18n/mythfrontend_zh_tw.ts --- mythtv.bak/i18n/mythfrontend_zh_tw.ts 2007-11-29 16:33:43.515195000 -0600 +++ mythtv.new/i18n/mythfrontend_zh_tw.ts 2008-01-25 15:42:17.134863705 -0600 @@ -1086,6 +1086,10 @@ + Unwatched + + + There are %1 recordings in this display group @@ -3185,6 +3189,10 @@ + Unwatched + + + Start in Title section diff -urN mythtv.bak/libs/libmythtv/programinfo.cpp mythtv.new/libs/libmythtv/programinfo.cpp --- mythtv.bak/libs/libmythtv/programinfo.cpp 2008-01-23 15:51:06.539300000 -0600 +++ mythtv.new/libs/libmythtv/programinfo.cpp 2008-01-25 15:42:17.746824909 -0600 @@ -4031,7 +4031,7 @@ { QString result = QString(""); - if (group == "All Programs") + if ((group == "All Programs") || (group == "Unwatched")) { result = gContext->GetSetting("AllRecGroupPassword"); } diff -urN mythtv.bak/programs/mythfrontend/globalsettings.cpp mythtv.new/programs/mythfrontend/globalsettings.cpp --- mythtv.bak/programs/mythfrontend/globalsettings.cpp 2008-01-14 10:45:33.016249000 -0600 +++ mythtv.new/programs/mythfrontend/globalsettings.cpp 2008-01-25 15:42:17.818820345 -0600 @@ -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()); diff -urN mythtv.bak/programs/mythfrontend/playbackbox.cpp mythtv.new/programs/mythfrontend/playbackbox.cpp --- mythtv.bak/programs/mythfrontend/playbackbox.cpp 2008-01-25 01:36:01.256967000 -0600 +++ mythtv.new/programs/mythfrontend/playbackbox.cpp 2008-01-25 15:42:17.802821359 -0600 @@ -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); }