Merge pull request #327 from plc-user/master

set config- and data-dir to system-specific paths

sources/dxf/dxftoelmt.cpp

@@ -17,11 +17,11 @@
 */
 #include "dxftoelmt.h"
 #include "../ui/thirdpartybinaryinstalldialog.h"
+#include "../qetapp.h"
 
 #include <QFile>
 #include <QProcess>
 #include <QMessageBox>
-#include <QDir>
 
 /**
  * @brief dxftoElmt
@@ -71,13 +71,7 @@ QByteArray dxfToElmt(const QString &file_path)
 
 QString dxf2ElmtDirPath()
 {
-#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64)
+	return QETApp::dataDir() + "/binary";
-	return (QDir::homePath() + QStringLiteral("/Application Data/qet/binary"));
-#elif defined(Q_OS_MACOS)
-	return (QDir::homePath() + QStringLiteral("/.qet/binary"));
-#else
-	return (QDir::homePath() + QStringLiteral("/.qet/binary"));
-#endif
 }
 
 /**

sources/machine_info.cpp

@@ -156,13 +156,15 @@ void MachineInfo::send_info_to_debug()
 	qInfo()<< " Custom TitleBlock Templates Dir:"<< QString(QETApp::customTitleBlockTemplatesDir().toLatin1());
 	qInfo()<< " Company Elements Dir:"<< QString(QETApp::companyElementsDir().toLatin1());
 	qInfo()<< " Company TitleBlock Templates Dir:"<< QString(QETApp::companyTitleBlockTemplatesDir().toLatin1());
+	qInfo()<< " User Location:"<< QString(QETApp::configDir().toLatin1());
 	
-	qInfo()<< " Standard Location :"<< QStringList(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation));
+	
-	qInfo()<< " App Data Location:"<< QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
+	qInfo()<< " Config Location :"<< QStringList(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation));
-	qInfo()<< " App Local DataLocation:"<< QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation);
+	qInfo()<< " Project stalefiles Location:"<< QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
-	qInfo()<< " Home Location:"<< QStandardPaths::writableLocation(QStandardPaths::HomeLocation);
+	//qInfo()<< " App Local DataLocation:"<< QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation);
-	qInfo()<< " Runtime Location:"<< QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation);
+	// qInfo()<< " Home Location:"<< QStandardPaths::writableLocation(QStandardPaths::HomeLocation);
-	qInfo()<< " Cache Location:"<< QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
+	// qInfo()<< " Runtime Location:"<< QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation);
+	// qInfo()<< " Cache Location:"<< QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
 	
 	
 	

sources/main.cpp

@@ -112,7 +112,8 @@ void myMessageOutput(QtMsgType type,
 		txt+= context.function ? context.function : "";
 		txt+=")\n";
 	}
-	QFile outFile(QETApp::configDir()
+	QFile outFile(QETApp::dataDir()
+			  +"/"
 			  +QDate::currentDate().toString("yyyyMMdd")
 			  +".log");
 	if(outFile.open(QIODevice::WriteOnly | QIODevice::Append))
@@ -131,7 +132,7 @@ void myMessageOutput(QtMsgType type,
 void delete_old_log_files(int days)
 {
 	const QDate today = QDate::currentDate();
-	const QString path = QETApp::configDir() + "/";
+	const QString path = QETApp::dataDir() + "/";
 
 	QString filter("%1%1%1%1%1%1%1%1.log"); // pattern
 	filter = filter.arg("[0123456789]"); // valid characters

sources/qet_elementscaler/qet_elementscaler.cpp

@@ -17,12 +17,12 @@
 */
 #include "qet_elementscaler.h"
 #include "../ui/thirdpartybinaryinstalldialog.h"
+#include "../qetapp.h"
 
 #include <QFile>
 #include <QProcess>
 #include <QInputDialog>
 #include <QMessageBox>
-#include <QDir>
 
 /**
  * @brief QET_ElementScaler
@@ -113,13 +113,7 @@ QByteArray ElementScaler(const QString &file_path, QWidget *parent)
 
 QString ElementScalerDirPath()
 {
-#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64)
+	return QETApp::dataDir() + "/binary";
-	return (QDir::homePath() + QStringLiteral("/Application Data/qet/binary"));
-#elif defined(Q_OS_MACOS)
-	return (QDir::homePath() + QStringLiteral("/.qet/binary"));
-#else
-	return (QDir::homePath() + QStringLiteral("/.qet/binary"));
-#endif
 }
 
 /**

sources/qetapp.cpp

@@ -121,7 +121,7 @@ QETApp::QETApp() :
 		tr("Chargement... Initialisation du cache des collections d'éléments",
 		   "splash screen caption"));
 	if (!collections_cache_) {
-	QString cache_path = QETApp::configDir() + "/elements_cache.sqlite";
+	QString cache_path = QETApp::dataDir() + "/elements_cache.sqlite";
 
 		collections_cache_ = new ElementsCollectionCache(cache_path, this);
 		collections_cache_->setLocale(langFromSetting());
@@ -620,7 +620,7 @@ QString QETApp::customElementsDir()
 			}
 		}
 
-		m_custom_element_dir = configDir() + "elements/";
+		m_custom_element_dir = dataDir() + "/elements/";
 		return m_custom_element_dir;
 	}
 }
@@ -657,7 +657,7 @@ QString QETApp::companyElementsDir()
 			}
 		}
 
-		m_company_element_dir = configDir() + "elements-company/";
+		m_company_element_dir = dataDir() + "/elements-company/";
 		return m_company_element_dir;
 	}
 }
@@ -780,7 +780,7 @@ QString QETApp::companyTitleBlockTemplatesDir()
 		return m_user_company_tbt_dir;
 	}
 
-	return(configDir() + "titleblocks-company/");
+	return(dataDir() + "/titleblocks-company/");
 }
 
 /**
@@ -813,7 +813,7 @@ QString QETApp::customTitleBlockTemplatesDir()
 		return m_user_custom_tbt_dir;
 	}
 
-	return(configDir() + "titleblocks/");
+	return(dataDir() + "/titleblocks/");
 }
 
 /**
@@ -821,17 +821,17 @@ QString QETApp::customTitleBlockTemplatesDir()
 	Return the QET configuration folder, i.e. the path to the folder in
 	which QET will read configuration and customization information
 	specific to the current user. This file is generally
-	C:\\Documents And Settings\\user\\Application Data\ qet
+	C:/Users/<USER>/AppData/Local/<APPNAME>
 	on Windows and
-	~/.qet
+	~/.config/<APPNAME>
 	under UNIX-like systems.
 	\~French Renvoie le dossier de configuration de QET,
 	c-a-d le chemin du dossier dans lequel QET lira les informations
 	de configuration et de personnalisation propres a l'utilisateur courant.
 	Ce dossier est generalement
-	C:\\Documents And Settings\\utilisateur\\Application Data\\qet
+	C:/Users/<USER>/AppData/Local/<APPNAME>
 	sous Windows et
-	~/.qet
+	~/.config/<APPNAME>
 	sous les systemes type UNIX.
 	\~ @return The path of the QElectroTech configuration folder
 	\~French Le chemin du dossier de configuration de QElectroTech
@@ -841,21 +841,32 @@ QString QETApp::configDir()
 #ifdef QET_ALLOW_OVERRIDE_CD_OPTION
 	if (config_dir != QString()) return(config_dir);
 #endif
-#ifdef Q_OS_WIN32
+	QString configdir = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation);
-	// recupere l'emplacement du dossier Application Data
+	if (configdir.endsWith('/')) {
-	// char *app_data_env = getenv("APPDATA");
+		configdir.remove(configdir.length()-1, 1);
-	// QString app_data_str(app_data_env);
-	QProcess * process = new QProcess();
-	QString app_data_str = (process->processEnvironment()).value("APPDATA");
-	// delete app_data_env;
-	delete process;
-	if (app_data_str.isEmpty()) {
-		app_data_str = QDir::homePath() + "/Application Data";
 	}
-	return(app_data_str + "/qet/");
+	return configdir;
-#else
+}
-	return(QDir::homePath() + "/.qet/");
+
-#endif
+/**
+	@brief QETApp::dataDir
+	Return the QET data folder, i.e. the path to the folder in
+	which QET will save log-files and elements-cache and where
+	to find user-collections and user-titleblocks by default
+	specific to the current user. This directory is generally
+	C:/Users/<USER>/AppData/Roaming/<APPNAME>
+	on Windows and
+	~/.local/share/<APPNAME>
+	under UNIX-like systems.
+	\~ @return The path of the QElectroTech data-folder
+*/
+QString QETApp::dataDir()
+{
+	QString datadir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
+	if (datadir.endsWith('/')) {
+		datadir.remove(datadir.length()-1, 1);
+	}
+	return datadir;
 }
 
 /**
@@ -1536,7 +1547,7 @@ void QETApp::useSystemPalette(bool use) {
 				"}"
 				);
 	} else {
-		QFile file(configDir() + "style.css");
+		QFile file(configDir() + "/style.css");
 		file.open(QFile::ReadOnly);
 		QString styleSheet = QLatin1String(file.readAll());
 		qApp->setStyleSheet(styleSheet);
@@ -2044,6 +2055,12 @@ void QETApp::initConfiguration()
 	QDir config_dir(QETApp::configDir());
 	if (!config_dir.exists()) config_dir.mkpath(QETApp::configDir());
 
+	// we definitely need the dataDir for log files and element cache
+	// Nous avons absolument besoin du répertoire dataDir pour
+	// les fichiers journaux et le cache des éléments.
+	QDir data_dir(QETApp::dataDir());
+	if (!data_dir.exists()) data_dir.mkpath(QETApp::dataDir());
+
 	QDir custom_elements_dir(QETApp::customElementsDir());
 	if (!custom_elements_dir.exists())
 		custom_elements_dir.mkpath(QETApp::customElementsDir());

sources/qetapp.h

@@ -97,6 +97,7 @@ class QETApp : public QObject
 		static QETProject *project(const uint &);
 		static int projectId(const QETProject *);
 		static QString configDir();
+		static QString dataDir();
 		static QString languagesPath();
 		static QString realPath(const QString &);
 		static QString symbolicPath(const QString &);

sources/ui/aboutqetdialog.cpp

@@ -208,7 +208,7 @@ void AboutQETDialog::setLicence()
 */
 void AboutQETDialog::setLoginfo()
 {
-	const QString path = QETApp::configDir() + "/";
+	const QString path = QETApp::dataDir() + "/";
 	QString filter("%1%1%1%1%1%1%1%1.log"); // pattern
 	filter = filter.arg("[0123456789]"); // valid characters
 	Q_FOREACH (auto fileInfo,