Ticket #6814: patch-6814mine.cpp

File patch-6814mine.cpp, 4.4 KB (added by ylee@…, 16 years ago)

Revised patch against 0.22-fixes

Line 
1diff -ur mythtv-0.22.orig/programs/mythfrontend/playbackbox.cpp mythtv-0.22/programs/mythfrontend/playbackbox.cpp
2--- mythtv-0.22.orig/programs/mythfrontend/playbackbox.cpp 2009-10-23 18:58:54.000000000 -0700
3+++ mythtv-0.22/programs/mythfrontend/playbackbox.cpp 2009-12-12 23:31:21.000000000 -0800
4@@ -1820,8 +1820,7 @@
5 {
6 if (m_popupMenu)
7 return;
8-
9- QString label = tr("Recording List Menu");
10+ QString label = tr("Group List Menu");
11
12 ProgramInfo *pginfo = CurrentItem();
13
14@@ -1869,6 +1868,12 @@
15 }
16
17 m_popupMenu->AddButton(tr("Help (Status Icons)"), SLOT(showIconHelp()));
18+
19+ if (GetFocusWidget() != m_groupList)
20+ {
21+ m_popupMenu->AddButton(tr("Recording Options Menu"),
22+ SLOT(showActionsSelected()));
23+ }
24 }
25
26 void PlaybackBox::showActionsSelected()
27@@ -2410,6 +2415,10 @@
28 SLOT(doPlaylistExpireSetOff()));
29 m_popupMenu->AddButton(tr("Enable Auto Expire"),
30 SLOT(doPlaylistExpireSetOn()));
31+ m_popupMenu->AddButton(tr("Mark As Watched"),
32+ SLOT(doPlaylistWatchedSetOn()));
33+ m_popupMenu->AddButton(tr("Mark As UN-Watched"),
34+ SLOT(doPlaylistWatchedSetOff()));
35 }
36
37 void PlaybackBox::showPlaylistJobPopup()
38@@ -2801,13 +2810,19 @@
39 SLOT(showPlayFromPopup()), true);
40 else
41 m_popupMenu->AddButton(tr("Play"), SLOT(playSelected()));
42-
43+
44 if (m_playList.filter(pginfo->MakeUniqueKey()).size())
45 m_popupMenu->AddButton(tr("Remove from Playlist"),
46 SLOT(togglePlayListItem()));
47 else
48 m_popupMenu->AddButton(tr("Add to Playlist"),
49 SLOT(togglePlayListItem()));
50+ if (m_playList.size())
51+ {
52+ m_popupMenu->AddButton(tr("Playlist options"),
53+ SLOT(showPlaylistPopup()), true);
54+ }
55+
56 }
57
58 if (pginfo->recstatus == rsRecording &&
59@@ -2842,6 +2857,8 @@
60 m_popupMenu->AddButton(tr("Delete"), SLOT(askDelete()));
61 }
62 }
63+ m_popupMenu->AddButton(tr("Group List Menu"),
64+ SLOT(showMenu()));
65 }
66
67 void PlaybackBox::showFileNotFoundActionPopup(ProgramInfo *pginfo)
68@@ -3516,7 +3533,13 @@
69 if (action == "1" || action == "HELP")
70 showIconHelp();
71 else if (action == "MENU")
72- showMenu();
73+
74+ {
75+ if (GetFocusWidget() == m_groupList)
76+ showMenu();
77+ else showActionsSelected();
78+ }
79+
80 else if (action == "NEXTFAV")
81 {
82 if (GetFocusWidget() == m_groupList)
83@@ -3577,8 +3600,6 @@
84 else if (action == "PLAYBACK")
85 playSelected(m_recordingList->GetItemCurrent());
86 else if (action == "INFO")
87- showActionsSelected();
88- else if (action == "DETAILS")
89 details();
90 else if (action == "CUSTOMEDIT")
91 customEdit();
92@@ -4340,6 +4361,19 @@
93 }
94 }
95
96+void PlaybackBox::doPlaylistWatchedSetting(bool turnOn)
97+{
98+ ProgramInfo *tmpItem;
99+ QStringList::Iterator it;
100+
101+ for (it = m_playList.begin(); it != m_playList.end(); ++it)
102+ {
103+ if ((tmpItem = findMatchingProg(*it)))
104+ {
105+ tmpItem->SetWatchedFlag(turnOn);
106+ }
107+ }
108+}
109 void PlaybackBox::showMetadataEditor()
110 {
111 ProgramInfo *pgInfo = CurrentItem();
112diff -ur mythtv-0.22.orig/programs/mythfrontend/playbackbox.h mythtv-0.22/programs/mythfrontend/playbackbox.h
113--- mythtv-0.22.orig/programs/mythfrontend/playbackbox.h 2009-10-23 18:58:54.000000000 -0700
114+++ mythtv-0.22/programs/mythfrontend/playbackbox.h 2009-12-11 16:28:14.000000000 -0800
115@@ -249,6 +249,9 @@
116 void doPlaylistExpireSetting(bool turnOn);
117 void doPlaylistExpireSetOn() { doPlaylistExpireSetting(true); }
118 void doPlaylistExpireSetOff() { doPlaylistExpireSetting(false); }
119+ void doPlaylistWatchedSetting(bool turnOn);
120+ void doPlaylistWatchedSetOn() { doPlaylistWatchedSetting(true); }
121+ void doPlaylistWatchedSetOff() { doPlaylistWatchedSetting(false); }
122 void togglePlayListTitle(void);
123 void togglePlayListItem(void);
124 void playSelectedPlaylist(bool random);
125Only in mythtv-0.22/programs/mythfrontend: playbackbox.h.orig