realAscot/qelectrotech-source-mirror
realAscot/qelectrotech-source-mirror
1
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-09-13 20:23:04 +02:00
Code Packages Releases 1 Activity

preparing for list of drawings

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2816 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810 2014-02-06 23:55:02 +00:00
parent 801a2d298f
commit 5814b55083
7 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ico/48x48/view-pim-journal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

1
qelectrotech.qrc
View File

@ -225,5 +225,6 @@
<file>ico/24x16/gr.png</file> <file>ico/24x16/gr.png</file>
<file>ico/24x16/it.png</file> <file>ico/24x16/it.png</file>
<file>ico/22x22/applications-development-translation.png</file> <file>ico/22x22/applications-development-translation.png</file>
<file>ico/48x48/view-pim-journal.png</file>
</qresource> </qresource>
</RCC> </RCC>

14
sources/qetdiagrameditor.cpp
View File

@ -215,7 +215,7 @@ void QETDiagramEditor::actions() {
infos_diagram = new QAction(QET::Icons::DialogInformation, tr("Propri\351t\351s du sch\351ma"), this); 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_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_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); remove_column = new QAction(QET::Icons::EditTableDeleteColumn, tr("Enlever une colonne"), this);
add_row = new QAction(QET::Icons::EditTableInsertRowUnder, tr("Ajouter une ligne"), 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); 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_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_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_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); prj_nomenclature = new QAction(QET::Icons::DocumentExport, tr("Exporter une nomenclature (beta)"), this);
zoom_in = new QAction(QET::Icons::ZoomIn, tr("Zoom avant"), 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_add_diagram, SIGNAL(triggered()), this, SLOT(addDiagramToProject()) );
connect(prj_del_diagram, SIGNAL(triggered()), this, SLOT(removeDiagramFromProject()) ); connect(prj_del_diagram, SIGNAL(triggered()), this, SLOT(removeDiagramFromProject()) );
connect(prj_clean, SIGNAL(triggered()), this, SLOT(cleanCurrentProject()) ); 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(prj_nomenclature, SIGNAL(triggered()), this, SLOT(nomenclatureProject()) );
connect(zoom_in, SIGNAL(triggered()), this, SLOT(slot_zoomIn()) ); connect(zoom_in, SIGNAL(triggered()), this, SLOT(slot_zoomIn()) );
connect(zoom_out, SIGNAL(triggered()), this, SLOT(slot_zoomOut()) ); connect(zoom_out, SIGNAL(triggered()), this, SLOT(slot_zoomOut()) );
@ -491,6 +493,7 @@ void QETDiagramEditor::menus() {
menu_project -> addAction(prj_clean); menu_project -> addAction(prj_clean);
menu_project -> addSeparator(); menu_project -> addSeparator();
menu_project -> addAction(prj_diagramNum); menu_project -> addAction(prj_diagramNum);
menu_project -> addAction(prj_diagramList);
menu_project -> addAction(prj_nomenclature); menu_project -> addAction(prj_nomenclature);
main_bar -> toggleViewAction() -> setStatusTip(tr("Affiche ou non la barre d'outils principale")); 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_del_diagram -> setEnabled(editable_project);
prj_clean -> setEnabled(editable_project); prj_clean -> setEnabled(editable_project);
prj_diagramNum -> setEnabled(editable_project); prj_diagramNum -> setEnabled(editable_project);
prj_diagramList -> setEnabled(opened_project);
prj_nomenclature -> setEnabled(editable_project); prj_nomenclature -> setEnabled(editable_project);
import_diagram -> setEnabled(editable_project); import_diagram -> setEnabled(editable_project);
export_diagram -> setEnabled(opened_diagram); export_diagram -> setEnabled(opened_diagram);
@ -1153,7 +1157,7 @@ void QETDiagramEditor::slot_updateActions() {
remove_column -> setEnabled(editable_diagram); remove_column -> setEnabled(editable_diagram);
add_row -> setEnabled(editable_diagram); add_row -> setEnabled(editable_diagram);
remove_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 //display the beta feature only in debug mode
#ifdef QT_NO_DEBUG #ifdef QT_NO_DEBUG
@ -1203,7 +1207,7 @@ void QETDiagramEditor::slot_updateComplexActions() {
rotate_selection -> setEnabled(editable_diagram && dv -> diagram() -> canRotateSelection()); rotate_selection -> setEnabled(editable_diagram && dv -> diagram() -> canRotateSelection());
selection_prop -> setEnabled(deletable_items); selection_prop -> setEnabled(deletable_items);
prj_diagramNum -> setEnabled(editable_diagram); prj_diagramNum -> setEnabled(editable_diagram);
// actions ayant besoin de textes selectionnes // actions ayant besoin de textes selectionnes
int selected_texts = dv ? (dv -> diagram() -> selectedTexts().count()) : 0; int selected_texts = dv ? (dv -> diagram() -> selectedTexts().count()) : 0;
int selected_conductor_texts = dv ? (dv -> diagram() -> selectedConductorTexts().count()) : 0; int selected_conductor_texts = dv ? (dv -> diagram() -> selectedConductorTexts().count()) : 0;

1
sources/qetdiagrameditor.h
View File

@ -206,6 +206,7 @@ class QETDiagramEditor : public QETMainWindow {
QAction *prj_del_diagram; ///< Delete a diagram from the current project 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_clean; ///< Clean the content of the curent project by removing useless items
QAction *prj_diagramNum; ///< Numerotation des schemas QAction *prj_diagramNum; ///< Numerotation des schemas
QAction *prj_diagramList; ///< Sommaire des schemas
QAction *prj_nomenclature; ///< generate nomenclature QAction *prj_nomenclature; ///< generate nomenclature
QAction *zoom_in; ///< Zoom in QAction *zoom_in; ///< Zoom in
QAction *zoom_out; ///< Zoom out QAction *zoom_out; ///< Zoom out

4
sources/qeticons.cpp
View File

@ -170,6 +170,7 @@ namespace QET {
QIcon ru; QIcon ru;
QIcon sl; QIcon sl;
QIcon translation; QIcon translation;
QIcon listDrawings;
} }
} }
@ -419,5 +420,6 @@ void QET::Icons::initIcons() {
ro .addFile(":/ico/24x16/ro.png"); ro .addFile(":/ico/24x16/ro.png");
ru .addFile(":/ico/24x16/ru.png"); ru .addFile(":/ico/24x16/ru.png");
sl .addFile(":/ico/24x16/sl.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");
} }

1
sources/qeticons.h
View File

@ -179,6 +179,7 @@ namespace QET {
extern QIcon ru; extern QIcon ru;
extern QIcon sl; extern QIcon sl;
extern QIcon translation; extern QIcon translation;
extern QIcon listDrawings;
} }
} }
#endif #endif

2
sources/qetproject.cpp
View File

@ -842,7 +842,7 @@ Diagram *QETProject::addNewDiagramFolioList() {
diagram_folio_list -> border_and_titleblock.importBorder(defaultBorderProperties()); diagram_folio_list -> border_and_titleblock.importBorder(defaultBorderProperties());
diagram_folio_list -> border_and_titleblock.importTitleBlock(defaultTitleBlockProperties()); diagram_folio_list -> border_and_titleblock.importTitleBlock(defaultTitleBlockProperties());
diagram_folio_list -> defaultConductorProperties = defaultConductorProperties(); 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); diagram_folio_list -> border_and_titleblock.setTitle(title);
addDiagram(diagram_folio_list); addDiagram(diagram_folio_list);