KisApplication.cpp (krita-5.1.3.tar.xz) | : | KisApplication.cpp (krita-5.1.4.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 360 | skipping to change at line 360 | |||
#if defined HAVE_SEEXPR | #if defined HAVE_SEEXPR | |||
reg->add(new KisResourceLoader<KisSeExprScript>(ResourceType::SeExprScripts, ResourceType::SeExprScripts, i18n("SeExpr Scripts"), QStringList() << "applicat ion/x-krita-seexpr-script")); | reg->add(new KisResourceLoader<KisSeExprScript>(ResourceType::SeExprScripts, ResourceType::SeExprScripts, i18n("SeExpr Scripts"), QStringList() << "applicat ion/x-krita-seexpr-script")); | |||
#endif | #endif | |||
// XXX: this covers only individual styles, not the library itself! | // XXX: this covers only individual styles, not the library itself! | |||
reg->add(new KisResourceLoader<KisPSDLayerStyle>(ResourceType::LayerStyles, | reg->add(new KisResourceLoader<KisPSDLayerStyle>(ResourceType::LayerStyles, | |||
ResourceType::LayerStyles, | ResourceType::LayerStyles, | |||
i18nc("Resource type name", "Layer styles"), | i18nc("Resource type name", "Layer styles"), | |||
QStringList() << "applicati on/x-photoshop-style")); | QStringList() << "applicati on/x-photoshop-style")); | |||
reg->registerFixup(10, new KisBrushTypeMetaDataFixup()); | reg->registerFixup(10, new KisBrushTypeMetaDataFixup()); | |||
#ifndef Q_OS_ANDROID | ||||
QString databaseLocation = KoResourcePaths::getAppDataLocation(); | QString databaseLocation = KoResourcePaths::getAppDataLocation(); | |||
#else | ||||
// Sqlite doesn't support content URIs (obviously). So, we make database loc | ||||
ation unconfigurable on android. | ||||
QString databaseLocation = QStandardPaths::writableLocation(QStandardPaths:: | ||||
AppDataLocation); | ||||
#endif | ||||
if (!KisResourceCacheDb::initialize(databaseLocation)) { | if (!KisResourceCacheDb::initialize(databaseLocation)) { | |||
QMessageBox::critical(qApp->activeWindow(), i18nc("@title:window", "Krit a: Fatal error"), i18n("%1\n\nKrita will quit now.", KisResourceCacheDb::lastErr or())); | QMessageBox::critical(qApp->activeWindow(), i18nc("@title:window", "Krit a: Fatal error"), i18n("%1\n\nKrita will quit now.", KisResourceCacheDb::lastErr or())); | |||
} | } | |||
KisResourceLocator::LocatorError r = KisResourceLocator::instance()->initial ize(KoResourcePaths::getApplicationRoot() + "/share/krita"); | KisResourceLocator::LocatorError r = KisResourceLocator::instance()->initial ize(KoResourcePaths::getApplicationRoot() + "/share/krita"); | |||
connect(KisResourceLocator::instance(), SIGNAL(progressMessage(const QString &)), this, SLOT(setSplashScreenLoadingText(const QString&))); | connect(KisResourceLocator::instance(), SIGNAL(progressMessage(const QString &)), this, SLOT(setSplashScreenLoadingText(const QString&))); | |||
if (r != KisResourceLocator::LocatorError::Ok && qApp->inherits("KisApplicat ion")) { | if (r != KisResourceLocator::LocatorError::Ok && qApp->inherits("KisApplicat ion")) { | |||
QMessageBox::critical(qApp->activeWindow(), i18nc("@title:window", "Krit a: Fatal error"), KisResourceLocator::instance()->errorMessages().join('\n') + i 18n("\n\nKrita will quit now.")); | QMessageBox::critical(qApp->activeWindow(), i18nc("@title:window", "Krit a: Fatal error"), KisResourceLocator::instance()->errorMessages().join('\n') + i 18n("\n\nKrita will quit now.")); | |||
return false; | return false; | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 8 lines changed or added |