diff --git a/ico/16x16/edit-table-cell-merge.png b/ico/16x16/edit-table-cell-merge.png new file mode 100644 index 000000000..91a9993c9 Binary files /dev/null and b/ico/16x16/edit-table-cell-merge.png differ diff --git a/ico/16x16/edit-table-cell-split.png b/ico/16x16/edit-table-cell-split.png new file mode 100644 index 000000000..0cc176cdb Binary files /dev/null and b/ico/16x16/edit-table-cell-split.png differ diff --git a/ico/16x16/edit-table-delete-column.png b/ico/16x16/edit-table-delete-column.png new file mode 100644 index 000000000..4fe000d93 Binary files /dev/null and b/ico/16x16/edit-table-delete-column.png differ diff --git a/ico/16x16/edit-table-delete-row.png b/ico/16x16/edit-table-delete-row.png new file mode 100644 index 000000000..b0c86f090 Binary files /dev/null and b/ico/16x16/edit-table-delete-row.png differ diff --git a/ico/16x16/edit-table-insert-column-left.png b/ico/16x16/edit-table-insert-column-left.png new file mode 100644 index 000000000..e99503635 Binary files /dev/null and b/ico/16x16/edit-table-insert-column-left.png differ diff --git a/ico/16x16/edit-table-insert-column-right.png b/ico/16x16/edit-table-insert-column-right.png new file mode 100644 index 000000000..cd8bc9810 Binary files /dev/null and b/ico/16x16/edit-table-insert-column-right.png differ diff --git a/ico/16x16/edit-table-insert-row-above.png b/ico/16x16/edit-table-insert-row-above.png new file mode 100644 index 000000000..bf36435ad Binary files /dev/null and b/ico/16x16/edit-table-insert-row-above.png differ diff --git a/ico/16x16/edit-table-insert-row-under.png b/ico/16x16/edit-table-insert-row-under.png new file mode 100644 index 000000000..52bce9286 Binary files /dev/null and b/ico/16x16/edit-table-insert-row-under.png differ diff --git a/ico/22x22/edit-table-cell-merge.png b/ico/22x22/edit-table-cell-merge.png new file mode 100644 index 000000000..11a2405d0 Binary files /dev/null and b/ico/22x22/edit-table-cell-merge.png differ diff --git a/ico/22x22/edit-table-cell-split.png b/ico/22x22/edit-table-cell-split.png new file mode 100644 index 000000000..9d335a12e Binary files /dev/null and b/ico/22x22/edit-table-cell-split.png differ diff --git a/ico/22x22/edit-table-delete-column.png b/ico/22x22/edit-table-delete-column.png new file mode 100644 index 000000000..6d5a81840 Binary files /dev/null and b/ico/22x22/edit-table-delete-column.png differ diff --git a/ico/22x22/edit-table-delete-row.png b/ico/22x22/edit-table-delete-row.png new file mode 100644 index 000000000..9537003d9 Binary files /dev/null and b/ico/22x22/edit-table-delete-row.png differ diff --git a/ico/22x22/edit-table-insert-column-left.png b/ico/22x22/edit-table-insert-column-left.png new file mode 100644 index 000000000..f66559e5d Binary files /dev/null and b/ico/22x22/edit-table-insert-column-left.png differ diff --git a/ico/22x22/edit-table-insert-column-right.png b/ico/22x22/edit-table-insert-column-right.png new file mode 100644 index 000000000..efce34904 Binary files /dev/null and b/ico/22x22/edit-table-insert-column-right.png differ diff --git a/ico/22x22/edit-table-insert-row-above.png b/ico/22x22/edit-table-insert-row-above.png new file mode 100644 index 000000000..4973e62bf Binary files /dev/null and b/ico/22x22/edit-table-insert-row-above.png differ diff --git a/ico/22x22/edit-table-insert-row-under.png b/ico/22x22/edit-table-insert-row-under.png new file mode 100644 index 000000000..2926def68 Binary files /dev/null and b/ico/22x22/edit-table-insert-row-under.png differ diff --git a/qelectrotech.qrc b/qelectrotech.qrc index 47eafce12..961f994e6 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -36,6 +36,14 @@ ico/16x16/edit-paste.png ico/16x16/edit-redo.png ico/16x16/edit-select-all.png + ico/16x16/edit-table-insert-row-above.png + ico/16x16/edit-table-insert-column-left.png + ico/16x16/edit-table-insert-row-under.png + ico/16x16/edit-table-delete-row.png + ico/16x16/edit-table-insert-column-right.png + ico/16x16/edit-table-delete-column.png + ico/16x16/edit-table-cell-split.png + ico/16x16/edit-table-cell-merge.png ico/16x16/edit-undo.png ico/16x16/endline-circle.png ico/16x16/endline-diamond.png @@ -112,6 +120,14 @@ ico/22x22/edit-paste.png ico/22x22/edit-redo.png ico/22x22/edit-select-all.png + ico/22x22/edit-table-insert-row-above.png + ico/22x22/edit-table-insert-column-left.png + ico/22x22/edit-table-insert-row-under.png + ico/22x22/edit-table-delete-row.png + ico/22x22/edit-table-insert-column-right.png + ico/22x22/edit-table-delete-column.png + ico/22x22/edit-table-cell-split.png + ico/22x22/edit-table-cell-merge.png ico/22x22/edit-undo.png ico/22x22/element-delete.png ico/22x22/element-edit.png diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index bf8509aa8..d0695185c 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -62,6 +62,14 @@ namespace QET { QIcon EditPaste; QIcon EditRedo; QIcon EditSelectAll; + QIcon EditTableCellMerge; + QIcon EditTableCellSplit; + QIcon EditTableDeleteColumn; + QIcon EditTableDeleteRow; + QIcon EditTableInsertColumnLeft; + QIcon EditTableInsertColumnRight; + QIcon EditTableInsertRowAbove; + QIcon EditTableInsertRowUnder; QIcon EditUndo; QIcon Element; QIcon ElementDelete; @@ -219,6 +227,22 @@ void QET::Icons::initIcons() { EditRedo .addFile(":/ico/22x22/edit-redo.png"); EditSelectAll .addFile(":/ico/16x16/edit-select-all.png"); EditSelectAll .addFile(":/ico/22x22/edit-select-all.png"); + EditTableCellMerge .addFile(":ico/16x16/edit-table-cell-merge.png"); + EditTableCellMerge .addFile(":ico/22x22/edit-table-cell-merge.png"); + EditTableCellSplit .addFile(":ico/16x16/edit-table-cell-split.png"); + EditTableCellSplit .addFile(":ico/22x22/edit-table-cell-split.png"); + EditTableDeleteColumn .addFile(":ico/16x16/edit-table-delete-column.png"); + EditTableDeleteColumn .addFile(":ico/22x22/edit-table-delete-column.png"); + EditTableDeleteRow .addFile(":ico/16x16/edit-table-delete-row.png"); + EditTableDeleteRow .addFile(":ico/22x22/edit-table-delete-row.png"); + EditTableInsertColumnLeft .addFile(":ico/16x16/edit-table-insert-column-left.png"); + EditTableInsertColumnLeft .addFile(":ico/22x22/edit-table-insert-column-left.png"); + EditTableInsertColumnRight.addFile(":ico/16x16/edit-table-insert-column-right.png"); + EditTableInsertColumnRight.addFile(":ico/22x22/edit-table-insert-column-right.png"); + EditTableInsertRowAbove .addFile(":ico/16x16/edit-table-insert-row-above.png"); + EditTableInsertRowAbove .addFile(":ico/22x22/edit-table-insert-row-above.png"); + EditTableInsertRowUnder .addFile(":ico/16x16/edit-table-insert-row-under.png"); + EditTableInsertRowUnder .addFile(":ico/22x22/edit-table-insert-row-under.png"); EditUndo .addFile(":/ico/16x16/edit-undo.png"); EditUndo .addFile(":/ico/22x22/edit-undo.png"); Element .addFile(":/ico/oxygen-icons/16x16/mimetypes/application-x-qet-element.png"); diff --git a/sources/qeticons.h b/sources/qeticons.h index d71b8fed5..11d7d8b03 100644 --- a/sources/qeticons.h +++ b/sources/qeticons.h @@ -70,6 +70,14 @@ namespace QET { extern QIcon EditPaste; extern QIcon EditRedo; extern QIcon EditSelectAll; + extern QIcon EditTableCellMerge; + extern QIcon EditTableCellSplit; + extern QIcon EditTableDeleteColumn; + extern QIcon EditTableDeleteRow; + extern QIcon EditTableInsertColumnLeft; + extern QIcon EditTableInsertColumnRight; + extern QIcon EditTableInsertRowAbove; + extern QIcon EditTableInsertRowUnder; extern QIcon EditUndo; extern QIcon Element; extern QIcon ElementDelete; diff --git a/sources/titleblock/qettemplateeditor.cpp b/sources/titleblock/qettemplateeditor.cpp index e233c98e6..6c11bc6ce 100644 --- a/sources/titleblock/qettemplateeditor.cpp +++ b/sources/titleblock/qettemplateeditor.cpp @@ -304,8 +304,8 @@ void QETTitleBlockTemplateEditor::initActions() { zoom_out_ = new QAction(QET::Icons::ZoomOut, tr("Zoom arri\350re", "menu entry"), this); zoom_fit_ = new QAction(QET::Icons::ZoomFitBest, tr("Zoom adapt\351", "menu entry"), this); zoom_reset_ = new QAction(QET::Icons::ZoomOriginal, tr("Pas de zoom", "menu entry"), this); - merge_cells_ = new QAction( tr("&Fusionner les cellules", "menu entry"), this); - split_cell_ = new QAction( tr("&S\351parer les cellules", "menu entry"), this); + merge_cells_ = new QAction(QET::Icons::EditTableCellMerge, tr("&Fusionner les cellules", "menu entry"), this); + split_cell_ = new QAction(QET::Icons::EditTableCellSplit, tr("&S\351parer les cellules", "menu entry"), this); undo_ -> setIcon(QET::Icons::EditUndo); redo_ -> setIcon(QET::Icons::EditRedo); diff --git a/sources/titleblock/templateview.cpp b/sources/titleblock/templateview.cpp index 4d41c7291..744a89b24 100644 --- a/sources/titleblock/templateview.cpp +++ b/sources/titleblock/templateview.cpp @@ -24,6 +24,7 @@ #include "templatecellsset.h" #include "dimensionwidget.h" #include "qetapp.h" +#include "qeticons.h" #define ROW_OFFSET 2 #define COL_OFFSET 1 #define DEFAULT_PREVIEW_WIDTH 600 @@ -380,15 +381,15 @@ qreal TitleBlockTemplateView::zoomFactor() const { Initialize this view (actions, signals/slots connections, etc.) */ void TitleBlockTemplateView::init() { - add_column_before_ = new QAction(tr("Ajouter une colonne (avant)", "context menu"), this); - add_row_before_ = new QAction(tr("Ajouter une ligne (avant)", "context menu"), this); - add_column_after_ = new QAction(tr("Ajouter une colonne (apr\350s)", "context menu"), this); - add_row_after_ = new QAction(tr("Ajouter une ligne (apr\350s)", "context menu"), this); - edit_column_dim_ = new QAction(tr("Modifier les dimensions de cette colonne", "context menu"), this); - edit_row_dim_ = new QAction(tr("Modifier les dimensions de cette ligne", "context menu"), this); - delete_column_ = new QAction(tr("Supprimer cette colonne", "context menu"), this); - delete_row_ = new QAction(tr("Supprimer cette ligne", "context menu"), this); - change_preview_width_ = new QAction(tr("Modifier la largeur de cet aper\347u", "context menu"), this); + add_column_before_ = new QAction(QET::Icons::EditTableInsertColumnLeft, tr("Ajouter une colonne (avant)", "context menu"), this); + add_row_before_ = new QAction(QET::Icons::EditTableInsertRowAbove, tr("Ajouter une ligne (avant)", "context menu"), this); + add_column_after_ = new QAction(QET::Icons::EditTableInsertColumnRight, tr("Ajouter une colonne (apr\350s)", "context menu"), this); + add_row_after_ = new QAction(QET::Icons::EditTableInsertRowUnder, tr("Ajouter une ligne (apr\350s)", "context menu"), this); + edit_column_dim_ = new QAction( tr("Modifier les dimensions de cette colonne", "context menu"), this); + edit_row_dim_ = new QAction( tr("Modifier les dimensions de cette ligne", "context menu"), this); + delete_column_ = new QAction(QET::Icons::EditTableDeleteColumn, tr("Supprimer cette colonne", "context menu"), this); + delete_row_ = new QAction(QET::Icons::EditTableDeleteRow, tr("Supprimer cette ligne", "context menu"), this); + change_preview_width_ = new QAction( tr("Modifier la largeur de cet aper\347u", "context menu"), this); connect(add_column_before_, SIGNAL(triggered()), this, SLOT(addColumnBefore())); connect(add_row_before_, SIGNAL(triggered()), this, SLOT(addRowBefore()));