diff --git a/ico/128x128/project.png b/ico/128x128/project.png new file mode 100644 index 000000000..8655c7b03 Binary files /dev/null and b/ico/128x128/project.png differ diff --git a/ico/22x22/dialog-information.png b/ico/22x22/dialog-information.png index a5607bc72..f87d36134 100644 Binary files a/ico/22x22/dialog-information.png and b/ico/22x22/dialog-information.png differ diff --git a/ico/22x22/qelectrotab-into.png b/ico/22x22/qelectrotab-into.png new file mode 100644 index 000000000..202a5b2bd Binary files /dev/null and b/ico/22x22/qelectrotab-into.png differ diff --git a/qelectrotech.qrc b/qelectrotech.qrc index b7e7ece98..9094ea0a9 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -231,5 +231,7 @@ ico/24x16/be.png ico/128x128/plasmagik.png ico/22x22/autoconnect.png + ico/128x128/project.png + ico/22x22/qelectrotab-into.png diff --git a/sources/configpages.cpp b/sources/configpages.cpp index 878ed268a..22c94b4d1 100644 --- a/sources/configpages.cpp +++ b/sources/configpages.cpp @@ -161,7 +161,7 @@ void NewDiagramPage::applyConf() { * @return icon of this page */ QIcon NewDiagramPage::icon() const { - return(QET::Icons::NewDiagram); + return(QET::Icons::Projects); } /** diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index 8dbec118d..01af70715 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -189,7 +189,7 @@ void QETDiagramEditor::setUpActions() { cut = new QAction(QET::Icons::EditCut, tr("Co&uper"), this); copy = new QAction(QET::Icons::EditCopy, tr("Cop&ier"), this); paste = new QAction(QET::Icons::EditPaste, tr("C&oller"), this); - conductor_reset = new QAction(QET::Icons::ConductorSettings, tr("Réinitialiser les conducteurs"), this); + conductor_reset = new QAction(QET::Icons::ConductorSettings, tr("Réinitialiser les conducteurs"), this); m_auto_conductor = new QAction (QET::Icons::Autoconnect, tr("Création automatique de conducteur(s)","Tool tip of auto conductor"), this); m_auto_conductor -> setStatusTip (tr("Utiliser la création automatique de conducteur(s) quand cela est possible", "Status tip of auto conductor")); @@ -197,21 +197,21 @@ void QETDiagramEditor::setUpActions() { m_auto_conductor -> setDisabled (true); connect(m_auto_conductor, SIGNAL(triggered(bool)), this, SLOT(slot_autoConductor(bool))); - infos_diagram = new QAction(QET::Icons::DialogInformation, tr("Propriétés du schéma"), this); - prj_edit_prop = new QAction(QET::Icons::DialogInformation, tr("Propriétés du projet"), this); - prj_add_diagram = new QAction(QET::Icons::DiagramAdd, tr("Ajouter un schéma"), this); - prj_del_diagram = new QAction(QET::Icons::DiagramDelete, tr("Supprimer le schéma"), this); + infos_diagram = new QAction(QET::Icons::DialogInformation, tr("Propriétés du schéma"), this); + prj_edit_prop = new QAction(QET::Icons::DialogInformation, tr("Propriétés du projet"), this); + prj_add_diagram = new QAction(QET::Icons::DiagramAdd, tr("Ajouter un schéma"), this); + prj_del_diagram = new QAction(QET::Icons::DiagramDelete, tr("Supprimer le schéma"), 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_nomenclature = new QAction(QET::Icons::DocumentExport, tr("Exporter une nomenclature"), this); + prj_nomenclature = new QAction(QET::Icons::DocumentSpreadsheet, tr("Exporter une nomenclature"), this); tabbed_view_mode = new QAction( tr("en utilisant des onglets"), this); - windowed_view_mode= new QAction( tr("en utilisant des fenêtres"), this); + windowed_view_mode= new QAction( tr("en utilisant des fenêtres"), this); mode_selection = new QAction(QET::Icons::PartSelect, tr("Mode Selection"), this); mode_visualise = new QAction(QET::Icons::ViewMove, tr("Mode Visualisation"), this); - tile_window = new QAction( tr("&Mosaïque"), this); - cascade_window = new QAction( tr("&Cascade"), this); - next_window = new QAction( tr("Projet suivant"), this); - prev_window = new QAction( tr("Projet précédent"), this); + tile_window = new QAction( tr("&Mosaïque"), this); + cascade_window = new QAction( tr("&Cascade"), this); + next_window = new QAction( tr("Projet suivant"), this); + prev_window = new QAction( tr("Projet précédent"), this); ///Files action/// QAction *new_file = m_file_actions_group.addAction( QET::Icons::DocumentNew, tr("&Nouveau") ); diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index d636c619f..66fb23734 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -45,6 +45,7 @@ namespace QET { QIcon DialogOk; QIcon DocumentClose; QIcon DocumentExport; + QIcon DocumentSpreadsheet; QIcon DocumentImport; QIcon DocumentNew; QIcon DocumentOpen; @@ -125,6 +126,7 @@ namespace QET { QIcon PrintPortrait; QIcon PrintTwoPages; QIcon Project; + QIcon Projects; QIcon ProjectFile; QIcon QETIcon; QIcon QETLogo; @@ -222,6 +224,7 @@ void QET::Icons::initIcons() { DocumentClose .addFile(":/ico/22x22/document-close.png"); DocumentExport .addFile(":/ico/16x16/document-export.png"); DocumentExport .addFile(":/ico/22x22/document-export.png"); + DocumentSpreadsheet .addFile(":/ico/22x22/qelectrotab-into.png"); DocumentExport .addFile(":/ico/128x128/document-export.png"); DocumentImport .addFile(":/ico/16x16/document-import.png"); DocumentImport .addFile(":/ico/22x22/document-import.png"); @@ -329,7 +332,7 @@ void QET::Icons::initIcons() { HotSpot .addFile(":/ico/22x22/hotspot.png"); InsertImage .addFile(":/ico/22x22/insert-image.png"); Lower .addFile(":/ico/22x22/lower.png"); - IC_MoveFile .addFile(":/ico/16x16/item_move.png"); + IC_MoveFile .addFile(":/ico/16x16/item_move.png"); Names .addFile(":/ico/22x22/names.png"); Neutral .addFile(":/ico/16x16/neutral.png"); NewDiagram .addFile(":/ico/128x128/diagram.png"); @@ -355,6 +358,7 @@ void QET::Icons::initIcons() { PrintLandscape .addFile(":/ico/22x22/landscape.png"); PrintPortrait .addFile(":/ico/22x22/portrait.png"); PrintTwoPages .addFile(":/ico/22x22/two_pages.png"); + Projects .addFile(":/ico/128x128/project.png"); ProjectFile .addFile(":/ico/oxygen-icons/16x16/mimetypes/application-x-qet-project.png"); ProjectFile .addFile(":/ico/oxygen-icons/22x22/mimetypes/application-x-qet-project.png"); ProjectFile .addFile(":/ico/oxygen-icons/32x32/mimetypes/application-x-qet-project.png"); diff --git a/sources/qeticons.h b/sources/qeticons.h index ab162baa1..d3dc3d1c0 100644 --- a/sources/qeticons.h +++ b/sources/qeticons.h @@ -61,6 +61,7 @@ namespace QET { extern QIcon DocumentSave; extern QIcon DocumentSaveAll; extern QIcon DocumentSaveAs; + extern QIcon DocumentSpreadsheet; extern QIcon East; extern QIcon EditClear; extern QIcon EditClearLocationBar; @@ -134,6 +135,7 @@ namespace QET { extern QIcon PrintPortrait; extern QIcon PrintTwoPages; extern QIcon Project; + extern QIcon Projects; extern QIcon ProjectFile; extern QIcon QETIcon; extern QIcon QETLogo;