FreshRSS
/
rssguard
mirror of https://github.com/martinrotter/rssguard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow loading of skin fonts

This commit is contained in:
Martin Rotter 2023-01-31 13:37:02 +01:00
parent 10e02edee5
commit 6fcedef29b
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/librssguard/miscellaneous/skinfactory.cpp
View File

@ -10,6 +10,7 @@
#include <QDir>
#include <QDomDocument>
#include <QDomElement>
#include <QFontDatabase>
#include <QMetaEnum>
#include <QMetaObject>
#include <QProcessEnvironment>
@ -57,6 +58,25 @@ void SkinFactory::loadSkinFromData(const Skin& skin) {
const QString env_forced_style = env.value(QSL("QT_STYLE_OVERRIDE"));
const QString cli_forced_style = qApp->cmdParser()->value(QSL(CLI_STYLE_SHORT));
// Load fonts.
QDir dr_fonts(skin.m_skinFolder + QDir::separator() + QSL("fonts"));
if (dr_fonts.exists()) {
QStringList ttf_fonts =
dr_fonts.entryList({QSL("*.ttf"), QSL("*.otf")}, QDir::Filter::Files | QDir::Filter::Readable);
for (const QString& font_file : ttf_fonts) {
bool added = QFontDatabase::addApplicationFont(dr_fonts.absoluteFilePath(font_file)) >= 0;
if (added) {
qDebugNN << "Adding font" << QUOTE_W_SPACE(font_file) << "to font database.";
}
else {
qCriticalNN << "Font" << QUOTE_W_SPACE(font_file) << "could not be loaded.";
}
}
}
if (env_forced_style.isEmpty() && cli_forced_style.isEmpty()) {
m_styleIsFrozen = false;
@ -222,7 +242,6 @@ Skin SkinFactory::skinInfo(const QString& skin_name, bool* ok) const {
const QDomNode skin_node = document.namedItem(QSL("skin"));
const QString base_skin_name = skin_node.toElement().attribute(QSL("base"));
;
QString real_base_skin_folder;
if (!base_skin_name.isEmpty()) {
@ -294,8 +313,6 @@ Skin SkinFactory::skinInfo(const QString& skin_name, bool* ok) const {
QDomElement style_palette_root = skin_node.namedItem(QSL("style-palette")).toElement();
if (!style_palette_root.isNull()) {
const QMetaObject& mop = QPalette::staticMetaObject;
QMetaEnum enumerp = QMetaEnum::fromType<QPalette::ColorGroup>();
QMetaEnum enumerx = QMetaEnum::fromType<QPalette::ColorRole>();
QMetaEnum enumery = QMetaEnum::fromType<Qt::BrushStyle>();
@ -359,6 +376,7 @@ Skin SkinFactory::skinInfo(const QString& skin_name, bool* ok) const {
loadSkinFile(skin_folder_no_sep, QSL("html_enclosure_every.html"), real_base_skin_folder);
skin.m_rawData = loadSkinFile(skin_folder_no_sep, QSL("qt_style.qss"), real_base_skin_folder);
skin.m_adblocked = loadSkinFile(skin_folder_no_sep, QSL("html_adblocked.html"), real_base_skin_folder);
skin.m_skinFolder = skin_folder_no_sep;
if (ok != nullptr) {
*ok = !skin.m_author.isEmpty() && !skin.m_version.isEmpty() && !skin.m_baseName.isEmpty() &&

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

@ -49,6 +49,7 @@ class SkinEnums : public QObject {
};
struct RSSGUARD_DLLSPEC Skin {
QString m_skinFolder;
QString m_baseName;
QString m_visibleName;
QString m_author;