diff --git a/ico/16x16/add_col.png b/ico/16x16/add_col.png deleted file mode 100644 index 02a70edf7..000000000 Binary files a/ico/16x16/add_col.png and /dev/null differ diff --git a/ico/16x16/add_row.png b/ico/16x16/add_row.png deleted file mode 100644 index 8174ea172..000000000 Binary files a/ico/16x16/add_row.png and /dev/null differ diff --git a/ico/16x16/remove_col.png b/ico/16x16/remove_col.png deleted file mode 100644 index 9993b3740..000000000 Binary files a/ico/16x16/remove_col.png and /dev/null differ diff --git a/ico/16x16/remove_row.png b/ico/16x16/remove_row.png deleted file mode 100644 index 974cd5470..000000000 Binary files a/ico/16x16/remove_row.png and /dev/null differ diff --git a/qelectrotech.qrc b/qelectrotech.qrc index 6f75580f1..83d150efd 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -4,8 +4,6 @@ ico/128x128/settings.png ico/128x128/document-export.png ico/128x128/printer.png - ico/16x16/add_col.png - ico/16x16/add_row.png ico/16x16/application-exit.png ico/16x16/arrow-left-double.png ico/16x16/arrow-left.png @@ -71,8 +69,6 @@ ico/16x16/phase.png ico/16x16/preferences-desktop-user.png ico/16x16/qet.png - ico/16x16/remove_col.png - ico/16x16/remove_row.png ico/16x16/south.png ico/16x16/text-xml.png ico/16x16/user-busy.png diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index acd68f12a..4d721c57c 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -199,10 +199,10 @@ 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_column = new QAction(QET::Icons::AddColumn, tr("Ajouter une colonne"), this); - remove_column = new QAction(QET::Icons::RemoveColumn, tr("Enlever une colonne"), this); - add_row = new QAction(QET::Icons::AddRow, tr("Ajouter une ligne"), this); - remove_row = new QAction(QET::Icons::RemoveRow, tr("Enlever une ligne"), 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); + remove_row = new QAction(QET::Icons::EditTableDeleteRow, tr("Enlever une ligne"), this); prj_edit_prop = new QAction(QET::Icons::DialogInformation, tr("Propri\351t\351s du projet"), this); prj_add_diagram = new QAction(QET::Icons::DiagramAdd, tr("Ajouter un sch\351ma"), this); diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index deb0d3cdc..1b89ff396 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -22,8 +22,6 @@ namespace QET { namespace Icons { QIcon Add; - QIcon AddColumn; - QIcon AddRow; QIcon Allowed; QIcon ApplicationExit; QIcon ArrowLeft; @@ -132,8 +130,6 @@ namespace QET { QIcon QtLogo; QIcon Raise; QIcon Remove; - QIcon RemoveColumn; - QIcon RemoveRow; QIcon Restore; QIcon SendBackward; QIcon Settings; @@ -167,8 +163,6 @@ void QET::Icons::initIcons() { Add .addFile(":/ico/16x16/list-add.png"); Add .addFile(":/ico/22x22/list-add.png"); - AddColumn .addFile(":/ico/16x16/add_col.png"); - AddRow .addFile(":/ico/16x16/add_row.png"); Allowed .addFile(":/ico/16x16/user-online.png"); ApplicationExit .addFile(":/ico/16x16/application-exit.png"); ApplicationExit .addFile(":/ico/22x22/application-exit.png"); @@ -351,8 +345,6 @@ void QET::Icons::initIcons() { Raise .addFile(":/ico/22x22/raise.png"); Remove .addFile(":/ico/16x16/list-remove.png"); Remove .addFile(":/ico/22x22/list-remove.png"); - RemoveColumn .addFile(":/ico/16x16/remove_col.png"); - RemoveRow .addFile(":/ico/16x16/remove_row.png"); Restore .addFile(":/ico/22x22/restaurer.png"); SendBackward .addFile(":/ico/22x22/send_backward.png"); Settings .addFile(":/ico/128x128/settings.png"); diff --git a/sources/qeticons.h b/sources/qeticons.h index 1c224f18a..acb88d219 100644 --- a/sources/qeticons.h +++ b/sources/qeticons.h @@ -29,8 +29,6 @@ namespace QET { // l'utilisation du mot-cle extern permet l'acces aux objets statiques // depuis l'exterieur du namespace extern QIcon Add; - extern QIcon AddColumn; - extern QIcon AddRow; extern QIcon Allowed; extern QIcon ApplicationExit; extern QIcon ArrowLeft; @@ -141,8 +139,6 @@ namespace QET { extern QIcon QtLogo; extern QIcon Raise; extern QIcon Remove; - extern QIcon RemoveColumn; - extern QIcon RemoveRow; extern QIcon Restore; extern QIcon SendBackward; extern QIcon Settings;