add shortcuts for manual reload of devmodules , add safety copy to mac

Author: Rens

Desktop/analysis/analyses.cpp

@@ -351,6 +351,13 @@ void Analyses::rescanAnalysisEntriesOfDynamicModule(Modules::DynamicModule * mod
 		removeAnalysisById(size_t(id));
 }
 
+void Analyses::reloadQmlAnalysesDynamicModule(Modules::DynamicModule * module)
+{
+	for(auto idAnalysis : _analysisMap)
+		if(idAnalysis.second->dynamicModule() == module)
+			idAnalysis.second->analysisQMLFileChanged();
+}
+
 void Analyses::refreshAllAnalyses()
 {
 	for(auto idAnalysis : _analysisMap)

Desktop/analysis/analyses.h

@@ -124,6 +124,7 @@ public slots:
 	void refreshAnalysesOfDynamicModule(Modules::DynamicModule * module);
 	void replaceAnalysesOfDynamicModule(Modules::DynamicModule * oldModule, Modules::DynamicModule * newModule);
 	void rescanAnalysisEntriesOfDynamicModule(Modules::DynamicModule * module);
+	void reloadQmlAnalysesDynamicModule(Modules::DynamicModule * module);
 	void setChangedAnalysisTitle();
 	void analysisTitleChangedInResults(int id, QString title);
 	void setCurrentFormPrevH(double currentFormPrevH);

Desktop/components/JASP/Widgets/MainWindow.qml

@@ -109,6 +109,10 @@ Window
 		Shortcut { onActivated: mainWindow.undo();								sequences: ["Ctrl+Z", Qt.Key_Undo];								context: Qt.ApplicationShortcut; }
 		Shortcut { onActivated: mainWindow.redo();								sequences: ["Ctrl+Shift+Z", "Ctrl-Y", Qt.Key_Redo];				context: Qt.ApplicationShortcut; }
 
+        Shortcut { onActivated: { dynamicModules.refreshDeveloperModule(false, true);}  sequences: ["Ctrl+Shift+U"];                     context: Qt.ApplicationShortcut; }
+        Shortcut { onActivated: { dynamicModules.refreshDeveloperModule(true, false);}  sequences: ["Ctrl+Shift+R"];                     context: Qt.ApplicationShortcut; }
+        Shortcut { onActivated: { dynamicModules.refreshDeveloperModule(true, true);}   sequences: ["Ctrl+Shift+D"];                     context: Qt.ApplicationShortcut; }
+
 
 		RibbonBar
 		{

Desktop/components/JASP/Widgets/ModulesMenu.qml

@@ -265,11 +265,28 @@ FocusScope
 							anchors
 							{
 								left			: parent.left
-								right			: minusButton.left
+                                right			: refreshButton.left
 								verticalCenter	: parent.verticalCenter
 							}
 						}
 
+
+                        MenuButton
+                        {
+                            z:				1
+                            id:				refreshButton
+                            visible:		!isBundled && !isSpecial
+                            iconSource:		jaspTheme.iconPath + "/redo.svg"
+                            width:			visible ? height : 0
+                            onClicked:		dynamicModules.refreshDeveloperModule();
+                            toolTip:		qsTr("Refresh developer module ") + displayText
+                            anchors
+                            {
+                                right			: minusButton.left
+                                verticalCenter	: parent.verticalCenter
+                            }
+                        }
+
 						MenuButton
 						{
 							z:				1

Desktop/mainwindow.cpp

@@ -557,6 +557,7 @@ void MainWindow::makeConnections()
 
 	connect(_dynamicModules,		&DynamicModules::dynamicModuleUnloadBegin,			_analyses,				&Analyses::removeAnalysesOfDynamicModule					);
 	connect(_dynamicModules,		&DynamicModules::dynamicModuleChanged,				_analyses,				&Analyses::refreshAnalysesOfDynamicModule						);
+	connect(_dynamicModules,		&DynamicModules::dynamicModuleQmlChanged,			_analyses,				&Analyses::reloadQmlAnalysesDynamicModule						);
 	connect(_dynamicModules,		&DynamicModules::dynamicModuleReplaced,				_analyses,				&Analyses::replaceAnalysesOfDynamicModule,					Qt::DirectConnection);
 	connect(_dynamicModules,		&DynamicModules::descriptionReloaded,				_analyses,				&Analyses::rescanAnalysisEntriesOfDynamicModule,			Qt::QueuedConnection);
 	connect(_dynamicModules,		&DynamicModules::reloadHelpPage,					_helpModel,				&HelpModel::reloadPage										);

Desktop/modules/dynamicmodule.cpp

@@ -40,6 +40,7 @@
 
 #ifdef __APPLE__
 #include "otoolstuff.h"
+#include <filesystem>
 #endif
 
 namespace Modules
@@ -107,6 +108,7 @@ DynamicModule::DynamicModule(QObject * parent) : QObject(parent), _isDeveloperMo
 ///This constructor is meant specifically for the development module from a libpath *it*!
 DynamicModule::DynamicModule(QObject * parent, QString libpath) : QObject(parent), _isDeveloperMod(true), _isLibpathDevMod(true)
 {
+	libpath = patchLibPathHelperFunc(libpath);
 	_modulePackage	= fq(libpath + "/" + Settings::value(Settings::DIRECT_DEVMOD_NAME).toString() + "/");
 	_moduleFolder	= QFileInfo(libpath + "/");
 	_name = extractPackageNameFromFolder(_modulePackage);
@@ -117,10 +119,6 @@ DynamicModule::DynamicModule(QObject * parent, QString libpath) : QObject(parent
 
 	_developmentModuleName = _name;
 
-	#ifdef __APPLE__
-	_moduleLibraryFixer(libpath.toStdString(), true, true, true);
-	#endif
-
 	loadDescriptionFromFolder(_modulePackage);
 	setInstalled(true);
 }
@@ -942,5 +940,23 @@ stringset DynamicModule::requiredModules() const
 	return out;
 }
 
+QString DynamicModule::patchLibPathHelperFunc(QString libpath) {
+#ifdef __APPLE__
+	//we copy everything because we need to patch and resign it all
+	auto path = std::filesystem::temp_directory_path() / Settings::value(Settings::DIRECT_DEVMOD_NAME).toString().toStdString();
+	std::filesystem::remove_all(path);
+	std::filesystem::copy(libpath.toStdString(), path, std::filesystem::copy_options::recursive);
+	_moduleLibraryFixer(path, true, true, true);
+	return tq(path.generic_string());
+#else
+	return libpath;
+#endif
+
+}
+
 
 }
+
+
+
+

Desktop/modules/dynamicmodule.h

@@ -259,6 +259,8 @@ public slots:
 
 	static std::string			_developmentModuleName;
 	static const std::string	_moduleDirPostfix;
+
+	QString patchLibPathHelperFunc(QString libpath);
 };
 
 

Desktop/modules/dynamicmodules.cpp

@@ -36,6 +36,7 @@
 #include "modules/upgrader/changeincompatible.h"
 #include "modules/description/description.h"
 #include "modules/description/entrybase.h"
+#include "engine/enginesync.h"
 
 namespace Modules
 {
@@ -527,10 +528,23 @@ void DynamicModules::uninstallJASPDeveloperModule()
 		uninstallModule(developmentModuleName());
 }
 
+void DynamicModules::refreshDeveloperModule(bool R, bool Qml)
+{
+	if(_modules.count(developmentModuleName())) {
+		EngineSync::singleton()->killModuleEngine(_modules[developmentModuleName()]);
+		if(R && Qml)
+			installJASPDeveloperModule();
+		else if(R)
+			emit dynamicModuleChanged(_modules[developmentModuleName()]);
+		else if(Qml)
+			emit dynamicModuleQmlChanged(_modules[developmentModuleName()]);
+	}
+}
+
 void DynamicModules::installJASPDeveloperModule()
 {
-	bool directLibpathEnabled = PreferencesModel::prefs()->directLibpathEnabled();
-	QString modulePath = directLibpathEnabled ? PreferencesModel::prefs()->directLibpathFolder() : Settings::value(Settings::DEVELOPER_FOLDER).toString();
+	bool directLibpathEnabled = Settings::value(Settings::DIRECT_LIBPATH_ENABLED).toBool();
+	QString modulePath = directLibpathEnabled ? Settings::value(Settings::DIRECT_LIBPATH_FOLDER).toString() : Settings::value(Settings::DEVELOPER_FOLDER).toString();
 	if(modulePath == "")
 	{
 		MessageForwarder::showWarning(tr("Select a folder"), tr("To install a development module you need to select the folder you want to watch and load, you can do this under the filemenu, Preferences->Advanced."));

Desktop/modules/dynamicmodules.h

@@ -120,6 +120,7 @@ public slots:
 	void setDevelopersModuleInstallButtonEnabled(bool developersModuleInstallButtonEnabled);
 	void setDataLoaded(bool dataLoaded);
 	void uninstallJASPDeveloperModule();
+	void refreshDeveloperModule(bool R = true, bool Qml = true);
 
 	QStringList requiredModulesLibPaths(QString moduleName);
 
@@ -129,6 +130,7 @@ public slots:
 	void dynamicModuleAdded(			Modules::DynamicModule * dynamicModule);
 	void dynamicModuleUnloadBegin(		Modules::DynamicModule * dynamicModule);
 	void dynamicModuleChanged(			Modules::DynamicModule * dynamicModule);
+	void dynamicModuleQmlChanged(		Modules::DynamicModule * dynamicModule);
 	void descriptionReloaded(			Modules::DynamicModule * dynamicModule);
 	void loadModuleTranslationFile(		Modules::DynamicModule * dynamicModule);
 	void dynamicModuleReplaced(			Modules::DynamicModule * oldMod, Modules::DynamicModule *  newMod);