From 2150c62181d5e5e8441272984d206699e49d017f Mon Sep 17 00:00:00 2001 From: scorpio810 Date: Tue, 30 Aug 2016 21:42:35 +0000 Subject: [PATCH] Added new entry for launch plugin qet_tb_generator git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4676 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- ico/22x22/terminalstrip.png | Bin 0 -> 425 bytes qelectrotech.qrc | 1 + sources/qetdiagrameditor.cpp | 68 ++++++++++++++++++++++++++++++----- sources/qetdiagrameditor.h | 2 ++ sources/qeticons.cpp | 2 ++ sources/qeticons.h | 1 + 6 files changed, 66 insertions(+), 8 deletions(-) create mode 100644 ico/22x22/terminalstrip.png diff --git a/ico/22x22/terminalstrip.png b/ico/22x22/terminalstrip.png new file mode 100644 index 0000000000000000000000000000000000000000..c84dc30bddb19ab7962162c35a441af34f333130 GIT binary patch literal 425 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fjKx9jP7LeL$-D$|*pj^6T^LM3 z@X5sdi$D?10*}aI1_r*vAk26?e?D4o;4B~|N^3+JK*E|2)8WYn;~+S}|tWhb+cD(j@nmD*k^T2g%t3phA$ zux(15J8_YP{iVr&|KDJXT6J!|-Y!yg(JZ~dZXo0F5d`)*B{`v)zP{Dk|VyB)V& z^K01r`4nft=4ogB%oUHgNAVxHy>BajHG_mM{|TMk?d*phFZ#QB<mdKI;Vst0Aj_cK>z>% literal 0 HcmV?d00001 diff --git a/qelectrotech.qrc b/qelectrotech.qrc index 6099bab7a..62e1998a6 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -248,5 +248,6 @@ ico/24x16/dk.png ico/24x16/br.png ico/22x22/grid.png + ico/22x22/terminalstrip.png diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index 35fce9864..f4a8aa3e0 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -289,14 +289,15 @@ void QETDiagramEditor::setUpActions() } }); - infos_diagram = new QAction(QET::Icons::DialogInformation, tr("Propriétés du folio"), this); + infos_diagram = new QAction(QET::Icons::DialogInformation, tr("Propriétés du folio"), this); infos_diagram -> setShortcut( QKeySequence( tr("Ctrl+L") ) ); prj_edit_prop = new QAction(QET::Icons::DialogInformation, tr("Propriétés du projet"), this); - prj_add_diagram = new QAction(QET::Icons::DiagramAdd, tr("Ajouter un folio"), this); - prj_del_diagram = new QAction(QET::Icons::DiagramDelete, tr("Supprimer le folio"), this); + prj_add_diagram = new QAction(QET::Icons::DiagramAdd, tr("Ajouter un folio"), this); + prj_del_diagram = new QAction(QET::Icons::DiagramDelete, tr("Supprimer le folio"), this); prj_clean = new QAction(QET::Icons::EditClear, tr("Nettoyer le projet"), this); prj_diagramList = new QAction(QET::Icons::listDrawings, tr("Ajouter un sommaire"), this); prj_nomenclature = new QAction(QET::Icons::DocumentSpreadsheet, tr("Exporter une nomenclature"), this); + prj_terminalBloc = new QAction(QET::Icons::TerminalStrip, tr("Lancer le plugin de creation de bornier"), this); tabbed_view_mode = new QAction( tr("en utilisant des onglets"), this); windowed_view_mode= new QAction( tr("en utilisant des fenêtres"), this); mode_selection = new QAction(QET::Icons::PartSelect, tr("Mode Selection"), this); @@ -497,6 +498,7 @@ void QETDiagramEditor::setUpActions() connect(prj_clean, SIGNAL(triggered()), this, SLOT(cleanCurrentProject()) ); connect(prj_diagramList, SIGNAL(triggered()), this, SLOT(addDiagramFolioListToProject())); connect(prj_nomenclature, SIGNAL(triggered()), this, SLOT(nomenclatureProject()) ); + connect(prj_terminalBloc, SIGNAL(triggered()), this, SLOT(slot_generateTerminalBlock())); connect(print, SIGNAL(triggered()), this, SLOT(printDialog()) ); connect(export_diagram, SIGNAL(triggered()), this, SLOT(exportDialog()) ); connect(tile_window, SIGNAL(triggered()), &workspace, SLOT(tileSubWindows()) ); @@ -613,12 +615,14 @@ void QETDiagramEditor::setUpMenu() { menu_project -> addSeparator(); menu_project -> addAction(prj_diagramList); menu_project -> addAction(prj_nomenclature); + menu_project -> addAction(prj_terminalBloc); - main_bar -> toggleViewAction() -> setStatusTip(tr("Affiche ou non la barre d'outils principale")); - view_bar -> toggleViewAction() -> setStatusTip(tr("Affiche ou non la barre d'outils Affichage")); - diagram_bar -> toggleViewAction() -> setStatusTip(tr("Affiche ou non la barre d'outils Schéma")); - qdw_pa -> toggleViewAction() -> setStatusTip(tr("Affiche ou non le panel d'appareils")); - qdw_undo -> toggleViewAction() -> setStatusTip(tr("Affiche ou non la liste des modifications")); + main_bar -> toggleViewAction() -> setStatusTip(tr("Affiche ou non la barre d'outils principale")); + view_bar -> toggleViewAction() -> setStatusTip(tr("Affiche ou non la barre d'outils Affichage")); + diagram_bar -> toggleViewAction() -> setStatusTip(tr("Affiche ou non la barre d'outils Schéma")); + qdw_pa -> toggleViewAction() -> setStatusTip(tr("Affiche ou non le panel d'appareils")); + qdw_undo -> toggleViewAction() -> setStatusTip(tr("Affiche ou non la liste des modifications")); + // menu Affichage QMenu *projects_view_mode = menu_affichage -> addMenu(tr("Afficher les projets")); @@ -2137,3 +2141,51 @@ void QETDiagramEditor::activeUndoStackCleanChanged(bool clean) { save_file -> setEnabled(true); } } + + +/** + * @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, +"Error launching plugin", +"To install the plugin qet_tb_generator\nVisit https://pypi.python.org/pypi/qet-tb-generator/\n" + "\n" + "Requires python 3.5 or above.\n" + ">> First install on Linux\n" + "1. check you have pip3 installed: pip3 --version.\n" + "If not install with: sudo apt-get install python3-pip\n" + "2. Install the program: sudo pip3 install qet_tb_generator\n" + "3. Run the program: qet_tb_generator\n" + ">> Update on Linux\n" + "sudo pip3 install --upgrade qet_tb_generator\n" + "\n" + ">> First install on Windows\n" + "1. Install, if required, python 3.5 or above\n" + "2. pip install qet_generator\n" + ">> Update on Windows\n" + "python -m pip install --upgrade qet_tb_generator\n" + ); +} + +} + diff --git a/sources/qetdiagrameditor.h b/sources/qetdiagrameditor.h index ef1f7a785..fb516e17d 100644 --- a/sources/qetdiagrameditor.h +++ b/sources/qetdiagrameditor.h @@ -117,6 +117,7 @@ class QETDiagramEditor : public QETMainWindow { void editSelectionProperties(); void slot_resetConductors(); void slot_autoConductor(bool ac); + void slot_generateTerminalBlock(); void setWindowedMode(); void setTabbedMode(); void readSettings(); @@ -187,6 +188,7 @@ class QETDiagramEditor : public QETMainWindow { QAction *prj_clean; ///< Clean the content of the curent project by removing useless items QAction *prj_diagramList; ///< Sommaire des schemas QAction *prj_nomenclature; ///< generate nomenclature + QAction *prj_terminalBloc; ///< generate terminal block QAction *tile_window; ///< Show MDI subwindows as tile QAction *cascade_window; ///< Show MDI subwindows as cascade QAction *prev_window; ///< Switch to the previous document diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index 3e43881ab..3463d887d 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -185,6 +185,7 @@ namespace QET { QIcon translation; QIcon listDrawings; QIcon AutoNum; + QIcon TerminalStrip; } } @@ -452,4 +453,5 @@ void QET::Icons::initIcons() { translation .addFile(":/ico/22x22/applications-development-translation.png"); listDrawings .addFile(":/ico/48x48/view-pim-journal.png"); AutoNum .addFile(":/ico/128x128/plasmagik.png"); + TerminalStrip .addFile(":/ico/22x22/terminalstrip.png"); } diff --git a/sources/qeticons.h b/sources/qeticons.h index c311ed562..5442a50b5 100644 --- a/sources/qeticons.h +++ b/sources/qeticons.h @@ -194,6 +194,7 @@ namespace QET { extern QIcon translation; extern QIcon listDrawings; extern QIcon AutoNum; + extern QIcon TerminalStrip; } } #endif