Merge remote-tracking branch 'upstream/develop' into icon-indexing
This commit is contained in:
commit
f8b935ab37
11 changed files with 333 additions and 39 deletions
|
@ -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())
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue