diff --git a/librecad/src/lib/engine/rs_system.cpp b/librecad/src/lib/engine/rs_system.cpp index db81b075a..72870af12 100644 --- a/librecad/src/lib/engine/rs_system.cpp +++ b/librecad/src/lib/engine/rs_system.cpp @@ -88,7 +88,7 @@ void RS_System::initLanguageList() { QStringList lst = getFileList("qm", "qm"); RS_SETTINGS->beginGroup("/Paths"); - lst += (RS_SETTINGS->readEntry("/Translations", "")).split(";", QString::SkipEmptyParts); + lst += (RS_SETTINGS->readEntry("/Translations", "/usr/share/librecad/qm")).split(";", QString::SkipEmptyParts); RS_SETTINGS->endGroup(); for (QStringList::Iterator it = lst.begin(); @@ -393,7 +393,7 @@ void RS_System::loadTranslation(const QString& lang, const QString& /*langCmd*/) QStringList lst = getDirectoryList( "qm"); RS_SETTINGS->beginGroup( "/Paths"); - lst += (RS_SETTINGS->readEntry( "/Translations", "")).split( ";", QString::SkipEmptyParts); + lst += (RS_SETTINGS->readEntry( "/Translations", "/usr/share/librecad/qm")).split( ";", QString::SkipEmptyParts); RS_SETTINGS->endGroup(); if( tLibreCAD != NULL) { @@ -585,16 +585,16 @@ QStringList RS_System::getDirectoryList(const QString& _subDirectory) { // from package manager the executable is in /usr/bin // in AppImage the executable is APPDIR/usr/bin // so this should work for package manager and AppImage distribution - dirList.append( QDir::cleanPath( appDir + "/../share/doc/" + appDirName + "/" + subDirectory)); + dirList.append( QDir::cleanPath( "/usr/share/doc/" + appDirName + "/" + subDirectory)); // try various locations for different Linux distributions - dirList.append( QDir::cleanPath( appDir + "/../share/" + appDirName + "/" + subDirectory)); - dirList.append( QDir::cleanPath( appDir + "/../lib64/" + appDirName + "/" + subDirectory)); - dirList.append( QDir::cleanPath( appDir + "/../lib/" + appDirName + "/" + subDirectory)); + dirList.append( QDir::cleanPath( "/usr/share/" + appDirName + "/" + subDirectory)); + dirList.append( QDir::cleanPath( "/usr/lib64/" + appDirName + "/" + subDirectory)); + dirList.append( QDir::cleanPath( "/usr/lib/" + appDirName + "/" + subDirectory)); if (QStringLiteral( "plugins") == subDirectory) { - dirList.append( QDir::cleanPath( appDir + "/../lib64/" + appDirName)); - dirList.append( QDir::cleanPath( appDir + "/../lib/" + appDirName)); + dirList.append( QDir::cleanPath( "/usr/lib64/" + appDirName)); + dirList.append( QDir::cleanPath( "/usr/lib/" + appDirName)); } #endif @@ -614,23 +614,23 @@ QStringList RS_System::getDirectoryList(const QString& _subDirectory) { // Individual directories: RS_SETTINGS->beginGroup( "/Paths"); if (subDirectory == "fonts") { - dirList += (RS_SETTINGS->readEntry( "/Fonts", "")).split( QRegExp("[;]"), + dirList += (RS_SETTINGS->readEntry( "/Fonts", "/usr/share/librecad/fonts")).split( QRegExp("[;]"), QString::SkipEmptyParts); } else if (subDirectory == "patterns") { - dirList += (RS_SETTINGS->readEntry( "/Patterns", "")).split( QRegExp("[;]"), + dirList += (RS_SETTINGS->readEntry( "/Patterns", "/usr/share/librecad/patterns")).split( QRegExp("[;]"), QString::SkipEmptyParts); } else if (subDirectory.startsWith( "scripts")) { - dirList += (RS_SETTINGS->readEntry( "/Scripts", "")).split( QRegExp("[;]"), + dirList += (RS_SETTINGS->readEntry( "/Scripts", "/usr/lib/librecad/plugins")).split( QRegExp("[;]"), QString::SkipEmptyParts); } else if (subDirectory.startsWith( "library")) { - dirList += (RS_SETTINGS->readEntry( "/Library", "")).split( QRegExp("[;]"), + dirList += (RS_SETTINGS->readEntry( "/Library", "/usr/share/librecad/library")).split( QRegExp("[;]"), QString::SkipEmptyParts); } else if (subDirectory.startsWith( "qm")) { - dirList += (RS_SETTINGS->readEntry( "/Translations", "")).split( QRegExp("[;]"), + dirList += (RS_SETTINGS->readEntry( "/Translations", "/usr/share/librecad/qm")).split( QRegExp("[;]"), QString::SkipEmptyParts); } RS_SETTINGS->endGroup();