From fc4ecb5587ba5fbbae70989e9ffd85b8cf546dbf Mon Sep 17 00:00:00 2001 From: nuri Date: Sun, 26 Nov 2017 21:13:56 +0000 Subject: [PATCH] icon theme: add missing icons in size 16x16px git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5115 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- ico/16x16/element-delete.png | Bin 0 -> 490 bytes ico/16x16/element-edit.png | Bin 0 -> 523 bytes ico/16x16/element-new.png | Bin 0 -> 472 bytes ico/16x16/element.png | Bin 0 -> 516 bytes ico/16x16/folder-delete.png | Bin 0 -> 271 bytes ico/16x16/folder-edit.png | Bin 0 -> 334 bytes ico/16x16/folder-open.png | Bin 0 -> 227 bytes ico/16x16/folder-properties.png | Bin 0 -> 281 bytes ico/copyright | 7 ++++++ qelectrotech.qrc | 8 +++++++ .../elementscollectionwidget.cpp | 22 +++++++++--------- sources/elementspanelwidget.cpp | 2 +- sources/qeticons.cpp | 17 +++++++++++--- sources/qeticons.h | 2 ++ 14 files changed, 43 insertions(+), 15 deletions(-) create mode 100644 ico/16x16/element-delete.png create mode 100644 ico/16x16/element-edit.png create mode 100644 ico/16x16/element-new.png create mode 100644 ico/16x16/element.png create mode 100644 ico/16x16/folder-delete.png create mode 100644 ico/16x16/folder-edit.png create mode 100644 ico/16x16/folder-open.png create mode 100644 ico/16x16/folder-properties.png diff --git a/ico/16x16/element-delete.png b/ico/16x16/element-delete.png new file mode 100644 index 0000000000000000000000000000000000000000..800bc84ecb5652635ce3ce59766d640427f0e299 GIT binary patch literal 490 zcmVK~y-6#go5E13?hRznKjj!OBK##GtVH1lB1;&1JU|Nh!XA zVtfJvK1BS3Lb`;Ug`%p^!p zegxn|q!L9@$FCVqX;^mg+3 z{2GAwtbp@~07*qoM6N<$f~UX8o&W#< literal 0 HcmV?d00001 diff --git a/ico/16x16/element-edit.png b/ico/16x16/element-edit.png new file mode 100644 index 0000000000000000000000000000000000000000..34770a772f991499a7f3dcd26cccd750568255b0 GIT binary patch literal 523 zcmV+m0`&cfP)7^fgE zW^!;%A!9qWKfo?7rGrAW1d{iWIg>+nhb)RqyA-68OW$|8ycb^6SDXY7d~h${J@=k- z`99!Z!p!uy8WxbA02q*bA!(iDxuhw8qd1O#uGR8~OM1Cl3_x+I5D6m8|nlDYsshG94; zw2*o}b!xt7cOW+pT17ZOs0x%fw=Qh5yEdn$h~ zJDpDF%zOV<(t|jTZ&@g1LA_pYNP1eU)vj~0KUb^OuOxet-T~NYG#Xqi7Rv=McTg^u z4@vg&o&g{X!ybT_0JZ^Ku3A_&7>!03K@fBRc#@j{&~CT)CA}i~2Eb6#hsk8JU)TTu z#^dp~QmOO|z#{;V^galJ*WUXtB+s042dfJ1Jmoynzi>(Ncy;psgBz28tOgv$!JYsB N002ovPDHLkV1lJF+hza& literal 0 HcmV?d00001 diff --git a/ico/16x16/element-new.png b/ico/16x16/element-new.png new file mode 100644 index 0000000000000000000000000000000000000000..325718abee48c044a652e3757526cb5d173d75a8 GIT binary patch literal 472 zcmV;}0Vn>6P)nS!)~Wpn0mb+U z6fCT*;vX#1CFDTt(kiL67L&q85VQ;-J2tm+o+l#Wz%;vW-n@A`3;!9`TKx$l*@I@Y zSvAJ&1Dn7yFa@rIAUNpv`;#o*WI8sCF}J`A&;XX4bCHO=Ef$NhwRYoM1xe={z^Q60 zj^mNPi=wD5B0WHYAXrZ;`A{Gt9TDlOYD+|VQ54nF#j4s;)vj}HFLwlEOhZ-A;y508 z5^L>_FHX)cR5i>cP}TBmHk$w>@{fG_apv>+BT&vI5RvC%u~_l4fnA?|oKmS&1)g$E zwAP-e>ML-SmYwz>ZR{5Xz@dn2XTfPt0BYm*r{(&zNXa{20;k59bLZTHF=llz7~FeI zZQRzowPVR800_fyrBEnzRCNoe0Mp@cSjlz9e O00007X literal 0 HcmV?d00001 diff --git a/ico/16x16/element.png b/ico/16x16/element.png new file mode 100644 index 0000000000000000000000000000000000000000..14888be00d505df6916be485f333645ec01b31cb GIT binary patch literal 516 zcmV+f0{i`mP)?ZmG?3hYNPlQ zM6i)`VyTVD{)SaoaGS{sDC}ZkAq4yZX~bO#`UfQ8@jNzp5_S{TMm*IW=H4^soXfz! zM2u0V_1KD`OTfU)GD+vnY$~Y$o~D$(9Pjt#LzZRNfw7r=bN61S(>derJzxrq^E}^L zt6=f+7;s59hr{8A`mW#a_kcY!`&Cs{cQhJ(U8P`PW-ovnX0{t+ytW{|YG%7;c3aYR zv)LT1v|whLyT42+eFSa+uVRc3fVaS%l+uB_??}p45=h!;wOU623z8?mb2EFEQaS)A z%kl^~yDr2ZWm#URWdo0ahms!Eb{dVwCh&ckpivhggv*jHh7hVH*{?$gpMWMe(kxs;;}Ale9mZ&3;PSm$U&~IX-+U{^l?IfBXjLprN$tqgciO00002?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4OmpZoMb|NqxtpQamqs?&(`E`z_ne_(w4eQ!HEySYEUYE%rLi(I5D4>KH!(6WxFYztNJKn=n|%?Z=B$ZVlfE)(HY71W zXo&g$xW_G};Iyj5;exHU*^-@R49g^>56qsD$S^H~O`UKzA{Cy85}S Ib4q9e0MVRZ5C8xG literal 0 HcmV?d00001 diff --git a/ico/16x16/folder-edit.png b/ico/16x16/folder-edit.png new file mode 100644 index 0000000000000000000000000000000000000000..3a71427a140e78ebafc91909e9db324d208c4a33 GIT binary patch literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4+?%&K%^ao8`i#<~N6J z-KLWI@88oO++XnR;F(90l!{iqw&E@-;+>=tY4F+D_wwfndY^;>OBe)%1J9gspKg9k zfI-857SjPum7nfS`{bGoUGL2OT6TebZK2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4OmpZoMb|NqxtpQamq>Z9a=mg^;M$Bg9V=lgAnZQ#$jw`b7Bs zIy+SU{r`V|L+a^iZaGCK)*XGtR5R=2E{13NK@3L|4S0AQI9-B-FF#;lm};#cd!g^! QGoW1zp00i_>zopr08LF%CjbBd literal 0 HcmV?d00001 diff --git a/ico/16x16/folder-properties.png b/ico/16x16/folder-properties.png new file mode 100644 index 0000000000000000000000000000000000000000..e5a609d4dd648d2cb9509eef46fb34837a90aa8d GIT binary patch literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4{{OGPK210JRHqT=T?T)D|G@b8``&hTc5{Dx+4x{eLgLB9 zgoF#JDJfUJe*LQJJpKNjN@HbaAQ0xeZenC$a7FNOk%)K#H~S(+%~=z#Cbcxa-8KEc zq=bY7AA6_qp&KV26il#CHj+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;