Minor

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4677 bfdf4180-ca20-0410-9c96-a3a8aa849046

sources/editor/qetelementeditor.cpp

@@ -140,25 +140,25 @@ void QETElementEditor::setupActions() {
 	new_element       = new QAction(QET::Icons::DocumentNew,          tr("&Nouveau"),                                  this);
 	open              = new QAction(QET::Icons::DocumentOpen,         tr("&Ouvrir"),                                   this);
 	open_file         = new QAction(QET::Icons::DocumentOpen,         tr("&Ouvrir depuis un fichier"),                 this);
-	open_dxf          = new QAction(QET::Icons::DocumentOpen,         tr("&Ouvrir depuis un fichier dxf"),             this);
+	open_dxf          = new QAction(QET::Icons::DocumentOpen,         tr("&Lancer le plugin convertisseur DXF"),       this);
 	save              = new QAction(QET::Icons::DocumentSave,         tr("&Enregistrer"),                              this);
 	save_as           = new QAction(QET::Icons::DocumentSaveAs,       tr("Enregistrer sous"),                          this);
 	save_as_file      = new QAction(QET::Icons::DocumentSaveAs,       tr("Enregistrer dans un fichier"),               this);
 	reload            = new QAction(QET::Icons::ViewRefresh,          tr("Recharger"),                                 this);
 	quit              = new QAction(QET::Icons::ApplicationExit,      tr("&Quitter"),                                  this);
-	selectall         = new QAction(QET::Icons::EditSelectAll,        tr("Tout sélectionner"),                      this);
+	selectall         = new QAction(QET::Icons::EditSelectAll,        tr("Tout sélectionner"),                         this);
-	deselectall       = new QAction(                                  tr("Désélectionner tout"),                 this);
+	deselectall       = new QAction(                                  tr("Désélectionner tout"),                       this);
 	cut               = new QAction(QET::Icons::EditCut,              tr("Co&uper"),                                   this);
 	copy              = new QAction(QET::Icons::EditCopy,             tr("Cop&ier"),                                   this);
 	paste             = new QAction(QET::Icons::EditPaste,            tr("C&oller"),                                   this);
 	paste_in_area     = new QAction(QET::Icons::EditPaste,            tr("C&oller dans la zone..."),                   this);
 	paste_from_file   = new QAction(QET::Icons::XmlTextFile,          tr("un fichier"),                                this);
-	paste_from_elmt   = new QAction(QET::Icons::Element,              tr("un élément"),                          this);
+	paste_from_elmt   = new QAction(QET::Icons::Element,              tr("un élément"),                                this);
-	inv_select        = new QAction(                                  tr("Inverser la sélection"),                  this);
+	inv_select        = new QAction(                                  tr("Inverser la sélection"),                     this);
 	edit_delete       = new QAction(QET::Icons::EditDelete,           tr("&Supprimer"),                                this);
 	edit_names        = new QAction(QET::Icons::Names,                tr("Éditer le nom et les traductions de l'élément"), this);
-	edit_author       = new QAction(QET::Icons::UserInformations,     tr("Éditer les informations sur l'auteur"),   this);
+	edit_author       = new QAction(QET::Icons::UserInformations,     tr("Éditer les informations sur l'auteur"),      this);
-	m_edit_properties = new QAction(QET::Icons::ElementEdit,          tr("Éditer les propriétés de l'élément"), this);
+	m_edit_properties = new QAction(QET::Icons::ElementEdit,          tr("Éditer les propriétés de l'élément"),        this);
 	
 	undo = ce_scene -> undoStack().createUndoAction(this, tr("Annuler"));
 	redo = ce_scene -> undoStack().createRedoAction(this, tr("Refaire"));
@@ -1043,14 +1043,34 @@ void QETElementEditor::openRecentFile(const QString &filepath) {
  * @brief QETElementEditor::slot_openDxf
  */
 void QETElementEditor::slot_openDxf (){
+bool success;
 #ifdef Q_OS_WIN32
 QString program = (QDir::homePath() + "/Application Data/qet/DXFtoQET.exe");
 #else
 QString program = (QDir::homePath() + "/.qet/DXFtoQET");
 #endif
-QStringList arguments;
+
 QProcess *DXF = new QProcess(qApp);
-DXF->start(program, arguments);
+success = DXF->startDetached(program);
+if ( !success ) {
+QMessageBox::warning(0,
+					 "Error launching plugin DXF", 
+					 "To install the plugin DXF\nVisit https://download.tuxfamily.org/qet/builds/dxf_to_elmt/\n"
+					 "\n"
+					 ">> Install plugin on Linux\n"
+					 "\n"
+					 "cd ~/.qet/\n"
+					 "wget http://download.tuxfamily.org/qet/builds/dxf_to_elmt/linux_x86-64_qt5.5.1/DXFtoQET\n"
+					 "\n"
+					 "chmod +x DXFtoQET\n"
+					 "\n"
+					 "\n"
+					 ">> Install plugin on Windows\n"
+					 "Download http://download.tuxfamily.org/qet/builds/dxf_to_elmt/windows_64/DXFtoQET.exe\n"
+					 "Move or past this exe to your C:\\Users\\username\\AppData\\Roaming\\qet\\ directory\n"
+					 );
+}
+
 }
 
 /**

sources/qetdiagrameditor.cpp

@@ -2146,24 +2146,14 @@ void QETDiagramEditor::activeUndoStackCleanChanged(bool clean) {
 /**
  * @brief QETDiagramEditor::slot_generateTerminalBlock
  */
-//void QETDiagramEditor::slot_generateTerminalBlock(){
-
-//QString path,program;
-//QStringList args;
-//path=(QDir("/bin/bash").absolutePath());
-//program="gksudo";
-//args << "pip3 install --upgrade qet_tb_generator";
-//QProcess *process = new QProcess(qApp);
-//process->start(program,args);
-//process->waitForFinished();
-//}
-
 void QETDiagramEditor::slot_generateTerminalBlock() {
 bool success;
 QProcess *process = new QProcess(qApp);
+
 // If launched under control:
 //connect(process, SIGNAL(errorOcurred(int error)), this, SLOT(slot_generateTerminalBlock_error()));
 //process->start("qet_tb_generator");
+
 success = process->startDetached("qet_tb_generator");
 if ( !success ) {
 QMessageBox::warning(0,