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

2020-05-17 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Updated interlocking logic in the 'Edit Feed' dialog in
	rdadmin(1) to handle image assignments correctly.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2020-05-17 17:49:57 -04:00
parent 66a2924c6b
commit 1923e9840c
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -19939,3 +19939,6 @@
* Dropped the 'RSS_SCHEMAS' table from the database. * Dropped the 'RSS_SCHEMAS' table from the database.
* Incremented the database version to 325. * Incremented the database version to 325.
* Moved RSS template definitions to 'lib/rdfeed.h'. * Moved RSS template definitions to 'lib/rdfeed.h'.
2020-05-17 Fred Gleason <fredg@paravelsystems.com>
* Updated interlocking logic in the 'Edit Feed' dialog in
rdadmin(1) to handle image assignments correctly.

8
rdadmin/edit_feed.cpp
View File

@ -775,11 +775,14 @@ void EditFeed::UpdateControlState()
bool custom_schema= bool custom_schema=
feed_rss_schema_box->itemData(feed_rss_schema_box->currentIndex()).toInt()== feed_rss_schema_box->itemData(feed_rss_schema_box->currentIndex()).toInt()==
RDFeed::CustomSchema; RDFeed::CustomSchema;
bool item_image=feed_rss_schema_box->itemData(feed_rss_schema_box->currentIndex()).toInt()!=RDFeed::Rss202Schema;
feed_is_superfeed_label->setDisabled(redirected); feed_is_superfeed_label->setDisabled(redirected);
feed_is_superfeed_box->setDisabled(redirected); feed_is_superfeed_box->setDisabled(redirected);
feed_is_superfeed_button->setDisabled(redirected||(!superfeed)); feed_is_superfeed_button->setDisabled(redirected||(!superfeed));
feed_list_images_button->setDisabled(redirected);
feed_audience_metrics_check->setDisabled(redirected); feed_audience_metrics_check->setDisabled(redirected);
feed_audience_metrics_label->setDisabled(redirected); feed_audience_metrics_label->setDisabled(redirected);
@ -799,6 +802,8 @@ void EditFeed::UpdateControlState()
feed_channel_copyright_label->setDisabled(redirected); feed_channel_copyright_label->setDisabled(redirected);
feed_channel_language_label->setDisabled(redirected); feed_channel_language_label->setDisabled(redirected);
feed_channel_description_label->setDisabled(redirected); feed_channel_description_label->setDisabled(redirected);
feed_channel_image_label->setDisabled(redirected);
feed_channel_image_box->setDisabled(redirected);
feed_redirect_url_label->setEnabled(redirected); feed_redirect_url_label->setEnabled(redirected);
feed_redirect_url_edit->setEnabled(redirected); feed_redirect_url_edit->setEnabled(redirected);
@ -841,6 +846,9 @@ void EditFeed::UpdateControlState()
feed_media_link_mode_box->setDisabled(redirected||superfeed); feed_media_link_mode_box->setDisabled(redirected||superfeed);
feed_media_link_mode_label->setDisabled(redirected||superfeed); feed_media_link_mode_label->setDisabled(redirected||superfeed);
feed_item_image_label->setEnabled(item_image&&(!redirected));
feed_item_image_box->setEnabled(item_image&&(!redirected));
feed_header_xml_label->setDisabled(redirected||(!custom_schema)); feed_header_xml_label->setDisabled(redirected||(!custom_schema));
feed_header_xml_edit->setDisabled(redirected||(!custom_schema)); feed_header_xml_edit->setDisabled(redirected||(!custom_schema));