diff --git a/ico/16x16/folio-delete.png b/ico/16x16/folio-delete.png new file mode 100644 index 000000000..1ed2b8028 Binary files /dev/null and b/ico/16x16/folio-delete.png differ diff --git a/ico/16x16/folio-properties.png b/ico/16x16/folio-properties.png new file mode 100644 index 000000000..a4581c162 Binary files /dev/null and b/ico/16x16/folio-properties.png differ diff --git a/ico/16x16/project-properties.png b/ico/16x16/project-properties.png new file mode 100644 index 000000000..6c30705ef Binary files /dev/null and b/ico/16x16/project-properties.png differ diff --git a/ico/16x16/table-of-content.png b/ico/16x16/table-of-content.png new file mode 100644 index 000000000..604fe31c2 Binary files /dev/null and b/ico/16x16/table-of-content.png differ diff --git a/ico/22x22/dialog-information.png b/ico/22x22/dialog-information.png index f0d506659..1f2a3c680 100644 Binary files a/ico/22x22/dialog-information.png and b/ico/22x22/dialog-information.png differ diff --git a/ico/copyright b/ico/copyright index 9b776e63e..c44cd455c 100644 --- a/ico/copyright +++ b/ico/copyright @@ -147,6 +147,7 @@ Clarification: ico/16x16/endline-simple.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/endline-triangle.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/export-csv.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) + 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/folder-only-this.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) @@ -160,6 +161,7 @@ Clarification: ico/16x16/project-close.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/project-delete.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/project-new.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) + ico/16x16/project-properties.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/qet.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/qt.png from http://brand.qt.io/downloads/ ico/16x16/south.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) diff --git a/qelectrotech.qrc b/qelectrotech.qrc index 1fb6921c1..714a10a0d 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -556,5 +556,9 @@ ico/copyright ico/16x16/folder-only-this.png ico/16x16/folder-show-all.png + ico/16x16/folio-delete.png + ico/16x16/project-properties.png + ico/16x16/table-of-content.png + ico/16x16/folio-properties.png diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index 79616c5fa..bcb6bb57d 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -292,11 +292,11 @@ void QETDiagramEditor::setUpActions() infos_diagram = new QAction(QET::Icons::DialogInformation, tr("Propriétés du folio"), this); infos_diagram -> setShortcut( QKeySequence( tr("Ctrl+L") ) ); - prj_edit_prop = new QAction(QET::Icons::DialogInformation, tr("Propriétés du projet"), this); + prj_edit_prop = new QAction(QET::Icons::ProjectProperties, tr("Propriétés du projet"), this); prj_add_diagram = new QAction(QET::Icons::DiagramAdd, tr("Ajouter un folio"), this); prj_del_diagram = new QAction(QET::Icons::DiagramDelete, tr("Supprimer le folio"), this); prj_clean = new QAction(QET::Icons::EditClear, tr("Nettoyer le projet"), this); - prj_diagramList = new QAction(QET::Icons::listDrawings, tr("Ajouter un sommaire"), this); + prj_diagramList = new QAction(QET::Icons::TableOfContent, tr("Ajouter un sommaire"), this); prj_nomenclature = new QAction(QET::Icons::DocumentSpreadsheet, tr("Exporter une nomenclature"), this); prj_terminalBloc = new QAction(QET::Icons::TerminalStrip, tr("Lancer le plugin de creation de bornier"), this); tabbed_view_mode = new QAction( tr("en utilisant des onglets"), this); diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index ab15d8f2e..bc14f188f 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -136,6 +136,7 @@ namespace QET { QIcon Projects; QIcon ProjectFile; QIcon ProjectFileGP; + QIcon ProjectProperties; QIcon QETIcon; QIcon QETLogo; QIcon QETOxygenLogo; @@ -148,7 +149,8 @@ namespace QET { QIcon SinglePage; QIcon South; QIcon Start; - QIcon Terminal; + QIcon TableOfContent; + QIcon Terminal; QIcon TitleBlock; QIcon UserInformations; QIcon ViewFitWidth; @@ -228,12 +230,15 @@ void QET::Icons::initIcons() { ConfigureToolbars .addFile(":/ico/16x16/configure-toolbars.png"); ConfigureToolbars .addFile(":/ico/22x22/configure-toolbars.png"); IC_CopyFile .addFile(":/ico/16x16/item-copy.png"); + DiagramAdd .addFile(":/ico/16x16/folio-new.png"); DiagramAdd .addFile(":/ico/22x22/diagram_add.png"); Diagram .addFile(":/ico/diagram.png"); DiagramBg .addFile(":/ico/22x22/diagram_bg.png"); - DiagramDelete .addFile(":/ico/22x22/diagram_del.png"); + DiagramDelete .addFile(":/ico/16x16/folio-delete.png"); + DiagramDelete .addFile(":/ico/22x22/diagram_del.png"); DialogCancel .addFile(":/ico/16x16/dialog-cancel.png"); DialogCancel .addFile(":/ico/22x22/dialog-cancel.png"); + DialogInformation .addFile(":/ico/16x16/folio-properties.png"); DialogInformation .addFile(":/ico/22x22/dialog-information.png"); DialogOk .addFile(":/ico/16x16/dialog-ok.png"); DialogOk .addFile(":/ico/22x22/dialog-ok.png"); @@ -386,6 +391,7 @@ void QET::Icons::initIcons() { ProjectFile .addFile(":/ico/breeze-icons/16x16/mimetypes/application-x-qet-project.png"); ProjectFile .addFile(":/ico/breeze-icons/22x22/mimetypes/application-x-qet-project.png"); ProjectFile .addFile(":/ico/breeze-icons/32x32/mimetypes/application-x-qet-project.png"); + ProjectProperties .addFile(":/ico/16x16/project-properties.png"); QETDonate .addFile(":/ico/16x16/help-donate.png"); QETDownload .addFile(":/ico/16x16/edit-download.png"); QETIcon .addFile(":/ico/256x256/qelectrotech.png"); @@ -412,8 +418,11 @@ void QET::Icons::initIcons() { SinglePage .addFile(":/ico/22x22/single_page.png"); South .addFile(":/ico/16x16/south.png"); Start .addFile(":/ico/22x22/start.png"); - Terminal .addFile(":/ico/22x22/terminal.png"); - TitleBlock .addFile(":/ico/16x16/label.png"); + TableOfContent .addFile(":/ico/16x16/table-of-content.png"); + Terminal .addFile(":/ico/22x22/terminal.png"); + TerminalStrip .addFile(":/ico/16x16/terminalstrip.png"); + TerminalStrip .addFile(":/ico/22x22/terminalstrip.png"); + TitleBlock .addFile(":/ico/16x16/label.png"); TitleBlock .addFile(":/ico/22x22/label.png"); UserInformations .addFile(":/ico/16x16/preferences-desktop-user.png"); UserInformations .addFile(":/ico/22x22/preferences-desktop-user.png"); @@ -465,7 +474,6 @@ void QET::Icons::initIcons() { translation .addFile(":/ico/22x22/applications-development-translation.png"); listDrawings .addFile(":/ico/48x48/view-pim-journal.png"); AutoNum .addFile(":/ico/128x128/plasmagik.png"); - TerminalStrip .addFile(":/ico/22x22/terminalstrip.png"); sub .addFile(":/ico/22x22/format-text-subscript.png"); super .addFile(":/ico/22x22/format-text-superscript.png"); } diff --git a/sources/qeticons.h b/sources/qeticons.h index 9864688d0..5f0b38c7b 100644 --- a/sources/qeticons.h +++ b/sources/qeticons.h @@ -144,6 +144,7 @@ namespace QET { extern QIcon ProjectFile; extern QIcon ProjectFileGP; extern QIcon ProjectNew; + extern QIcon ProjectProperties; extern QIcon Projects; extern QIcon QETIcon; extern QIcon QETLogo; @@ -157,7 +158,8 @@ namespace QET { extern QIcon SinglePage; extern QIcon South; extern QIcon Start; - extern QIcon Terminal; + extern QIcon TableOfContent; + extern QIcon Terminal; extern QIcon TitleBlock; extern QIcon UserInformations; extern QIcon ViewFitWidth;