From a40551f2ea49d474c950665efd70cf9190c76799 Mon Sep 17 00:00:00 2001 From: scorpio810 Date: Wed, 27 Mar 2013 19:11:16 +0000 Subject: [PATCH] Prepare to add new texteditor action. git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2074 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- ico/Actions-format-text-bold-icon.png | Bin 0 -> 4497 bytes sources/qetdiagrameditor.cpp | 6 ++++++ sources/qetdiagrameditor.h | 1 + sources/qeticons.cpp | 2 ++ sources/qeticons.h | 1 + 5 files changed, 10 insertions(+) create mode 100644 ico/Actions-format-text-bold-icon.png diff --git a/ico/Actions-format-text-bold-icon.png b/ico/Actions-format-text-bold-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d1dc3d6b8f3b35e593d22c3e4191a85d8c91f8d2 GIT binary patch literal 4497 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 literal 0 HcmV?d00001 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;