summaryrefslogtreecommitdiffstats
path: root/scribus
diff options
context:
space:
mode:
authorcraig <craig@11d20701-8431-0410-a711-e3c959e3b870>2012-06-24 13:39:34 +0000
committercraig <craig@11d20701-8431-0410-a711-e3c959e3b870>2012-06-24 13:39:34 +0000
commit0db118d5888100576b91dc0054369fed0dd0601a (patch)
tree236eb505abc74735ca06193126dafb69095cea27 /scribus
parentd2a33b2e18d827baf7fd0022e03d510e1b09b32d (diff)
downloadscribus-0db118d5888100576b91dc0054369fed0dd0601a.tar.gz
scribus-0db118d5888100576b91dc0054369fed0dd0601a.tar.xz
scribus-0db118d5888100576b91dc0054369fed0dd0601a.zip
#9940: Add /Users/craig/.local/share/color/icc to ICC profile locations
git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17619 11d20701-8431-0410-a711-e3c959e3b870
Diffstat (limited to 'scribus')
-rw-r--r--scribus/scpaths.cpp1
-rw-r--r--scribus/tabgeneral.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/scribus/scpaths.cpp b/scribus/scpaths.cpp
index ae0217c..cbabf65 100644
--- a/scribus/scpaths.cpp
+++ b/scribus/scpaths.cpp
@@ -342,6 +342,7 @@ QStringList ScPaths::getSystemProfilesDirs(void)
#elif defined(Q_WS_X11)
iccProfDirs.append(QDir::homePath()+"/color/icc/");
iccProfDirs.append(QDir::homePath()+"/.color/icc/");
+ iccProfDirs.append(QDir::homePath()+"/.local/share/color/icc/");
iccProfDirs.append("/usr/share/color/icc/");
iccProfDirs.append("/usr/local/share/color/icc/");
#elif defined(_WIN32)
diff --git a/scribus/tabgeneral.cpp b/scribus/tabgeneral.cpp
index 0ecbb68..7ab1239 100644
--- a/scribus/tabgeneral.cpp
+++ b/scribus/tabgeneral.cpp
@@ -58,7 +58,7 @@ TabGeneral::TabGeneral(QWidget* parent, const char* name)
GTFsize->setToolTip( "<qt>" + tr("Default font size for the tool windows") + "</qt>" );
Docs->setToolTip( "<qt>" + tr( "Default documents directory" ) + "</qt>" );
useSmallWidgetsCheck->setToolTip( "<qt>" + tr("Palette windows will use smaller (space savy) widgets. Requires application restart") + "</qt>");
- ProPfad->setToolTip( "<qt>" + tr( "Default ICC profiles directory. This cannot be changed with a document open. By default, Scribus will look in the System Directories under Mac OSX and Windows. On Linux and Unix, Scribus will search $home/.color/icc,/usr/share/color/icc and /usr/local/share/color/icc " ) + "</qt>" );
+ ProPfad->setToolTip( "<qt>" + tr( "Default ICC profiles directory. This cannot be changed with a document open. By default, Scribus will look in the System Directories under Mac OSX and Windows. On Linux and Unix, Scribus will search $home/.color/icc, $home/.local/share/color/icc, /usr/share/color/icc and /usr/local/share/color/icc" ) + "</qt>" );
ScriptPfad->setToolTip( "<qt>" + tr( "Default Scripter scripts directory" ) + "</qt>" );
DocumentTemplateDir->setToolTip( "<qt>"+ tr("Additional directory for document templates")+"</qt>" );