From eff674896c3857c20ec3ad4982594a5ff10bfe5c Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Fri, 7 Feb 2020 16:58:36 -0500 Subject: [PATCH] 2020-02-07 Fred Gleason * Removed Q3Support dependencies from the 'Editing Feed' dialog in rdadmin(1). --- ChangeLog | 3 +++ rdadmin/edit_feed.cpp | 31 +++++++++++++++++-------------- rdadmin/edit_feed.h | 13 ++++++------- rdcastmanager/list_casts.cpp | 4 +--- 4 files changed, 27 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index f709fa93..f479b1f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19533,3 +19533,6 @@ * Cleaned up a compiler warning in 'lib/rdcae.cpp'. 2020-02-07 Fred Gleason * Incremented the package version to 3.2.1int1. +2020-02-07 Fred Gleason + * Removed Q3Support dependencies from the 'Editing Feed' dialog + in rdadmin(1). diff --git a/rdadmin/edit_feed.cpp b/rdadmin/edit_feed.cpp index f5310394..a4cb4cf9 100644 --- a/rdadmin/edit_feed.cpp +++ b/rdadmin/edit_feed.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Feed // -// (C) Copyright 2002-2018 Fred Gleason +// (C) Copyright 2002-2020 Fred Gleason // // 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 @@ -20,13 +20,12 @@ #include -#include -#include +#include #include #include #include -#include -#include +#include +#include #include #include @@ -149,7 +148,8 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) // // Channel Description // - feed_channel_description_edit=new Q3TextEdit(this); + feed_channel_description_edit=new QTextEdit(this); + feed_channel_description_edit->setAcceptRichText(false); feed_channel_description_edit->setGeometry(115,192,375,76); feed_channel_description_label= new QLabel(feed_channel_description_edit,tr("Description:"),this); @@ -369,7 +369,8 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) // // Header XML // - feed_header_xml_edit=new Q3TextEdit(this); + feed_header_xml_edit=new QTextEdit(this); + feed_header_xml_edit->setAcceptRichText(false); feed_header_xml_edit->setGeometry(615,10,365,76); feed_header_xml_label=new QLabel(feed_header_xml_edit,tr("Header XML:"),this); feed_header_xml_label->setGeometry(520,10,90,19); @@ -379,7 +380,8 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) // // Channel XML // - feed_channel_xml_edit=new Q3TextEdit(this); + feed_channel_xml_edit=new QTextEdit(this); + feed_channel_xml_edit->setAcceptRichText(false); feed_channel_xml_edit->setGeometry(615,88,365,176); feed_channel_xml_label= new QLabel(feed_channel_xml_edit,tr("Channel XML:"),this); @@ -390,7 +392,8 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) // // Item XML // - feed_item_xml_edit=new Q3TextEdit(this); + feed_item_xml_edit=new QTextEdit(this); + feed_item_xml_edit->setAcceptRichText(false); feed_item_xml_edit->setGeometry(615,270,365,250); feed_item_xml_label=new QLabel(feed_item_xml_edit,tr("Item XML:"),this); feed_item_xml_label->setGeometry(520,270,90,19); @@ -426,16 +429,16 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) feed_channel_link_edit->setText(feed_feed->channelLink()); feed_channel_copyright_edit->setText(feed_feed->channelCopyright()); feed_channel_webmaster_edit->setText(feed_feed->channelWebmaster()); - feed_channel_description_edit->setText(feed_feed->channelDescription()); + feed_channel_description_edit->setPlainText(feed_feed->channelDescription()); feed_channel_language_edit->setText(feed_feed->channelLanguage()); feed_base_url_edit->setText(feed_feed->baseUrl()); feed_base_preamble_edit->setText(feed_feed->basePreamble()); feed_purge_url_edit->setText(feed_feed->purgeUrl()); feed_purge_username_edit->setText(feed_feed->purgeUsername()); feed_purge_password_edit->setText(feed_feed->purgePassword()); - feed_header_xml_edit->setText(feed_feed->headerXml()); - feed_channel_xml_edit->setText(feed_feed->channelXml()); - feed_item_xml_edit->setText(feed_feed->itemXml()); + feed_header_xml_edit->setPlainText(feed_feed->headerXml()); + feed_channel_xml_edit->setPlainText(feed_feed->channelXml()); + feed_item_xml_edit->setPlainText(feed_feed->itemXml()); feed_max_shelf_life_spin->setValue(feed_feed->maxShelfLife()); feed_autopost_box->setChecked(feed_feed->enableAutopost()); feed_keep_metadata_box->setChecked(feed_feed->keepMetadata()); @@ -479,7 +482,7 @@ QSizePolicy EditFeed::sizePolicy() const void EditFeed::purgeUrlChangedData(const QString &str) { - Q3Url url(str); + QUrl url(str); QString protocol=url.protocol(); if(((protocol=="ftp")||(protocol=="sftp"))&& (!feed_redirect_check->isChecked())) { diff --git a/rdadmin/edit_feed.h b/rdadmin/edit_feed.h index fa34560f..d816048c 100644 --- a/rdadmin/edit_feed.h +++ b/rdadmin/edit_feed.h @@ -2,7 +2,7 @@ // // Edit a Rivendell Feed // -// (C) Copyright 2002-2019 Fred Gleason +// (C) Copyright 2002-2020 Fred Gleason // // 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 @@ -28,8 +28,7 @@ #include #include #include - -#include +#include #include #include @@ -58,7 +57,7 @@ class EditFeed : public RDDialog RDFeed *feed_feed; QLineEdit *feed_keyname_edit; QLineEdit *feed_channel_title_edit; - Q3TextEdit *feed_channel_description_edit; + QTextEdit *feed_channel_description_edit; QLineEdit *feed_channel_category_edit; QLineEdit *feed_channel_link_edit; QLineEdit *feed_channel_copyright_edit; @@ -71,9 +70,9 @@ class EditFeed : public RDDialog QLineEdit *feed_purge_username_edit; QLabel *feed_purge_password_label; QLineEdit *feed_purge_password_edit; - Q3TextEdit *feed_header_xml_edit; - Q3TextEdit *feed_channel_xml_edit; - Q3TextEdit *feed_item_xml_edit; + QTextEdit *feed_header_xml_edit; + QTextEdit *feed_channel_xml_edit; + QTextEdit *feed_item_xml_edit; QSpinBox *feed_max_shelf_life_spin; QCheckBox *feed_autopost_box; QCheckBox *feed_keep_metadata_box; diff --git a/rdcastmanager/list_casts.cpp b/rdcastmanager/list_casts.cpp index 5fa7ae23..79392555 100644 --- a/rdcastmanager/list_casts.cpp +++ b/rdcastmanager/list_casts.cpp @@ -2,7 +2,7 @@ // // List Rivendell Casts // -// (C) Copyright 2002-2019 Fred Gleason +// (C) Copyright 2002-2020 Fred Gleason // // 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 @@ -43,8 +43,6 @@ ListCasts::ListCasts(unsigned feed_id,QWidget *parent) : RDDialog(parent) { - setModal(true); - list_feed_id=feed_id; //