Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-02 15:13:52 +01:00
Code Issues Projects Releases Wiki Activity

2025-06-21 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Restored the 'Show Only First 100 Carts' checkbox to the
	'RDCartFilter' widget.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2025-06-20 13:12:20 -04:00
parent 7ea9105709
commit 6cc7a9d809
9 changed files with 177 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -24987,3 +24987,6 @@
2025-06-18 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in the 'Editing Event' in rdlogmanager(1) that
caused double SQL lookups.
2025-06-21 Fred Gleason <fredg@paravelsystems.com>
* Restored the 'Show Only First 100 Carts' checkbox to the
'RDCartFilter' widget.

55
lib/rdcart_dialog.cpp
View File

@@ -2,7 +2,7 @@
//
// A widget to select a Rivendell Cart.
//
// (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2025 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -170,7 +170,6 @@ QSize RDCartDialog::sizeHint() const
int RDCartDialog::exec(int *cartnum,RDCart::Type type,const QString &svc,
bool *temp_allowed)
{
LoadState();
cart_cart_filter->setShowCartType(type);
cart_cart_filter->setService(svc);
cart_cartnum=cartnum;
@@ -339,7 +338,6 @@ void RDCartDialog::okData()
QModelIndexList rows=cart_cart_view->selectionModel()->selectedRows();
if(rows.size()==1) {
SaveState();
if(cart_player!=NULL) {
cart_player->stop();
}
@@ -357,7 +355,6 @@ void RDCartDialog::okData()
void RDCartDialog::cancelData()
{
SaveState();
if(cart_player!=NULL) {
cart_player->stop();
}
@@ -391,53 +388,3 @@ void RDCartDialog::closeEvent(QCloseEvent *e)
}
cancelData();
}
QString RDCartDialog::StateFile() {
bool home_found = false;
QString home = RDGetHomeDir(&home_found);
if (home_found) {
return home+"/.rdcartdialog";
}
else {
return NULL;
}
}
void RDCartDialog::LoadState()
{
QString state_file=StateFile();
if (state_file.isEmpty()) {
return;
}
RDProfile *p=new RDProfile();
p->setSource(state_file);
cart_cart_filter->
setLimitSearch(p->boolValue("RDCartDialog","LimitSearch",true));
delete p;
}
void RDCartDialog::SaveState()
{
FILE *f=NULL;
QString state_file=StateFile();
if (state_file.isEmpty()) {
return;
}
if((f=fopen(state_file.toUtf8(),"w"))==NULL) {
return;
}
fprintf(f,"[RDCartDialog]\n");
if(cart_cart_filter->limitSearch()) {
fprintf(f,"LimitSearch=Yes\n");
}
else {
fprintf(f,"LimitSearch=No\n");
}
fclose(f);
}

5
lib/rdcart_dialog.h
View File

@@ -2,7 +2,7 @@
//
// A widget to select a Rivendell Cart.
//
// (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2025 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -66,9 +66,6 @@ class RDCartDialog : public RDDialog
void closeEvent(QCloseEvent *e);
private:
QString StateFile();
void LoadState();
void SaveState();
int *cart_cartnum;
RDCartFilter *cart_cart_filter;
RDTableView *cart_cart_view;

220
lib/rdcartfilter.cpp
View File

@@ -27,6 +27,8 @@
#include "rdescape_string.h"
#include "rd.h"
#define RDCARTFILTER_SECOND_SCHED_CODE_WIDTH 810
RDCartFilter::RDCartFilter(bool show_drag_box,bool user_is_admin,
QWidget *parent)
: RDWidget(parent)
@@ -105,11 +107,20 @@ RDCartFilter::RDCartFilter(bool show_drag_box,bool user_is_admin,
this,SLOT(andSchedulerCodeChangedData(const QString &)));
//
// Results Counter
// Cart Matches Switch
//
d_showmatches_check=new QCheckBox(this);
d_showmatches_label=new QLabel(tr("Show Only First 100 Carts"),this);
d_showmatches_label->setFont(labelFont());
connect(d_showmatches_check,SIGNAL(toggled(bool)),
this,SLOT(filterToggledData(bool)));
//
// Cart Matches Counter
//
d_matches_edit=new QLineEdit(this);
d_matches_edit->setReadOnly(true);
d_matches_label=new QLabel(tr("Matching Carts:"),this);
d_matches_label=new QLabel(tr("Matches")+":",this);
d_matches_label->setFont(labelFont());
//
@@ -128,27 +139,18 @@ RDCartFilter::RDCartFilter(bool show_drag_box,bool user_is_admin,
}
//
// Show Audio Carts Checkbox
// Show Type Selector
//
d_showaudio_check=new QCheckBox(this);
d_showaudio_check->setChecked(true);
d_showaudio_label=new QLabel(tr("Show Audio Carts"),this);
d_showaudio_label->setFont(labelFont());
d_showaudio_label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft);
connect(d_showaudio_check,SIGNAL(stateChanged(int)),
this,SLOT(checkChangedData(int)));
//
// Show Macro Carts Checkbox
//
d_showmacro_check=new QCheckBox(this);
d_showmacro_check->setChecked(true);
d_showmacro_label=new QLabel(tr("Show Macro Carts"),this);
d_showmacro_label->setFont(labelFont());
d_showmacro_label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft);
connect(d_showmacro_check,SIGNAL(stateChanged(int)),
this,SLOT(checkChangedData(int)));
d_showtype_box=new QComboBox(this);
d_showtype_label=new QLabel(tr("Cart Type")+":",this);
d_showtype_label->setFont(labelFont());
d_showtype_label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft);
connect(d_showtype_box,SIGNAL(activated(int)),
this,SLOT(showtypeActivatedData(int)));
d_showtype_box->insertItem((int)RDCart::All,tr("All carts"));
d_showtype_box->insertItem((int)RDCart::Audio,tr("Audio carts"));
d_showtype_box->insertItem((int)RDCart::Macro,tr("Macro carts"));
//
// Show Cart Notes Checkbox
//
@@ -158,6 +160,25 @@ RDCartFilter::RDCartFilter(bool show_drag_box,bool user_is_admin,
new QLabel(tr("Show Note Bubbles"),this);
d_shownotes_label->setFont(labelFont());
d_shownotes_label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft);
connect(d_showmatches_check,SIGNAL(stateChanged(int)),
this,SLOT(searchLimitChangedData(int)));
//
// Load Data
//
switch(rda->libraryConf()->limitSearch()) {
case RDLibraryConf::LimitNo:
d_showmatches_check->setChecked(false);
break;
case RDLibraryConf::LimitYes:
d_showmatches_check->setChecked(true);
break;
case RDLibraryConf::LimitPrevious:
d_showmatches_check->setChecked(rda->libraryConf()->searchLimited());
break;
}
}
@@ -190,9 +211,9 @@ QString RDCartFilter::filterSql(const QStringList &and_fields) const
//
// Cart Type Filter
//
sql+=RDCartFilter::typeFilter(d_showaudio_check->isChecked(),
d_showmacro_check->isChecked(),
sql+=RDCartFilter::typeFilter((RDCart::Type)(d_showtype_box->currentIndex()),
d_show_cart_type);
//
// Full Text Filter
//
@@ -222,7 +243,8 @@ QString RDCartFilter::filterSql(const QStringList &and_fields) const
if(d_codes_box->currentIndex()>0) {
sql+="&&(`CART_SCHED_CODES`.`SCHED_CODE`='"+
RDEscapeString(d_codes_box->currentText())+"') ";
if(d_and_codes_box->currentIndex()>0) {
if((d_and_codes_box->currentIndex()>0)&&
(size().width()>RDCARTFILTER_SECOND_SCHED_CODE_WIDTH)) {
//
// Generate a list of carts with the second scheduler code
//
@@ -249,7 +271,10 @@ QString RDCartFilter::filterSql(const QStringList &and_fields) const
int RDCartFilter::cartLimit() const
{
return RD_LIMITED_CART_SEARCH_QUANTITY;
if(d_showmatches_check->isChecked()) {
return RD_LIMITED_CART_SEARCH_QUANTITY;
}
return RD_MAX_CART_NUMBER+1; // Effectively "unlimited"
}
@@ -291,19 +316,9 @@ RDCart::Type RDCartFilter::showCartType() const
void RDCartFilter::setShowCartType(RDCart::Type type)
{
if(type!=d_show_cart_type) {
if(type==RDCart::All) {
d_showaudio_check->show();
d_showaudio_label->show();
d_showmacro_check->show();
d_showmacro_label->show();
}
else {
d_showaudio_check->hide();
d_showaudio_label->hide();
d_showmacro_check->hide();
d_showmacro_label->hide();
}
if(type!=d_show_cart_type) {
d_showtype_box->setVisible(type==RDCart::All);
d_showtype_label->setVisible(type==RDCart::All);
d_show_cart_type=type;
}
}
@@ -325,12 +340,13 @@ void RDCartFilter::setShowTrackCarts(bool state)
bool RDCartFilter::limitSearch() const
{
return true;
return d_showmatches_check->isChecked();
}
void RDCartFilter::setLimitSearch(bool state)
{
d_showmatches_check->setChecked(state);
}
@@ -433,6 +449,12 @@ void RDCartFilter::filterChangedData(const QString &str)
}
void RDCartFilter::filterToggledData(bool state)
{
filterChangedData("");
}
void RDCartFilter::setMatchCount(int matches)
{
d_matches_edit->setText(QString::asprintf("%d",matches));
@@ -499,11 +521,17 @@ void RDCartFilter::andSchedulerCodeChangedData(const QString &str)
filterChangedData("");
}
/*
void RDCartFilter::checkChangedData(int n)
{
filterChangedData("");
}
*/
void RDCartFilter::showtypeActivatedData(int n)
{
filterChangedData("");
}
void RDCartFilter::dragsChangedData(int n)
@@ -525,49 +553,53 @@ void RDCartFilter::resizeEvent(QResizeEvent *e)
switch(rda->station()->filterMode()) {
case RDStation::FilterSynchronous:
d_filter_edit->setGeometry(70,10,w-170,20);
d_filter_edit->setGeometry(80,5,w-180,20);
break;
case RDStation::FilterAsynchronous:
d_search_button->setGeometry(w-180,10,80,50);
d_filter_edit->setGeometry(70,10,w-260,20);
d_search_button->setGeometry(w-180,5,80,50);
d_filter_edit->setGeometry(80,5,w-280,20);
break;
}
d_clear_button->setGeometry(w-90,10,80,50);
d_filter_label->setGeometry(10,10,55,20);
d_group_label->setGeometry(10,40,55,20);
d_group_box->setGeometry(70,38,140,24);
d_codes_label->setGeometry(215,40,115,20);
d_codes_box->setGeometry(335,38,120,24);
d_clear_button->setGeometry(w-90,5,80,50);
d_filter_label->setGeometry(20,5,55,20);
d_group_label->setGeometry(20,33,55,20);
d_group_box->setGeometry(80,31,140,24);
d_codes_label->setGeometry(225,33,115,20);
d_codes_box->setGeometry(345,31,120,24);
d_and_codes_label->
setGeometry(455,40,labelFontMetrics()->width(d_and_codes_label->text()),20);
setGeometry(465,33,labelFontMetrics()->width(d_and_codes_label->text()),20);
d_and_codes_label->setVisible(w>RDCARTFILTER_SECOND_SCHED_CODE_WIDTH);
d_and_codes_box->
setGeometry(d_and_codes_label->x()+d_and_codes_label->width(),38,120,24);
int x_pos=70;
setGeometry(d_and_codes_label->x()+d_and_codes_label->width(),31,120,24);
d_and_codes_box->setVisible(w>810);
int x_pos=10;
if(d_show_cart_type==RDCart::All) {
d_showaudio_check->setGeometry(x_pos,68,15,15);
d_showaudio_label->setGeometry(x_pos+20,66,130,20);
d_showmacro_check->setGeometry(x_pos+160,68,15,15);
d_showmacro_label->setGeometry(x_pos+180,66,130,20);
x_pos+=320;
d_showtype_label->setGeometry(x_pos,61,65,24);
d_showtype_box->setGeometry(x_pos+70,61,100,24);
x_pos+=190;
}
else {
x_pos+=70;
}
d_shownotes_box->setGeometry(x_pos,68,15,15);
d_shownotes_label->setGeometry(x_pos+20,66,130,20);
d_shownotes_box->setGeometry(x_pos,70-5,15,15);
d_shownotes_label->setGeometry(x_pos+20,61,130,24);
x_pos+=160;
if(d_show_drag_box) {
d_allowdrag_box->setGeometry(x_pos,68,15,15);
d_allowdrag_label->setGeometry(x_pos+20,66,130,20);
d_allowdrag_box->setGeometry(x_pos,70-5,15,15);
d_allowdrag_label->setGeometry(x_pos+20,61,130,24);
x_pos+=160;
}
d_matches_label->setGeometry(w-165,66,100,20);
d_matches_edit->setGeometry(w-65,66,55,20);
d_showmatches_check->setGeometry(w-340,65,15,15);
d_showmatches_label->setGeometry(w-320,61,180,24);
d_matches_label->setGeometry(w-135,61,60,24);
d_matches_edit->setGeometry(w-75,61,65,24);
}
@@ -666,7 +698,7 @@ QString RDCartFilter::groupFilter(const QString &group,
QString RDCartFilter::typeFilter(bool incl_audio,bool incl_macro,
RDCart::Type mask)
RDCart::Type mask)
{
QString sql;
@@ -702,6 +734,58 @@ QString RDCartFilter::typeFilter(bool incl_audio,bool incl_macro,
}
QString RDCartFilter::typeFilter(RDCart::Type type,RDCart::Type mask)
{
QString sql;
switch(mask) {
case RDCart::Audio:
switch(type) {
case RDCart::Audio:
case RDCart::All:
sql="(`CART`.`TYPE`=1) &&";
break;
case RDCart::Macro:
sql="(`CART`.`TYPE`=0) &&";
break;
}
break;
case RDCart::Macro:
switch(type) {
case RDCart::Macro:
case RDCart::All:
sql="(`CART`.`TYPE`=2) &&";
break;
case RDCart::Audio:
sql="(`CART`.`TYPE`=0) &&";
break;
}
break;
case RDCart::All:
switch(type) {
case RDCart::All:
sql="((`CART`.`TYPE`=1)||(`CART`.`TYPE`=2)) &&";
break;
case RDCart::Audio:
sql="(`CART`.`TYPE`=1) &&";
break;
case RDCart::Macro:
sql="(`CART`.`TYPE`=2) &&";
break;
}
break;
}
return sql;
}
void RDCartFilter::showEvent(QShowEvent *e)
{
UpdateModel();

12
lib/rdcartfilter.h
View File

@@ -60,6 +60,7 @@ class RDCartFilter : public RDWidget
static QString phraseFilter(QString phrase,bool incl_cuts);
static QString groupFilter(const QString &group,const QStringList &groups);
static QString typeFilter(bool incl_audio,bool incl_macro,RDCart::Type mask);
static QString typeFilter(RDCart::Type type,RDCart::Type mask);
public slots:
void setDragEnabled(bool state);
@@ -77,12 +78,13 @@ class RDCartFilter : public RDWidget
private slots:
void setMatchCount(int matches);
void filterChangedData(const QString &str);
void filterToggledData(bool state);
void searchClickedData();
void clearClickedData();
void groupChangedData(const QString &str);
void schedulerCodeChangedData(const QString &str);
void andSchedulerCodeChangedData(const QString &str);
void checkChangedData(int n);
void showtypeActivatedData(int n);
void dragsChangedData(int n);
void searchLimitChangedData(int state);
@@ -105,6 +107,8 @@ class RDCartFilter : public RDWidget
QLabel *d_codes_label;
QComboBox *d_and_codes_box;
QLabel *d_and_codes_label;
QLabel *d_showmatches_label;
QCheckBox *d_showmatches_check;
QLineEdit *d_matches_edit;
QLabel *d_matches_label;
QPushButton *d_search_button;
@@ -112,12 +116,10 @@ class RDCartFilter : public RDWidget
QCheckBox *d_allowdrag_box;
QLabel *d_allowdrag_label;
bool d_show_drag_box;
QCheckBox *d_showaudio_check;
QLabel *d_showaudio_label;
QCheckBox *d_showmacro_check;
QLabel *d_showtype_label;
QComboBox *d_showtype_box;
QLabel *d_shownotes_label;
QCheckBox *d_shownotes_box;
QLabel *d_showmacro_label;
RDCart::Type d_show_cart_type;
bool d_show_track_carts;
QString d_default_group;

13
lib/rdcartslot.cpp
View File

@@ -2,7 +2,7 @@
//
// The cart slot widget.
//
// (C) Copyright 2012-2023 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2012-2025 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -613,11 +613,12 @@ unsigned RDCartSlot::SelectCart(const QString &svcname,unsigned msecs)
"`AUTOFILLS`.`CART_NUMBER`,"+ // 00
"`CART`.`FORCED_LENGTH` "+ // 01
"from "+
"`AUTOFILLS` left join `CART` on `AUTOFILLS`.`CART_NUMBER`=`CART`.`NUMBER`"+
QString().
sprintf(" where (`CART`.`FORCED_LENGTH`>%u)&&(`CART`.`FORCED_LENGTH`<%u)&&",
(unsigned)((double)msecs*RD_TIMESCALE_MIN),
(unsigned)((double)msecs*RD_TIMESCALE_MAX))+
"`AUTOFILLS` left join `CART` "+
"on `AUTOFILLS`.`CART_NUMBER`=`CART`.`NUMBER` where "+
QString::asprintf("(`CART`.`FORCED_LENGTH`>%u)&&",
(unsigned)((double)msecs*RD_TIMESCALE_MIN))+
QString::asprintf("(`CART`.`FORCED_LENGTH`<%u)&&",
(unsigned)((double)msecs*RD_TIMESCALE_MAX))+
"(`SERVICE`='"+RDEscapeString(svcname)+"')";
q=new RDSqlQuery(sql);
while(q->next()) {

57
lib/rdcut_dialog.cpp
View File

@@ -1,8 +1,8 @@
// rdcut_dialog.cpp
//
// A widget to select a Rivendell Cut.
// A dialog to select a Rivendell Cut.
//
// (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2025 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -173,7 +173,6 @@ QSize RDCutDialog::sizeHint() const
int RDCutDialog::exec(QString *cutname)
{
LoadState();
cart_cart_filter->setShowCartType(RDCart::Audio);
cart_cutname=cutname;
cart_ok_button->setEnabled(false);
@@ -278,7 +277,6 @@ void RDCutDialog::okData()
QModelIndexList rows=cart_cart_view->selectionModel()->selectedRows();
if((rows.size()==1)&&(cart_cart_model->isCut(rows.first()))) {
SaveState();
if(cart_filter!=NULL) {
*cart_filter=cart_cart_filter->filterText();
}
@@ -293,7 +291,6 @@ void RDCutDialog::okData()
void RDCutDialog::cancelData()
{
SaveState();
done(false);
}
@@ -325,53 +322,3 @@ void RDCutDialog::closeEvent(QCloseEvent *e)
{
cancelData();
}
QString RDCutDialog::StateFile() {
bool home_found = false;
QString home = RDGetHomeDir(&home_found);
if (home_found) {
return home+"/.rdcartdialog";
}
else {
return NULL;
}
}
void RDCutDialog::LoadState()
{
QString state_file=StateFile();
if (state_file.isEmpty()) {
return;
}
RDProfile *p=new RDProfile();
p->setSource(state_file);
cart_cart_filter->
setLimitSearch(p->boolValue("RDCutDialog","LimitSearch",true));
delete p;
}
void RDCutDialog::SaveState()
{
FILE *f=NULL;
QString state_file=StateFile();
if (state_file.isEmpty()) {
return;
}
if((f=fopen(state_file.toUtf8(),"w"))==NULL) {
return;
}
fprintf(f,"[RDCutDialog]\n");
if(cart_cart_filter->limitSearch()) {
fprintf(f,"LimitSearch=Yes\n");
}
else {
fprintf(f,"LimitSearch=No\n");
}
fclose(f);
}

7
lib/rdcut_dialog.h
View File

@@ -1,8 +1,8 @@
// rdcut_dialog.h
//
// A widget to select a Rivendell Cut.
// A Dialog to select a Rivendell Cut.
//
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2025 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -65,9 +65,6 @@ class RDCutDialog : public RDDialog
void closeEvent(QCloseEvent *e);
private:
QString StateFile();
void LoadState();
void SaveState();
QString *cart_cutname;
RDCartFilter *cart_cart_filter;
RDTreeView *cart_cart_view;

4
lib/rdlibrarymodel.cpp
View File

@@ -2,7 +2,7 @@
//
// Data model for the Rivendell cart library
//
// (C) Copyright 2021-2024 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-2025 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -675,7 +675,7 @@ void RDLibraryModel::updateModel(const QString &filter_sql)
sql=sqlFields()+
filter_sql+
QString::asprintf(" limit %d ",RD_LIMITED_CART_SEARCH_QUANTITY);
QString::asprintf(" limit %d ",d_cart_limit);
beginResetModel();
d_texts.clear();