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