From db76984b9806e2b318cf41a17827defeb1844ef5 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Thu, 30 Sep 2021 11:03:46 +0200
Subject: [PATCH] do not require email for skins

---
 resources/desktop/com.github.rssguard.appdata.xml     |  2 +-
 resources/skins/dark/metadata.xml                     |  1 -
 resources/skins/plain/metadata.xml                    |  1 -
 resources/skins/vergilius/metadata.xml                |  1 -
 src/librssguard/gui/settings/settingsfeedsmessages.ui |  2 +-
 src/librssguard/gui/settings/settingsgui.cpp          | 11 ++++-------
 src/librssguard/miscellaneous/skinfactory.cpp         |  5 +----
 src/librssguard/miscellaneous/skinfactory.h           |  1 -
 8 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml
index 04c7e8fb0..ff4d290d8 100644
--- a/resources/desktop/com.github.rssguard.appdata.xml
+++ b/resources/desktop/com.github.rssguard.appdata.xml
@@ -26,7 +26,7 @@
   <url type="donation">https://github.com/sponsors/martinrotter</url>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="4.0.3" date="2021-09-27"/>
+    <release version="4.0.3" date="2021-09-30"/>
   </releases>
   <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">none</content_attribute>
diff --git a/resources/skins/dark/metadata.xml b/resources/skins/dark/metadata.xml
index db8622652..59495e05c 100644
--- a/resources/skins/dark/metadata.xml
+++ b/resources/skins/dark/metadata.xml
@@ -2,7 +2,6 @@
 <skin version="0.05">
   <author>
     <name>Martin Rotter</name>
-    <email>rotter.martinos@gmail.com</email>
   </author>
   <palette>
     <color key="1">#7ae2ff</color>
diff --git a/resources/skins/plain/metadata.xml b/resources/skins/plain/metadata.xml
index 2f74d5d93..fabb1788a 100644
--- a/resources/skins/plain/metadata.xml
+++ b/resources/skins/plain/metadata.xml
@@ -2,7 +2,6 @@
 <skin version="0.666">
   <author>
     <name>Martin Rotter</name>
-    <email>rotter.martinos@gmail.com</email>
   </author>
   <palette>
     <!--
diff --git a/resources/skins/vergilius/metadata.xml b/resources/skins/vergilius/metadata.xml
index 9c47a6def..2b289cf13 100644
--- a/resources/skins/vergilius/metadata.xml
+++ b/resources/skins/vergilius/metadata.xml
@@ -2,7 +2,6 @@
 <skin version="0.24">
   <author>
     <name>Martin Rotter</name>
-    <email>rotter.martinos@gmail.com</email>
   </author>
   <palette>
     <color key="1">#4861f0</color>
diff --git a/src/librssguard/gui/settings/settingsfeedsmessages.ui b/src/librssguard/gui/settings/settingsfeedsmessages.ui
index 65d8d80f6..3160b80b1 100644
--- a/src/librssguard/gui/settings/settingsfeedsmessages.ui
+++ b/src/librssguard/gui/settings/settingsfeedsmessages.ui
@@ -14,7 +14,7 @@
    <item>
     <widget class="QTabWidget" name="m_tabFeedsMessages">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="m_tabFeeds">
       <attribute name="title">
diff --git a/src/librssguard/gui/settings/settingsgui.cpp b/src/librssguard/gui/settings/settingsgui.cpp
index 348b107af..e971b80e2 100644
--- a/src/librssguard/gui/settings/settingsgui.cpp
+++ b/src/librssguard/gui/settings/settingsgui.cpp
@@ -23,19 +23,17 @@ SettingsGui::SettingsGui(Settings* settings, QWidget* parent) : SettingsPanel(se
   m_ui->m_editorFeedsToolbar->activeItemsWidget()->viewport()->installEventFilter(this);
   m_ui->m_editorMessagesToolbar->availableItemsWidget()->viewport()->installEventFilter(this);
   m_ui->m_editorFeedsToolbar->availableItemsWidget()->viewport()->installEventFilter(this);
-  m_ui->m_treeSkins->setColumnCount(4);
+  m_ui->m_treeSkins->setColumnCount(3);
   m_ui->m_treeSkins->setHeaderHidden(false);
   m_ui->m_treeSkins->setHeaderLabels(QStringList()
                                      << /*: Skin list name column. */ tr("Name")
                                      << /*: Version column of skin list. */ tr("Version")
-                                     << tr("Author")
-                                     << tr("E-mail"));
+                                     << tr("Author"));
 
   // Setup skins.
   m_ui->m_treeSkins->header()->setSectionResizeMode(0, QHeaderView::ResizeMode::ResizeToContents);
   m_ui->m_treeSkins->header()->setSectionResizeMode(1, QHeaderView::ResizeMode::ResizeToContents);
   m_ui->m_treeSkins->header()->setSectionResizeMode(2, QHeaderView::ResizeMode::ResizeToContents);
-  m_ui->m_treeSkins->header()->setSectionResizeMode(3, QHeaderView::ResizeMode::ResizeToContents);
 
   connect(m_ui->m_cmbIconTheme, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &SettingsGui::requireRestart);
   connect(m_ui->m_cmbIconTheme, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
@@ -133,8 +131,7 @@ void SettingsGui::loadSettings() {
     QTreeWidgetItem* new_item = new QTreeWidgetItem(QStringList() <<
                                                     skin.m_visibleName <<
                                                     skin.m_version <<
-                                                    skin.m_author <<
-                                                    skin.m_email);
+                                                    skin.m_author);
 
     new_item->setData(0, Qt::UserRole, QVariant::fromValue(skin));
 
@@ -236,7 +233,7 @@ void SettingsGui::saveSettings() {
 
   // Save and activate new skin.
   if (!m_ui->m_treeSkins->selectedItems().isEmpty()) {
-    const Skin active_skin = m_ui->m_treeSkins->currentItem()->data(0, Qt::UserRole).value<Skin>();
+    const Skin active_skin = m_ui->m_treeSkins->currentItem()->data(0, Qt::ItemDataRole::UserRole).value<Skin>();
 
     if (qApp->skins()->selectedSkinName() != active_skin.m_baseName) {
       qApp->skins()->setCurrentSkinName(active_skin.m_baseName);
diff --git a/src/librssguard/miscellaneous/skinfactory.cpp b/src/librssguard/miscellaneous/skinfactory.cpp
index 66e0c6199..56ebbc916 100644
--- a/src/librssguard/miscellaneous/skinfactory.cpp
+++ b/src/librssguard/miscellaneous/skinfactory.cpp
@@ -108,9 +108,6 @@ Skin SkinFactory::skinInfo(const QString& skin_name, bool* ok) const {
       // Obtain author.
       skin.m_author = skin_node.namedItem(QSL("author")).namedItem(QSL("name")).toElement().text();
 
-      // Obtain email.
-      skin.m_email = skin_node.namedItem(QSL("author")).namedItem(QSL("email")).toElement().text();
-
       // Obtain version.
       skin.m_version = skin_node.attributes().namedItem(QSL("version")).toAttr().value();
 
@@ -167,7 +164,7 @@ Skin SkinFactory::skinInfo(const QString& skin_name, bool* ok) const {
 
       if (ok != nullptr) {
         *ok = !skin.m_author.isEmpty() && !skin.m_version.isEmpty() &&
-              !skin.m_baseName.isEmpty() && !skin.m_email.isEmpty() &&
+              !skin.m_baseName.isEmpty() &&
               !skin.m_layoutMarkup.isEmpty();
       }
 
diff --git a/src/librssguard/miscellaneous/skinfactory.h b/src/librssguard/miscellaneous/skinfactory.h
index 404d5a5d3..18919ef69 100644
--- a/src/librssguard/miscellaneous/skinfactory.h
+++ b/src/librssguard/miscellaneous/skinfactory.h
@@ -20,7 +20,6 @@ struct RSSGUARD_DLLSPEC Skin {
   QString m_baseName;
   QString m_visibleName;
   QString m_author;
-  QString m_email;
   QString m_version;
   QString m_rawData;
   QString m_adblocked;