Ticket #12180: 0001-Add-Show-Channel-Search-in-several-Lists.patch

mythtv/libs/libmythtv/tv_actions.h

@@ -26 +26 @@
 
 #define ACTION_GUIDE             "GUIDE"
 #define ACTION_FINDER            "FINDER"
-#define ACTION_CHANNELSEARCH     "CHANNELSEARCH"
 #define ACTION_TOGGLESLEEP       QString("TOGGLESLEEP")
 #define ACTION_PLAY              "PLAY"
 #define ACTION_VIEWSCHEDULED     "VIEWSCHEDULED"

mythtv/libs/libmythtv/tv_play.cpp

@@ -542 +542 @@
             "Show the Program Guide"), "S");
     REG_KEY("TV Frontend", ACTION_FINDER, QT_TRANSLATE_NOOP("MythControls",
             "Show the Program Finder"), "#");
-    REG_KEY("TV Frontend", ACTION_CHANNELSEARCH, QT_TRANSLATE_NOOP("MythControls",
-            "Show the Channel Search"), "");
     REG_KEY("TV Frontend", "NEXTFAV", QT_TRANSLATE_NOOP("MythControls",
             "Cycle through channel groups and all channels in the "
             "program guide."), "/");

mythtv/programs/mythfrontend/guidegrid.cpp

@@ -31 +31 @@
 #include "mythuiguidegrid.h"
 #include "mythdialogbox.h"
 #include "progfind.h"
-#include "proglist.h"
 
 QWaitCondition epgIsVisibleCond;
 
@@ -761 +760 @@
             toggleGuideListing();
         else if (action == ACTION_FINDER)
             showProgFinder();
-        else if (action == ACTION_CHANNELSEARCH)
-            showChannelSearch();
         else if (action == "MENU")
             ShowMenu();
         else if (action == "ESCAPE" || action == ACTION_GUIDE)
@@ -864 +861 @@
 
         menuPopup->AddButton(tr("Reverse Channel Order"));
 
-        menuPopup->AddButton(tr("Channel Search"));
-
         if (!m_changrplist.empty())
         {
             menuPopup->AddButton(tr("Choose Channel Group"));
@@ -1711 +1706 @@
                 generateListings();
                 updateChannels();
             }
-            else if (resulttext == tr("Channel Search"))
-            {
-                showChannelSearch();
-            }
             else if (resulttext == tr("Add To Channel Group"))
             {
                 if (m_changrpid == -1)
@@ -2307 +2298 @@
         RunProgramFinder(m_player, m_embedVideo, false);
 }
 
-void GuideGrid::showChannelSearch()
-{
-    ProgramInfo *pginfo = m_programInfos[m_currentRow][m_currentCol];
-    if (!pginfo)
-        return;
-
-    MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
-    ProgLister *pl = new ProgLister(mainStack, pginfo);
-    if (pl->Create())
-        mainStack->AddScreen(pl);
-    else
-        delete pl;
-}
-
 void GuideGrid::enter()
 {
     if (!m_player)

mythtv/programs/mythfrontend/guidegrid.h

@@ -148 +148 @@
     void enter();
 
     void showProgFinder();
-    void showChannelSearch();
     void channelUpdate();
     void volumeUpdate(bool);
     void toggleMute(const bool muteIndividualChannels = false);

mythtv/programs/mythfrontend/progfind.cpp

@@ -26 +26 @@
 #include "guidegrid.h"
 #include "customedit.h"
 #include "progfind.h"
-#include "proglist.h"
 
 #define LOC      QString("ProgFinder: ")
 #define LOC_ERR  QString("ProgFinder, Error: ")
@@ -201 +200 @@
             quickRecord();
         else if (action == "GUIDE" || action == "4")
             showGuide();
-        else if (action == ACTION_CHANNELSEARCH)
-            showChannelSearch();
         else if (action == "ESCAPE")
         {
             // don't fade the screen if we are returning to the player
@@ -245 +242 @@
             menuPopup->AddButton(tr("Previously Recorded"));
             menuPopup->AddButton(tr("Custom Edit"));
             menuPopup->AddButton(tr("Program Guide"));
-            menuPopup->AddButton(tr("Channel Search"));
         }
 
         popupStack->AddScreen(menuPopup);
@@ -327 +323 @@
             {
                 showGuide();
             }
-            else if (resulttext == tr("Channel Search"))
-            {
-                showChannelSearch();
-            }
         }
         else if (resultid == "searchtext")
         {
@@ -431 +423 @@
     }
 }
 
-void ProgFinder::showChannelSearch()
-{
-    if (GetFocusWidget() == m_timesList)
-    {
-        ProgramInfo *pginfo = m_showData[m_timesList->GetCurrentPos()];
-        if (!pginfo)
-           return;
-
-        MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
-        ProgLister *pl = new ProgLister(mainStack, pginfo);
-        if (pl->Create())
-            mainStack->AddScreen(pl);
-        else
-            delete pl;
-    }
-}
-
 void ProgFinder::getInfo(bool toggle)
 {
     if (GetFocusWidget() == m_timesList)

mythtv/programs/mythfrontend/progfind.h

@@ -38 +38 @@
     void timesListLosingFocus(void);
 
     void showGuide();
-    void showChannelSearch();
     void select();
     void customEdit();
     void upcoming();

mythtv/programs/mythfrontend/proglist.cpp

@@ -64 +64 @@
     m_progList(NULL),
     m_messageText(NULL),
 
-    m_allowViewDialog(true),
-    m_pginfo(NULL)
+    m_allowViewDialog(true)
 {
     if (pltype == plMovies)
     {
@@ -132 +131 @@
     m_progList(NULL),
     m_messageText(NULL),
 
-    m_allowViewDialog(true),
-    m_pginfo(NULL)
-
+    m_allowViewDialog(true)
 {
 }
 
-// channel lister ctor
-ProgLister::ProgLister(
-    MythScreenStack *parent, ProgramInfo *pginfo) :
-    ScheduleCommon(parent, "ProgLister"),
-    m_type(plChannel),
-    m_recid(0),
-    m_title(),
-    m_extraArg(),
-    m_startTime(MythDate::current()),
-    m_searchTime(m_startTime),
-    m_channelOrdering(gCoreContext->GetSetting("ChannelOrdering", "channum")),
-
-    m_searchType(kNoSearch),
-
-    m_view(),
-    m_curView(),
-    m_viewList(),
-    m_viewTextList(),
-
-    m_itemList(),
-    m_itemListSave(),
-    m_schedList(),
-
-    m_typeList(),
-    m_genreList(),
-    m_stationList(),
-
-    m_allowEvents(true),
-    m_titleSort(false),
-    m_reverseSort(false),
-    m_useGenres(false),
-
-    m_schedText(NULL),
-    m_curviewText(NULL),
-    m_positionText(NULL),
-    m_progList(NULL),
-    m_messageText(NULL),
-
-    m_allowViewDialog(true),
-
-    m_pginfo(pginfo)
-{
-    uint chanid = m_pginfo->GetChanID();
-
-    FillViewList(QString::number(chanid));
-}
-
 ProgLister::~ProgLister()
 {
     m_itemList.clear();
@@ -316 +266 @@
             ShowDetails();
         else if (action == "GUIDE")
             ShowGuide();
-        else if (action == ACTION_CHANNELSEARCH)
-            ShowChannelSearch();
         else if (action == "TOGGLERECORD")
             RecordSelected();
         else if (action == "1")
@@ -853 +801 @@
     }
 }
 
-void ProgLister::ShowChannelSearch()
-{
-    ProgramInfo *pi = GetCurrent();
-    if(pi)
-    {
-        MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
-        ProgLister *pl = new ProgLister(mainStack, pi);
-        if (pl->Create())
-            mainStack->AddScreen(pl);
-        else
-            delete pl;
-    }
-}
-
 void ProgLister::ShowUpcoming(void)
 {
     ProgramInfo *pi = GetCurrent();
@@ -1802 +1736 @@
             if (m_curView < 0 && m_type != plPreviouslyRecorded)
                 ShowChooseViewMenu();
         }
-        if (m_pginfo)   // set position on first call of ChannelSearch when called from GuideGrid
-        {
-           for (int pos = 0; pos < (int) m_itemList.size(); pos++)
-            {
-                if (m_pginfo->GetScheduledEndTime() == m_itemList[pos]->GetScheduledEndTime())
-                {
-                    m_progList->SetItemCurrent(pos);
-                    break;
-                }
-            }
-            m_pginfo = NULL;
-        }
     }
     else if ((MythEvent::Type)(event->type()) == MythEvent::MythEventMessage)
     {

mythtv/programs/mythfrontend/proglist.h

@@ -42 +42 @@
                const QString &view, const QString &extraArg);
     explicit ProgLister(MythScreenStack *parent, uint recid = 0,
                         const QString &title = QString());
-    explicit ProgLister(MythScreenStack *parent,
-                        ProgramInfo *pginfo);
     ~ProgLister();
 
     bool Create(void);
@@ -67 +65 @@
 
     void ShowDetails(void)   { ScheduleCommon::ShowDetails(GetCurrent());   }
     void ShowGuide(void);
-    void ShowChannelSearch(void);
     void ShowUpcoming(void);
     void ShowPrevious(void);
     void ShowDeleteRuleMenu(void);
@@ -140 +137 @@
     MythUIText       *m_messageText;
 
     bool              m_allowViewDialog;
-
-    ProgramInfo      *m_pginfo;
 };
 
 #endif

mythtv/programs/mythfrontend/viewscheduled.cpp

@@ -16 +16 @@
 #include "mythdialogbox.h"
 #include "mythmainwindow.h"
 #include "guidegrid.h"
-#include "proglist.h"
 
 void *ViewScheduled::RunViewScheduled(void *player, bool showTV)
 {
@@ -177 +176 @@
             details();
         else if (action == "GUIDE")
             showGuide();
-        else if (action == ACTION_CHANNELSEARCH)
-            showChannelSearch();
         else if (action == "1")
             setShowAll(true);
         else if (action == "2")
@@ -222 +219 @@
             menuPopup->AddButton(tr("Show All"));
         menuPopup->AddButton(tr("Program Details"));
         menuPopup->AddButton(tr("Program Guide"));
-        menuPopup->AddButton(tr("Channel Search"));
         menuPopup->AddButton(tr("Upcoming by title"));
         menuPopup->AddButton(tr("Upcoming scheduled"));
         menuPopup->AddButton(tr("Previously Recorded"));
@@ -608 +604 @@
     GuideGrid::RunProgramGuide(startchanid, startchannel, starttime);
 }
 
-void ViewScheduled::showChannelSearch()
-{
-    MythUIButtonListItem *item = m_schedulesList->GetItemCurrent();
-
-    if (!item)
-        return;
-
-    ProgramInfo *pginfo = qVariantValue<ProgramInfo*>(item->GetData());
-
-    MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
-    ProgLister *pl = new ProgLister(mainStack, pginfo);
-    if (pl->Create())
-        mainStack->AddScreen(pl);
-    else
-        delete pl;
-}
-
 void ViewScheduled::upcoming()
 {
     MythUIButtonListItem *item = m_schedulesList->GetItemCurrent();
@@ -799 +778 @@
             {
                 showGuide();
             }
-            else if (resulttext == tr("Channel Search"))
-            {
-                showChannelSearch();
-            }
             else if (resulttext == tr("Upcoming by title"))
             {
                 upcoming();

mythtv/programs/mythfrontend/viewscheduled.h

@@ -42 +42 @@
   protected slots:
     void ChangeGroup(MythUIButtonListItem *item);
     void showGuide();
-    void showChannelSearch();
     void edit();
     void customEdit();
     void deleteRule();