diff --git a/ico/16x16/document-edit.png b/ico/16x16/document-edit.png deleted file mode 100644 index 84e345d22..000000000 Binary files a/ico/16x16/document-edit.png and /dev/null differ diff --git a/ico/22x22/document-delete.png b/ico/22x22/document-delete.png deleted file mode 100644 index 3a47f0d74..000000000 Binary files a/ico/22x22/document-delete.png and /dev/null differ diff --git a/ico/22x22/document-edit.png b/ico/22x22/document-edit.png deleted file mode 100644 index 3d8f3a319..000000000 Binary files a/ico/22x22/document-edit.png and /dev/null differ diff --git a/ico/22x22/element-delete.png b/ico/22x22/element-delete.png new file mode 100644 index 000000000..ee87b7875 Binary files /dev/null and b/ico/22x22/element-delete.png differ diff --git a/ico/22x22/element-edit.png b/ico/22x22/element-edit.png new file mode 100644 index 000000000..03410b422 Binary files /dev/null and b/ico/22x22/element-edit.png differ diff --git a/ico/22x22/element-new.png b/ico/22x22/element-new.png new file mode 100644 index 000000000..e53b14df7 Binary files /dev/null and b/ico/22x22/element-new.png differ diff --git a/ico/scalable/document-delete.svgz b/ico/scalable/document-delete.svgz deleted file mode 100644 index b61fb83e9..000000000 Binary files a/ico/scalable/document-delete.svgz and /dev/null differ diff --git a/ico/scalable/element-delete.svgz b/ico/scalable/element-delete.svgz new file mode 100644 index 000000000..c75c738b2 Binary files /dev/null and b/ico/scalable/element-delete.svgz differ diff --git a/ico/scalable/element-edit.svgz b/ico/scalable/element-edit.svgz new file mode 100644 index 000000000..b5a140c34 Binary files /dev/null and b/ico/scalable/element-edit.svgz differ diff --git a/ico/scalable/element-new.svgz b/ico/scalable/element-new.svgz new file mode 100644 index 000000000..e4745b756 Binary files /dev/null and b/ico/scalable/element-new.svgz differ diff --git a/qelectrotech.qrc b/qelectrotech.qrc index bca52a0e9..81f8bb94a 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -14,7 +14,6 @@ ico/16x16/dialog-cancel.png ico/16x16/dialog-ok.png ico/16x16/document-close.png - ico/16x16/document-edit.png ico/16x16/document-export.png ico/16x16/document-import.png ico/16x16/document-new.png @@ -88,8 +87,6 @@ ico/22x22/dialog-information.png ico/22x22/dialog-ok.png ico/22x22/document-close.png - ico/22x22/document-delete.png - ico/22x22/document-edit.png ico/22x22/document-export.png ico/22x22/document-import.png ico/22x22/document-new.png @@ -109,6 +106,9 @@ ico/22x22/edit-redo.png ico/22x22/edit-select-all.png ico/22x22/edit-undo.png + ico/22x22/element-delete.png + ico/22x22/element-edit.png + ico/22x22/element-new.png ico/22x22/ellipse.png ico/22x22/folder-delete.png ico/22x22/folder-edit.png diff --git a/sources/elementspanelwidget.cpp b/sources/elementspanelwidget.cpp index 165bb9d52..fbdbb08cd 100644 --- a/sources/elementspanelwidget.cpp +++ b/sources/elementspanelwidget.cpp @@ -53,9 +53,9 @@ ElementsPanelWidget::ElementsPanelWidget(QWidget *parent) : QWidget(parent) { edit_category = new QAction(QET::Icons::FolderEdit, tr("\311diter la cat\351gorie"), this); delete_category = new QAction(QET::Icons::FolderDelete, tr("Supprimer la cat\351gorie"), this); delete_collection = new QAction(QET::Icons::FolderDelete, tr("Vider la collection"), this); - new_element = new QAction(QET::Icons::DocumentNew, tr("Nouvel \351l\351ment"), this); - edit_element = new QAction(QET::Icons::DocumentEdit, tr("\311diter l'\351l\351ment"), this); - delete_element = new QAction(QET::Icons::DocumentDelete, tr("Supprimer l'\351l\351ment"), this); + new_element = new QAction(QET::Icons::ElementNew, tr("Nouvel \351l\351ment"), this); + edit_element = new QAction(QET::Icons::ElementEdit, tr("\311diter l'\351l\351ment"), this); + delete_element = new QAction(QET::Icons::ElementDelete, tr("Supprimer l'\351l\351ment"), this); prj_close = new QAction(QET::Icons::DocumentClose, tr("Fermer ce projet"), this); prj_edit_prop = new QAction(QET::Icons::DialogInformation, tr("Propri\351t\351s du projet"), this); prj_prop_diagram = new QAction(QET::Icons::DialogInformation, tr("Propri\351t\351s du sch\351ma"), this); diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index fe1af392f..55b21e6c9 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -47,8 +47,6 @@ namespace QET { QIcon DialogInformation; QIcon DialogOk; QIcon DocumentClose; - QIcon DocumentDelete; - QIcon DocumentEdit; QIcon DocumentExport; QIcon DocumentImport; QIcon DocumentNew; @@ -69,6 +67,9 @@ namespace QET { QIcon EditRedo; QIcon EditSelectAll; QIcon EditUndo; + QIcon ElementDelete; + QIcon ElementEdit; + QIcon ElementNew; QIcon EndLineCircle; QIcon EndLineDiamond; QIcon EndLineNone; @@ -176,9 +177,6 @@ void QET::Icons::initIcons() { DialogOk .addFile(":/ico/22x22/dialog-ok.png"); DocumentClose .addFile(":/ico/16x16/document-close.png"); DocumentClose .addFile(":/ico/22x22/document-close.png"); - DocumentDelete .addFile(":/ico/22x22/document-delete.png"); - DocumentEdit .addFile(":/ico/16x16/document-edit.png"); - DocumentEdit .addFile(":/ico/22x22/document-edit.png"); DocumentExport .addFile(":/ico/16x16/document-export.png"); DocumentExport .addFile(":/ico/22x22/document-export.png"); DocumentImport .addFile(":/ico/16x16/document-import.png"); @@ -218,6 +216,9 @@ void QET::Icons::initIcons() { EditSelectAll .addFile(":/ico/22x22/edit-select-all.png"); EditUndo .addFile(":/ico/16x16/edit-undo.png"); EditUndo .addFile(":/ico/22x22/edit-undo.png"); + ElementDelete .addFile(":/ico/22x22/element-delete.png"); + ElementEdit .addFile(":/ico/22x22/element-edit.png"); + ElementNew .addFile(":/ico/22x22/element-new.png"); EndLineCircle .addFile(":/ico/16x16/endline-circle.png"); EndLineDiamond .addFile(":/ico/16x16/endline-diamond.png"); EndLineNone .addFile(":/ico/16x16/endline-none.png"); diff --git a/sources/qeticons.h b/sources/qeticons.h index 4cd0359d4..142c3d6ea 100644 --- a/sources/qeticons.h +++ b/sources/qeticons.h @@ -51,8 +51,6 @@ namespace QET { extern QIcon DialogInformation; extern QIcon DialogOk; extern QIcon DocumentClose; - extern QIcon DocumentDelete; - extern QIcon DocumentEdit; extern QIcon DocumentExport; extern QIcon DocumentImport; extern QIcon DocumentNew; @@ -73,6 +71,9 @@ namespace QET { extern QIcon EditRedo; extern QIcon EditSelectAll; extern QIcon EditUndo; + extern QIcon ElementDelete; + extern QIcon ElementEdit; + extern QIcon ElementNew; extern QIcon EndLineCircle; extern QIcon EndLineDiamond; extern QIcon EndLineNone;