[krita] /: BUG:361155 Remove all hard-coded krita prefixes for resource paths
Boudewijn Rempt
boud at valdyas.org
Thu Mar 31 00:15:07 UTC 2016
Git commit c24489dd302afa07058f07b977b1b72e7d65786c by Boudewijn Rempt.
Committed on 30/03/2016 at 23:31.
Pushed by rempt into branch 'master'.
BUG:361155 Remove all hard-coded krita prefixes for resource paths
This makes krita look in the same place for local and installed
templates. This commit probably needs thorough testing on OSX
and Windows.
CCMAIL:kimageshop at kde.org
M +4 -4 krita/sketch/main.cpp
M +1 -1 krita/sketch/models/TemplatesModel.cpp
M +1 -1 libs/flake/KoMarkerCollection.cpp
M +1 -1 libs/ui/KisApplication.cpp
M +3 -3 libs/ui/KisMainWindow.cpp
M +1 -1 libs/ui/KisPart.cpp
M +24 -24 libs/ui/KisResourceBundle.cpp
M +1 -0 libs/ui/KisView.cpp
M +1 -1 libs/ui/KisViewManager.cpp
M +2 -2 libs/ui/dialogs/kis_dlg_layer_style.cpp
M +1 -1 libs/ui/input/config/kis_input_configuration_page.cpp
M +4 -4 libs/ui/input/kis_input_profile_manager.cpp
M +1 -1 libs/ui/kis_animation_exporter.cpp
M +1 -1 libs/ui/kis_node_manager.cpp
M +5 -5 libs/ui/widgets/kis_custom_image_widget.cc
M +2 -2 plugins/dockers/compositiondocker/compositiondocker_dock.cpp
M +3 -3 plugins/dockers/lut/lutdocker_dock.cpp
M +1 -1 plugins/extensions/bigbrother/bigbrother.cc
M +2 -2 plugins/paintops/libpaintop/kis_clipboard_brush_widget.cpp
M +1 -1 plugins/paintops/libpaintop/kis_custom_brush_widget.cpp
M +1 -1 plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
http://commits.kde.org/krita/c24489dd302afa07058f07b977b1b72e7d65786c
diff --git a/krita/sketch/main.cpp b/krita/sketch/main.cpp
index 2f4ac3a..e6bfac0 100644
--- a/krita/sketch/main.cpp
+++ b/krita/sketch/main.cpp
@@ -111,19 +111,19 @@ int main( int argc, char** argv )
// QT5TODO: untested replacement of KIconLoader::global()->addAppDir("krita");
QStringList themeSearchPaths = QIcon::themeSearchPaths();
- themeSearchPaths.append(QStandardPaths::locate(QStandardPaths::GenericDataLocation, "krita/pics", QStandardPaths::LocateDirectory));
+ themeSearchPaths.append(QStandardPaths::locate(QStandardPaths::GenericDataLocation, "pics", QStandardPaths::LocateDirectory));
QIcon::setThemeSearchPaths(themeSearchPaths);
// Initialize all Calligra directories etc.
KoGlobal::initialize();
// for cursors
- KoResourcePaths::addResourceType("kis_pics", "data", "krita/pics/");
+ KoResourcePaths::addResourceType("kis_pics", "data", "pics/");
// for images in the paintop box
- KoResourcePaths::addResourceType("kis_images", "data", "krita/images/");
+ KoResourcePaths::addResourceType("kis_images", "data", "images/");
- KoResourcePaths::addResourceType("icc_profiles", "data", "krita/profiles/");
+ KoResourcePaths::addResourceType("icc_profiles", "data", "profiles/");
KisOpenGL::initialize();
diff --git a/krita/sketch/models/TemplatesModel.cpp b/krita/sketch/models/TemplatesModel.cpp
index 0cd071b..1290f76 100644
--- a/krita/sketch/models/TemplatesModel.cpp
+++ b/krita/sketch/models/TemplatesModel.cpp
@@ -155,7 +155,7 @@ void TemplatesModel::toggleGroup(const QString& name)
void TemplatesModel::populate()
{
- KisTemplateTree templateTree( QStringLiteral("krita/templates/"), true);
+ KisTemplateTree templateTree( QStringLiteral("templates/"), true);
Q_FOREACH (KisTemplateGroup *group, templateTree.groups()) {
if (group->isHidden()) {
continue;
diff --git a/libs/flake/KoMarkerCollection.cpp b/libs/flake/KoMarkerCollection.cpp
index ff0adac..c4a9d56 100644
--- a/libs/flake/KoMarkerCollection.cpp
+++ b/libs/flake/KoMarkerCollection.cpp
@@ -78,7 +78,7 @@ void KoMarkerCollection::loadDefaultMarkers()
KoOdfLoadingContext odfContext(markerReader, 0);
KoShapeLoadingContext shapeContext(odfContext, 0);
KoXmlDocument doc;
- QString filePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "krita/styles/markers.xml");
+ QString filePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "styles/markers.xml");
if (!filePath.isEmpty()) {
QFile file(filePath);
diff --git a/libs/ui/KisApplication.cpp b/libs/ui/KisApplication.cpp
index d01e6d1..1b31c8b 100644
--- a/libs/ui/KisApplication.cpp
+++ b/libs/ui/KisApplication.cpp
@@ -643,7 +643,7 @@ bool KisApplication::createNewDocFromTemplate(const QString &fileName, KisMainWi
}
else {
QString desktopName(fileName);
- const QString templatesResourcePath = QStringLiteral("krita/templates/");
+ const QString templatesResourcePath = QStringLiteral("templates/");
QStringList paths = KoResourcePaths::findAllResources("data", templatesResourcePath + "*/" + desktopName);
if (paths.isEmpty()) {
diff --git a/libs/ui/KisMainWindow.cpp b/libs/ui/KisMainWindow.cpp
index de0d6b5..a19b7b9 100644
--- a/libs/ui/KisMainWindow.cpp
+++ b/libs/ui/KisMainWindow.cpp
@@ -445,10 +445,10 @@ KisMainWindow::KisMainWindow()
configChanged();
// If we have customized the toolbars, load that first
- setLocalXMLFile(KoResourcePaths::locateLocal("data", "krita/krita.xmlgui"));
+ setLocalXMLFile(KoResourcePaths::locateLocal("data", "krita.xmlgui"));
QString doc;
- QStringList allFiles = KoResourcePaths::findAllResources("data", "krita/krita.xmlgui");
+ QStringList allFiles = KoResourcePaths::findAllResources("data", "krita.xmlgui");
// We need at least one krita.xmlgui file!
if (allFiles.size() == 0) {
m_errorMessage = i18n("Krita cannot find the configuration file! Krita will quit now.");
@@ -1280,7 +1280,7 @@ void KisMainWindow::slotFileNew()
KisImportExportManager::Import,
KisDocument::extraNativeMimeTypes());
- startupWidget = new KisOpenPane(this, mimeFilter, QStringLiteral("krita/templates/"));
+ startupWidget = new KisOpenPane(this, mimeFilter, QStringLiteral("templates/"));
startupWidget->setWindowModality(Qt::WindowModal);
KisConfig cfg;
diff --git a/libs/ui/KisPart.cpp b/libs/ui/KisPart.cpp
index cd5dee5..967a984 100644
--- a/libs/ui/KisPart.cpp
+++ b/libs/ui/KisPart.cpp
@@ -232,7 +232,7 @@ KisView *KisPart::createView(KisDocument *document,
{
// If creating the canvas fails, record this and disable OpenGL next time
KisConfig cfg;
- KConfigGroup grp( KSharedConfig::openConfig(), "krita/crashprevention");
+ KConfigGroup grp( KSharedConfig::openConfig(), "crashprevention");
if (grp.readEntry("CreatingCanvas", false)) {
cfg.setUseOpenGL(false);
}
diff --git a/libs/ui/KisResourceBundle.cpp b/libs/ui/KisResourceBundle.cpp
index 794ed04..e53a91b 100644
--- a/libs/ui/KisResourceBundle.cpp
+++ b/libs/ui/KisResourceBundle.cpp
@@ -180,7 +180,7 @@ bool KisResourceBundle::load()
warnKrita << "Could not load meta.xml";
return false;
}
-
+
if (resourceStore->open("preview.png")) {
// Workaround for some OS (Debian, Ubuntu), where loading directly from the QIODevice
// fails with "libpng error: IDAT: CRC error"
@@ -282,7 +282,7 @@ bool KisResourceBundle::save()
addMeta("updated", QDate::currentDate().toString("dd/MM/yyyy"));
- QDir bundleDir = KoResourcePaths::saveLocation("data", "krita/bundles");
+ QDir bundleDir = KoResourcePaths::saveLocation("data", "bundles");
bundleDir.cdUp();
QScopedPointer<KoStore> store(KoStore::createStore(filename(), KoStore::Write, "application/x-krita-resourcebundle", KoStore::Zip));
@@ -444,18 +444,18 @@ bool KisResourceBundle::install()
continue;
}
dbgResources << "\t\tresource:" << res->name();
-
+
KoAbstractGradient *res2 = gradientServer->resourceByName(res->name());
if (!res2) {//if it doesn't exist...
- gradientServer->addResource(res, false);//add it!
-
+ gradientServer->addResource(res, false);//add it!
+
if (!m_gradientsMd5Installed.contains(res->md5())) {
m_gradientsMd5Installed.append(res->md5());
}
if (ref.md5sum!=res->md5()) {
md5Mismatch.append(res->name());
}
-
+
Q_FOREACH (const QString &tag, ref.tagList) {
gradientServer->addTag(res, tag);
}
@@ -464,7 +464,7 @@ bool KisResourceBundle::install()
else {
//warnKrita << "Didn't install" << res->name()<<"It already exists on the server";
}
-
+
}
}
else if (resType == "patterns") {
@@ -488,24 +488,24 @@ bool KisResourceBundle::install()
continue;
}
dbgResources << "\t\tresource:" << res->name();
-
+
KoPattern *res2 = patternServer->resourceByName(res->name());
if (!res2) {//if it doesn't exist...
patternServer->addResource(res, false);//add it!
-
+
if (!m_patternsMd5Installed.contains(res->md5())) {
m_patternsMd5Installed.append(res->md5());
}
if (ref.md5sum!=res->md5()) {
md5Mismatch.append(res->name());
}
-
+
Q_FOREACH (const QString &tag, ref.tagList) {
patternServer->addTag(res, tag);
}
patternServer->addTag(res, name());
}
-
+
}
}
else if (resType == "brushes") {
@@ -529,19 +529,19 @@ bool KisResourceBundle::install()
continue;
}
dbgResources << "\t\tresource:" << res->name();
-
+
//find the resouce on the server
KisBrushSP res2 = brushServer->resourceByName(res->name());
if (!res2) {//if it doesn't exist...
brushServer->addResource(res, false);//add it!
-
+
if (!m_brushesMd5Installed.contains(res->md5())) {
m_brushesMd5Installed.append(res->md5());
}
if (ref.md5sum!=res->md5()) {
md5Mismatch.append(res->name());
}
-
+
Q_FOREACH (const QString &tag, ref.tagList) {
brushServer->addTag(res.data(), tag);
}
@@ -574,19 +574,19 @@ bool KisResourceBundle::install()
continue;
}
dbgResources << "\t\tresource:" << res->name();
-
+
//find the resouce on the server
KoColorSet *res2 = paletteServer->resourceByName(res->name());
if (!res2) {//if it doesn't exist...
- paletteServer->addResource(res, false);//add it!
-
+ paletteServer->addResource(res, false);//add it!
+
if (!m_palettesMd5Installed.contains(res->md5())) {
m_palettesMd5Installed.append(res->md5());
}
if (ref.md5sum!=res->md5()) {
md5Mismatch.append(res->name());
}
-
+
Q_FOREACH (const QString &tag, ref.tagList) {
paletteServer->addTag(res, tag);
}
@@ -622,15 +622,15 @@ bool KisResourceBundle::install()
//the following tries to find the resource by name.
KisWorkspaceResource *res2 = workspaceServer->resourceByName(res->name());
if (!res2) {//if it doesn't exist...
- workspaceServer->addResource(res, false);//add it!
-
+ workspaceServer->addResource(res, false);//add it!
+
if (!m_workspacesMd5Installed.contains(res->md5())) {
m_workspacesMd5Installed.append(res->md5());
}
if (ref.md5sum!=res->md5()) {
md5Mismatch.append(res->name());
}
-
+
Q_FOREACH (const QString &tag, ref.tagList) {
workspaceServer->addTag(res, tag);
}
@@ -639,7 +639,7 @@ bool KisResourceBundle::install()
else {
//warnKrita << "Didn't install" << res->name()<<"It already exists on the server";
}
-
+
}
}
else if (resType == "paintoppresets") {
@@ -679,7 +679,7 @@ bool KisResourceBundle::install()
if (ref.md5sum!=res->md5()) {
md5Mismatch.append(res->name());
}
-
+
Q_FOREACH (const QString &tag, ref.tagList) {
paintoppresetServer->addTag(res.data(), tag);
}
@@ -688,7 +688,7 @@ bool KisResourceBundle::install()
else {
//warnKrita << "Didn't install" << res->name()<<"It already exists on the server";
}
-
+
}
}
}
diff --git a/libs/ui/KisView.cpp b/libs/ui/KisView.cpp
index 9bc495a..3bd8a68 100644
--- a/libs/ui/KisView.cpp
+++ b/libs/ui/KisView.cpp
@@ -57,6 +57,7 @@
#include <kis_image.h>
#include <kis_node.h>
+
#include <kis_group_layer.h>
#include <kis_layer.h>
#include <kis_mask.h>
diff --git a/libs/ui/KisViewManager.cpp b/libs/ui/KisViewManager.cpp
index 731e66b..e8ffcb0 100644
--- a/libs/ui/KisViewManager.cpp
+++ b/libs/ui/KisViewManager.cpp
@@ -716,7 +716,7 @@ int KisViewManager::viewCount() const
void KisViewManager::slotCreateTemplate()
{
if (!document()) return;
- KisTemplateCreateDia::createTemplate( QStringLiteral("krita/templates/"), ".kra", document(), mainWindow());
+ KisTemplateCreateDia::createTemplate( QStringLiteral("templates/"), ".kra", document(), mainWindow());
}
void KisViewManager::slotCreateCopy()
diff --git a/libs/ui/dialogs/kis_dlg_layer_style.cpp b/libs/ui/dialogs/kis_dlg_layer_style.cpp
index 8aa28d0..3e40b3b 100644
--- a/libs/ui/dialogs/kis_dlg_layer_style.cpp
+++ b/libs/ui/dialogs/kis_dlg_layer_style.cpp
@@ -260,7 +260,7 @@ void KisDlgLayerStyle::slotLoadStyle()
{
QString filename; // default value?
- KoFileDialog dialog(this, KoFileDialog::OpenFile, "krita/layerstyle");
+ KoFileDialog dialog(this, KoFileDialog::OpenFile, "layerstyle");
dialog.setCaption(i18n("Select ASL file"));
//dialog.setDefaultDir(QDir::cleanPath(filename));
dialog.setNameFilter(i18n("Layer style library (*.asl)"));
@@ -274,7 +274,7 @@ void KisDlgLayerStyle::slotSaveStyle()
{
QString filename; // default value?
- KoFileDialog dialog(this, KoFileDialog::SaveFile, "krita/layerstyle");
+ KoFileDialog dialog(this, KoFileDialog::SaveFile, "layerstyle");
dialog.setCaption(i18n("Select ASL file"));
//dialog.setDefaultDir(QDir::cleanPath(filename));
dialog.setNameFilter(i18n("Layer style configuration (*.asl)"));
diff --git a/libs/ui/input/config/kis_input_configuration_page.cpp b/libs/ui/input/config/kis_input_configuration_page.cpp
index e344922..3c450fa 100644
--- a/libs/ui/input/config/kis_input_configuration_page.cpp
+++ b/libs/ui/input/config/kis_input_configuration_page.cpp
@@ -66,7 +66,7 @@ void KisInputConfigurationPage::revertChanges()
void KisInputConfigurationPage::setDefaults()
{
- QDir profileDir(KoResourcePaths::saveLocation("data", "krita/input/", false));
+ QDir profileDir(KoResourcePaths::saveLocation("data", "input/", false));
if (profileDir.exists()) {
QStringList entries = profileDir.entryList(QStringList() << "*.profile", QDir::NoDot | QDir::NoDotDot);
diff --git a/libs/ui/input/kis_input_profile_manager.cpp b/libs/ui/input/kis_input_profile_manager.cpp
index 1e51547..79560fb 100644
--- a/libs/ui/input/kis_input_profile_manager.cpp
+++ b/libs/ui/input/kis_input_profile_manager.cpp
@@ -123,7 +123,7 @@ void KisInputProfileManager::removeProfile(const QString &name)
d->profiles.remove(name);
//Delete the settings file for the removed profile, if it exists
- QDir userDir(KoResourcePaths::saveLocation("data", "krita/input/"));
+ QDir userDir(KoResourcePaths::saveLocation("data", "input/"));
if (userDir.exists(d->profileFileName(name))) {
userDir.remove(d->profileFileName(name));
@@ -193,7 +193,7 @@ void KisInputProfileManager::loadProfiles()
d->profiles.clear();
//Look up all profiles (this includes those installed to $prefix as well as the user's local data dir)
- QStringList profiles = KoResourcePaths::findAllResources("data", "krita/input/*", KoResourcePaths::Recursive);
+ QStringList profiles = KoResourcePaths::findAllResources("data", "input/*", KoResourcePaths::Recursive);
dbgKrita << "profiles" << profiles;
@@ -284,7 +284,7 @@ void KisInputProfileManager::loadProfiles()
void KisInputProfileManager::saveProfiles()
{
- QString storagePath = KoResourcePaths::saveLocation("data", "krita/input/");
+ QString storagePath = KoResourcePaths::saveLocation("data", "input/");
Q_FOREACH(KisInputProfile * p, d->profiles) {
QString fileName = d->profileFileName(p->name());
KConfig config(storagePath + fileName, KConfig::SimpleConfig);
@@ -316,7 +316,7 @@ void KisInputProfileManager::saveProfiles()
void KisInputProfileManager::resetAll()
{
QString kdeHome = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
- QStringList profiles = KoResourcePaths::findAllResources("data", "krita/input/*", KoResourcePaths::Recursive);
+ QStringList profiles = KoResourcePaths::findAllResources("data", "input/*", KoResourcePaths::Recursive);
Q_FOREACH (const QString &profile, profiles) {
if(profile.contains(kdeHome)) {
diff --git a/libs/ui/kis_animation_exporter.cpp b/libs/ui/kis_animation_exporter.cpp
index 9330176..4a4a2d7 100644
--- a/libs/ui/kis_animation_exporter.cpp
+++ b/libs/ui/kis_animation_exporter.cpp
@@ -59,7 +59,7 @@ KisAnimationExporterUI::~KisAnimationExporterUI()
KisImportExportFilter::ConversionStatus KisAnimationExporterUI::exportSequence(KisDocument *document)
{
- KoFileDialog dialog(m_d->parentWidget, KoFileDialog::SaveFile, "krita/exportsequence");
+ KoFileDialog dialog(m_d->parentWidget, KoFileDialog::SaveFile, "exportsequence");
dialog.setCaption(i18n("Export sequence"));
dialog.setDefaultDir(QDesktopServices::storageLocation(QDesktopServices::PicturesLocation));
dialog.setMimeTypeFilters(KisImportExportManager::mimeFilter("application/x-krita", KisImportExportManager::Export));
diff --git a/libs/ui/kis_node_manager.cpp b/libs/ui/kis_node_manager.cpp
index 1ba5852..60d2dde 100644
--- a/libs/ui/kis_node_manager.cpp
+++ b/libs/ui/kis_node_manager.cpp
@@ -917,7 +917,7 @@ void KisNodeManager::Private::saveDeviceAsImage(KisPaintDeviceSP device,
qreal yRes,
quint8 opacity)
{
- KoFileDialog dialog(view->mainWindow(), KoFileDialog::SaveFile, "krita/savenodeasimage");
+ KoFileDialog dialog(view->mainWindow(), KoFileDialog::SaveFile, "savenodeasimage");
dialog.setCaption(i18n("Export \"%1\"", defaultName));
dialog.setDefaultDir(QDesktopServices::storageLocation(QDesktopServices::PicturesLocation));
dialog.setMimeTypeFilters(KisImportExportManager::mimeFilter("application/x-krita", KisImportExportManager::Export));
diff --git a/libs/ui/widgets/kis_custom_image_widget.cc b/libs/ui/widgets/kis_custom_image_widget.cc
index 890104d..932e92e 100644
--- a/libs/ui/widgets/kis_custom_image_widget.cc
+++ b/libs/ui/widgets/kis_custom_image_widget.cc
@@ -133,15 +133,15 @@ KisCustomImageWidget::KisCustomImageWidget(QWidget* parent, qint32 defWidth, qin
intNumLayers->setValue(cfg.numDefaultLayers());
cmbColor->setColor(cfg.defaultBackgroundColor());
setBackgroundOpacity(cfg.defaultBackgroundOpacity());
-
+
KisConfig::BackgroundStyle bgStyle = cfg.defaultBackgroundStyle();
-
+
if (bgStyle == KisConfig::LAYER) {
radioBackgroundAsLayer->setChecked(true);
} else {
radioBackgroundAsProjection->setChecked(true);
}
-
+
fillPredefined();
switchPortraitLandscape();
}
@@ -320,7 +320,7 @@ void KisCustomImageWidget::fillPredefined()
cmbPredefined->addItem("");
- QStringList definitions = KoResourcePaths::findAllResources("data", "krita/predefined_image_sizes/*.predefinedimage", KoResourcePaths::Recursive | KoResourcePaths::NoDuplicates);
+ QStringList definitions = KoResourcePaths::findAllResources("data", "predefined_image_sizes/*.predefinedimage", KoResourcePaths::Recursive | KoResourcePaths::NoDuplicates);
definitions.sort();
if (!definitions.empty()) {
@@ -374,7 +374,7 @@ void KisCustomImageWidget::saveAsPredefined()
if (fileName.isEmpty()) {
return;
}
- QString saveLocation = KoResourcePaths::saveLocation("data", "krita/predefined_image_sizes/", true);
+ QString saveLocation = KoResourcePaths::saveLocation("data", "predefined_image_sizes/", true);
QFile f(saveLocation + '/' + fileName.replace(' ', '_').replace('(', '_').replace(')', '_') + ".predefinedimage");
f.open(QIODevice::WriteOnly | QIODevice::Truncate);
diff --git a/plugins/dockers/compositiondocker/compositiondocker_dock.cpp b/plugins/dockers/compositiondocker/compositiondocker_dock.cpp
index 558610d..2601c68 100644
--- a/plugins/dockers/compositiondocker/compositiondocker_dock.cpp
+++ b/plugins/dockers/compositiondocker/compositiondocker_dock.cpp
@@ -90,7 +90,7 @@ CompositionDockerDock::CompositionDockerDock( ) : QDockWidget(i18n("Compositions
CompositionDockerDock::~CompositionDockerDock()
{
-
+
}
void CompositionDockerDock::setCanvas(KoCanvasBase * canvas)
@@ -179,7 +179,7 @@ void CompositionDockerDock::exportClicked()
if (m_canvas && m_canvas->viewManager() && m_canvas->viewManager()->image()) {
QString path;
- KoFileDialog dialog(0, KoFileDialog::OpenDirectory, "krita/compositiondockerdock");
+ KoFileDialog dialog(0, KoFileDialog::OpenDirectory, "compositiondockerdock");
dialog.setCaption(i18n("Select a Directory"));
dialog.setDefaultDir(QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
path = dialog.filename();
diff --git a/plugins/dockers/lut/lutdocker_dock.cpp b/plugins/dockers/lut/lutdocker_dock.cpp
index 0739924..373d8ea 100644
--- a/plugins/dockers/lut/lutdocker_dock.cpp
+++ b/plugins/dockers/lut/lutdocker_dock.cpp
@@ -63,7 +63,7 @@ OCIO::ConstConfigRcPtr defaultRawProfile()
/**
* Copied from OCIO, just a noop profile
*/
- const char * INTERNAL_RAW_PROFILE =
+ const char * INTERNAL_RAW_PROFILE =
"ocio_profile_version: 1\n"
"strictparsing: false\n"
"roles:\n"
@@ -420,7 +420,7 @@ void LutDockerDock::selectOcioConfiguration()
{
QString filename = m_txtConfigurationPath->text();
- KoFileDialog dialog(this, KoFileDialog::OpenFile, "krita/lutdocker");
+ KoFileDialog dialog(this, KoFileDialog::OpenFile, "lutdocker");
dialog.setCaption(i18n("Select OpenColorIO Configuration"));
dialog.setDefaultDir(QDir::cleanPath(filename));
dialog.setNameFilter(i18n("OpenColorIO configuration (*.ocio)"));
@@ -553,7 +553,7 @@ void LutDockerDock::selectLut()
{
QString filename = m_txtLut->text();
- KoFileDialog dialog(this, KoFileDialog::OpenFile, "krita/lutdocker");
+ KoFileDialog dialog(this, KoFileDialog::OpenFile, "lutdocker");
dialog.setCaption(i18n("Select LUT file"));
dialog.setDefaultDir(QDir::cleanPath(filename));
dialog.setNameFilter("*.*");
diff --git a/plugins/extensions/bigbrother/bigbrother.cc b/plugins/extensions/bigbrother/bigbrother.cc
index 6205df8..816cafc 100644
--- a/plugins/extensions/bigbrother/bigbrother.cc
+++ b/plugins/extensions/bigbrother/bigbrother.cc
@@ -213,7 +213,7 @@ KisMacro* BigBrotherPlugin::openMacro()
void BigBrotherPlugin::saveMacro(const KisMacro* macro)
{
- KoFileDialog dialog(m_view->mainWindow(), KoFileDialog::SaveFile, "krita/bigbrother");
+ KoFileDialog dialog(m_view->mainWindow(), KoFileDialog::SaveFile, "bigbrother");
dialog.setCaption(i18n("Save Macro"));
dialog.setNameFilter(i18n("Recorded actions (*.krarec)"));
diff --git a/plugins/paintops/libpaintop/kis_clipboard_brush_widget.cpp b/plugins/paintops/libpaintop/kis_clipboard_brush_widget.cpp
index de06409..13c7731 100644
--- a/plugins/paintops/libpaintop/kis_clipboard_brush_widget.cpp
+++ b/plugins/paintops/libpaintop/kis_clipboard_brush_widget.cpp
@@ -120,7 +120,7 @@ void KisClipboardBrushWidget::slotAddPredefined()
if(!m_brush)
return;
- QString dir = KoResourcePaths::saveLocation("data", "krita/brushes");
+ QString dir = KoResourcePaths::saveLocation("data", "brushes");
QString extension = ".gbr";
QString name = nameEdit->text();
@@ -156,4 +156,4 @@ void KisClipboardBrushWidget::slotAddPredefined()
close();
}
-#include "moc_kis_clipboard_brush_widget.cpp"
\ No newline at end of file
+#include "moc_kis_clipboard_brush_widget.cpp"
diff --git a/plugins/paintops/libpaintop/kis_custom_brush_widget.cpp b/plugins/paintops/libpaintop/kis_custom_brush_widget.cpp
index 36e385c..84a83e2 100644
--- a/plugins/paintops/libpaintop/kis_custom_brush_widget.cpp
+++ b/plugins/paintops/libpaintop/kis_custom_brush_widget.cpp
@@ -118,7 +118,7 @@ void KisCustomBrushWidget::slotUpdateUseColorAsMask(bool useColorAsMask)
void KisCustomBrushWidget::slotAddPredefined()
{
- QString dir = KoResourcePaths::saveLocation("data", "krita/brushes");
+ QString dir = KoResourcePaths::saveLocation("data", "brushes");
QString extension;
if (brushStyle->currentIndex() == 0) {
diff --git a/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
index 9b96cd4..cd04386 100644
--- a/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
+++ b/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
@@ -73,7 +73,7 @@ struct KisFreeTransformStrategy::Private
scaleCursors[6] = KisCursor::sizeVerCursor();
scaleCursors[7] = KisCursor::sizeBDiagCursor();
- shearCursorPixmap.load(KoResourcePaths::locate("data", "krita/icons/cursor_shear.png"));
+ shearCursorPixmap.load(KoResourcePaths::locate("data", "icons/cursor_shear.png"));
}
More information about the kimageshop
mailing list