| [qet] [2816] preparing for list of drawings |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 2816
Author: scorpio810
Date: 2014-02-07 00:55:02 +0100 (Fri, 07 Feb 2014)
Log Message:
-----------
preparing for list of drawings
Modified Paths:
--------------
trunk/qelectrotech.qrc
trunk/sources/qetdiagrameditor.cpp
trunk/sources/qetdiagrameditor.h
trunk/sources/qeticons.cpp
trunk/sources/qeticons.h
trunk/sources/qetproject.cpp
Added Paths:
-----------
trunk/ico/48x48/view-pim-journal.png
Added: trunk/ico/48x48/view-pim-journal.png
===================================================================
(Binary files differ)
Property changes on: trunk/ico/48x48/view-pim-journal.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/qelectrotech.qrc
===================================================================
--- trunk/qelectrotech.qrc 2014-02-06 21:35:13 UTC (rev 2815)
+++ trunk/qelectrotech.qrc 2014-02-06 23:55:02 UTC (rev 2816)
@@ -225,5 +225,6 @@
<file>ico/24x16/gr.png</file>
<file>ico/24x16/it.png</file>
<file>ico/22x22/applications-development-translation.png</file>
+ <file>ico/48x48/view-pim-journal.png</file>
</qresource>
</RCC>
Modified: trunk/sources/qetdiagrameditor.cpp
===================================================================
--- trunk/sources/qetdiagrameditor.cpp 2014-02-06 21:35:13 UTC (rev 2815)
+++ trunk/sources/qetdiagrameditor.cpp 2014-02-06 23:55:02 UTC (rev 2816)
@@ -215,7 +215,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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;
Modified: trunk/sources/qetdiagrameditor.h
===================================================================
--- trunk/sources/qetdiagrameditor.h 2014-02-06 21:35:13 UTC (rev 2815)
+++ trunk/sources/qetdiagrameditor.h 2014-02-06 23:55:02 UTC (rev 2816)
@@ -206,6 +206,7 @@
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
Modified: trunk/sources/qeticons.cpp
===================================================================
--- trunk/sources/qeticons.cpp 2014-02-06 21:35:13 UTC (rev 2815)
+++ trunk/sources/qeticons.cpp 2014-02-06 23:55:02 UTC (rev 2816)
@@ -170,6 +170,7 @@
QIcon ru;
QIcon sl;
QIcon translation;
+ QIcon listDrawings;
}
}
@@ -419,5 +420,6 @@
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");
}
Modified: trunk/sources/qeticons.h
===================================================================
--- trunk/sources/qeticons.h 2014-02-06 21:35:13 UTC (rev 2815)
+++ trunk/sources/qeticons.h 2014-02-06 23:55:02 UTC (rev 2816)
@@ -179,6 +179,7 @@
extern QIcon ru;
extern QIcon sl;
extern QIcon translation;
+ extern QIcon listDrawings;
}
}
#endif
Modified: trunk/sources/qetproject.cpp
===================================================================
--- trunk/sources/qetproject.cpp 2014-02-06 21:35:13 UTC (rev 2815)
+++ trunk/sources/qetproject.cpp 2014-02-06 23:55:02 UTC (rev 2816)
@@ -842,7 +842,7 @@
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);