diff --git a/ico/16x16/element-delete.png b/ico/16x16/element-delete.png new file mode 100644 index 000000000..800bc84ec Binary files /dev/null and b/ico/16x16/element-delete.png differ diff --git a/ico/16x16/element-edit.png b/ico/16x16/element-edit.png new file mode 100644 index 000000000..34770a772 Binary files /dev/null and b/ico/16x16/element-edit.png differ diff --git a/ico/16x16/element-new.png b/ico/16x16/element-new.png new file mode 100644 index 000000000..325718abe Binary files /dev/null and b/ico/16x16/element-new.png differ diff --git a/ico/16x16/element.png b/ico/16x16/element.png new file mode 100644 index 000000000..14888be00 Binary files /dev/null and b/ico/16x16/element.png differ diff --git a/ico/16x16/folder-delete.png b/ico/16x16/folder-delete.png new file mode 100644 index 000000000..d84800baf Binary files /dev/null and b/ico/16x16/folder-delete.png differ diff --git a/ico/16x16/folder-edit.png b/ico/16x16/folder-edit.png new file mode 100644 index 000000000..3a71427a1 Binary files /dev/null and b/ico/16x16/folder-edit.png differ diff --git a/ico/16x16/folder-open.png b/ico/16x16/folder-open.png new file mode 100644 index 000000000..a191f9979 Binary files /dev/null and b/ico/16x16/folder-open.png differ diff --git a/ico/16x16/folder-properties.png b/ico/16x16/folder-properties.png new file mode 100644 index 000000000..e5a609d4d Binary files /dev/null and b/ico/16x16/folder-properties.png differ diff --git a/ico/copyright b/ico/copyright index 8a0a10c44..79e819d94 100644 --- a/ico/copyright +++ b/ico/copyright @@ -141,6 +141,10 @@ Clarification: ico/16x16/east.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/edit-clear.png from https://www.brandeps.com (License CC BY-ND 3.0) changes: icon color, icon rotation + ico/16x16/element.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) + ico/16x16/element-delete.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) + ico/16x16/element-edit.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) + ico/16x16/element-new.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/endline-circle.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/endline-diamond.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/endline-none.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) @@ -150,7 +154,10 @@ Clarification: ico/16x16/folio-delete.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/folio-new.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/folio-properties.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) + ico/16x16/folder-delete.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) + ico/16x16/folder-edit.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/folder-only-this.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) + ico/16x16/folder-properties.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/folder-show-all.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/ground.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/label.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) diff --git a/qelectrotech.qrc b/qelectrotech.qrc index 55da7e923..c819f41d9 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -565,5 +565,13 @@ ico/16x16/move.png ico/22x22/titleblock-bottom.png ico/22x22/titleblock-right.png + ico/16x16/element.png + ico/16x16/element-new.png + ico/16x16/element-delete.png + ico/16x16/element-edit.png + ico/16x16/folder-delete.png + ico/16x16/folder-edit.png + ico/16x16/folder-open.png + ico/16x16/folder-properties.png diff --git a/sources/ElementsCollection/elementscollectionwidget.cpp b/sources/ElementsCollection/elementscollectionwidget.cpp index 7f586ec2b..ebac89d0b 100644 --- a/sources/ElementsCollection/elementscollectionwidget.cpp +++ b/sources/ElementsCollection/elementscollectionwidget.cpp @@ -138,17 +138,17 @@ void ElementsCollectionWidget::leaveEvent(QEvent *event) void ElementsCollectionWidget::setUpAction() { - m_open_dir = new QAction(QET::Icons::DocumentOpen, tr("Ouvrir le dossier correspondant"), this); - m_edit_element = new QAction(QET::Icons::ElementEdit, tr("Éditer l'élément"), this); - m_delete_element = new QAction(QET::Icons::ElementDelete, tr("Supprimer l'élément"), this); - m_delete_dir = new QAction(QET::Icons::FolderDelete, tr("Supprimer le dossier"), this); - m_reload = new QAction(QET::Icons::ViewRefresh, tr("Recharger les collections"), this); - m_edit_dir = new QAction(QET::Icons::FolderEdit, tr("Éditer le dossier"), this); - m_new_directory = new QAction(QET::Icons::FolderNew, tr("Nouveau dossier"), this); - m_new_element = new QAction(QET::Icons::ElementNew, tr("Nouvel élément"), this); - m_show_this_dir = new QAction(QET::Icons::FolderOnlyThis,tr("Afficher uniquement ce dossier"), this); - m_show_all_dir = new QAction(QET::Icons::FolderShowAll, tr("Afficher tous les dossiers"), this); - m_dir_propertie = new QAction(QET::Icons::Folder, tr("Propriété du dossier"), this); + m_open_dir = new QAction(QET::Icons::FolderOpen, tr("Ouvrir le dossier correspondant"), this); + m_edit_element = new QAction(QET::Icons::ElementEdit, tr("Éditer l'élément"), this); + m_delete_element = new QAction(QET::Icons::ElementDelete, tr("Supprimer l'élément"), this); + m_delete_dir = new QAction(QET::Icons::FolderDelete, tr("Supprimer le dossier"), this); + m_reload = new QAction(QET::Icons::ViewRefresh, tr("Recharger les collections"), this); + m_edit_dir = new QAction(QET::Icons::FolderEdit, tr("Éditer le dossier"), this); + m_new_directory = new QAction(QET::Icons::FolderNew, tr("Nouveau dossier"), this); + m_new_element = new QAction(QET::Icons::ElementNew, tr("Nouvel élément"), this); + m_show_this_dir = new QAction(QET::Icons::FolderOnlyThis, tr("Afficher uniquement ce dossier"), this); + m_show_all_dir = new QAction(QET::Icons::FolderShowAll, tr("Afficher tous les dossiers"), this); + m_dir_propertie = new QAction(QET::Icons::FolderProperties, tr("Propriété du dossier"), this); } /** diff --git a/sources/elementspanelwidget.cpp b/sources/elementspanelwidget.cpp index 2ed2c2056..c906712dc 100644 --- a/sources/elementspanelwidget.cpp +++ b/sources/elementspanelwidget.cpp @@ -43,7 +43,7 @@ ElementsPanelWidget::ElementsPanelWidget(QWidget *parent) : QWidget(parent) { elements_panel = new ElementsPanel(this); // initialise les actions - open_directory = new QAction(QET::Icons::DocumentOpen, tr("Ouvrir le dossier correspondant"), this); + open_directory = new QAction(QET::Icons::FolderOpen, tr("Ouvrir le dossier correspondant"), this); copy_path = new QAction(QET::Icons::IC_CopyFile, tr("Copier le chemin"), this); prj_activate = new QAction(QET::Icons::ProjectFile, tr("Basculer vers ce projet"), this); prj_close = new QAction(QET::Icons::DocumentClose, tr("Fermer ce projet"), this); diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index 56cba11ce..20604d327 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -81,7 +81,8 @@ namespace QET { QIcon ElementDelete; QIcon ElementEdit; QIcon ElementNew; - QIcon EndLineCircle; + QIcon ElementSmall; + QIcon EndLineCircle; QIcon EndLineDiamond; QIcon EndLineNone; QIcon EndLineSimple; @@ -92,6 +93,8 @@ namespace QET { QIcon FolderEdit; QIcon FolderNew; QIcon FolderOnlyThis; + QIcon FolderOpen; + QIcon FolderProperties; QIcon FolderShowAll; QIcon Forbidden; QIcon FullScreenEnter; @@ -326,21 +329,29 @@ void QET::Icons::initIcons() { Element .addFile(":/ico/breeze-icons/16x16/mimetypes/application-x-qet-element.png"); Element .addFile(":/ico/breeze-icons/22x22/mimetypes/application-x-qet-element.png"); Element .addFile(":/ico/breeze-icons/32x32/mimetypes/application-x-qet-element.png"); - ElementDelete .addFile(":/ico/22x22/element-delete.png"); + ElementDelete .addFile(":/ico/16x16/element-delete.png"); + ElementDelete .addFile(":/ico/22x22/element-delete.png"); + ElementEdit .addFile(":/ico/16x16/element-edit.png"); ElementEdit .addFile(":/ico/22x22/element-edit.png"); + ElementNew .addFile(":/ico/16x16/element-new.png"); ElementNew .addFile(":/ico/22x22/element-new.png"); - EndLineCircle .addFile(":/ico/16x16/endline-circle.png"); + ElementSmall .addFile(":/ico/16x16/element.png"); + EndLineCircle .addFile(":/ico/16x16/endline-circle.png"); EndLineDiamond .addFile(":/ico/16x16/endline-diamond.png"); EndLineNone .addFile(":/ico/16x16/endline-none.png"); EndLineSimple .addFile(":/ico/16x16/endline-simple.png"); EndLineTriangle .addFile(":/ico/16x16/endline-triangle.png"); EPS .addFile(":/ico/32x32/image-x-eps.png"); Folder .addFile(":/ico/16x16/folder.png"); + FolderDelete .addFile(":/ico/16x16/folder-delete.png"); FolderDelete .addFile(":/ico/22x22/folder-delete.png"); + FolderEdit .addFile(":/ico/16x16/folder-edit.png"); FolderEdit .addFile(":/ico/22x22/folder-edit.png"); FolderNew .addFile(":/ico/16x16/folder-new.png"); FolderNew .addFile(":/ico/22x22/folder-new.png"); FolderOnlyThis .addFile(":/ico/16x16/folder-only-this.png"); + FolderOpen .addFile(":/ico/16x16/folder-open.png"); + FolderProperties .addFile(":/ico/16x16/folder-properties.png"); FolderShowAll .addFile(":/ico/16x16/folder-show-all.png"); Forbidden .addFile(":/ico/16x16/user-busy.png"); FullScreenEnter .addFile(":/ico/16x16/view-fullscreen.png"); diff --git a/sources/qeticons.h b/sources/qeticons.h index 88cfedda5..9d5e5d2c6 100644 --- a/sources/qeticons.h +++ b/sources/qeticons.h @@ -99,6 +99,8 @@ namespace QET { extern QIcon FolderEdit; extern QIcon FolderNew; extern QIcon FolderOnlyThis; + extern QIcon FolderOpen; + extern QIcon FolderProperties; extern QIcon FolderShowAll; extern QIcon Forbidden; extern QIcon FullScreenEnter;