From 83b58ec246c9cdb8c33ab00ff9b7005e30ae57cf Mon Sep 17 00:00:00 2001 From: Laurent Trinques Date: Tue, 19 May 2020 11:15:52 +0200 Subject: [PATCH] Try to launch qet_tb_generator portable version of the plugin if user put binary on QDir::homePath() --- sources/qetdiagrameditor.cpp | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index a5e6846a2..142e7d615 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -2247,6 +2247,12 @@ void QETDiagramEditor::generateTerminalBlock() else { success = process->startDetached("/Library/Frameworks/Python.framework/Versions/3.8/bin/qet_tb_generator"); } + if (openedProjects().count()){ + success = process->startDetached(QDir::homePath() + "/.qet/qet_tb_generator.app", {(QETDiagramEditor::currentProjectView()->project()->filePath())}); + } + else { + success = process->startDetached(QDir::homePath() + "/.qet/qet_tb_generator.app"); + } #else if (openedProjects().count()){ success = process->startDetached("qet_tb_generator", {(QETDiagramEditor::currentProjectView()->project()->filePath())}); @@ -2254,8 +2260,31 @@ void QETDiagramEditor::generateTerminalBlock() else { success = process->startDetached("qet_tb_generator"); } + if (openedProjects().count()){ + success = process->startDetached(QDir::homePath() + "/.qet/qet_tb_generator", {(QETDiagramEditor::currentProjectView()->project()->filePath())}); + } + else { + success = process->startDetached(QDir::homePath() + "/.qet/qet_tb_generator"); + } #endif + +#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) +if (openedProjects().count()){ + success = process->startDetached("qet_tb_generator", {(QETDiagramEditor::currentProjectView()->project()->filePath())}); + } + else { + success = process->startDetached("qet_tb_generator"); + } + if (openedProjects().count()){ + success = process->startDetached(QDir::homePath() + "/Application Data/qet/qet_tb_generator.exe", {(QETDiagramEditor::currentProjectView()->project()->filePath())}); + } + else { + success = process->startDetached(QDir::homePath() + "/Application Data/qet/qet_tb_generator.exe"); + } +#endif + + if ( !success ) { #if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) QMessageBox::warning(nullptr,