Ticket #110: watch-filter.diff
File watch-filter.diff, 5.3 KB (added by , 19 years ago) |
---|
-
programs/mythfrontend/playbackbox.cpp
250 250 connect(freeSpaceTimer, SIGNAL(timeout()), this, 251 251 SLOT(setUpdateFreeSpace())); 252 252 253 if ( recGroupPassword != "")253 if ((recGroupPassword != "") || (gContext->GetNumSetting("ShowInitialFilter"))) 254 254 showRecGroupChooser(); 255 255 256 256 // Initialize yuv2rgba conversion stuff … … 3654 3654 grayOut(&backup); 3655 3655 backup.end(); 3656 3656 3657 QLabel *label = choosePopup->addLabel(tr(" Recording Group View"),3657 QLabel *label = choosePopup->addLabel(tr("Select Group Filter"), 3658 3658 MythPopupBox::Large, false); 3659 3659 label->setAlignment(Qt::AlignCenter | Qt::WordBreak); 3660 3660 3661 3661 QStringList groups; 3662 3662 3663 3663 MSqlQuery query(MSqlQuery::InitCon()); 3664 query.prepare("SELECT DISTINCT recgroup from recorded;");3664 query.prepare("SELECT DISTINCT recgroup, COUNT(title) from recorded GROUP BY recgroup;"); 3665 3665 query.exec(); 3666 3666 3667 3667 QString tmpType = recGroupType[recGroup]; … … 3671 3671 3672 3672 if ((recGroup == "Default") || (recGroup == "All Programs")) 3673 3673 groups += tr(recGroup); 3674 else3675 groups += recGroup;3676 3674 3675 if (recGroup != "All Programs") 3676 { 3677 groups += tr("All Programs"); 3678 recGroupType["All Programs"] = "recgroup"; 3679 } 3680 3677 3681 if (query.isActive() && query.size() > 0) 3678 3682 { 3679 3683 while (query.next()) 3680 3684 { 3681 QString key = QString::fromUtf8( query.value(0).toString());3685 QString key = QString::fromUtf8(QString("%1 [%2 items]").arg(query.value(0).toString()).arg(query.value(1).toString())); 3682 3686 3683 3687 if (key != recGroup) 3684 3688 { … … 3691 3695 } 3692 3696 } 3693 3697 3694 query.prepare("SELECT DISTINCT category from recorded;");3698 query.prepare("SELECT DISTINCT category, COUNT(title) from recorded GROUP BY category;"); 3695 3699 3696 3700 if (query.exec() && query.isActive() && query.size() > 0) 3697 3701 { 3698 3702 while (query.next()) 3699 3703 { 3700 QString key = QString::fromUtf8( query.value(0).toString());3704 QString key = QString::fromUtf8(QString("%1 [%2 items]").arg(query.value(0).toString()).arg(query.value(1).toString())); 3701 3705 3702 3706 if ((key != recGroup) && (key != "")) 3703 3707 { … … 3708 3712 } 3709 3713 } 3710 3714 3711 if (recGroup != "All Programs") 3712 { 3713 groups += tr("All Programs"); 3714 recGroupType["All Programs"] = "recgroup"; 3715 } 3715 chooseListBox = new MythListBox(choosePopup); 3716 chooseListBox->insertStringList(groups); 3716 3717 3717 QGridLayout *grid = new QGridLayout(1, 2, (int)(10 * wmult));3718 choosePopup->addWidget(chooseListBox); 3718 3719 3719 label = new QLabel(tr("Group"), choosePopup); 3720 label->setAlignment(Qt::WordBreak | Qt::AlignLeft); 3721 label->setBackgroundOrigin(ParentOrigin); 3722 label->setPaletteForegroundColor(popupForeground); 3723 grid->addWidget(label, 0, 0, Qt::AlignLeft); 3724 3725 chooseComboBox = new MythComboBox(false, choosePopup); 3726 chooseComboBox->insertStringList(groups); 3727 chooseComboBox->setAcceptOnSelect(true); 3728 grid->addWidget(chooseComboBox, 0, 1, Qt::AlignLeft); 3729 3730 choosePopup->addLayout(grid); 3731 3732 connect(chooseComboBox, SIGNAL(accepted(int)), this, 3720 connect(chooseListBox, SIGNAL(accepted(int)), this, 3733 3721 SLOT(chooseSetViewGroup())); 3734 connect(chooseComboBox, SIGNAL(activated(int)), this, 3735 SLOT(chooseComboBoxChanged())); 3736 connect(chooseComboBox, SIGNAL(highlighted(int)), this, 3737 SLOT(chooseComboBoxChanged())); 3722 connect(chooseListBox, SIGNAL(highlighted(int)), this, 3723 SLOT(chooseListBoxChanged())); 3738 3724 3739 3725 chooseGroupPassword = getRecGroupPassword(recGroup); 3740 3726 3741 choose ComboBox->setFocus();3727 chooseListBox->setFocus(); 3742 3728 choosePopup->ExecPopup(); 3743 3729 3744 delete choose ComboBox;3745 choose ComboBox = NULL;3730 delete chooseListBox; 3731 chooseListBox = NULL; 3746 3732 3747 3733 backup.begin(this); 3748 3734 backup.drawPixmap(0, 0, myBackground); … … 3759 3745 3760 3746 void PlaybackBox::chooseSetViewGroup(void) 3761 3747 { 3762 if (!choose ComboBox)3748 if (!chooseListBox) 3763 3749 return; 3764 3750 3765 recGroup = choose ComboBox->currentText();3751 recGroup = chooseListBox->currentText().section(' ', 0, 0); 3766 3752 recGroupPassword = chooseGroupPassword; 3767 3753 3768 3754 if (groupnameAsAllProg) … … 3812 3798 choosePopup->done(0); 3813 3799 } 3814 3800 3815 void PlaybackBox::choose ComboBoxChanged(void)3801 void PlaybackBox::chooseListBoxChanged(void) 3816 3802 { 3817 if (!choose ComboBox)3803 if (!chooseListBox) 3818 3804 return; 3819 3805 3820 QString newGroup = choose ComboBox->currentText();3806 QString newGroup = chooseListBox->currentText().section(' ', 0, 0); 3821 3807 3822 3808 if (newGroup == tr("Default")) 3823 3809 newGroup = "Default"; -
programs/mythfrontend/playbackbox.h
92 92 93 93 void setUpdateFreeSpace() { updateFreeSpace = true; } 94 94 95 void chooseComboBoxChanged(void); 95 // void chooseComboBoxChanged(void); 96 void chooseListBoxChanged(void); 96 97 void chooseSetViewGroup(void); 97 98 void chooseSetGroupView(void); 98 99 void changeComboBoxChanged(void);