CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant methods

Browse Source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2023-07-21 13:01:01 +01:00
parent f8b935ab37
commit 1a7c5693cc
5 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
launcher/Application.cpp
View File

@ -1175,16 +1175,6 @@ QIcon Application::getThemedIcon(const QString& name)
return QIcon::fromTheme(name); return QIcon::fromTheme(name);
} }
QList<CatPack*> Application::getValidCatPacks()
{
return m_themeManager->getValidCatPacks();
}
QString Application::getCatPack(QString catName)
{
return m_themeManager->getCatPack(catName);
}
bool Application::openJsonEditor(const QString& filename) bool Application::openJsonEditor(const QString& filename)
{ {
const QString file = QDir::current().absoluteFilePath(filename); const QString file = QDir::current().absoluteFilePath(filename);

4
launcher/Application.h
View File

@ -122,10 +122,6 @@ public:
ThemeManager* themeManager() { return m_themeManager.get(); } ThemeManager* themeManager() { return m_themeManager.get(); }
QList<CatPack*> getValidCatPacks();
QString getCatPack(QString catName = "");
shared_qobject_ptr<ExternalUpdater> updater() { return m_updater; } shared_qobject_ptr<ExternalUpdater> updater() { return m_updater; }
void triggerUpdateCheck(); void triggerUpdateCheck();

4
launcher/ui/instanceview/InstanceView.cpp
View File

@ -52,7 +52,7 @@
#include <Application.h> #include <Application.h>
#include <InstanceList.h> #include <InstanceList.h>
#include "ui/themes/ThemeManager.h"
template <typename T> bool listsIntersect(const QList<T> &l1, const QList<T> t2) template <typename T> bool listsIntersect(const QList<T> &l1, const QList<T> t2)
{ {
@ -503,7 +503,7 @@ void InstanceView::setPaintCat(bool visible)
{ {
m_catVisible = visible; m_catVisible = visible;
if (visible) if (visible)
m_catPixmap.load(APPLICATION->getCatPack()); m_catPixmap.load(APPLICATION->themeManager()->getCatPack());
else else
m_catPixmap = QPixmap(); m_catPixmap = QPixmap();
} }

2
launcher/ui/setupwizard/ThemeWizardPage.cpp
View File

@ -61,7 +61,7 @@ void ThemeWizardPage::updateIcons()
void ThemeWizardPage::updateCat() void ThemeWizardPage::updateCat()
{ {
qDebug() << "Setting Cat"; qDebug() << "Setting Cat";
ui->catImagePreviewButton->setIcon(QIcon(QString(R"(%1)").arg(APPLICATION->getCatPack()))); ui->catImagePreviewButton->setIcon(QIcon(QString(R"(%1)").arg(APPLICATION->themeManager()->getCatPack())));
} }
void ThemeWizardPage::retranslate() void ThemeWizardPage::retranslate()

2
launcher/ui/widgets/ThemeCustomizationWidget.cpp
View File

@ -152,7 +152,7 @@ void ThemeCustomizationWidget::loadSettings()
} }
auto cat = settings->get("BackgroundCat").toString(); auto cat = settings->get("BackgroundCat").toString();
for (auto& catFromList : APPLICATION->getValidCatPacks()) { for (auto& catFromList : APPLICATION->themeManager()->getValidCatPacks()) {
QIcon catIcon = QIcon(QString("%1").arg(catFromList->path())); QIcon catIcon = QIcon(QString("%1").arg(catFromList->path()));
ui->backgroundCatComboBox->addItem(catIcon, catFromList->name(), catFromList->id()); ui->backgroundCatComboBox->addItem(catIcon, catFromList->name(), catFromList->id());
if (cat == catFromList->id()) { if (cat == catFromList->id()) {