summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Stichnoth <jstichnoth@mythtv.org>2012-12-13 13:59:29 (GMT)
committer Jim Stichnoth <jstichnoth@mythtv.org>2012-12-13 13:59:29 (GMT)
commit7c7b44a7da27add500990307144a1e477dcfaff6 (patch)
tree49fb5bf1e102e55b621437b48a0ad50b29ae2026
parent5173ecb2960970861f0e3fc73aeecd5cad555d1e (diff)
Improve the group filter display on the Watch Recordings screen.
Refs #11027. The first entry in the group list on the left is labeled "All Programs - <current_group_filter>". If the current filter is All Programs, the label is just "All Programs". This makes it very clear which group filter is in effect even when the theme doesn't explicitly add it ot the Watch Recordings screen.
-rw-r--r--mythtv/libs/libmyth/programinfo.cpp5
-rw-r--r--mythtv/programs/mythfrontend/playbackbox.cpp8
2 files changed, 12 insertions, 1 deletions
diff --git a/mythtv/libs/libmyth/programinfo.cpp b/mythtv/libs/libmyth/programinfo.cpp
index 587e567..0db80da 100644
--- a/mythtv/libs/libmyth/programinfo.cpp
+++ b/mythtv/libs/libmyth/programinfo.cpp
@@ -4386,6 +4386,10 @@ static int init_tr(void)
QObject::tr("Default", "Recording Group Default") +
QObject::tr("Deleted", "Recording Group Deleted");
+ QString special_program_groups =
+ QObject::tr("All Programs - %1",
+ "Show all programs from a specific recording group");
+
QString storage_groups =
QObject::tr("Default", "Storage Group Name") +
QObject::tr("Live TV", "Storage Group Name") +
@@ -4399,6 +4403,7 @@ static int init_tr(void)
return (rec_profile_names.length() +
rec_profile_groups.length() +
display_rec_groups.length() +
+ special_program_groups.length() +
storage_groups.length() +
play_groups.length());
}
diff --git a/mythtv/programs/mythfrontend/playbackbox.cpp b/mythtv/programs/mythfrontend/playbackbox.cpp
index 6c3cfa2..1a84bf4 100644
--- a/mythtv/programs/mythfrontend/playbackbox.cpp
+++ b/mythtv/programs/mythfrontend/playbackbox.cpp
@@ -1337,7 +1337,13 @@ void PlaybackBox::UpdateUIGroupList(const QStringList &groupPreferences)
QString displayName = groupname;
if (displayName.isEmpty())
- displayName = ProgramInfo::i18n("All Programs");
+ {
+ if (m_recGroup == "All Programs")
+ displayName = ProgramInfo::i18n("All Programs");
+ else
+ displayName = ProgramInfo::i18n("All Programs - %1")
+ .arg(m_groupDisplayName);
+ }
item->SetText(displayName, "name");
item->SetText(displayName);