pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

do not require email for skins

Browse source
This commit is contained in:
Martin Rotter 2021-09-30 11:03:46 +02:00
parent 2888458e47
commit db76984b98
8 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/desktop/com.github.rssguard.appdata.xml
View file

@ -26,7 +26,7 @@
<url type="donation">https://github.com/sponsors/martinrotter</url> <url type="donation">https://github.com/sponsors/martinrotter</url>
<content_rating type="oars-1.1" /> <content_rating type="oars-1.1" />
<releases> <releases>
<release version="4.0.3" date="2021-09-27"/> <release version="4.0.3" date="2021-09-30"/>
</releases> </releases>
<content_rating type="oars-1.0"> <content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute> <content_attribute id="violence-cartoon">none</content_attribute>

1
resources/skins/dark/metadata.xml
View file

@ -2,7 +2,6 @@
<skin version="0.05"> <skin version="0.05">
<author> <author>
<name>Martin Rotter</name> <name>Martin Rotter</name>
<email>rotter.martinos@gmail.com</email>
</author> </author>
<palette> <palette>
<color key="1">#7ae2ff</color> <color key="1">#7ae2ff</color>

1
resources/skins/plain/metadata.xml
View file

@ -2,7 +2,6 @@
<skin version="0.666"> <skin version="0.666">
<author> <author>
<name>Martin Rotter</name> <name>Martin Rotter</name>
<email>rotter.martinos@gmail.com</email>
</author> </author>
<palette> <palette>
<!-- <!--

1
resources/skins/vergilius/metadata.xml
View file

@ -2,7 +2,6 @@
<skin version="0.24"> <skin version="0.24">
<author> <author>
<name>Martin Rotter</name> <name>Martin Rotter</name>
<email>rotter.martinos@gmail.com</email>
</author> </author>
<palette> <palette>
<color key="1">#4861f0</color> <color key="1">#4861f0</color>

2
src/librssguard/gui/settings/settingsfeedsmessages.ui
View file

@ -14,7 +14,7 @@
<item> <item>
<widget class="QTabWidget" name="m_tabFeedsMessages"> <widget class="QTabWidget" name="m_tabFeedsMessages">
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="m_tabFeeds"> <widget class="QWidget" name="m_tabFeeds">
<attribute name="title"> <attribute name="title">

11
src/librssguard/gui/settings/settingsgui.cpp
View file

@ -23,19 +23,17 @@ SettingsGui::SettingsGui(Settings* settings, QWidget* parent) : SettingsPanel(se
m_ui->m_editorFeedsToolbar->activeItemsWidget()->viewport()->installEventFilter(this); m_ui->m_editorFeedsToolbar->activeItemsWidget()->viewport()->installEventFilter(this);
m_ui->m_editorMessagesToolbar->availableItemsWidget()->viewport()->installEventFilter(this); m_ui->m_editorMessagesToolbar->availableItemsWidget()->viewport()->installEventFilter(this);
m_ui->m_editorFeedsToolbar->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->setHeaderHidden(false);
m_ui->m_treeSkins->setHeaderLabels(QStringList() m_ui->m_treeSkins->setHeaderLabels(QStringList()
<< /*: Skin list name column. */ tr("Name") << /*: Skin list name column. */ tr("Name")
<< /*: Version column of skin list. */ tr("Version") << /*: Version column of skin list. */ tr("Version")
<< tr("Author") << tr("Author"));
<< tr("E-mail"));
// Setup skins. // Setup skins.
m_ui->m_treeSkins->header()->setSectionResizeMode(0, QHeaderView::ResizeMode::ResizeToContents); 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(1, QHeaderView::ResizeMode::ResizeToContents);
m_ui->m_treeSkins->header()->setSectionResizeMode(2, 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, &SettingsGui::requireRestart);
connect(m_ui->m_cmbIconTheme, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, 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() << QTreeWidgetItem* new_item = new QTreeWidgetItem(QStringList() <<
skin.m_visibleName << skin.m_visibleName <<
skin.m_version << skin.m_version <<
skin.m_author << skin.m_author);
skin.m_email);
new_item->setData(0, Qt::UserRole, QVariant::fromValue(skin)); new_item->setData(0, Qt::UserRole, QVariant::fromValue(skin));
@ -236,7 +233,7 @@ void SettingsGui::saveSettings() {
// Save and activate new skin. // Save and activate new skin.
if (!m_ui->m_treeSkins->selectedItems().isEmpty()) { 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) { if (qApp->skins()->selectedSkinName() != active_skin.m_baseName) {
qApp->skins()->setCurrentSkinName(active_skin.m_baseName); qApp->skins()->setCurrentSkinName(active_skin.m_baseName);

5
src/librssguard/miscellaneous/skinfactory.cpp
View file

@ -108,9 +108,6 @@ Skin SkinFactory::skinInfo(const QString& skin_name, bool* ok) const {
// Obtain author. // Obtain author.
skin.m_author = skin_node.namedItem(QSL("author")).namedItem(QSL("name")).toElement().text(); 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. // Obtain version.
skin.m_version = skin_node.attributes().namedItem(QSL("version")).toAttr().value(); 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) { if (ok != nullptr) {
*ok = !skin.m_author.isEmpty() && !skin.m_version.isEmpty() && *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(); !skin.m_layoutMarkup.isEmpty();
} }

1
src/librssguard/miscellaneous/skinfactory.h
View file

@ -20,7 +20,6 @@ struct RSSGUARD_DLLSPEC Skin {
QString m_baseName; QString m_baseName;
QString m_visibleName; QString m_visibleName;
QString m_author; QString m_author;
QString m_email;
QString m_version; QString m_version;
QString m_rawData; QString m_rawData;
QString m_adblocked; QString m_adblocked;