diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index 1860838e9..b54ade0ce 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -2306,110 +2306,64 @@ void QETDiagramEditor::generateTerminalBlock() } #endif - - if ( !success ) { - #if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) - QMessageBox::warning(nullptr, - tr("Error launching qet_tb_generator plugin"), - QObject::tr("To install the plugin qet_tb_generator" - "
" - "Visit :" - "
" - "qet-tb-generator" - "
" - "Requires python 3.5 or above." - "
" - """" - " First install on Windows" - """" - "
" - "1. Install, if required, python 3.5 or above" - "
" - " Visit :" - "
" - "python.org" - "
" - "2. pip install qet_tb_generator" - "
" - """" - " Update on Windows" - """" - "
" - "python -m pip install --upgrade qet_tb_generator" - "
" - ">>user could launch in a terminal this script in this directory" - "
" - " C:\\users\\XXXX\\AppData\\Local\\Programs\\Python\\Python36-32\\Scripts " - "
" - )); - } -} +#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) + QString message=QObject::tr( + "To install the plugin qet_tb_generator" + "
Visit :" + "
" + "qet-tb-generator" + "
Requires python 3.5 or above." + "
First install on Windows" + "
1. Install, if required, python 3.5 or above" + "
Visit :" + "
" + "python.org" + "
2. pip install qet_tb_generator" + "
Update on Windows" + "
python -m pip install --upgrade qet_tb_generator" + "
" + ">>user could launch in a terminal this script in this directory" + "
" + " C:\\users\\XXXX\\AppData\\Local\\Programs\\Python\\Python36-32\\Scripts " + "
"); #elif defined(Q_OS_MAC) - QMessageBox::warning(nullptr, - QObject::tr("Error launching qet_tb_generator plugin"), - QObject::tr("To install the plugin qet_tb_generator" - "
" - "Visit :" - "
" - "qet-tb-generator" - "
" - """" - " First install on macOSX" - """" - "
" - "1. Install, if required, python 3.8 bundle only, because program use hardcoded PATH for localise qet-tb-generator plugin " - "
" - " Visit :" - "
" - "howto" - "
" - "2. pip3 install qet_tb_generator" - "
" - """" - " Update on macOSX" - """" - "
" - " pip3 install --upgrade qet_tb_generator" - "
" - )); - } -} - + QString message=QObject::tr( + "To install the plugin qet_tb_generator" + "
Visit :" + "
" + "qet-tb-generator" + "
First install on macOSX" + "
1. Install, if required, python 3.8 bundle only, " + "because program use hardcoded PATH for localise qet-tb-generator plugin " + "
Visit :" + "
" + "howto" + "
2. pip3 install qet_tb_generator" + "
Update on macOSX" + "
pip3 install --upgrade qet_tb_generator" + "
"); #else + QString message=QObject::tr( + "To install the plugin qet_tb_generator" + "
Visit :" + "
" + "qet-tb-generator" + "
" + "
Requires python 3.5 or above." + "
" + "
First install on Linux""" + "
1. check you have pip3 installed: pip3 --version" + "
If not install with: sudo apt-get install python3-pip" + "
2. Install the program: sudo pip3 install qet_tb_generator" + "
3. Run the program: qet_tb_generator" + "
" + "
"" Update on Linux""" + "
sudo pip3 install --upgrade qet_tb_generator" + "
"); +#endif + if ( !success ) { QMessageBox::warning(nullptr, - QObject::tr("Error launching qet_tb_generator plugin"), - QObject::tr("To install the plugin qet_tb_generator" - "
" - "Visit : " - "
" - "qet-tb-generator" - "
" - "
" - "Requires python 3.5 or above." - "
" - "
" - """" - " First install on Linux" - """" - "
" - "1. check you have pip3 installed: pip3 --version" - "
" - "If not install with: sudo apt-get install python3-pip" - "
" - "2. Install the program: sudo pip3 install qet_tb_generator" - "
" - "3. Run the program: qet_tb_generator" - "
" - "
" - """" - " Update on Linux" - """" - "
" - "sudo pip3 install --upgrade qet_tb_generator" - "
" - )); + QObject::tr("Error launching qet_tb_generator plugin"), + message); } } - -#endif -