FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save.

Browse Source
This commit is contained in:
Martin Rotter 2020-11-26 20:06:22 +01:00
parent 35be43b5c6
commit 78f78de0f8
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/librssguard/services/standard/gui/standardfeeddetails.cpp
View File

@ -185,19 +185,19 @@ void StandardFeedDetails::onLoadIconFromFile() {
QFileDialog dialog(this, tr("Select icon file for the feed"), QFileDialog dialog(this, tr("Select icon file for the feed"),
qApp->homeFolder(), tr("Images (*.bmp *.jpg *.jpeg *.png *.svg *.tga)")); 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.setWindowIcon(qApp->icons()->fromTheme(QSL("image-x-generic")));
dialog.setOptions(QFileDialog::DontUseNativeDialog | QFileDialog::ReadOnly); dialog.setOptions(QFileDialog::Option::DontUseNativeDialog | QFileDialog::Option::ReadOnly);
dialog.setViewMode(QFileDialog::Detail); dialog.setViewMode(QFileDialog::ViewMode::Detail);
dialog.setLabelText(QFileDialog::Accept, tr("Select icon")); dialog.setLabelText(QFileDialog::DialogLabel::Accept, tr("Select icon"));
dialog.setLabelText(QFileDialog::Reject, tr("Cancel")); dialog.setLabelText(QFileDialog::DialogLabel::Reject, tr("Cancel"));
//: Label for field with icon file name textbox for selection dialog. //: Label for field with icon file name textbox for selection dialog.
dialog.setLabelText(QFileDialog::LookIn, tr("Look in:")); dialog.setLabelText(QFileDialog::DialogLabel::LookIn, tr("Look in:"));
dialog.setLabelText(QFileDialog::FileName, tr("Icon name:")); dialog.setLabelText(QFileDialog::DialogLabel::FileName, tr("Icon name:"));
dialog.setLabelText(QFileDialog::FileType, tr("Icon type:")); 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))); ui.m_btnIcon->setIcon(QIcon(dialog.selectedFiles().value(0)));
} }
} }
@ -218,8 +218,7 @@ void StandardFeedDetails::prepareForNewFeed(RootItem* parent_to_select, const QS
if (parent_to_select != nullptr) { if (parent_to_select != nullptr) {
if (parent_to_select->kind() == RootItem::Kind::Category) { if (parent_to_select->kind() == RootItem::Kind::Category) {
ui.m_cmbParentCategory->setCurrentIndex(ui.m_cmbParentCategory->findData(QVariant::fromValue((void*) ui.m_cmbParentCategory->setCurrentIndex(ui.m_cmbParentCategory->findData(QVariant::fromValue((void*)parent_to_select)));
parent_to_select)));
} }
else if (parent_to_select->kind() == RootItem::Kind::Feed) { 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()));
@ -247,18 +246,15 @@ void StandardFeedDetails::setExistingFeed(StandardFeed* feed) {
ui.m_btnIcon->setIcon(feed->icon()); ui.m_btnIcon->setIcon(feed->icon());
ui.m_txtUrl->lineEdit()->setText(feed->url()); ui.m_txtUrl->lineEdit()->setText(feed->url());
ui.m_cmbType->setCurrentIndex(ui.m_cmbType->findData(QVariant::fromValue(int(feed->type())))); 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, ui.m_cmbEncoding->setCurrentIndex(ui.m_cmbEncoding->findData(feed->encoding(),
Qt::MatchFixedString)); Qt::ItemDataRole::DisplayRole,
Qt::MatchFlag::MatchFixedString));
} }
void StandardFeedDetails::loadCategories(const QList<Category*>& categories, RootItem* root_item) { void StandardFeedDetails::loadCategories(const QList<Category*>& categories, RootItem* root_item) {
ui.m_cmbParentCategory->addItem(root_item->fullIcon(), ui.m_cmbParentCategory->addItem(root_item->fullIcon(), root_item->title(), QVariant::fromValue((void*) root_item));
root_item->title(),
QVariant::fromValue((void*) root_item));
for (Category* category : categories) { for (Category* category : categories) {
ui.m_cmbParentCategory->addItem(category->fullIcon(), ui.m_cmbParentCategory->addItem(category->fullIcon(), category->title(), QVariant::fromValue((void*) category));
category->title(),
QVariant::fromValue((void*) category));
} }
} }

1
src/librssguard/services/standard/gui/standardfeeddetails.h
View File

@ -22,6 +22,7 @@ class StandardFeedDetails : public QWidget {
private slots: private slots:
void guessIconOnly(const QString& url, const QString& username, const QString& password); void guessIconOnly(const QString& url, const QString& username, const QString& password);
void guessFeed(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 onTitleChanged(const QString& new_title);
void onDescriptionChanged(const QString& new_description); void onDescriptionChanged(const QString& new_description);
void onUrlChanged(const QString& new_url); void onUrlChanged(const QString& new_url);