[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/koffice/1.6/koffice/krita
From:       Bart Coppens <kde () bartcoppens ! be>
Date:       2007-01-01 0:50:27
Message-ID: 1167612627.849296.28219.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 618296 by coppens:

As requested by mrdocs: search recursively for icc profiles (makes sense). Also add \
the dirs we need to look inside to the KGlobal instance, before this we were not yet \
using KisDoc's instance (which actually sets the kis_profiles resource type). Happy \
newyear everybody!

 M  +10 -20    core/kis_meta_registry.cc  
 M  +1 -0      ui/kis_factory.cc  


--- branches/koffice/1.6/koffice/krita/core/kis_meta_registry.cc #618295:618296
@@ -36,27 +36,17 @@
     KGlobal::instance()->dirs()->addResourceType("kis_profiles",
                                                      \
KStandardDirs::kde_default("data") + "krita/profiles/");  
-    QStringList profileFilenames;
-    profileFilenames += \
                KGlobal::instance()->dirs()->findAllResources("kis_profiles", \
                "*.icm");
-    profileFilenames += \
                KGlobal::instance()->dirs()->findAllResources("kis_profiles", \
                "*.ICM");
-    profileFilenames += \
                KGlobal::instance()->dirs()->findAllResources("kis_profiles", \
                "*.ICC");
-    profileFilenames += \
KGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.icc"); +    // Add \
those things here as well, since we are not yet using KisDoc's KisFactory instance \
(which inits these as well) +    \
KGlobal::instance()->dirs()->addResourceType("kis_profiles", \
KStandardDirs::kde_default("data") + "krita/profiles/"); +    \
KGlobal::instance()->dirs()->addResourceDir("kis_profiles", "/usr/share/color/icc"); \
+    KGlobal::instance()->dirs()->addResourceDir("kis_profiles", QDir::homeDirPath() \
+ QString("/.icc/")); +    \
KGlobal::instance()->dirs()->addResourceDir("kis_profiles", QDir::homeDirPath() + \
QString("/.color/icc/"));  
-    QDir d("/usr/share/color/icc/", "*.icc;*.ICC;*.icm;*.ICM");
-
-    QStringList filenames = d.entryList();
-
-    for (QStringList::iterator it = filenames.begin(); it != filenames.end(); ++it) \
                {
-        profileFilenames += d.absFilePath(*it);
-    }
-
-    d.setPath(QDir::homeDirPath() + "/.color/icc/");
-    filenames = d.entryList();
-
-    for (QStringList::iterator it = filenames.begin(); it != filenames.end(); ++it) \
                {
-        profileFilenames += d.absFilePath(*it);
-    }
-
+    QStringList profileFilenames;
+    profileFilenames += \
KGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.icm", true /* \
recursive */); +    profileFilenames += \
KGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.ICM", true); +    \
profileFilenames += KGlobal::instance()->dirs()->findAllResources("kis_profiles", \
"*.ICC", true); +    profileFilenames += \
                KGlobal::instance()->dirs()->findAllResources("kis_profiles", \
                "*.icc", true);
     // Set lcms to return NUll/false etc from failing calls, rather than aborting \
the app.  cmsErrorAction(LCMS_ERROR_SHOW);
 
--- branches/koffice/1.6/koffice/krita/ui/kis_factory.cc #618295:618296
@@ -137,6 +137,7 @@
         s_instance->dirs()->addResourceType("kis_profiles", \
                KStandardDirs::kde_default("data") + "krita/profiles/");
         s_instance->dirs()->addResourceDir("kis_profiles", "/usr/share/color/icc");
         s_instance->dirs()->addResourceDir("kis_profiles", QDir::homeDirPath() + \
QString("/.icc")); +        s_instance->dirs()->addResourceDir("kis_profiles", \
QDir::homeDirPath() + QString("/.color/icc"));  
         s_instance->dirs()->addResourceType("kis_palettes", \
                KStandardDirs::kde_default("data") + "krita/palettes/");
         s_instance->dirs()->addResourceDir("kis_palettes", \
"/usr/share/create/swatches");


[prev in list] [next in list] [prev in thread] [next in thread]