diff --git a/ico/Actions-format-text-bold-icon.png b/ico/Actions-format-text-bold-icon.png new file mode 100644 index 000000000..d1dc3d6b8 Binary files /dev/null and b/ico/Actions-format-text-bold-icon.png differ diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index e92d6679d..e457321d2 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -211,6 +211,7 @@ void QETDiagramEditor::actions() { conductor_reset = new QAction(QET::Icons::ConductorSettings, tr("R\351initialiser les conducteurs"), 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_edittext = new QAction(QET::Icons::EditText, tr("Editer un champ de texte"), this); add_column = new QAction(QET::Icons::EditTableInsertColumnRight, tr("Ajouter 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); @@ -331,6 +332,7 @@ void QETDiagramEditor::actions() { // traitements speciaux add_text -> setCheckable(true); + add_edittext -> setCheckable(true); windowed_view_mode -> setCheckable(true); tabbed_view_mode -> setCheckable(true); mode_selection -> setCheckable(true); @@ -390,6 +392,7 @@ void QETDiagramEditor::actions() { connect(conductor_reset, SIGNAL(triggered()), this, SLOT(slot_resetConductors()) ); connect(infos_diagram, SIGNAL(triggered()), this, SLOT(editCurrentDiagramProperties())); connect(add_text, SIGNAL(triggered()), this, SLOT(slot_addText()) ); + connect(add_edittext, SIGNAL(triggered()), this, SLOT(slot_editText()) ); connect(add_column, SIGNAL(triggered()), this, SLOT(slot_addColumn()) ); connect(remove_column, SIGNAL(triggered()), this, SLOT(slot_removeColumn()) ); connect(add_row, SIGNAL(triggered()), this, SLOT(slot_addRow()) ); @@ -551,6 +554,7 @@ void QETDiagramEditor::toolbar() { diagram_bar -> addAction(infos_diagram); diagram_bar -> addAction(conductor_reset); diagram_bar -> addAction(add_text); + diagram_bar -> addAction(add_edittext); // ajout de la barre d'outils a la fenetre principale addToolBar(Qt::TopToolBarArea, main_bar); @@ -1133,6 +1137,7 @@ void QETDiagramEditor::slot_updateActions() { zoom_reset -> setEnabled(opened_diagram); infos_diagram -> setEnabled(opened_diagram); add_text -> setEnabled(editable_diagram); + add_edittext -> setEnabled(editable_diagram); add_column -> setEnabled(editable_diagram); remove_column -> setEnabled(editable_diagram); add_row -> setEnabled(editable_diagram); @@ -1701,6 +1706,7 @@ void QETDiagramEditor::diagramWasAdded(DiagramView *dv) { connect(dv, SIGNAL(selectionChanged()), this, SLOT(slot_updateComplexActions())); connect(dv, SIGNAL(modeChanged()), this, SLOT(slot_updateModeActions())); connect(dv, SIGNAL(textAdded(bool)), add_text, SLOT(setChecked(bool))); + connect(dv, SIGNAL(textAdded(bool)), add_edittext, SLOT(setChecked(bool))); } /** diff --git a/sources/qetdiagrameditor.h b/sources/qetdiagrameditor.h index 845fc8188..ababac6b7 100644 --- a/sources/qetdiagrameditor.h +++ b/sources/qetdiagrameditor.h @@ -192,6 +192,7 @@ class QETDiagramEditor : public QETMainWindow { QAction *conductor_default; ///< Show a dialog to edit default conductor properties QAction *infos_diagram; ///< Show a dialog to edit diagram properties QAction *add_text; ///< Tool to add an independent text item on diagrams + QAction *add_edittext; ///< Tool to add an independent text item on diagrams QAction *add_column; ///< Increase diagram width by adding an extra column QAction *remove_column; ///< Decrease diagram width by removing the last column QAction *add_row; ///< Increase diagram height by adding an extra row diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index fec131503..f8bb48c77 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -71,6 +71,7 @@ namespace QET { QIcon EditTableInsertColumnRight; QIcon EditTableInsertRowAbove; QIcon EditTableInsertRowUnder; + QIcon EditText; QIcon EditUndo; QIcon Element; QIcon ElementDelete; @@ -219,6 +220,7 @@ void QET::Icons::initIcons() { East .addFile(":/ico/16x16/east.png"); EditClear .addFile(":/ico/16x16/edit-clear.png"); EditClear .addFile(":/ico/22x22/edit-clear.png"); + EditText .addFile(":ico/Actions-format-text-bold-icon.png"); if (rtl) { EditClearLocationBar.addPixmap(QPixmap(":/ico/16x16/edit-clear-locationbar-ltr.png").transformed(reverse)); diff --git a/sources/qeticons.h b/sources/qeticons.h index 437eef0e1..562b5caea 100644 --- a/sources/qeticons.h +++ b/sources/qeticons.h @@ -78,6 +78,7 @@ namespace QET { extern QIcon EditTableInsertColumnRight; extern QIcon EditTableInsertRowAbove; extern QIcon EditTableInsertRowUnder; + extern QIcon EditText; extern QIcon EditUndo; extern QIcon Element; extern QIcon ElementDelete;