From 53f78fb3c99aedf376dee6e56f3995f3e33702b5 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Wed, 4 Aug 2021 15:10:23 +0200
Subject: [PATCH] use real icons in edit dialogs of category, feed, acc

---
 .../services/abstract/gui/formcategorydetails.cpp    | 12 +++++++-----
 .../services/abstract/gui/formfeeddetails.cpp        | 11 ++++++-----
 .../services/greader/gui/formeditgreaderaccount.cpp  |  1 +
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/librssguard/services/abstract/gui/formcategorydetails.cpp b/src/librssguard/services/abstract/gui/formcategorydetails.cpp
index 7e442216d..c7019249c 100644
--- a/src/librssguard/services/abstract/gui/formcategorydetails.cpp
+++ b/src/librssguard/services/abstract/gui/formcategorydetails.cpp
@@ -55,7 +55,9 @@ void FormCategoryDetails::loadCategoryData() {
   loadCategories(m_serviceRoot->getSubTreeCategories(), m_serviceRoot, m_category);
 
   if (m_creatingNew) {
-    setWindowTitle(tr("Add new category"));
+    GuiUtilities::applyDialogProperties(*this,
+                                        qApp->icons()->fromTheme(QSL("folder")),
+                                        tr("Add new category"));
 
     // Make sure that "default" icon is used as the default option for new
     // categories.
@@ -76,7 +78,10 @@ void FormCategoryDetails::loadCategoryData() {
     }
   }
   else {
-    setWindowTitle(tr("Edit \"%1\"").arg(m_category->title()));
+    GuiUtilities::applyDialogProperties(*this,
+                                        m_category->fullIcon(),
+                                        tr("Edit \"%1\"").arg(m_category->title()));
+
     m_ui->m_cmbParentCategory->setCurrentIndex(m_ui->m_cmbParentCategory->findData(QVariant::fromValue((void*) m_category->parent())));
   }
 
@@ -161,9 +166,6 @@ void FormCategoryDetails::initialize() {
   m_ui->m_txtDescription->lineEdit()->setPlaceholderText(tr("Category description"));
   m_ui->m_txtDescription->lineEdit()->setToolTip(tr("Set description for your category."));
 
-  // Set flags and attributes.
-  GuiUtilities::applyDialogProperties(*this, qApp->icons()->fromTheme(QSL("folder")));
-
   // Setup button box.
   m_ui->m_buttonBox->button(QDialogButtonBox::StandardButton::Ok)->setEnabled(false);
 
diff --git a/src/librssguard/services/abstract/gui/formfeeddetails.cpp b/src/librssguard/services/abstract/gui/formfeeddetails.cpp
index ead8ec2ac..eaf2678d0 100644
--- a/src/librssguard/services/abstract/gui/formfeeddetails.cpp
+++ b/src/librssguard/services/abstract/gui/formfeeddetails.cpp
@@ -78,10 +78,14 @@ void FormFeedDetails::createConnections() {
 
 void FormFeedDetails::loadFeedData() {
   if (m_creatingNew) {
-    setWindowTitle(tr("Add new feed"));
+    GuiUtilities::applyDialogProperties(*this,
+                                        qApp->icons()->fromTheme(QSL("application-rss+xml")),
+                                        tr("Add new feed"));
   }
   else {
-    setWindowTitle(tr("Edit \"%1\"").arg(m_feed->title()));
+    GuiUtilities::applyDialogProperties(*this,
+                                        m_feed->fullIcon(),
+                                        tr("Edit \"%1\"").arg(m_feed->title()));
   }
 
   m_ui->m_cmbAutoUpdateType->setCurrentIndex(m_ui->m_cmbAutoUpdateType->findData(QVariant::fromValue(int(m_feed->autoUpdateType()))));
@@ -107,9 +111,6 @@ void FormFeedDetails::initialize() {
   m_ui.reset(new Ui::FormFeedDetails());
   m_ui->setupUi(this);
 
-  // Set flags and attributes.
-  GuiUtilities::applyDialogProperties(*this, qApp->icons()->fromTheme(QSL("application-rss+xml")));
-
   // Setup auto-update options.
   m_ui->m_spinAutoUpdateInterval->setValue(DEFAULT_AUTO_UPDATE_INTERVAL);
   m_ui->m_cmbAutoUpdateType->addItem(tr("Fetch articles using global interval"),
diff --git a/src/librssguard/services/greader/gui/formeditgreaderaccount.cpp b/src/librssguard/services/greader/gui/formeditgreaderaccount.cpp
index 4d2ff07f0..ba7ec1a8e 100755
--- a/src/librssguard/services/greader/gui/formeditgreaderaccount.cpp
+++ b/src/librssguard/services/greader/gui/formeditgreaderaccount.cpp
@@ -45,6 +45,7 @@ void FormEditGreaderAccount::loadAccountData() {
 
   GreaderServiceRoot* existing_root = account<GreaderServiceRoot>();
 
+  setWindowIcon(existing_root->icon());
   m_details->setService(existing_root->network()->service());
   m_details->m_ui.m_txtUsername->lineEdit()->setText(existing_root->network()->username());
   m_details->m_ui.m_txtPassword->lineEdit()->setText(existing_root->network()->password());