added local conf browser

Desktop/components/JASP/Widgets/FileMenu/PrefsAdvanced.qml

@@ -208,6 +208,7 @@ ScrollView
 				KeyNavigation.tab:		useRemoteConf
 				activeFocusOnTab:		true
 			}
+
 
 
 			CheckBox
@@ -255,7 +256,44 @@ ScrollView
 						right:			parent.right
 					}
 
-					KeyNavigation.tab:	logToFile
+					KeyNavigation.tab:	localconf
+				}
+			}
+
+			Item
+			{
+				id:					localconf
+				//enabled:			!preferencesModel.remoteConfiguration
+				width:				parent.width
+				height:				browseLocalconfButton.height
+
+				RectangularButton
+				{
+					id:					browseLocalconfButton
+					text:				qsTr("Select configuration file")
+					onClicked:			preferencesModel.browseConfigurationFile()
+					anchors.left:		parent.left
+					toolTip:			qsTr("Select configuration file.")
+
+					KeyNavigation.tab:		browseLocalconfFolderText.textInput
+					activeFocusOnTab:		true
+				}
+
+				PrefsTextInput
+				{
+					id:					browseLocalconfFolderText
+
+					text:				preferencesModel.localConfigurationPATH
+					onEditingFinished:	preferencesModel.localConfigurationPATH = text
+					nextEl:				logToFile
+
+					height:				browseLocalconfButton.height
+					anchors
+					{
+						left:			browseLocalconfButton.right
+						right:			parent.right
+						top:			parent.top
+					}
 				}
 			}
 		}

Desktop/gui/jaspConfiguration/jaspconfiguration.cpp

@@ -1,6 +1,7 @@
 #include "jaspconfiguration.h"
 #include "jaspconfigurationparser.h"
 #include "utilities/settings.h"
+#include "gui/preferencesmodel.h"
 #include "log.h"
 #include <QNetworkReply>
 #include <QStandardPaths>
@@ -24,7 +25,6 @@ JASPConfiguration* JASPConfiguration::getInstance(QObject *parent)
 JASPConfiguration::JASPConfiguration(QObject *parent)
 	: QObject{parent}
 {
-
 }
 
 bool JASPConfiguration::constantExists(const QString &constant, const QString &module, const QString &analysis)
@@ -87,10 +87,10 @@ void JASPConfiguration::processConfiguration()
                 if(!JASPConfigurationParser::getParser(JASPConfigurationParser::Format::TOML)->parse(this, payload))
 					throw std::runtime_error("Parsing failed");
 
-				auto localConfFile = getLocalConfFile(true);
-				localConfFile->write(payload);
-				localConfFile->close();
-				Log::log() << "Updated local copy of remote configuration" << std::endl;
+				auto conf = getDefaultConfFile(true);
+				conf->write(payload);
+				conf->close();
+				Log::log() << "Stored local copy of remote configuration" << std::endl;
 				emit this->configurationProcessed("REMOTE");
 			}
 			catch (std::runtime_error& e)
@@ -142,16 +142,38 @@ void JASPConfiguration::remoteChanged()
 }
 
 std::shared_ptr<QFile> JASPConfiguration::getLocalConfFile(bool truncate) {
-	QString confPath = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation);
+
+	//the right default path can only be determined here, so after jasp init
+	if(PreferencesModel::prefs()->localConfigurationPATH() == "")
+	{
+		defaultConfigurationFolder = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation);
+		defaultConfigurationPath = defaultConfigurationFolder + "/" + defaultConfigurationFilename;
+		PreferencesModel::prefs()->setLocalConfigurationPATH(defaultConfigurationPath);
+	}
+
+	if(Settings::value(Settings::REMOTE_CONFIGURATION).toBool()) //if we use a remote but we are offline
+		return getDefaultConfFile(truncate);
+	else //user specified local file
+		return getConfFile(Settings::value(Settings::LOCAL_CONFIGURATION_PATH).toString(), truncate);
+}
+
+std::shared_ptr<QFile> JASPConfiguration::getDefaultConfFile(bool truncate)
+{
 	QDir confDir;
-	if(!confDir.mkpath(confPath))
-		throw std::runtime_error("Could not Access app configuration path");
+	defaultConfigurationFolder = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation);
+	defaultConfigurationPath = defaultConfigurationFolder + "/" + defaultConfigurationFilename;
+	if(!confDir.mkpath(defaultConfigurationFolder))
+		throw std::runtime_error("Could not access app configuration path");
 
-	QString configurationFilePath = confPath + "/" + configurationFilename;
-	std::shared_ptr<QFile> localConfFile = std::make_shared<QFile>(configurationFilePath);
+	return getConfFile(defaultConfigurationPath, truncate);
+}
+
+std::shared_ptr<QFile> JASPConfiguration::getConfFile(QString path, bool truncate)
+{
+	std::shared_ptr<QFile> localConfFile = std::make_shared<QFile>(path);
 	QIODeviceBase::OpenMode flags = QIODeviceBase::ReadWrite | QIODeviceBase::Text | (truncate ? QIODeviceBase::Truncate : QIODeviceBase::NotOpen);
 	if (!localConfFile->open(flags))
-		throw std::runtime_error("Could not open local configuration file " + configurationFilePath.toStdString() + ": " + localConfFile->errorString().toStdString());
+		throw std::runtime_error("Could not open local configuration file " + path.toStdString() + ": " + localConfFile->errorString().toStdString());
 	return localConfFile;
 }
 

Desktop/gui/jaspConfiguration/jaspconfiguration.h

@@ -63,6 +63,8 @@ class JASPConfiguration : public QObject
 	JASPConfiguration(JASPConfiguration& other) = delete;
 	void operator=(const JASPConfiguration&) = delete;
 
+	QString getDefaultConfigurationPath() { return defaultConfigurationPath; };
+
 public slots:
     void remoteChanged();
 
@@ -77,8 +79,9 @@ private slots:
 	bool processLocal();
 	void clear();
 
-
 	std::shared_ptr<QFile> getLocalConfFile(bool truncate = false);
+	std::shared_ptr<QFile> getDefaultConfFile(bool truncate = false);
+	std::shared_ptr<QFile> getConfFile(QString path, bool truncate = false);
 
 	QNetworkAccessManager	_networkManager;
 
@@ -89,10 +92,12 @@ private slots:
 	QString _startupCommands;
 	QStringList _modulesToLoad;
 
-	const QString configurationFilename = "conf.toml";
-
 	explicit JASPConfiguration(QObject *parent = nullptr);
 	static JASPConfiguration* _instance;
+
+	const QString defaultConfigurationFilename = "conf.toml";
+	QString defaultConfigurationFolder;
+	QString defaultConfigurationPath;
 };
 
 #endif // JASPCONFIGURATION_H

Desktop/gui/preferencesmodel.cpp.in

@@ -1,3 +1,4 @@
+#include "gui/jaspConfiguration/jaspconfiguration.h"
 #include "preferencesmodel.h"
 #include "utils.h"
 #include "utilities/qutils.h"
@@ -83,6 +84,28 @@ void PreferencesModel::browseDeveloperFolder()
 
 }
 
+void PreferencesModel::browseConfigurationFile()
+{
+	QString defaultfolder = JASPConfiguration::getInstance()->getDefaultConfigurationPath();
+	if (defaultfolder.isEmpty())
+	{
+#ifdef _WIN32
+		defaultfolder = "c:\\";
+#else
+		defaultfolder = "~";
+#endif
+	}
+
+	QString folder = MessageForwarder::browseOpenFile(tr("Select a file..."), defaultfolder, "");
+
+	if (!folder.isEmpty())
+	{
+		setLocalConfigurationPATH(folder);
+		JASPConfiguration::getInstance()->processConfiguration();
+	}
+
+}
+
 #define GET_PREF_FUNC(TYPE, NAME, SETTING, TO_FUNC)	TYPE PreferencesModel::NAME() const { return Settings::value(SETTING).TO_FUNC; }
 #define GET_PREF_FUNC_BOOL(NAME, SETTING)					GET_PREF_FUNC(bool,		NAME, SETTING, toBool())
 #define GET_PREF_FUNC_INT(NAME, SETTING)					GET_PREF_FUNC(int,		NAME, SETTING, toInt())
@@ -127,6 +150,7 @@ GET_PREF_FUNC_BOOL( reportingMode,				Settings::REPORT_SHOW								)
 GET_PREF_FUNC_BOOL( showRSyntax,				Settings::SHOW_RSYNTAX								)
 GET_PREF_FUNC_BOOL( showAllROptions,			Settings::SHOW_ALL_R_OPTIONS						)
 GET_PREF_FUNC_BOOL( showRSyntaxInResults,		Settings::SHOW_RSYNTAX_IN_RESULTS					)
+GET_PREF_FUNC_STR(	localConfigurationPATH,		Settings::LOCAL_CONFIGURATION_PATH              	)
 GET_PREF_FUNC_BOOL(	remoteConfiguration,		Settings::REMOTE_CONFIGURATION                     	)
 GET_PREF_FUNC_STR(	remoteConfigurationURL,		Settings::REMOTE_CONFIGURATION_URL					)
 
@@ -309,6 +333,7 @@ SET_PREF_FUNCTION(				bool,		setReportingMode,			reportingMode,				reportingMode
 SET_PREF_FUNCTION_EMIT_NO_ARG(	bool,		setShowRSyntax,				showRSyntax,				showRSyntaxChanged,				Settings::SHOW_RSYNTAX								)
 SET_PREF_FUNCTION_EMIT_NO_ARG(	bool,		setShowAllROptions,			showAllROptions,			showAllROptionsChanged,			Settings::SHOW_ALL_R_OPTIONS						)
 SET_PREF_FUNCTION(				bool,		setShowRSyntaxInResults,	showRSyntaxInResults,		showRSyntaxInResultsChanged,	Settings::SHOW_RSYNTAX_IN_RESULTS					)
+SET_PREF_FUNCTION(				QString,	setLocalConfigurationPATH,	localConfigurationPATH,		localConfigurationPATHChanged,	Settings::LOCAL_CONFIGURATION_PATH					)
 SET_PREF_FUNCTION(				bool,   	setRemoteConfiguration, 	remoteConfiguration,		remoteConfigurationChanged,     Settings::REMOTE_CONFIGURATION  					)
 SET_PREF_FUNCTION(				QString,	setRemoteConfigurationURL,	remoteConfigurationURL,		remoteConfigurationURLChanged,	Settings::REMOTE_CONFIGURATION_URL					)
 

Desktop/gui/preferencesmodel.h

@@ -69,7 +69,8 @@ class PreferencesModel : public PreferencesModelBase
 	Q_PROPERTY(bool			showRSyntax				READ showRSyntax				WRITE setShowRSyntax				NOTIFY showRSyntaxChanged				)
 	Q_PROPERTY(bool			showAllROptions			READ showAllROptions			WRITE setShowAllROptions			NOTIFY showAllROptionsChanged			)
     Q_PROPERTY(bool			showRSyntaxInResults	READ showRSyntaxInResults		WRITE setShowRSyntaxInResults		NOTIFY showRSyntaxInResultsChanged		)
-    Q_PROPERTY(bool 		remoteConfiguration 	READ remoteConfiguration		WRITE setRemoteConfiguration		NOTIFY remoteConfigurationChanged	)
+	Q_PROPERTY(QString 		localConfigurationPATH 	READ localConfigurationPATH		WRITE setLocalConfigurationPATH		NOTIFY localConfigurationPATHChanged	)
+	Q_PROPERTY(bool 		remoteConfiguration 	READ remoteConfiguration		WRITE setRemoteConfiguration		NOTIFY remoteConfigurationChanged		)
     Q_PROPERTY(QString		remoteConfigurationURL	READ remoteConfigurationURL		WRITE setRemoteConfigurationURL		NOTIFY remoteConfigurationURLChanged	)
 
 
@@ -137,6 +138,7 @@ class PreferencesModel : public PreferencesModelBase
 	void		zoomReset();
 	int 		maxEnginesAdmin() 						const;
 	bool		developerMode()							const;
+	QString		localConfigurationPATH()				const;
 	QString		remoteConfigurationURL()				const;
     bool		remoteConfiguration()           		const;
 
@@ -158,6 +160,7 @@ public slots:
 	void setDataAutoSynchronization(	bool		dataAutoSynchronization);
 	void browseSpreadsheetEditor();
 	void browseDeveloperFolder();
+	void browseConfigurationFile();
 	void updateUtilsMissingValues();
 	void removeMissingValue(			QString		value);
 	void addMissingValue(				QString		value);
@@ -197,6 +200,7 @@ public slots:
 	void setShowAllROptions(			bool		showAllROptions)				override;
 	void setShowRSyntaxInResults(		bool		showRSyntax);
 	void currentThemeNameHandler();
+	void setLocalConfigurationPATH(		QString		path);
     void setRemoteConfiguration(		bool		enabled);
 	void setRemoteConfigurationURL(		QString		URL);
 
@@ -248,6 +252,7 @@ public slots:
 	void guiQtTextRenderChanged(		bool		guiQtTextRender);
 	void reportingModeChanged(			bool		reportingMode);
 	void showRSyntaxInResultsChanged(	bool		showRSyntax);
+	void localConfigurationPATHChanged(	QString		path);
     void remoteConfigurationChanged(	bool		enabled);
 	void remoteConfigurationURLChanged(	QString		remoteConfigurationURL);
 

Desktop/utilities/settings.cpp

@@ -1,7 +1,9 @@
 #include "settings.h"
+#include "gui/jaspConfiguration/jaspconfiguration.h"
 #include "utilities/qutils.h"
 #include "enginedefinitions.h"
 
+
 QSettings* Settings::_settings = nullptr;
 
 const char *	Settings::defaultMissingValues = "NaN|nan|.|NA";
@@ -89,10 +91,10 @@ const Settings::Setting Settings::Values[] = {
 	{"showReports",					false	},
 	{"showRSyntax",					false	},
 	{"showAllROptions",				false	},
-	{"guiQtTextRender",				true	},
     {"showRSyntaxInResults",		false	},
     {"remoteConfiguration",			false   },
-    {"remoteConfigurationURL",		""      }
+	{"remoteConfigurationURL",		""      },
+	{"localConfigurationPath",		""		}
 };	
 
 QVariant Settings::value(Settings::Type key)

Desktop/utilities/settings.h

@@ -75,7 +75,8 @@ class Settings {
 		SHOW_ALL_R_OPTIONS,
         SHOW_RSYNTAX_IN_RESULTS,
         REMOTE_CONFIGURATION,
-		REMOTE_CONFIGURATION_URL
+		REMOTE_CONFIGURATION_URL,
+		LOCAL_CONFIGURATION_PATH
 	};
 
 	static QVariant value(Settings::Type key);