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

2021-07-12 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Modified the 'Edit Upload' dialog in rdcatch(1) to disable the
	'Url', 'Username', 'Password' and 'Export Format' controls when
	an RSS feed is selected.
	* Added the feed icon to the 'RSS Feed' column in the record list
	display in rdcatch(1).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-07-12 09:56:24 -04:00
parent cbdf0a4735
commit cd91364485
10 changed files with 304 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/rdfeedlistmodel.cpp
View File

@@ -25,10 +25,11 @@
#include "rdfeedlistmodel.h"
#include "rdpodcast.h"
RDFeedListModel::RDFeedListModel(bool is_admin,QObject *parent)
RDFeedListModel::RDFeedListModel(bool is_admin,bool incl_none,QObject *parent)
: QAbstractItemModel(parent)
{
d_is_admin=is_admin;
d_include_none=incl_none;
d_font_metrics=NULL;
d_bold_font_metrics=NULL;
@@ -481,6 +482,7 @@ void RDFeedListModel::updateModel(const QString &filter_sql)
}
QList<QList<QVariant> > list_list;
list_list.push_back(list);
QList<unsigned> ids;
sql=sqlFields()+
filter_sql+
@@ -493,8 +495,19 @@ void RDFeedListModel::updateModel(const QString &filter_sql)
d_cast_ids.clear();
d_cast_icons.clear();
d_icons.clear();
if(d_include_none) {
d_texts.push_back(list);
d_texts[0][0]=tr("[none]");
d_key_names.push_back(QString());
d_feed_ids.push_back(0);
d_cast_texts.push_back(list_list);
d_cast_ids.push_back(ids);
d_cast_icons.push_back(list);
d_icons.push_back(icons);
}
QString prev_keyname;
QList<unsigned> ids;
q=new RDSqlQuery(sql);
while(q->next()) {
if(q->value(0).toString()!=prev_keyname) {

3
lib/rdfeedlistmodel.h
View File

@@ -36,7 +36,7 @@ class RDFeedListModel : public QAbstractItemModel
{
Q_OBJECT
public:
RDFeedListModel(bool is_admin,QObject *parent=0);
RDFeedListModel(bool is_admin,bool incl_none,QObject *parent);
~RDFeedListModel();
QPalette palette();
void setPalette(const QPalette &pal);
@@ -96,6 +96,7 @@ class RDFeedListModel : public QAbstractItemModel
QStringList d_key_names;
QList<unsigned> d_feed_ids;
bool d_is_admin;
bool d_include_none;
};

2
lib/rdrecording.cpp
View File

@@ -671,7 +671,7 @@ QString RDRecording::feedKeyName() const
feedId());
RDSqlQuery *q=new RDSqlQuery(sql);
if(q->first()) {
QString ret=q->value(0).toString();
ret=q->value(0).toString();
}
delete q;
return ret;