From dd2c45ab6476fac2c99c4520b518549f267b0d2f Mon Sep 17 00:00:00 2001 From: nuri Date: Sun, 26 Nov 2017 04:54:31 +0000 Subject: [PATCH] icon theme: add dedicated icons for actions "show only this folder" and "show all folders" in the collection panel git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5110 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- ico/16x16/folder-only-this.png | Bin 0 -> 242 bytes ico/16x16/folder-show-all.png | Bin 0 -> 271 bytes ico/16x16/view-refresh.png | Bin 508 -> 492 bytes ico/22x22/view-refresh.png | Bin 645 -> 626 bytes ico/copyright | 2 ++ qelectrotech.qrc | 2 ++ .../elementscollectionwidget.cpp | 6 +++--- sources/qeticons.cpp | 4 ++++ sources/qeticons.h | 2 ++ 9 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 ico/16x16/folder-only-this.png create mode 100644 ico/16x16/folder-show-all.png diff --git a/ico/16x16/folder-only-this.png b/ico/16x16/folder-only-this.png new file mode 100644 index 0000000000000000000000000000000000000000..0927f3b08c6f30d624fbdcdb2b4945212f259375 GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPtw-k%I?!ncI76OIpJzX3_EKVmUED$jGXMZ@rzmriX zVAsL*7sZ{8PQ2oCZhBo>^GiBnLgnmN=7(>}@84v2MQ2k=LPElUYz}U{&b7-$CFS-# zO0M|P)t`9RP?V=~Myk&Z6MgFi=QccAAmy2O00bIzWju@+EO|aKrgYEH@MT}j7N97l edCo_KnPI~>#YX#|soQ~0VeoYIb6Mw<&;$U$BvTLo literal 0 HcmV?d00001 diff --git a/ico/16x16/folder-show-all.png b/ico/16x16/folder-show-all.png new file mode 100644 index 0000000000000000000000000000000000000000..9651020c8330afbffb6675e6dfb9fa2f2d455bd0 GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zKpodXn9)gNb_Gz7y~NYkmHi>N6pNPLTb|x9pwJvo7sn8b(`zT~6?%lgmvU*0Vjo5b1{bjtX7O)Gn}!m%3@WP-i; z&;QgTe~DWM4f0Q+Sz literal 0 HcmV?d00001 diff --git a/ico/16x16/view-refresh.png b/ico/16x16/view-refresh.png index 6486ddd3116618b6fddd7d0406c1602f47d115e3..7527ee00d87b8f43f52a2ed06697166fe9d2caeb 100644 GIT binary patch delta 392 zcmV;30eAlV1MCBkZhvV>L_t(Ijm45ZFGFDzfS>c;YMXSzVDJktn0!QHa4!;ORtaM5 zEYj-r5u-s&5=6q%*~g&wiiw25Aa;okLORk9?XkGDl#b5yo|AK)JnzYY{|>2Fw7sQi zL}vv$fQY~?DhEx4=B<gr_F}en9)))wMlr6pb?Mp%AqtR=iE6A&t7!DU>+6d58dR3rQ z4{%quUV0k=tbelf0CztCqOyqCblP$<%Y(H9ZB=3Wb1ry{9dAU6(cGmdM;Y5q zBB<@Hwu`)7Ad>WkQhW7`YVP1;;1GDMz=jIGsn99HxvIo{C$;+>P;-gClgPF_)2GUz mfuyB8iEs+s{Joj~jCVM=ds)J4&!zwX002ovPDHLkU;%=PR>2wo delta 408 zcmV;J0cZZ~1N;M!Zhv`6L_t(Ijm=WOOF~f?J@-Cd*X2zOLDHfiT0>Jm2pVhg>XcIu zn6yQ61hoW>4UIvy)IXpX9ip-=s6inF?-t|`Q6Px$czVC47f*ZPSZBK5;X8+OE+6pM zU}2<`GS3(*07wB40GZyGcZc{eFL`TrR%=KqiyfV~piI&s+49d?%1n=B1Qt{#+~;&xvTG+wHb|u2d== z5z(t{+gm>>Fvbd;^N(N(rPNKeTI~%)X6%@V*2DfFC4_kVtx^C_0A|7r#@g*RjZzCC z2!I!6(1=7L^M9iZT-Tig&MZ8Di+`~@y6MO<3&gQCsX+~X#Z%#ci& zec$Cda~{sUGXtEY8;WY?_SUAg@81ECCg73)NdR9VsF10)Dt`-)KM$K#QLwM|EdX~# zP#F7z^G198oFd#7MTg?+_m0curJW5c_Qn9<)JjDXxnZ>7e7MZtd-d7+`h?Xweonwt zvN3t(-PL=|Sa3hyOjz^v`NGft4FP36-WI`O)#26tnZQ-#_SU8|Eg6CfDx~m6 z1i2_Ug;w$)F5Cvb0JsnZn;o;^$Atly1azX{Z-$RlTvchL00d4Ngax}|(6zWQ6qZHc z4TZ^6TO_hNTVJ0D&oZ;JUA{iZCBcz0jm+yE~=AO;JEHmi{u#&Bgh6n!AOFJ7@>(q~@09Huw45oV9(Rx4G z8W)}TJ13A=LiEJ7i=|j_FN-yv(LlcY@n0mM4d6foo-&Qi-GxW{qc%SY{sFXVwHtsG Sch3L-00{s|MNUMnLSTYF%>khR delta 547 zcmV+;0^I%b1ce2VZGQp+Nkl6a*t<|X82<+;6zt7|9yDaLAr=+agMWdi9YYb14JZ;JtjW&vV1>3J=b*$OD8@_{fLNeNhz~*=OHtb)_?ka9?)7+qPGP5ZAQUhyP8?%v(g%&YMpwV@wF(Ms}8e z73D&qaI`GASS$_zTwVm00Mcc_lgUH^m@Wc;O_HR%EI3WmG7-(3G=Il$nAu+zOhntv z9L)t=mURGNM=7f15c)ezohm1u5lg07D{b20<{&XcwfE?}+GC5Cp9`>Hkd(0E59GtyC({ zg%Fzn_H5f;aU5qico/windows_icon/qelectrotech.ico ico/windows_icon/qelectrotech.rc ico/copyright + ico/16x16/folder-only-this.png + ico/16x16/folder-show-all.png diff --git a/sources/ElementsCollection/elementscollectionwidget.cpp b/sources/ElementsCollection/elementscollectionwidget.cpp index a724c36b6..7f586ec2b 100644 --- a/sources/ElementsCollection/elementscollectionwidget.cpp +++ b/sources/ElementsCollection/elementscollectionwidget.cpp @@ -146,8 +146,8 @@ void ElementsCollectionWidget::setUpAction() 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::ZoomDraw, tr("Afficher uniquement ce dossier"), this); - m_show_all_dir = new QAction(QET::Icons::ZoomOriginal, tr("Afficher tous les dossiers"), 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); } @@ -479,7 +479,7 @@ void ElementsCollectionWidget::showThisDir() showAndExpandItem(m_showed_index, true, true); ElementCollectionItem *eci = elementCollectionItemForIndex(m_showed_index); if (eci) - eci->setBackground(QBrush(Qt::yellow)); + eci->setBackground(QBrush(QColor(255, 204, 0, 255))); search(); } else diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index 6781bbdca..ab15d8f2e 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -91,6 +91,8 @@ namespace QET { QIcon FolderDelete; QIcon FolderEdit; QIcon FolderNew; + QIcon FolderOnlyThis; + QIcon FolderShowAll; QIcon Forbidden; QIcon FullScreenEnter; QIcon FullScreenExit; @@ -331,6 +333,8 @@ void QET::Icons::initIcons() { 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"); + FolderShowAll .addFile(":/ico/16x16/folder-show-all.png"); Forbidden .addFile(":/ico/16x16/user-busy.png"); FullScreenEnter .addFile(":/ico/16x16/view-fullscreen.png"); FullScreenEnter .addFile(":/ico/22x22/view-fullscreen.png"); diff --git a/sources/qeticons.h b/sources/qeticons.h index 5c7b3e0b5..9864688d0 100644 --- a/sources/qeticons.h +++ b/sources/qeticons.h @@ -98,6 +98,8 @@ namespace QET { extern QIcon FolderDelete; extern QIcon FolderEdit; extern QIcon FolderNew; + extern QIcon FolderOnlyThis; + extern QIcon FolderShowAll; extern QIcon Forbidden; extern QIcon FullScreenEnter; extern QIcon FullScreenExit;