Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 11059 → Rev 11111

/branches/Version13x/Scribus/scribus/scpaths.h
53,6 → 53,8
 
/** @brief Return path to the translations directory */
QString translationDir() const;
/** @brief Return path to the dictionaries directory */
QString dictDir() const;
 
/** @brief Return paths to system font directories*/
static QStringList getSystemFontDirs(void);
/branches/Version13x/Scribus/scribus/scribus.cpp
8707,7 → 8707,7
//Build our list of hyphenation dictionaries we have in the install dir
//Grab the language abbreviation from it, get the full language text
//Insert the name as key and a new string list into the map
QString hyphDirName = QDir::convertSeparators(ScPaths::instance().libDir() + "dicts/");
QString hyphDirName = QDir::convertSeparators(ScPaths::instance().dictDir());
QDir hyphDir(hyphDirName, "*.dic", QDir::Name, QDir::Files | QDir::NoSymLinks);
if ((hyphDir.exists()) && (hyphDir.count() != 0))
{
8724,7 → 8724,7
}
 
//For each qm file existing, load the file and find the translations of the names
QString pfad = ScPaths::instance().libDir();
QString pfad = ScPaths::instance().translationDir();
QDir d2(pfad, "*.*", QDir::Name, QDir::Files | QDir::NoSymLinks);
if ((d2.exists()) && (d2.count() != 0))
{
/branches/Version13x/Scribus/scribus/scpaths.cpp
197,6 → 197,10
return(m_shareDir + "translations/");
}
 
QString ScPaths::dictDir() const
{
return(m_shareDir + "dicts/");
}
 
QStringList ScPaths::getSystemFontDirs(void)
{
/branches/Version13x/Scribus/scribus/hyphenator.cpp
49,7 → 49,7
AutoCheck(doc->AutoCheck)
{
//FIXME:av pick up language from charstyle
QString pfad = ScPaths::instance().libDir();
QString pfad = ScPaths::instance().dictDir();
if (ScCore->primaryMainWindow()->Sprachen.contains(doc->Language))
Language = doc->Language;
else
57,7 → 57,7
Language = PrefsManager::instance()->appPrefs.Language;
doc->Language = Language;
}
pfad += "dicts/" + ScCore->primaryMainWindow()->Sprachen[Language];
pfad += ScCore->primaryMainWindow()->Sprachen[Language];
QFile f(pfad);
if (f.open(IO_ReadOnly))
{
94,12 → 94,12
Language = name;
 
char *filename = NULL;
QString pfad = ScPaths::instance().libDir();
QString pfad = ScPaths::instance().dictDir();
if (hdict != NULL)
hnj_hyphen_free(hdict);
 
pfad += "dicts/" + ScCore->primaryMainWindow()->Sprachen[Language];
pfad += ScCore->primaryMainWindow()->Sprachen[Language];
QFile f(pfad);
if (f.open(IO_ReadOnly))
{
/branches/Version13x/Scribus/scribus/dicts/CMakeLists.txt
35,5 → 35,5
hyph_sl.dic
hyph_sv.dic
hyph_uk.dic
DESTINATION ${LIBDIR}dicts
DESTINATION ${SHAREDIR}dicts
)