View Issue Details
| ID | Project | Category | View Status | Date Submitted | Last Update |
|---|---|---|---|---|---|
| 0002501 | Scribus | General | public | 2005-08-29 18:37 | 2005-09-09 21:41 |
| Reporter | jghali | Assigned To | fschmid | ||
| Priority | normal | Severity | feature | Reproducibility | always |
| Status | closed | Resolution | fixed | ||
| Platform | Windows | OS | Windows | OS Version | 2000 SP4 |
| Product Version | 1.3.1cvs | ||||
| Fixed in Version | 1.2.3cvs | ||||
| Summary | 0002501: Have Scribus look for icc profiles in system directories | ||||
| Description | The provided patch completes 0002040 and allows Scribus to look for icc profiles in system directories (*Nix/OSX/Win32). | ||||
| Tags | No tags attached. | ||||
| Attached Files | look_for_icc_profiles.diff (1,498 bytes)
Index: scribus.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/scribus.cpp,v
retrieving revision 1.228.2.502
diff -u -r1.228.2.502 scribus.cpp
--- scribus.cpp 27 Aug 2005 21:18:19 -0000 1.228.2.502
+++ scribus.cpp 29 Aug 2005 18:11:08 -0000
@@ -8529,23 +8534,27 @@
void ScribusApp::GetCMSProfiles()
{
+ QString profDir;
+ QStringList profDirs;
MonitorProfiles.clear();
PrinterProfiles.clear();
InputProfiles.clear();
InputProfilesCMYK.clear();
QString pfad = ScPaths::instance().libDir();
pfad += "profiles/";
- GetCMSProfilesDir(pfad);
- if (!prefsManager->appPrefs.ProfileDir.isEmpty())
- {
- if(prefsManager->appPrefs.ProfileDir.right(1) != "/")
- prefsManager->appPrefs.ProfileDir += "/";
- GetCMSProfilesDir(prefsManager->appPrefs.ProfileDir);
- }
-#if defined(Q_WS_X11)
- GetCMSProfilesDir("/usr/share/color/icc/");
- GetCMSProfilesDir(QDir::convertSeparators(QDir::homeDirPath()+"/.color/icc/"));
-#endif
+ profDirs = ScPaths::getSystemProfilesDirs();
+ profDirs.prepend( prefsManager->appPrefs.ProfileDir );
+ profDirs.prepend( pfad );
+ for(unsigned int i = 0; i < profDirs.count(); i++)
+ {
+ profDir = profDirs[i];
+ if(!profDir.isEmpty())
+ {
+ if(profDir.right(1) != "/")
+ profDir += "/";
+ GetCMSProfilesDir(profDir);
+ }
+ }
if ((!PrinterProfiles.isEmpty()) && (!InputProfiles.isEmpty()) && (!MonitorProfiles.isEmpty()))
CMSavail = true;
else
| ||||
| Patch | |||||
|
|
This is important. I would like to thank jghali for preparing a patch. Is it applicable to 1.2.3 cvs as well? It would be great if it could be backported to that series as well. |
|
|
patch from 0002040 is in my opinion backportable to 1.2.3. This one uses the patch from issue 0002490 which affects ScPaths class. |
|
|
Backported fix to 1.2.3cvs |
|
|
This is working on 1.3.1cvs, 1.2.3cvs and on the latest win32 builds. |
| Date Modified | Username | Field | Change |
|---|---|---|---|
| 2005-08-29 18:37 | jghali | New Issue | |
| 2005-08-29 18:37 | jghali | File Added: look_for_icc_profiles.diff | |
| 2005-08-29 18:37 | jghali | Relationship added | related to 0002040 |
| 2005-08-29 19:09 | malex | Note Added: 0006289 | |
| 2005-08-29 19:11 | malex | Note Edited: 0006289 | |
| 2005-08-29 19:21 | jghali | Note Added: 0006290 | |
| 2005-08-29 20:57 | fschmid | Note Added: 0006296 | |
| 2005-08-29 21:49 | fschmid | Status | assigned => resolved |
| 2005-08-29 21:49 | fschmid | Fixed in Version | => 1.3.1cvs |
| 2005-08-29 21:49 | fschmid | Resolution | open => fixed |
| 2005-09-09 21:40 |
|
Note Added: 0006496 | |
| 2005-09-09 21:40 |
|
Fixed in Version | 1.3.1cvs => 1.2.3cvs |
| 2005-09-09 21:41 |
|
Status | resolved => closed |