Merge remote-tracking branch 'upstream/develop' into icon-indexing

2023-07-21 12:48:05 +01:00
parent 5088d33fd2 821dd8400b
commit f8b935ab37
11 changed files with 333 additions and 39 deletions
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@ -1175,7 +1175,17 @@ QIcon Application::getThemedIcon(const QString& name)
    return QIcon::fromTheme(name);
 }

-bool Application::openJsonEditor(const QString &filename)
+QList<CatPack*> Application::getValidCatPacks()
+{
+    return m_themeManager->getValidCatPacks();
+}
+
+QString Application::getCatPack(QString catName)
+{
+    return m_themeManager->getCatPack(catName);
+}
+
+bool Application::openJsonEditor(const QString& filename)
 {
    const QString file = QDir::current().absoluteFilePath(filename);
    if (m_settings->get("JsonEditor").toString().isEmpty())