From 33c17d0fd892ba7ab6b3fe6511b33eed4a42b9f4 Mon Sep 17 00:00:00 2001 From: Boudewijn Rempt Date: Sat, 7 Nov 2015 15:31:53 +0100 Subject: [PATCH] Put aboutdata and shaders in qrc files This way they will always be found and won't clutter up the install directory with stuff that never changes. --- krita/CMakeLists.txt | 2 ++ krita/data/CMakeLists.txt | 4 ---- krita/data/aboutdata/CMakeLists.txt | 7 ------- krita/data/aboutdata/aboutdata.qrc | 9 +++++++++ krita/data/shaders/CMakeLists.txt | 20 -------------------- krita/data/shaders/shaders.qrc | 18 ++++++++++++++++++ krita/ui/dialogs/kis_about_application.cpp | 8 ++++---- krita/ui/opengl/kis_opengl_canvas2.cpp | 16 ++++++++-------- libs/widgetutils/KoResourcePaths.cpp | 4 ++-- 9 files changed, 43 insertions(+), 45 deletions(-) delete mode 100644 krita/data/aboutdata/CMakeLists.txt create mode 100644 krita/data/aboutdata/aboutdata.qrc delete mode 100644 krita/data/shaders/CMakeLists.txt create mode 100644 krita/data/shaders/shaders.qrc diff --git a/krita/CMakeLists.txt b/krita/CMakeLists.txt index 392e1bd7f5..135daf6630 100644 --- a/krita/CMakeLists.txt +++ b/krita/CMakeLists.txt @@ -166,6 +166,8 @@ qt5_add_resources(krita_SRCS krita.qrc ${CMAKE_SOURCE_DIR}/libs/flake/flake.qrc ${CMAKE_SOURCE_DIR}/libs/widgets/kritawidgets.qrc ${CMAKE_SOURCE_DIR}/pics/icons.qrc + data/aboutdata/aboutdata.qrc + data/shaders/shaders.qrc ) add_executable(krita ${krita_SRCS}) diff --git a/krita/data/CMakeLists.txt b/krita/data/CMakeLists.txt index cd1cf5bc1a..75b8eace5f 100644 --- a/krita/data/CMakeLists.txt +++ b/krita/data/CMakeLists.txt @@ -1,4 +1,3 @@ -add_subdirectory( aboutdata ) add_subdirectory( actions ) add_subdirectory( brushes ) add_subdirectory( bundles ) @@ -6,7 +5,6 @@ add_subdirectory( patterns ) add_subdirectory( gradients ) add_subdirectory( profiles ) add_subdirectory( templates ) -add_subdirectory( shaders ) add_subdirectory( cursors ) add_subdirectory( workspaces ) add_subdirectory( themes ) @@ -22,8 +20,6 @@ install( FILES DESTINATION ${CONFIG_INSTALL_DIR} ) - - install( FILES krita.xml DESTINATION ${XDG_MIME_INSTALL_DIR}) diff --git a/krita/data/aboutdata/CMakeLists.txt b/krita/data/aboutdata/CMakeLists.txt deleted file mode 100644 index 60db1543b1..0000000000 --- a/krita/data/aboutdata/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -install( FILES - developers.txt - backers.txt - credits.txt - LICENSE -DESTINATION ${DATA_INSTALL_DIR}/krita/aboutdata) - diff --git a/krita/data/aboutdata/aboutdata.qrc b/krita/data/aboutdata/aboutdata.qrc new file mode 100644 index 0000000000..9eb9f37255 --- /dev/null +++ b/krita/data/aboutdata/aboutdata.qrc @@ -0,0 +1,9 @@ + + + + backers.txt + credits.txt + developers.txt + LICENSE + + diff --git a/krita/data/shaders/CMakeLists.txt b/krita/data/shaders/CMakeLists.txt deleted file mode 100644 index 11223c9069..0000000000 --- a/krita/data/shaders/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -install( FILES - bilinear_gradient.frag - conical_gradient.frag - conical_symetric_gradient.frag - - matrix_transform.vert - matrix_transform_legacy.vert - - simple_texture.frag - simple_texture_legacy.frag - - highq_downscale.frag - - cursor.vert - cursor.frag - linear_gradient.frag - radial_gradient.frag - square_gradient.frag - DESTINATION ${DATA_INSTALL_DIR}/krita/shaders) - diff --git a/krita/data/shaders/shaders.qrc b/krita/data/shaders/shaders.qrc new file mode 100644 index 0000000000..538d064a88 --- /dev/null +++ b/krita/data/shaders/shaders.qrc @@ -0,0 +1,18 @@ + + + + bilinear_gradient.frag + conical_gradient.frag + conical_symetric_gradient.frag + cursor.frag + cursor.vert + highq_downscale.frag + linear_gradient.frag + matrix_transform.vert + matrix_transform_legacy.vert + radial_gradient.frag + simple_texture.frag + simple_texture_legacy.frag + square_gradient.frag + + diff --git a/krita/ui/dialogs/kis_about_application.cpp b/krita/ui/dialogs/kis_about_application.cpp index 74e932ca31..506eb7b8ff 100644 --- a/krita/ui/dialogs/kis_about_application.cpp +++ b/krita/ui/dialogs/kis_about_application.cpp @@ -60,7 +60,7 @@ KisAboutApplication::KisAboutApplication(QWidget *parent) "

Created By

" "

"); - QFile fileDevelopers(QStandardPaths::locate(QStandardPaths::AppDataLocation, "aboutdata/developers.txt")); + QFile fileDevelopers(":/developers.txt"); Q_ASSERT(fileDevelopers.exists()); fileDevelopers.open(QIODevice::ReadOnly); @@ -82,7 +82,7 @@ KisAboutApplication::KisAboutApplication(QWidget *parent) "

Backed By

" "

"); - QFile fileBackers(QStandardPaths::locate(QStandardPaths::AppDataLocation, "aboutdata/backers.txt")); + QFile fileBackers(":/backers.txt"); Q_ASSERT(fileBackers.exists()); fileBackers.open(QIODevice::ReadOnly); foreach(const QByteArray &backer, fileBackers.readAll().split('\n')) { @@ -104,7 +104,7 @@ KisAboutApplication::KisAboutApplication(QWidget *parent) "

Thanks To

" "

"); - QFile fileCredits(QStandardPaths::locate(QStandardPaths::AppDataLocation, "aboutdata/credits.txt")); + QFile fileCredits(":/credits.txt"); Q_ASSERT(fileCredits.exists()); fileCredits.open(QIODevice::ReadOnly); @@ -145,7 +145,7 @@ KisAboutApplication::KisAboutApplication(QWidget *parent) "to trial or educational versions of commercial software that will forbid your work in commercial situations.

" "
");
 
-    QFile licenseFile(QStandardPaths::locate(QStandardPaths::AppDataLocation, "aboutdata/LICENSE"));
+    QFile licenseFile(":/LICENSE");
     Q_ASSERT(licenseFile.exists());
     licenseFile.open(QIODevice::ReadOnly);
     QByteArray ba = licenseFile.readAll();
diff --git a/krita/ui/opengl/kis_opengl_canvas2.cpp b/krita/ui/opengl/kis_opengl_canvas2.cpp
index 54c730c63a..389c43f215 100644
--- a/krita/ui/opengl/kis_opengl_canvas2.cpp
+++ b/krita/ui/opengl/kis_opengl_canvas2.cpp
@@ -337,8 +337,8 @@ QOpenGLShaderProgram *KisOpenGLCanvas2::getCursorShader()
 {
     if (d->cursorShader == 0) {
         d->cursorShader = new QOpenGLShaderProgram();
-        d->cursorShader->addShaderFromSourceFile(QOpenGLShader::Vertex, KoResourcePaths::findResource("data", "krita/shaders/cursor.vert"));
-        d->cursorShader->addShaderFromSourceFile(QOpenGLShader::Fragment, KoResourcePaths::findResource("data", "krita/shaders/cursor.frag"));
+        d->cursorShader->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/cursor.vert");
+        d->cursorShader->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/cursor.frag");
         d->cursorShader->bindAttributeLocation("a_vertexPosition", PROGRAM_VERTEX_ATTRIBUTE);
         if (! d->cursorShader->link()) {
             dbgUI << "OpenGL error" << glGetError();
@@ -666,11 +666,11 @@ void KisOpenGLCanvas2::initializeCheckerShader()
     QString fragmentShaderName;
 
     if (KisOpenGL::supportsGLSL13()) {
-        vertexShaderName = KoResourcePaths::findResource("data", "krita/shaders/matrix_transform.vert");
-        fragmentShaderName = KoResourcePaths::findResource("data", "krita/shaders/simple_texture.frag");
+        vertexShaderName = ":/matrix_transform.vert";
+        fragmentShaderName = ":/simple_texture.frag";
     } else {
-        vertexShaderName = KoResourcePaths::findResource("data", "krita/shaders/matrix_transform_legacy.vert");
-        fragmentShaderName = KoResourcePaths::findResource("data", "krita/shaders/simple_texture_legacy.frag");
+        vertexShaderName = ":/matrix_transform_legacy.vert";
+        fragmentShaderName = ":/simple_texture_legacy.frag";
     }
 
     bool result;
@@ -748,9 +748,9 @@ void KisOpenGLCanvas2::initializeDisplayShader()
     reportShaderLinkFailedAndExit(result, "Display fragment shader", d->displayShader->log());
 
     if (KisOpenGL::supportsGLSL13()) {
-        result = d->displayShader->addShaderFromSourceFile(QOpenGLShader::Vertex, KoResourcePaths::findResource("data", "krita/shaders/matrix_transform.vert"));
+        result = d->displayShader->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/matrix_transform.vert");
     } else {
-        result = d->displayShader->addShaderFromSourceFile(QOpenGLShader::Vertex, KoResourcePaths::findResource("data", "krita/shaders/matrix_transform_legacy.vert"));
+        result = d->displayShader->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/matrix_transform_legacy.vert");
     }
     reportShaderLinkFailedAndExit(result, "Display vertex shader", d->displayShader->log());
 
diff --git a/libs/widgetutils/KoResourcePaths.cpp b/libs/widgetutils/KoResourcePaths.cpp
index 34edec0dee..39280a6e0d 100644
--- a/libs/widgetutils/KoResourcePaths.cpp
+++ b/libs/widgetutils/KoResourcePaths.cpp
@@ -51,7 +51,7 @@ QString getInstallationPrefix() {
                                             CFStringGetSystemEncoding());
      QString bundlePath = QString::fromLatin1(pathPtr);
 
-     qDebug() << "1" << bundlePath << (bundlePath + QString::fromLatin1("/Contents/MacOS/share"));
+//     qDebug() << "1" << bundlePath << (bundlePath + QString::fromLatin1("/Contents/MacOS/share"));
      if (QFile(bundlePath + QString::fromLatin1("/Contents/MacOS/share")).exists()) {
 //         qDebug() << "running from a deployed bundle";
          bundlePath += QString::fromLatin1("/Contents/MacOS/");
@@ -291,7 +291,7 @@ QStringList KoResourcePaths::findAllResourcesInternal(const QString &type,
     bool noDuplicates = options & KoResourcePaths::NoDuplicates;
     bool recursive = options & KoResourcePaths::Recursive;
 
-    qDebug() << "findAllResources: type" << type << "filter" << _filter << "no dups" << noDuplicates << "recursive" << recursive;
+//    qDebug() << "findAllResources: type" << type << "filter" << _filter << "no dups" << noDuplicates << "recursive" << recursive;
 
     QStringList aliases = d->aliases(type);
     QString filter = _filter;
-- 
GitLab