Introduce KiwixApp::parseStyleFromFile()

This change adds a new function parseStyleFromFile(QString filePath)
It takes a file path, reads it and returns the string
This commit is contained in:
Nikhil Tanwar 2023-09-12 19:20:37 +05:30 committed by Matthieu Gautier
parent a50f1e73be
commit d2a6098eca
9 changed files with 19 additions and 40 deletions

View File

@ -2,6 +2,7 @@
#include "ui_choiceitem.h" #include "ui_choiceitem.h"
#include <QFile> #include <QFile>
#include <QMouseEvent> #include <QMouseEvent>
#include "kiwixapp.h"
ChoiceItem::ChoiceItem(QString key, QString value, QWidget *parent) : ChoiceItem::ChoiceItem(QString key, QString value, QWidget *parent) :
QWidget(parent), QWidget(parent),
@ -10,10 +11,7 @@ ChoiceItem::ChoiceItem(QString key, QString value, QWidget *parent) :
m_value(value) m_value(value)
{ {
ui->setupUi(this); ui->setupUi(this);
QFile file(QString::fromUtf8(":/css/choiceBox.css")); this->setStyleSheet(KiwixApp::instance()->parseStyleFromFile(":/css/choiceBox.css"));
file.open(QFile::ReadOnly);
QString styleSheet = QString(file.readAll());
this->setStyleSheet(styleSheet);
ui->itemLabel->setText(key); ui->itemLabel->setText(key);
ui->itemLabel->setToolTip(key); ui->itemLabel->setToolTip(key);
connect(ui->closeButton, &QPushButton::clicked, [=](){ connect(ui->closeButton, &QPushButton::clicked, [=](){

View File

@ -13,10 +13,7 @@ ContentManagerSide::ContentManagerSide(QWidget *parent) :
{ {
setFocusPolicy(Qt::FocusPolicy::StrongFocus); setFocusPolicy(Qt::FocusPolicy::StrongFocus);
mp_ui->setupUi(this); mp_ui->setupUi(this);
QFile file(QString::fromUtf8(":/css/contentmanagerside.css")); this->setStyleSheet(KiwixApp::instance()->parseStyleFromFile(":/css/contentmanagerside.css"));
file.open(QFile::ReadOnly);
QString styleSheet = QString(file.readAll());
this->setStyleSheet(styleSheet);
mp_ui->buttonGroup->setId(mp_ui->allFileButton, CatalogButtonId::ALL); mp_ui->buttonGroup->setId(mp_ui->allFileButton, CatalogButtonId::ALL);
mp_ui->buttonGroup->setId(mp_ui->localFileButton, CatalogButtonId::LOCAL); mp_ui->buttonGroup->setId(mp_ui->localFileButton, CatalogButtonId::LOCAL);

View File

@ -10,10 +10,7 @@ ContentManagerView::ContentManagerView(QWidget *parent)
{ {
mp_ui->setupUi(this); mp_ui->setupUi(this);
mp_ui->m_view->setSortingEnabled(true); mp_ui->m_view->setSortingEnabled(true);
QFile file(QString::fromUtf8(":/css/_contentManager.css")); mp_ui->m_view->setStyleSheet(KiwixApp::instance()->parseStyleFromFile(":/css/_contentManager.css"));
file.open(QFile::ReadOnly);
QString styleSheet = QString(file.readAll());
mp_ui->m_view->setStyleSheet(styleSheet);
mp_ui->m_view->setContextMenuPolicy(Qt::CustomContextMenu); mp_ui->m_view->setContextMenuPolicy(Qt::CustomContextMenu);
auto managerDelegate = new ContentManagerDelegate(); auto managerDelegate = new ContentManagerDelegate();
mp_ui->m_view->setItemDelegate(managerDelegate); mp_ui->m_view->setItemDelegate(managerDelegate);

View File

@ -72,13 +72,7 @@ void KiwixApp::init()
setApplicationName("Kiwix"); setApplicationName("Kiwix");
setDesktopFileName("kiwix.desktop"); setDesktopFileName("kiwix.desktop");
setStyleSheet(parseStyleFromFile(":/css/style.css"));
QFile styleFile(":/css/style.css");
styleFile.open(QIODevice::ReadOnly);
auto byteContent = styleFile.readAll();
QString style(byteContent);
setStyleSheet(style);
createAction(); createAction();
mp_mainWindow = new MainWindow; mp_mainWindow = new MainWindow;
@ -474,3 +468,12 @@ void KiwixApp::printVersions(std::ostream& out) {
out << std::endl; out << std::endl;
zim::printVersions(out); zim::printVersions(out);
} }
QString KiwixApp::parseStyleFromFile(QString filePath)
{
QFile file(filePath);
file.open(QFile::ReadOnly);
QString styleSheet = QString(file.readAll());
file.close();
return styleSheet;
}

View File

@ -86,6 +86,7 @@ public:
QString getText(const QString &key) { return m_translation.getText(key); }; QString getText(const QString &key) { return m_translation.getText(key); };
void setMonitorDir(const QString &dir); void setMonitorDir(const QString &dir);
bool isCurrentArticleBookmarked(); bool isCurrentArticleBookmarked();
QString parseStyleFromFile(QString filePath);
public slots: public slots:
void openZimFile(const QString& zimfile=""); void openZimFile(const QString& zimfile="");

View File

@ -18,10 +18,7 @@ KiwixChoiceBox::KiwixChoiceBox(QWidget *parent) :
ui(new Ui::kiwixchoicebox) ui(new Ui::kiwixchoicebox)
{ {
ui->setupUi(this); ui->setupUi(this);
auto styleSheet = KiwixApp::instance()->parseStyleFromFile(":/css/choiceBox.css");
QFile file(QString::fromUtf8(":/css/choiceBox.css"));
file.open(QFile::ReadOnly);
QString styleSheet = QString(file.readAll());
this->setStyleSheet(styleSheet); this->setStyleSheet(styleSheet);
ui->clearButton->setText(gt("clear")); ui->clearButton->setText(gt("clear"));
ui->clearButton->setToolTip(gt("clear-filter")); ui->clearButton->setToolTip(gt("clear-filter"));

View File

@ -9,13 +9,7 @@ KiwixConfirmBox::KiwixConfirmBox(QString confirmTitle, QString confirmText, bool
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowFlag(Qt::FramelessWindowHint, true); setWindowFlag(Qt::FramelessWindowHint, true);
setStyleSheet(KiwixApp::instance()->parseStyleFromFile(":/css/confirmBox.css"));
QFile styleFile(":/css/confirmBox.css");
styleFile.open(QIODevice::ReadOnly);
auto byteContent = styleFile.readAll();
styleFile.close();
QString style(byteContent);
setStyleSheet(style);
connect(ui->yesButton, &QPushButton::clicked, [=]() { connect(ui->yesButton, &QPushButton::clicked, [=]() {
emit yesClicked(); emit yesClicked();
}); });

View File

@ -71,12 +71,7 @@ SearchBar::SearchBar(QWidget *parent) :
m_completer.setMaxVisibleItems(16); m_completer.setMaxVisibleItems(16);
setCompleter(&m_completer); setCompleter(&m_completer);
QFile styleFile(":/css/popup.css"); m_completer.popup()->setStyleSheet(KiwixApp::instance()->parseStyleFromFile(":/css/popup.css"));
styleFile.open(QIODevice::ReadOnly);
auto byteContent = styleFile.readAll();
styleFile.close();
QString style(byteContent);
m_completer.popup()->setStyleSheet(style);
qRegisterMetaType<QVector<QUrl>>("QVector<QUrl>"); qRegisterMetaType<QVector<QUrl>>("QVector<QUrl>");
connect(mp_typingTimer, &QTimer::timeout, this, &SearchBar::updateCompletion); connect(mp_typingTimer, &QTimer::timeout, this, &SearchBar::updateCompletion);

View File

@ -9,10 +9,7 @@ SettingsView::SettingsView(QWidget *parent)
, ui(new Ui::Settings) , ui(new Ui::Settings)
{ {
ui->setupUi(this); ui->setupUi(this);
QFile file(QString::fromUtf8(":/css/_settingsManager.css")); ui->widget->setStyleSheet(KiwixApp::instance()->parseStyleFromFile(":/css/_settingsManager.css"));
file.open(QFile::ReadOnly);
QString styleSheet = QString(file.readAll());
ui->widget->setStyleSheet(styleSheet);
connect(ui->zoomPercentSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this, &SettingsView::setZoom); connect(ui->zoomPercentSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this, &SettingsView::setZoom);
connect(ui->moveToTrashToggle, &QCheckBox::clicked, this, &SettingsView::setMoveToTrash); connect(ui->moveToTrashToggle, &QCheckBox::clicked, this, &SettingsView::setMoveToTrash);
connect(ui->browseButton, &QPushButton::clicked, this, &SettingsView::browseDownloadDir); connect(ui->browseButton, &QPushButton::clicked, this, &SettingsView::browseDownloadDir);