From 78f78de0f81f013ef5713e25f17f05d9b52e9e84 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 26 Nov 2020 20:06:22 +0100 Subject: [PATCH] Save. --- .../standard/gui/standardfeeddetails.cpp | 36 +++++++++---------- .../standard/gui/standardfeeddetails.h | 1 + 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/librssguard/services/standard/gui/standardfeeddetails.cpp b/src/librssguard/services/standard/gui/standardfeeddetails.cpp index b65f605e3..f7fb71ccd 100755 --- a/src/librssguard/services/standard/gui/standardfeeddetails.cpp +++ b/src/librssguard/services/standard/gui/standardfeeddetails.cpp @@ -185,19 +185,19 @@ void StandardFeedDetails::onLoadIconFromFile() { QFileDialog dialog(this, tr("Select icon file for the feed"), qApp->homeFolder(), tr("Images (*.bmp *.jpg *.jpeg *.png *.svg *.tga)")); - dialog.setFileMode(QFileDialog::ExistingFile); + dialog.setFileMode(QFileDialog::FileMode::ExistingFile); dialog.setWindowIcon(qApp->icons()->fromTheme(QSL("image-x-generic"))); - dialog.setOptions(QFileDialog::DontUseNativeDialog | QFileDialog::ReadOnly); - dialog.setViewMode(QFileDialog::Detail); - dialog.setLabelText(QFileDialog::Accept, tr("Select icon")); - dialog.setLabelText(QFileDialog::Reject, tr("Cancel")); + dialog.setOptions(QFileDialog::Option::DontUseNativeDialog | QFileDialog::Option::ReadOnly); + dialog.setViewMode(QFileDialog::ViewMode::Detail); + dialog.setLabelText(QFileDialog::DialogLabel::Accept, tr("Select icon")); + dialog.setLabelText(QFileDialog::DialogLabel::Reject, tr("Cancel")); //: Label for field with icon file name textbox for selection dialog. - dialog.setLabelText(QFileDialog::LookIn, tr("Look in:")); - dialog.setLabelText(QFileDialog::FileName, tr("Icon name:")); - dialog.setLabelText(QFileDialog::FileType, tr("Icon type:")); + dialog.setLabelText(QFileDialog::DialogLabel::LookIn, tr("Look in:")); + dialog.setLabelText(QFileDialog::DialogLabel::FileName, tr("Icon name:")); + dialog.setLabelText(QFileDialog::DialogLabel::FileType, tr("Icon type:")); - if (dialog.exec() == QDialog::Accepted) { + if (dialog.exec() == QDialog::DialogCode::Accepted) { ui.m_btnIcon->setIcon(QIcon(dialog.selectedFiles().value(0))); } } @@ -218,11 +218,10 @@ void StandardFeedDetails::prepareForNewFeed(RootItem* parent_to_select, const QS if (parent_to_select != nullptr) { if (parent_to_select->kind() == RootItem::Kind::Category) { - ui.m_cmbParentCategory->setCurrentIndex(ui.m_cmbParentCategory->findData(QVariant::fromValue((void*) - parent_to_select))); + ui.m_cmbParentCategory->setCurrentIndex(ui.m_cmbParentCategory->findData(QVariant::fromValue((void*)parent_to_select))); } else if (parent_to_select->kind() == RootItem::Kind::Feed) { - int target_item = ui.m_cmbParentCategory->findData(QVariant::fromValue((void*) parent_to_select->parent())); + int target_item = ui.m_cmbParentCategory->findData(QVariant::fromValue((void*)parent_to_select->parent())); if (target_item >= 0) { ui.m_cmbParentCategory->setCurrentIndex(target_item); @@ -247,18 +246,15 @@ void StandardFeedDetails::setExistingFeed(StandardFeed* feed) { ui.m_btnIcon->setIcon(feed->icon()); ui.m_txtUrl->lineEdit()->setText(feed->url()); ui.m_cmbType->setCurrentIndex(ui.m_cmbType->findData(QVariant::fromValue(int(feed->type())))); - ui.m_cmbEncoding->setCurrentIndex(ui.m_cmbEncoding->findData(feed->encoding(), Qt::DisplayRole, - Qt::MatchFixedString)); + ui.m_cmbEncoding->setCurrentIndex(ui.m_cmbEncoding->findData(feed->encoding(), + Qt::ItemDataRole::DisplayRole, + Qt::MatchFlag::MatchFixedString)); } void StandardFeedDetails::loadCategories(const QList& categories, RootItem* root_item) { - ui.m_cmbParentCategory->addItem(root_item->fullIcon(), - root_item->title(), - QVariant::fromValue((void*) root_item)); + ui.m_cmbParentCategory->addItem(root_item->fullIcon(), root_item->title(), QVariant::fromValue((void*) root_item)); for (Category* category : categories) { - ui.m_cmbParentCategory->addItem(category->fullIcon(), - category->title(), - QVariant::fromValue((void*) category)); + ui.m_cmbParentCategory->addItem(category->fullIcon(), category->title(), QVariant::fromValue((void*) category)); } } diff --git a/src/librssguard/services/standard/gui/standardfeeddetails.h b/src/librssguard/services/standard/gui/standardfeeddetails.h index dc47a5649..406576be0 100755 --- a/src/librssguard/services/standard/gui/standardfeeddetails.h +++ b/src/librssguard/services/standard/gui/standardfeeddetails.h @@ -22,6 +22,7 @@ class StandardFeedDetails : public QWidget { private slots: void guessIconOnly(const QString& url, const QString& username, const QString& password); void guessFeed(const QString& url, const QString& username, const QString& password); + void onTitleChanged(const QString& new_title); void onDescriptionChanged(const QString& new_description); void onUrlChanged(const QString& new_url);