From 5814b5508330f13749967276f354dcc3c39fc374 Mon Sep 17 00:00:00 2001 From: scorpio810 Date: Thu, 6 Feb 2014 23:55:02 +0000 Subject: [PATCH] preparing for list of drawings git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2816 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- ico/48x48/view-pim-journal.png | Bin 0 -> 2750 bytes qelectrotech.qrc | 1 + sources/qetdiagrameditor.cpp | 14 +++++++++----- sources/qetdiagrameditor.h | 1 + sources/qeticons.cpp | 4 +++- sources/qeticons.h | 1 + sources/qetproject.cpp | 2 +- 7 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 ico/48x48/view-pim-journal.png diff --git a/ico/48x48/view-pim-journal.png b/ico/48x48/view-pim-journal.png new file mode 100644 index 0000000000000000000000000000000000000000..122eb8a0993e538909818c9f731cea02a1dfb812 GIT binary patch literal 2750 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 Eg53cy8~^|S literal 0 HcmV?d00001 diff --git a/qelectrotech.qrc b/qelectrotech.qrc index d2af002da..d1d56f9c4 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -225,5 +225,6 @@ ico/24x16/gr.png ico/24x16/it.png ico/22x22/applications-development-translation.png + ico/48x48/view-pim-journal.png diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index eedab0031..0ba67a5da 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -215,7 +215,7 @@ void QETDiagramEditor::actions() { infos_diagram = new QAction(QET::Icons::DialogInformation, tr("Propri\351t\351s du sch\351ma"), this); add_text = new QAction(QET::Icons::PartTextField, tr("Ajouter un champ de texte"), this); add_column = new QAction(QET::Icons::EditTableInsertColumnRight, tr("Ajouter une colonne"), this); - add_image = new QAction(QET::Icons::adding_image, tr("Ajouter une image"), this); + add_image = new QAction(QET::Icons::adding_image, tr("Ajouter une image"), this); remove_column = new QAction(QET::Icons::EditTableDeleteColumn, tr("Enlever une colonne"), this); add_row = new QAction(QET::Icons::EditTableInsertRowUnder, tr("Ajouter une ligne"), this); remove_row = new QAction(QET::Icons::EditTableDeleteRow, tr("Enlever une ligne"), this); @@ -224,7 +224,8 @@ void QETDiagramEditor::actions() { prj_add_diagram = new QAction(QET::Icons::DiagramAdd, tr("Ajouter un sch\351ma"), this); prj_del_diagram = new QAction(QET::Icons::DiagramDelete, tr("Supprimer le sch\351ma"), this); prj_clean = new QAction(QET::Icons::EditClear, tr("Nettoyer le projet"), this); - prj_diagramNum = new QAction(QET::Icons::ConductorSettings, tr("Annoter les sch\351mas"), this); + prj_diagramNum = new QAction(QET::Icons::ConductorSettings, tr("Annoter les sch\351mas"), this); + prj_diagramList = new QAction(QET::Icons::listDrawings, tr("Ajouter un sommaire"), this); prj_nomenclature = new QAction(QET::Icons::DocumentExport, tr("Exporter une nomenclature (beta)"), this); zoom_in = new QAction(QET::Icons::ZoomIn, tr("Zoom avant"), this); @@ -372,7 +373,8 @@ void QETDiagramEditor::actions() { connect(prj_add_diagram, SIGNAL(triggered()), this, SLOT(addDiagramToProject()) ); connect(prj_del_diagram, SIGNAL(triggered()), this, SLOT(removeDiagramFromProject()) ); connect(prj_clean, SIGNAL(triggered()), this, SLOT(cleanCurrentProject()) ); - connect(prj_diagramNum, SIGNAL(triggered()), this, SLOT(diagramNumProject()) ); + connect(prj_diagramNum, SIGNAL(triggered()), this, SLOT(diagramNumProject()) ); + //connect(prj_diagramList, SIGNAL(triggered()), this, SLOT(addNewDiagramFolioList()) ); connect(prj_nomenclature, SIGNAL(triggered()), this, SLOT(nomenclatureProject()) ); connect(zoom_in, SIGNAL(triggered()), this, SLOT(slot_zoomIn()) ); connect(zoom_out, SIGNAL(triggered()), this, SLOT(slot_zoomOut()) ); @@ -491,6 +493,7 @@ void QETDiagramEditor::menus() { menu_project -> addAction(prj_clean); menu_project -> addSeparator(); menu_project -> addAction(prj_diagramNum); + menu_project -> addAction(prj_diagramList); menu_project -> addAction(prj_nomenclature); main_bar -> toggleViewAction() -> setStatusTip(tr("Affiche ou non la barre d'outils principale")); @@ -1135,6 +1138,7 @@ void QETDiagramEditor::slot_updateActions() { prj_del_diagram -> setEnabled(editable_project); prj_clean -> setEnabled(editable_project); prj_diagramNum -> setEnabled(editable_project); + prj_diagramList -> setEnabled(opened_project); prj_nomenclature -> setEnabled(editable_project); import_diagram -> setEnabled(editable_project); export_diagram -> setEnabled(opened_diagram); @@ -1153,7 +1157,7 @@ void QETDiagramEditor::slot_updateActions() { remove_column -> setEnabled(editable_diagram); add_row -> setEnabled(editable_diagram); remove_row -> setEnabled(editable_diagram); - add_image ->setEnabled(editable_diagram); + add_image ->setEnabled(editable_diagram); //display the beta feature only in debug mode #ifdef QT_NO_DEBUG @@ -1203,7 +1207,7 @@ void QETDiagramEditor::slot_updateComplexActions() { rotate_selection -> setEnabled(editable_diagram && dv -> diagram() -> canRotateSelection()); selection_prop -> setEnabled(deletable_items); prj_diagramNum -> setEnabled(editable_diagram); - + // actions ayant besoin de textes selectionnes int selected_texts = dv ? (dv -> diagram() -> selectedTexts().count()) : 0; int selected_conductor_texts = dv ? (dv -> diagram() -> selectedConductorTexts().count()) : 0; diff --git a/sources/qetdiagrameditor.h b/sources/qetdiagrameditor.h index dc827a63d..384ce9ed0 100644 --- a/sources/qetdiagrameditor.h +++ b/sources/qetdiagrameditor.h @@ -206,6 +206,7 @@ class QETDiagramEditor : public QETMainWindow { QAction *prj_del_diagram; ///< Delete a diagram from the current project QAction *prj_clean; ///< Clean the content of the curent project by removing useless items QAction *prj_diagramNum; ///< Numerotation des schemas + QAction *prj_diagramList; ///< Sommaire des schemas QAction *prj_nomenclature; ///< generate nomenclature QAction *zoom_in; ///< Zoom in QAction *zoom_out; ///< Zoom out diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index 7495fecaf..784eb0a7e 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -170,6 +170,7 @@ namespace QET { QIcon ru; QIcon sl; QIcon translation; + QIcon listDrawings; } } @@ -419,5 +420,6 @@ void QET::Icons::initIcons() { ro .addFile(":/ico/24x16/ro.png"); ru .addFile(":/ico/24x16/ru.png"); sl .addFile(":/ico/24x16/sl.png"); - translation .addFile(":/ico/22x22/applications-development-translation.png"); + translation .addFile(":/ico/22x22/applications-development-translation.png"); + listDrawings .addFile(":/ico/48x48/view-pim-journal.png"); } diff --git a/sources/qeticons.h b/sources/qeticons.h index a4a839b79..6669a26e9 100644 --- a/sources/qeticons.h +++ b/sources/qeticons.h @@ -179,6 +179,7 @@ namespace QET { extern QIcon ru; extern QIcon sl; extern QIcon translation; + extern QIcon listDrawings; } } #endif diff --git a/sources/qetproject.cpp b/sources/qetproject.cpp index 7ba8487dd..d5bf52799 100644 --- a/sources/qetproject.cpp +++ b/sources/qetproject.cpp @@ -842,7 +842,7 @@ Diagram *QETProject::addNewDiagramFolioList() { diagram_folio_list -> border_and_titleblock.importBorder(defaultBorderProperties()); diagram_folio_list -> border_and_titleblock.importTitleBlock(defaultTitleBlockProperties()); diagram_folio_list -> defaultConductorProperties = defaultConductorProperties(); - QString title = "List of Drawings"; + QString title = (tr("Liste des Sch\351mas")); diagram_folio_list -> border_and_titleblock.setTitle(title); addDiagram(diagram_folio_list);