Ticket #2613: list_genre.diff

mythtv/themes/DVR/tv_lists.xml

@@ -56 +56 @@
       <text lang="RU">КатегПрОО</text>
       <action>TV_SEARCH_CATEGORY</action>
    </button>
+
+   <button>
+      <type>TV_SEARCH_CATEGORIES</type>
+      <text>Genres</text>
+      <action>TV_SEARCH_GENRE</action>
+   </button>
    
    <button>
       <type>TV_SEARCH_CHANNELS</type>

mythtv/libs/libmythtv/proglist.h

@@ -21 +21 @@
     plCategory,
     plChannel,
     plTime,
-    plRecordid
+    plRecordid,
+    plGenre
 };
 
 

mythtv/libs/libmythtv/proglist.cpp

@@ -286 +286 @@
                 case plChannel: value = tr("Channel Search"); break;
                 case plMovies: value = tr("Movie Search"); break;
                 case plTime: value = tr("Time Search"); break;
+                case plGenre: value = tr("Genre Search"); break;
                 default: value = tr("Unknown Search"); break;
             }
             ltype->SetText(value);
@@ -674 +675 @@
 void ProgLister::chooseView(void)
 {
     if (type == plChannel || type == plCategory || 
-        type == plMovies || type == plNewListings)
+        type == plMovies || type == plNewListings ||
+        type == plGenre)
     {
         if (viewList.count() < 2)
             return;
@@ -688 +690 @@
             case plChannel: msg = tr("Select Channel"); break;
             case plCategory: msg = tr("Select Category"); break;
             case plNewListings: msg = tr("Select List"); break;
+            case plGenre: msg = tr("Select Genre"); break;
             default: msg = tr("Select"); break;
         }
         choosePopup->addLabel(msg);
@@ -1232 +1235 @@
         if (view != "")
             curView = viewList.findIndex(view);
     }
+    else if (type == plGenre) // list by genre
+    {
+        MSqlQuery query(MSqlQuery::InitCon()); 
+        query.prepare("SELECT genre FROM programgenres GROUP BY genre;");
+        query.exec();
+
+        if (query.isActive() && query.size())
+        {
+            while (query.next())
+            {
+                QString genre = query.value(0).toString();
+                if (genre <= " " || genre == NULL)
+                    continue;
+                genre = QString::fromUtf8(query.value(0).toString());
+                viewList << genre;
+                viewTextList << genre;
+            }
+        }
+        if (view != "")
+            curView = viewList.findIndex(view);
+    }
     else if (type == plTitleSearch || type == plKeywordSearch ||
              type == plPeopleSearch || type == plPowerSearch)
     {
@@ -1518 +1542 @@
                 "  AND program.endtime > :PGILSTART "
                 "  AND program.category = :PGILPHRASE ";
     }
+    else if (type == plGenre) // list by category
+    {
+        where = "LEFT JOIN programgenres ON "
+                "  programgenres.chanid = program.chanid AND "
+                "  programgenres.starttime = program.starttime "
+                "WHERE channel.visible = 1 "
+                "  AND program.endtime > :PGILSTART "
+                "  AND programgenres.genre = :PGILPHRASE ";
+    }
     else if (type == plMovies) // list movies
     {
         where = "WHERE channel.visible = 1 "

mythtv/programs/mythfrontend/main.cpp

@@ -130 +130 @@
     qApp->lock();
 }
 
+void startSearchGenre(void)
+{
+    ProgLister searchGenre(plGenre, "", "",
+                            gContext->GetMainWindow(), "proglist");
+
+    qApp->unlock();
+    searchGenre.exec();
+    qApp->lock();
+}
+
 void startSearchMovie(void)
 {
     ProgLister searchMovie(plMovies, "", "",
@@ -317 +327 @@
         startSearchChannel();
     else if (sel == "tv_search_category")
         startSearchCategory();
+    else if (sel == "tv_search_genre")
+        startSearchGenre();
     else if (sel == "tv_search_movie")
         startSearchMovie();
     else if (sel == "tv_search_new")

mythtv/programs/mythfrontend/tv_lists.xml

@@ -66 +66 @@
       <text lang="RU">КатегПрОО</text>
       <action>TV_SEARCH_CATEGORY</action>
    </button>
+
+   <button>
+      <type>TV_SEARCH_GENRES</type>
+      <text>Genres</text>
+      <action>TV_SEARCH_GENRE</action>
+   </button>
    
    <button>
       <type>TV_SEARCH_CHANNELS</type>