Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-09 22:43:11 +02:00
Code Issues Projects Releases Wiki Activity

2020-08-13 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the 'Unly Show Unexpired Items' checkbox from the
	'Podcast Feed Item List' dialog in rdcastmanager(1).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2020-08-13 18:14:32 -04:00
parent f63b5f1bcf
commit 783ce2fc9a
13 changed files with 169 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -20239,3 +20239,6 @@
2020-08-13 Fred Gleason <fredg@paravelsystems.com>
* Titled the audio selector dialog in rdcastmanager(1)
'Select Audio File'.
2020-08-13 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'Unly Show Unexpired Items' checkbox from the
'Podcast Feed Item List' dialog in rdcastmanager(1).

10
lib/rdcastsearch.cpp
View File

@ -24,8 +24,7 @@
#include <rdpodcast.h>
#include <rdcastsearch.h>
QString RDCastSearchString(const QString &filter,bool unexp_only,
bool active_only)
QString RDCastSearchString(const QString &filter,bool active_only)
{
QString ret;
if(!filter.stripWhiteSpace().isEmpty()) {
@ -39,9 +38,6 @@ QString RDCastSearchString(const QString &filter,bool unexp_only,
"(PODCASTS.ITEM_SOURCE_TEXT like \"%"+fil+"%\")||"+
"(PODCASTS.ITEM_SOURCE_URL like \"%"+fil+"%\"))";
}
if(unexp_only) {
ret+=QString().sprintf("&&(STATUS!=%d)",RDPodcast::StatusExpired);
}
if(active_only) {
ret+=QString().sprintf("&&(STATUS=%d)",RDPodcast::StatusActive);
}
@ -50,7 +46,7 @@ QString RDCastSearchString(const QString &filter,bool unexp_only,
QString RDCastSearch(const QString &keyname,bool is_super,const QString &filter,
bool unexp_only,bool active_only)
bool active_only)
{
QString sql;
RDSqlQuery *q;
@ -81,7 +77,7 @@ QString RDCastSearch(const QString &keyname,bool is_super,const QString &filter,
}
delete q;
}
ret+=RDCastSearchString(filter,unexp_only,active_only);
ret+=RDCastSearchString(filter,active_only);
return ret;
}

2
lib/rdcastsearch.h
View File

@ -22,7 +22,7 @@
#define RDCASTSEARCH_H
QString RDCastSearch(const QString &keyname,bool is_super,const QString &filter,
bool unexp_only,bool active_only);
bool active_only);
#endif // RDCASTSEARCH_H

18
rdcastmanager/list_casts.cpp
View File

@ -100,17 +100,6 @@ ListCasts::ListCasts(unsigned feed_id,bool is_super,QWidget *parent)
connect(list_filter_edit,SIGNAL(textChanged(const QString &)),
this,SLOT(filterChangedData(const QString &)));
//
// Unexpired Check Box
//
list_unexpired_check=new QCheckBox(this);
list_unexpired_label=
new QLabel(list_unexpired_check,tr("Only Show Unexpired Items"),this);
list_unexpired_label->setFont(labelFont());
list_unexpired_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
connect(list_unexpired_check,SIGNAL(toggled(bool)),
this,SLOT(notexpiredToggledData(bool)));
//
// Active Check Box
//
@ -489,10 +478,8 @@ void ListCasts::resizeEvent(QResizeEvent *e)
{
list_filter_label->setGeometry(10,10,40,20);
list_filter_edit->setGeometry(55,10,size().width()-65,20);
list_unexpired_check->setGeometry(55,35,15,15);
list_unexpired_label->setGeometry(75,33,200,20);
list_active_check->setGeometry(300,35,15,15);
list_active_label->setGeometry(320,33,200,20);
list_active_check->setGeometry(60,35,15,15);
list_active_label->setGeometry(80,33,200,20);
list_casts_label->setGeometry(15,57,size().width()-25,20);
list_casts_view->setGeometry(10,76,size().width()-20,size().height()-146);
list_cart_button->setGeometry(10,size().height()-60,80,50);
@ -565,7 +552,6 @@ void ListCasts::RefreshList()
sql=QString("select ID from PODCASTS ")+
RDCastSearch(list_feed->keyName(),list_is_superfeed,
list_filter_edit->text(),
list_unexpired_check->isChecked(),
list_active_check->isChecked())+
" order by ORIGIN_DATETIME";
q=new RDSqlQuery(sql);

2
rdcastmanager/list_casts.h
View File

@ -76,8 +76,6 @@ class ListCasts : public RDDialog
unsigned list_feed_id;
QLabel *list_filter_label;
QLineEdit *list_filter_edit;
QLabel *list_unexpired_label;
QCheckBox *list_unexpired_check;
QLabel *list_active_label;
QCheckBox *list_active_check;
QProgressDialog *list_progress_dialog;

30
rdcastmanager/rdcastmanager_cs.ts
View File

@ -247,15 +247,15 @@ Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n&gt;=2 &amp;&amp; n&lt;=4) ? 1 :
</message>
<message>
<source>Delete Podcast</source>
<translation>Smazat podcast</translation>
<translation type="obsolete">Smazat podcast</translation>
</message>
<message>
<source>Are you sure you want to delete this podcast?</source>
<translation>Opravdu chcete smazat tento podcast?</translation>
<translation type="obsolete">Opravdu chcete smazat tento podcast?</translation>
</message>
<message>
<source>Deleting Podcast...</source>
<translation>Maže se podcast...</translation>
<translation type="obsolete">Maže se podcast...</translation>
</message>
<message>
<source>Internal Error</source>
@ -350,10 +350,6 @@ Log</source>
<source>Podcast Item List</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Only Show Unexpired Items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Only Show Active Items</source>
<translation type="unfinished"></translation>
@ -382,6 +378,22 @@ Log</source>
<source>on</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Delete Item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Are you sure you want to delete this item?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deleting Item...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select Audio File</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogDialog</name>
@ -401,6 +413,10 @@ Log</source>
<source>At least one log event must be selected!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>List Log Events</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogModel</name>

30
rdcastmanager/rdcastmanager_de.ts
View File

@ -232,15 +232,15 @@ Car&amp;t/Cut</translation>
</message>
<message>
<source>Delete Podcast</source>
<translation>Podcast löschen</translation>
<translation type="obsolete">Podcast löschen</translation>
</message>
<message>
<source>Are you sure you want to delete this podcast?</source>
<translation>Sind Sie sicher, daß sie diesen Podcast löschen wollen?</translation>
<translation type="obsolete">Sind Sie sicher, daß sie diesen Podcast löschen wollen?</translation>
</message>
<message>
<source>Deleting Podcast...</source>
<translation>Lösche Podcast...</translation>
<translation type="obsolete">Lösche Podcast...</translation>
</message>
<message>
<source>Internal Error</source>
@ -335,10 +335,6 @@ Log</source>
<source>Podcast Item List</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Only Show Unexpired Items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Only Show Active Items</source>
<translation type="unfinished"></translation>
@ -367,6 +363,22 @@ Log</source>
<source>on</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Delete Item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Are you sure you want to delete this item?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deleting Item...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select Audio File</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogDialog</name>
@ -386,6 +398,10 @@ Log</source>
<source>At least one log event must be selected!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>List Log Events</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogModel</name>

30
rdcastmanager/rdcastmanager_es.ts
View File

@ -240,15 +240,15 @@ Suscripción</translation>
</message>
<message>
<source>Delete Podcast</source>
<translation>Borrar Podcast</translation>
<translation type="obsolete">Borrar Podcast</translation>
</message>
<message>
<source>Are you sure you want to delete this podcast?</source>
<translation>¿Está seguro de borrar este Podcast?</translation>
<translation type="obsolete">¿Está seguro de borrar este Podcast?</translation>
</message>
<message>
<source>Deleting Podcast...</source>
<translation>Eliminando Podcast...</translation>
<translation type="obsolete">Eliminando Podcast...</translation>
</message>
<message>
<source>Remote Error</source>
@ -290,10 +290,6 @@ Log</source>
<source>Podcast Item List</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Only Show Unexpired Items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Only Show Active Items</source>
<translation type="unfinished"></translation>
@ -322,6 +318,22 @@ Log</source>
<source>on</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Delete Item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Are you sure you want to delete this item?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deleting Item...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select Audio File</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogDialog</name>
@ -341,6 +353,10 @@ Log</source>
<source>At least one log event must be selected!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>List Log Events</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogModel</name>

36
rdcastmanager/rdcastmanager_fr.ts
View File

@ -152,18 +152,6 @@ Car&amp;t/Cut</source>
<source>Posting Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Delete Podcast</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Are you sure you want to delete this podcast?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deleting Podcast...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remote Error</source>
<translation type="unfinished"></translation>
@ -203,10 +191,6 @@ Log</source>
<source>Podcast Item List</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Only Show Unexpired Items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Only Show Active Items</source>
<translation type="unfinished"></translation>
@ -235,6 +219,22 @@ Log</source>
<source>on</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Delete Item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Are you sure you want to delete this item?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deleting Item...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select Audio File</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogDialog</name>
@ -254,6 +254,10 @@ Log</source>
<source>At least one log event must be selected!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>List Log Events</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogModel</name>

30
rdcastmanager/rdcastmanager_nb.ts
View File

@ -231,15 +231,15 @@ Korg/Ku&amp;tt</translation>
</message>
<message>
<source>Delete Podcast</source>
<translation type="unfinished">Slett podkast</translation>
<translation type="obsolete">Slett podkast</translation>
</message>
<message>
<source>Are you sure you want to delete this podcast?</source>
<translation type="unfinished">Er du sikker på at du vil sletta denne podkasten?</translation>
<translation type="obsolete">Er du sikker på at du vil sletta denne podkasten?</translation>
</message>
<message>
<source>Deleting Podcast...</source>
<translation type="unfinished">Slettar podkast...</translation>
<translation type="obsolete">Slettar podkast...</translation>
</message>
<message>
<source>Internal Error</source>
@ -322,10 +322,6 @@ Log</source>
<source>Podcast Item List</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Only Show Unexpired Items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Only Show Active Items</source>
<translation type="unfinished"></translation>
@ -354,6 +350,22 @@ Log</source>
<source>on</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Delete Item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Are you sure you want to delete this item?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deleting Item...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select Audio File</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogDialog</name>
@ -373,6 +385,10 @@ Log</source>
<source>At least one log event must be selected!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>List Log Events</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogModel</name>

30
rdcastmanager/rdcastmanager_nn.ts
View File

@ -231,15 +231,15 @@ Korg/Ku&amp;tt</translation>
</message>
<message>
<source>Delete Podcast</source>
<translation type="unfinished">Slett podkast</translation>
<translation type="obsolete">Slett podkast</translation>
</message>
<message>
<source>Are you sure you want to delete this podcast?</source>
<translation type="unfinished">Er du sikker på at du vil sletta denne podkasten?</translation>
<translation type="obsolete">Er du sikker på at du vil sletta denne podkasten?</translation>
</message>
<message>
<source>Deleting Podcast...</source>
<translation type="unfinished">Slettar podkast...</translation>
<translation type="obsolete">Slettar podkast...</translation>
</message>
<message>
<source>Internal Error</source>
@ -322,10 +322,6 @@ Log</source>
<source>Podcast Item List</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Only Show Unexpired Items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Only Show Active Items</source>
<translation type="unfinished"></translation>
@ -354,6 +350,22 @@ Log</source>
<source>on</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Delete Item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Are you sure you want to delete this item?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deleting Item...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select Audio File</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogDialog</name>
@ -373,6 +385,10 @@ Log</source>
<source>At least one log event must be selected!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>List Log Events</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogModel</name>

30
rdcastmanager/rdcastmanager_pt_BR.ts
View File

@ -233,15 +233,15 @@ Assinaturas</translation>
</message>
<message>
<source>Delete Podcast</source>
<translation>Deletar PodCast</translation>
<translation type="obsolete">Deletar PodCast</translation>
</message>
<message>
<source>Are you sure you want to delete this podcast?</source>
<translation>Tem certeza que você quer deletar este podcast?</translation>
<translation type="obsolete">Tem certeza que você quer deletar este podcast?</translation>
</message>
<message>
<source>Deleting Podcast...</source>
<translation>Deletando Podcast...</translation>
<translation type="obsolete">Deletando Podcast...</translation>
</message>
<message>
<source>Internal Error</source>
@ -300,10 +300,6 @@ Log</source>
<source>Podcast Item List</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Only Show Unexpired Items</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Only Show Active Items</source>
<translation type="unfinished"></translation>
@ -332,6 +328,22 @@ Log</source>
<source>on</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Delete Item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Are you sure you want to delete this item?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deleting Item...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select Audio File</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogDialog</name>
@ -351,6 +363,10 @@ Log</source>
<source>At least one log event must be selected!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>List Log Events</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogModel</name>

2
web/rdcastmanager/rdcastmanager.cpp
View File

@ -551,6 +551,7 @@ void MainObject::ServeListCasts()
line_colors[0]=RD_WEB_LINE_COLOR1;
line_colors[1]=RD_WEB_LINE_COLOR2;
int current_color=0;
/*
sql=QString("select ")+
"ID,"+ // 00
"STATUS,"+ // 01
@ -562,6 +563,7 @@ void MainObject::ServeListCasts()
"from PODCASTS "+
RDCastSearch(cast_key_name,false,filter,unexp_only,active_only)+
" order by ORIGIN_DATETIME desc";
*/
q=new RDSqlQuery(sql);
while(q->next()) {
printf("<tr>\n");