Ticket #110: watch-filter.3.diff

programs/mythfrontend/playbackbox.cpp

@@ -250 +250 @@
     connect(freeSpaceTimer, SIGNAL(timeout()), this, 
             SLOT(setUpdateFreeSpace()));
 
-    if (recGroupPassword != "")
+    if ((recGroupPassword != "") || (gContext->GetNumSetting("ShowInitialFilter")))
         showRecGroupChooser();
 
     // Initialize yuv2rgba conversion stuff
@@ -3654 +3654 @@
     grayOut(&backup);
     backup.end();
 
-    QLabel *label = choosePopup->addLabel(tr("Recording Group View"),
+    QLabel *label = choosePopup->addLabel(tr("Select Group Filter"),
                                   MythPopupBox::Large, false);
     label->setAlignment(Qt::AlignCenter | Qt::WordBreak);
 
     QStringList groups;
     
     MSqlQuery query(MSqlQuery::InitCon());
-    query.prepare("SELECT DISTINCT recgroup from recorded;");
+    query.prepare("SELECT DISTINCT recgroup, COUNT(title) from recorded GROUP BY recgroup;");
     query.exec();
 
     QString tmpType = recGroupType[recGroup];
@@ -3671 +3671 @@
 
     if ((recGroup == "Default") || (recGroup == "All Programs"))
         groups += tr(recGroup);
-    else
-        groups += recGroup;
 
+    if (recGroup != "All Programs")
+    {
+        groups += tr("All Programs");
+        recGroupType["All Programs"] = "recgroup";
+    }
+
     if (query.isActive() && query.size() > 0)
     {
         while (query.next())
         {
-            QString key = QString::fromUtf8(query.value(0).toString());
+            QString key = QString::fromUtf8(QString("%1 [%2 items]").arg(query.value(0).toString()).arg(query.value(1).toString()));
 
             if (key != recGroup)
             {
@@ -3686 +3690 @@
                     groups += tr("Default");
                 else
                     groups += key;
-                recGroupType[key] = "recgroup";
+                recGroupType[query.value(0).toString()] = "recgroup";
             }
         }
     }
 
-    query.prepare("SELECT DISTINCT category from recorded;");
+    query.prepare("SELECT DISTINCT category, COUNT(title) from recorded GROUP BY category;");
 
     if (query.exec() && query.isActive() && query.size() > 0)
     {
         while (query.next())
         {
-            QString key = QString::fromUtf8(query.value(0).toString());
+            QString key = QString::fromUtf8(QString("%1 [%2 items]").arg(query.value(0).toString()).arg(query.value(1).toString()));
 
             if ((key != recGroup) && (key != ""))
             {
                 groups += key;
                 if (!recGroupType.contains(key))
-                    recGroupType[key] = "category";
+                    recGroupType[query.value(0).toString()] = "category";
             }
         }
     }
 
-    if (recGroup != "All Programs")
-    {
-        groups += tr("All Programs");
-        recGroupType["All Programs"] = "recgroup";
-    }
+    chooseListBox = new MythListBox(choosePopup);
+    chooseListBox->insertStringList(groups);
 
-    QGridLayout *grid = new QGridLayout(1, 2, (int)(10 * wmult));
+    choosePopup->addWidget(chooseListBox);
 
-    label = new QLabel(tr("Group"), choosePopup);
-    label->setAlignment(Qt::WordBreak | Qt::AlignLeft);
-    label->setBackgroundOrigin(ParentOrigin);
-    label->setPaletteForegroundColor(popupForeground);
-    grid->addWidget(label, 0, 0, Qt::AlignLeft);
-
-    chooseComboBox = new MythComboBox(false, choosePopup);
-    chooseComboBox->insertStringList(groups);
-    chooseComboBox->setAcceptOnSelect(true);
-    grid->addWidget(chooseComboBox, 0, 1, Qt::AlignLeft);
-
-    choosePopup->addLayout(grid);
-
-    connect(chooseComboBox, SIGNAL(accepted(int)), this,
+    connect(chooseListBox, SIGNAL(accepted(int)), this,
             SLOT(chooseSetViewGroup()));
-    connect(chooseComboBox, SIGNAL(activated(int)), this,
-            SLOT(chooseComboBoxChanged()));
-    connect(chooseComboBox, SIGNAL(highlighted(int)), this,
-            SLOT(chooseComboBoxChanged()));
+    connect(chooseListBox, SIGNAL(highlighted(int)), this,
+            SLOT(chooseListBoxChanged()));
 
     chooseGroupPassword = getRecGroupPassword(recGroup);
 
-    chooseComboBox->setFocus();
+    chooseListBox->setFocus();
     choosePopup->ExecPopup();
 
-    delete chooseComboBox;
-    chooseComboBox = NULL;
+    delete chooseListBox;
+    chooseListBox = NULL;
 
     backup.begin(this);
     backup.drawPixmap(0, 0, myBackground);
@@ -3759 +3745 @@
 
 void PlaybackBox::chooseSetViewGroup(void)
 {
-    if (!chooseComboBox)
+    if (!chooseListBox)
         return;
 
-    recGroup = chooseComboBox->currentText();
+    recGroup = chooseListBox->currentText().section('[', 0, 0).simplifyWhiteSpace();
     recGroupPassword = chooseGroupPassword;
 
     if (groupnameAsAllProg)
@@ -3812 +3798 @@
     choosePopup->done(0);
 }
 
-void PlaybackBox::chooseComboBoxChanged(void)
+void PlaybackBox::chooseListBoxChanged(void)
 {
-    if (!chooseComboBox)
+    if (!chooseListBox)
         return;
 
-    QString newGroup = chooseComboBox->currentText();
+    QString newGroup = chooseListBox->currentText().section('[', 0, 0).simplifyWhiteSpace();
 
     if (newGroup == tr("Default"))
         newGroup = "Default";

programs/mythfrontend/playbackbox.h

@@ -92 +92 @@
 
     void setUpdateFreeSpace() { updateFreeSpace = true; }
 
-    void chooseComboBoxChanged(void);
+    // void chooseComboBoxChanged(void);
+    void chooseListBoxChanged(void);
     void chooseSetViewGroup(void);
     void chooseSetGroupView(void);
     void changeComboBoxChanged(void);