Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-12 07:35:55 +01:00
Code Issues Projects Releases Wiki Activity

2020-09-22 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Replaced the feed summary status icon with the feed image in the
	feed list in rdcastmanager(1).
	* Moved the post status icon to a new 'Status' column in the item
	list on the 'Podcast Item List' dialog in rdcastmanager(1).
	* Added the item icon to the start of each entry in the item list
	on the 'Podcast Item List' dialog in rdcastmanager(1).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2020-09-23 18:38:49 -04:00
parent c1fce3006e
commit 90a9990e2e
16 changed files with 208 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
rdcastmanager/list_casts.cpp
View File

@@ -40,6 +40,7 @@
#include "../icons/greenball.xpm"
#include "../icons/redball.xpm"
#include "../icons/whiteball.xpm"
#include "../icons/rdcastmanager-32x32.xpm"
ListCasts::ListCasts(unsigned feed_id,bool is_super,QWidget *parent)
: RDDialog(parent)
@@ -62,6 +63,7 @@ ListCasts::ListCasts(unsigned feed_id,bool is_super,QWidget *parent)
list_greenball_map=new QPixmap(greenball_xpm);
list_redball_map=new QPixmap(redball_xpm);
list_whiteball_map=new QPixmap(whiteball_xpm);
list_rdcastmanager_32x32_map=new QPixmap(rdcastmanager_32x32_xpm);
//
// Notifications
@@ -125,20 +127,24 @@ ListCasts::ListCasts(unsigned feed_id,bool is_super,QWidget *parent)
list_casts_view->setColumnAlignment(0,Qt::AlignCenter);
list_casts_view->addColumn(tr("Title"));
list_casts_view->setColumnAlignment(1,Qt::AlignLeft);
list_casts_view->addColumn(tr("Status"));
list_casts_view->setColumnAlignment(2,Qt::AlignCenter);
list_casts_view->addColumn(tr("Start"));
list_casts_view->setColumnAlignment(2,Qt::AlignLeft);
list_casts_view->setColumnAlignment(3,Qt::AlignLeft);
list_casts_view->addColumn(tr("Expiration"));
list_casts_view->setColumnAlignment(3,Qt::AlignCenter);
list_casts_view->setColumnAlignment(4,Qt::AlignCenter);
list_casts_view->addColumn(tr("Length"));
list_casts_view->setColumnAlignment(4,Qt::AlignRight);
list_casts_view->setColumnAlignment(5,Qt::AlignRight);
list_casts_view->addColumn(tr("Feed"));
list_casts_view->setColumnAlignment(5,Qt::AlignLeft);
list_casts_view->setColumnAlignment(6,Qt::AlignLeft);
list_casts_view->addColumn(tr("Category"));
list_casts_view->setColumnAlignment(6,Qt::AlignCenter);
list_casts_view->setColumnAlignment(7,Qt::AlignCenter);
list_casts_view->addColumn(tr("Posted By"));
list_casts_view->setColumnAlignment(7,Qt::AlignLeft);
list_casts_view->addColumn(tr("SHA1"));
list_casts_view->setColumnAlignment(8,Qt::AlignLeft);
list_casts_view->addColumn(tr("SHA1"));
list_casts_view->setColumnAlignment(9,Qt::AlignLeft);
connect(list_casts_view,
SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)),
this,
@@ -589,56 +595,65 @@ void ListCasts::RefreshItem(RDListViewItem *item)
"PODCASTS.ORIGIN_LOGIN_NAME,"+ // 08
"PODCASTS.ORIGIN_STATION,"+ // 09
"PODCASTS.ORIGIN_DATETIME,"+ // 10
"PODCASTS.SHA1_HASH "+ // 11
"PODCASTS.SHA1_HASH,"+ // 11
"FEED_IMAGES.DATA "+ // 12
"from PODCASTS left join FEEDS "+
"on PODCASTS.FEED_ID=FEEDS.ID where "+
"on PODCASTS.FEED_ID=FEEDS.ID left join FEED_IMAGES "+
"on FEEDS.ID=FEED_IMAGES.FEED_ID where "+
QString().sprintf("PODCASTS.ID=%d",item->id());
q=new RDSqlQuery(sql);
if(q->first()) {
if(q->value(12).isNull()) {
item->setPixmap(0,*list_rdcastmanager_32x32_map);
}
else {
QImage img=QImage::fromData(q->value(12).toByteArray());
item->setPixmap(0,QPixmap::fromImage(img.scaled(32,32)));
}
item->setText(1,q->value(1).toString());
switch((RDPodcast::Status)q->value(0).toUInt()) {
case RDPodcast::StatusActive:
if(q->value(2).toDateTime()<=QDateTime::currentDateTime()) {
item->setPixmap(0,*list_greenball_map);
item->setPixmap(2,*list_greenball_map);
}
else {
item->setPixmap(0,*list_blueball_map);
item->setPixmap(2,*list_blueball_map);
}
break;
case RDPodcast::StatusPending:
item->setPixmap(0,*list_redball_map);
item->setPixmap(2,*list_redball_map);
break;
case RDPodcast::StatusExpired:
item->setPixmap(0,*list_whiteball_map);
item->setPixmap(2,*list_whiteball_map);
break;
}
item->setText(1,q->value(1).toString());
item->setText(2,q->value(2).toDateTime().toString("MM/dd/yyyy hh:mm:ss"));
item->setText(3,q->value(2).toDateTime().toString("MM/dd/yyyy hh:mm:ss"));
if(q->value(3).isNull()) {
item->setText(3,tr("Never"));
item->setText(4,tr("Never"));
}
else {
item->setText(3,q->value(3).toDateTime().toString("MM/dd/yyyy hh:mm:ss"));
item->setText(4,q->value(3).toDateTime().toString("MM/dd/yyyy hh:mm:ss"));
}
item->setText(4,RDGetTimeLength(q->value(4).toInt(),false,false));
item->setText(5,RDGetTimeLength(q->value(4).toInt(),false,false));
item->setText(5,q->value(6).toString());
item->setText(6,q->value(7).toString());
item->setText(6,q->value(6).toString());
item->setText(7,q->value(7).toString());
if(q->value(8).isNull()) {
item->setText(7,tr("unknown")+" "+tr("at")+" "+
item->setText(8,tr("unknown")+" "+tr("at")+" "+
q->value(10).toDateTime().toString("MM/dd/yyyy hh:mm:ss"));
}
else {
item->setText(7,q->value(8).toString()+" "+tr("on")+" "+
item->setText(8,q->value(8).toString()+" "+tr("on")+" "+
q->value(9).toString()+" "+tr("at")+" "+
q->value(10).toDateTime().toString("MM/dd/yyyy hh:mm:ss"));
}
if(q->value(11).toString().isEmpty()) {
item->setText(8,tr("[none]"));
item->setText(9,tr("[none]"));
}
else {
item->setText(8,q->value(11).toString());
item->setText(9,q->value(11).toString());
}
}
delete q;

1
rdcastmanager/list_casts.h
View File

@@ -73,6 +73,7 @@ class ListCasts : public RDDialog
QPixmap *list_greenball_map;
QPixmap *list_redball_map;
QPixmap *list_whiteball_map;
QPixmap *list_rdcastmanager_32x32_map;
unsigned list_feed_id;
QLabel *list_filter_label;
QLineEdit *list_filter_edit;

23
rdcastmanager/rdcastmanager.cpp
View File

@@ -37,6 +37,7 @@
#include "../icons/rdcastmanager-22x22.xpm"
#include "../icons/greencheckmark.xpm"
#include "../icons/redx.xpm"
#include "../icons/rdcastmanager-32x32.xpm"
//
// Global Resources
@@ -99,6 +100,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
setWindowIcon(*cast_rivendell_map);
cast_greencheckmark_map=new QPixmap(greencheckmark_xpm);
cast_redx_map=new QPixmap(redx_xpm);
cast_rdcastmanager_32x32_map=new QPixmap(rdcastmanager_32x32_xpm);
//
// Notifications
@@ -278,12 +280,14 @@ void MainWidget::RefreshItem(RDListViewItem *item)
int total=0;
sql=QString("select ")+
"CHANNEL_TITLE,"+ // 00
"IS_SUPERFEED,"+ // 01
"ID,"+ // 02
"BASE_URL "+ // 03
"from FEEDS where "+
"KEY_NAME=\""+RDEscapeString(item->text(1))+"\"";
"FEEDS.CHANNEL_TITLE,"+ // 00
"FEEDS.IS_SUPERFEED,"+ // 01
"FEEDS.ID,"+ // 02
"FEEDS.BASE_URL,"+ // 03
"FEED_IMAGES.DATA "+ // 04
"from FEEDS left join FEED_IMAGES "+
"on FEEDS.ID=FEED_IMAGES.FEED_ID where "+
"FEEDS.KEY_NAME=\""+RDEscapeString(item->text(1))+"\"";
q=new RDSqlQuery(sql);
while(q->next()) {
sql=QString().sprintf("select STATUS from PODCASTS where FEED_ID=%u",
@@ -302,11 +306,12 @@ void MainWidget::RefreshItem(RDListViewItem *item)
}
}
delete q1;
if(active==total) {
item->setPixmap(0,*cast_greencheckmark_map);
if(q->value(4).isNull()) {
item->setPixmap(0,*cast_rdcastmanager_32x32_map);
}
else {
item->setPixmap(0,*cast_redx_map);
QImage img=QImage::fromData(q->value(4).toByteArray());
item->setPixmap(0,QPixmap::fromImage(img.scaled(32,32)));
}
item->setText(2,q->value(0).toString());
if(RDBool(q->value(1).toString())) {

1
rdcastmanager/rdcastmanager.h
View File

@@ -56,6 +56,7 @@ class MainWidget : public RDWidget
QPixmap *cast_rivendell_map;
QPixmap *cast_greencheckmark_map;
QPixmap *cast_redx_map;
QPixmap *cast_rdcastmanager_32x32_map;
QPushButton *cast_open_button;
QPushButton *cast_copy_button;
QPushButton *cast_close_button;

4
rdcastmanager/rdcastmanager_cs.ts
View File

@@ -418,6 +418,10 @@ Log</source>
<source>Unable to update remote XML data!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Status</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogDialog</name>

4
rdcastmanager/rdcastmanager_de.ts
View File

@@ -403,6 +403,10 @@ Log</source>
<source>Unable to update remote XML data!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Status</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogDialog</name>

4
rdcastmanager/rdcastmanager_es.ts
View File

@@ -358,6 +358,10 @@ Log</source>
<source>Unable to update remote XML data!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Status</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogDialog</name>

4
rdcastmanager/rdcastmanager_fr.ts
View File

@@ -254,6 +254,10 @@ Log</source>
<source>Unable to update remote XML data!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Status</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogDialog</name>

4
rdcastmanager/rdcastmanager_nb.ts
View File

@@ -385,6 +385,10 @@ Log</source>
<source>Unable to update remote XML data!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Status</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogDialog</name>

4
rdcastmanager/rdcastmanager_nn.ts
View File

@@ -385,6 +385,10 @@ Log</source>
<source>Unable to update remote XML data!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Status</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogDialog</name>

4
rdcastmanager/rdcastmanager_pt_BR.ts
View File

@@ -363,6 +363,10 @@ Log</source>
<source>Unable to update remote XML data!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Status</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogDialog</name>