From 10d4698f1915e47c09c9eab95c08784c2d415ba6 Mon Sep 17 00:00:00 2001 From: Pablo Gil Date: Wed, 9 Jan 2019 17:43:25 +0100 Subject: [PATCH] Project panel toolbar buttons with icons --- icons/icons.qrc | 12 +++++++++ icons/iconview-disabled.png | Bin 0 -> 611 bytes icons/iconview.png | Bin 0 -> 611 bytes icons/new-disabled.png | Bin 0 -> 663 bytes icons/new.png | Bin 0 -> 684 bytes icons/open-disabled.png | Bin 0 -> 827 bytes icons/open.png | Bin 0 -> 889 bytes icons/redo-disabled.png | Bin 0 -> 831 bytes icons/redo.png | Bin 0 -> 882 bytes icons/save-disabled.png | Bin 0 -> 792 bytes icons/save.png | Bin 0 -> 844 bytes icons/treeview-disabled.png | Bin 0 -> 607 bytes icons/treeview.png | Bin 0 -> 630 bytes icons/undo-disabled.png | Bin 0 -> 842 bytes icons/undo.png | Bin 0 -> 908 bytes panels/project.cpp | 48 +++++++++++++++++++++++++++--------- 16 files changed, 49 insertions(+), 11 deletions(-) create mode 100644 icons/iconview-disabled.png create mode 100644 icons/iconview.png create mode 100644 icons/new-disabled.png create mode 100644 icons/new.png create mode 100644 icons/open-disabled.png create mode 100644 icons/open.png create mode 100644 icons/redo-disabled.png create mode 100644 icons/redo.png create mode 100644 icons/save-disabled.png create mode 100644 icons/save.png create mode 100644 icons/treeview-disabled.png create mode 100644 icons/treeview.png create mode 100644 icons/undo-disabled.png create mode 100644 icons/undo.png diff --git a/icons/icons.qrc b/icons/icons.qrc index 57624c16c..1f3fd2899 100644 --- a/icons/icons.qrc +++ b/icons/icons.qrc @@ -58,5 +58,17 @@ tri-up.png hand.png hand-disabled.png + treeview.png + treeview-disabled.png + iconview.png + iconview-disabled.png + open.png + open-disabled.png + save.png + save-disabled.png + undo.png + undo-disabled.png + redo.png + redo-disabled.png diff --git a/icons/iconview-disabled.png b/icons/iconview-disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..37ea7f6e9b008edf1e478304d271b0271e372476 GIT binary patch literal 611 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf4nJ z2(JfW#^h&xhk=5UC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6dzfD}2F zmSp4?G597Hm1O2A1eF$N=a+3ieP$+5-WXy?X;E@2Lq5KliOF)uwoJ~KH#FK)iZ1O^7iMo$;Vkcv5PXBh?^HV|={pRs_upka>U zh0ay7z5CX>;DY^W zxdJB9AkZ<_S_>LV&{AXuhV7A~G z;|kstg$!BDSuzc`8l+H#?(lnv-Q_>4nJ z2(JfW#^h&xhk=5UC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6dzfD}2F zmSp4?G597Hm1O2A1eF$N=a+3ieP$+5-WXy?X;E@2Lq5KliOF)uwoJ~KH#FK)iZ1O^7iMo$;Vkcv5PXBh?^HV|={pRs_upka>U zh0ay7z5CX>;DY^W zxdJB9AkZ<_S_>LV&{AXuhV7A~G z;|kstg$!BDSuzc`8l+H#?(lnv-Q_>4nJ z2(JfW#^h&xhk=5UC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6dzfD}2F zmSp4?G597Hm1O2A1eF$N=a+3ieP$+5-WXy?X;E@2Lq5KliOF)uwoJ~KH#FK)iZ1O^7it)4E9Ar*7p&UW->HWYBXpK(>mDks>JyV)~yN`z5U<0ui@|` z&0RgeCrwaR$i90bVa=-RTdhwDUQqYVzd-?w(jt6F^K9{@JP<|`WK;

P379TFCI8DY>9q(oc!}QXX<~G qt(?ZUy63O4Hsokh;Al!XsK4Q0{M2c_lK+75&*16m=d#Wzp$P!`gAro@ literal 0 HcmV?d00001 diff --git a/icons/new.png b/icons/new.png new file mode 100644 index 0000000000000000000000000000000000000000..e69e392c550f30f7a993fb21e81c512cf6db11d8 GIT binary patch literal 684 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf4nJ z2(JfW#^h&xhk=5UC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6dzfD}2F zmSp4?G597Hm1O2A1eF$N=a+3ieP$+5-WXy?X;E@2Lq5KliOF)uwoJ~KH#FK)iZ1O^7iQ=Tr4Ar*7p&NTF54isqHFB&L#kU2xK z>BbArmKh>V?E*)IE7G3 z@9+D*Nq|FbwpXx<688ZugX|egxoyHizvkR1RyoP!k|Jxt^z7|pg#)Gqk)cylUf3U) zvM8UHhDT2KH$}UZMr8HoQBp9Vt+oqV+)5 zB6SDL=BELx7#hq>Jv1U2t|%-lVVn@zbhUeeY4m|(>x+$s~mJ54>8xF?F%s*87*e4r~jYe{1Fs)dhkd66YQ2^UG>< zJ1}?AGQCNgGru)#{`XwXVEKykj_vmzoZs8b;wZr4Xkb^v81pPSOK0ng=fFh4;OXk; Jvd$@?2>?5(3cLUS literal 0 HcmV?d00001 diff --git a/icons/open-disabled.png b/icons/open-disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..40b12f1377de0da72817b43a4b3ba40bffe3518e GIT binary patch literal 827 zcmV-B1H}A^P)VJ>fSXD@eYYiTc3VQyz{Uuk1+ZeE`# zkN^MzSxH1eRCt{2n_r6)F%(D7?Y6qO$byJ7DEJ@>`sDZj7QQR^;(zeP>RPJq^p|40#VCwq!r`l%$O2uQkaB+#qsv(kg42$+(t zw1ix>`~_Ggwtc*3f2XR5$m_)ZucY=fU`w$x;id?HLK12fppore?%APM0bhZ2WM9_V zp;iIsz-QtTvXw)v0$?bE;u2~W024^4T>uo8Q1YhcI-Ih5&++Gq&v&Y-BJ##MP^|)P zZ(bI9Rb7e5J4>URPy!YnS{u|L;CIHpZdn^dOF&gmfNo@`^F5zah8jK(?E41X8!<)^ zf&w-N|B~@%$Wg4X3oL+No7Y9YGn@s-hVi!jS+5g2#6ow*Fk@M4-Y-j7VZWU|1|D2D zQ0yShwPawyKN0SDT?DI<;5iFaA;EhZbeG^Q0GuV%@>O_&{c(G23V(iS(;E0BB4?vJ zal)D<_PgZ$z_wmhUxg&pPy$mh1NzvGLm~Lx=8yygX#%_hc+&)U2k@o|@DAWj6W|@d znrZZu?0>ykhDHlN@@4v-zkesPq1ib@HNU&sM0)7+>;zjV7Vgfz@ z%W_#JX9;`^?TG#+ud2fE_t=sPrlw#GEJdWIS*uYEe*twqgpYub3t<2N002ovPDHLk FV1j|=Uo!vz literal 0 HcmV?d00001 diff --git a/icons/open.png b/icons/open.png new file mode 100644 index 0000000000000000000000000000000000000000..0720fee850d016e03248ff093af6b4c6cbac7438 GIT binary patch literal 889 zcmV-<1BU#GP)VJ>fSXD@eYYiTc3VQyz{Uuk1+ZeE`# zkN^Mzmq|oHRA_HTd~n1et`G^;?J-Y zY^W3)m5Q@{feNqiP+ zliKdHA`7R1hd#w@QXx47+!K*8ABDNzoj&lUU|lEB;b!6ta92d0DW%p5)&aOntpZ;P z*453CXBuFuVpR#hG}GuFD;$bdlmabwM??y>uWYGBVBU~+7PuuM&Xa!GQhne#X0dY= z5Gz{>vc-Bhid8`hwAc&at0BDy+{`Oh6)Ava;3cqNNIwtU$Rk#^R0lYeI=a9+wBRr< z0N1m`ye=dQ&;@QgUULy0uCGlQ%I>M6To#c@Q({OdpU+GR9j-%300v8v1FR3naZ7<& z$dGgMgY&+gppDC@L_`h(kAS@!(!Lw6*^#5d6?D&}>;v!-*yUK>ee&H*KuaBQtiYvg*etdN{B$hqk4xqjme}+_!v9_iMu^cbA@F<{ zYDjMnjv$1br-F%vUMBsM@-Y#Qi^$>B|KGr(Qp)d3#GLr*u^w=B!?_gaj@D5ssiRc1&r?4nJ z2(JfW#^h&xhk=5UC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6dzfD}2F zmSp4?G597Hm1O2A1eF$N=a+3ieP$+5-WXy?X;E@2Lq5KliOF)uwoJ~KH#FK)iZ1O^7CSWg$nkcv5PXT|zoaS&;n&%CIEt#hJ7 z$>v!aGfw>fZ@5BSPe@o$U&JKkZ^hmW;mL2W=U4})J+wI)S9;6%`ONoa2McA6gVA%b zr0cPbRw{Ryzcv0oAo}6z8NHw*r~De0IeHawrS zY-4hoD#Hynv*>mH$=)Y?54btZT)9MiBhxdr2Syw2s7z~F!!qNh=m*seKU9ttobYlu zS^c0o;pV|&r?S%u4NFQN@P5$vFfG{l_XYK^X-o+=oHw}|3RO~c87_IBh+|kXb%PL- z!rYdrf()4|UxWhY-6;F9zkGl2zoI8c&iKvJW8>EF&#FFP+*SNb>!OCDN5hi#1B@RO z($=~y3v*h|;8}gZ`_mmWeQ#H%*E^RoZOzp|6?Rm0LYr*QT>!=70evXaFo3E<54E~zu{ue(e zUS+SLbL1{-9J@&GBpVZ%_S3mo z+-EvvpC-JljK8FIw6mmpk^7vb^BQC!so{8Gp6GvuXNPY_@a(?w5|~aIJYD@<);T3K F0RYjFYXSfO literal 0 HcmV?d00001 diff --git a/icons/redo.png b/icons/redo.png new file mode 100644 index 0000000000000000000000000000000000000000..cff5d8d5cc47c84d2a9c5aa92f254053341cfbd8 GIT binary patch literal 882 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf4nJ z2(JfW#^h&xhk=5UC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6dzfD}2F zmSp4?G597Hm1O2A1eF$N=a+3ieP$+5-WXy?X;E@2Lq5KliOF)uwoJ~KH#FK)iZ1O^7C37#&FAr*7p&f1+V5-8HXUsy@XK+BHf zP*X2w*HR^pri+ITnQ$kq?p+`DUs6=(jjE8q+BYtN7wiwPvv5nxYg}|<`5AeJYuD#p zyNlEJ%$~FUj-~PQIr-)9x>=7G%7D=v-j2WTnYt!y5w_qw!#KZjdfK;by)h>_Cv0Je zVNUz^Phv-U+V|w=v%CHtQ1h6@ruRAj^Mu;Kbk(oP&wacYHpt(IE!-;~?Ucoo#+>wP z(z&BvGiEiEHx_ztR8dhqaK?_|Jk#OnNqhJ_IVB3%D`X{ZSNM43NwG}WGBZcZMxf#} zv+-_gzjZ3C4&_3VL>caSctkO5(O0Zwys)mNQ-I;E=L`wP3w8r=)WoEPSbKC)~4;z*K z{oK*%_CQJ2l;4?&E%>%?LPel*!p$@HOgzKdm&g^U80;zh9I)x)L=*3_4;Pguf84Rw zUW4bUEn5sHNAD$@DLL(D-$-weQ9jtwa>n4|toAQu)$31$%}RC2l@k(9NV9K@KJdZo z^LYu8t(6{MHaK6BdmwW2;cM{+p5n<99$WN*(YdyV=6^YFuV3PjdkmPg89ZJ6T-G@y GGywp%ba6%i literal 0 HcmV?d00001 diff --git a/icons/save-disabled.png b/icons/save-disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..c65944d3051915fa56d0805991da5f6fdbea41f3 GIT binary patch literal 792 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf4nJ z2(JfW#^h&xhk=5UC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6dzfD}2F zmSp4?G597Hm1O2A1eF$N=a+3ieP$+5-WXy?X;E@2Lq5KliOF)uwoJ~KH#FK)iZ1O^5sGfx-Ckcv5PXM5*gF%WS(uiGki!N;}L zgGGp&MQF{B|Non6C*JrlO`xMOsCR*U_Y_v+GAqBwG2tI4rakV-x0AnF>C2||`B+=Y zq%Hh94bsYKf(2P=``y-5YMx|Lk!93x`1|oO!-sQc?xn2Sd-Ps|o&O2*iU#*d^U~J* zmv?5lBWZio>}`lp8;3;69SH~Rmyz%0@(3EJ`sQ&auYG#{z|8~u`t@(#^EhXNEs<+EMT=oq>V#OQ zlS~OroJ+YI&IlFVyAso?yzRZ^zb`fWC#o1%&)u~+h*c)0CMZL7?#!FFr}$k@ zV5>7HQ(b?=>#(f$7eW(C#50&&owEx){}(qE@0z{z0`KMW2RrQ3?3$SL*#1wtn|?y? zJlph==D*u6{%g(?lTmxa|3K~K@lM?&;{~2Po3*`nv1`Sf-%8%RxZnA~!BFO-Y%}*v z6N+H?ZgkE6&})T=9+vZ)9R!8;_&2{3+QZtgxg|)iRlFqf*ShcKoOSV+KKCv&{c!P& zU$U#$!*3p?@7Qled9HU7@`_*z-oUbP0l+XkK D4nJ z2(JfW#^h&xhk=5UC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6dzfD}2F zmSp4?G597Hm1O2A1eF$N=a+3ieP$+5-WXy?X;E@2Lq5KliOF)uwoJ~KH#FK)iZ1O^7CEKe85kcv5PXCL$qag;f3KY6A~Bilt+ z{)H`ayV_hftYu&LNBYRCI}7af4(`h^6>5L0TMYr9?F6{*?bt41vi&8=q8_8-%%Uav7JG1CgVKj z#UCFl9FY2OOhTFS*ZW674zpD+@yM;xf1>;9!WV-}jQyR3oLE}6a3;!C z%!+afZsuI-n#4I>`Rit`8s41WubO^|HFWIp+i3XAj``oj9JMdq3?3?q;f(b%Pjw#@ z`f%>#s^HGCes#-b4v=ZV5?0{du}!8(l%c?dS*S>if!E_iEQ884f!7Kmvwt6$8+9|V z|8=y3yGvLNzxPhA9ikVO@xBSV>-cYWT?CVz&JVK_jtA^oK?Z85!}!-t8#;bYX* zzNepdm#n|JS%&$3L#g-O^ap|OXT03-ZqD-NdPW}ie|z)~RIhT6PoK$}#~g0+OX~2Z zaEau3KUj*+Hkf^6=P&5by1Do9o|e)#n-_~4x8zQHUhtOjUiQgm%Y=ys)Guwkc#CE8 z#08b&C!CtTX)vnTjntyPo{$6u|Ql^7oET3axIB|?*F3v)&=O9uOeWgHjy7WfJ-kad`? zmdKI;Vst E0Dh}fn*aa+ literal 0 HcmV?d00001 diff --git a/icons/treeview-disabled.png b/icons/treeview-disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..f8fa8c2aeda53d786e4cb9e94440dc9a0ee46a62 GIT binary patch literal 607 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf4nJ z2(JfW#^h&xhk=5UC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6dzfD}2F zmSp4?G597Hm1O2A1eF$N=a+3ieP$+5-WXy?X;E@2Lq5KliOF)uwoJ~KH#FK)iZ1O^7iT2B|pkcv5PXYBSn>>%KJo{f<;z*Td? zi=co{|K}fMU$U&@j-wz~+o9~^l{Y57{TlUpue+D9`{JF#+2th;PkOVf6Vmt(7;osh zeoo~NFDP5=B{pV6e#hjk_zE-qgF^*=`KTvyOm-5T!%xwv2d=;PP?-nps zUvS^_2D@=JyP0B^?-^hD3)057C%9F-_{6AO!5g5gw$?5|L$iwIXG50&v&Ti{m|qQo zHLNQHC;I_aKEES(qkpY%=WV+Lj+^>UqMGXtId$wg`A^`Asl=j9H4ah_9qkw<@H0GN z?mNNGqM;_=P~-5dJHWMT^#%c@{7v>OrMzt`bmW27ffX_QY*7Bh$k=s~T|s`rPoR^kDSM+Q$4nJ z2(JfW#^h&xhk=5UC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6dzfD}2F zmSp4?G597Hm1O2A1eF$N=a+3ieP$+5-WXy?X;E@2Lq5KliOF)uwoJ~KH#FK)iZ1O^7iDV{ElAr*7p&am}6>>%KF-;Jr0iPMF@ zLwQHzEWS?V3A2I&3Pmi~O-(GB?Mqo~j|SZ6%Mr3Z5~sH5dv)j}U%U5f=H9)?Jke}n z=7BSO4Z#V=bItxAHvb^y^dri2#}@_Mhin6g$xs)%Z)e;7rB8&$%q0q8gv>chHLX zxo8)|`>TzD$p_qjrfp<6dd}kZv7R|Ix6Wnaf8u^LV&>%QI~;lg9_tHbwzdjn3YShd z-yHjZ=SKg`+mp}MIEbIgVTxf6KM>b*=0r{%&p*qXIt<$nxZc-czxJy^Z;o-#qlIVL zzdSHrq1Ckx{PUDjDlWZZ-t~dW#{I;{guVPPoG$eS zywzgP0ogbCkJ^gl4dt6^8i3HDg~$I1^8|hn)Cg1-`AW1R*H?cSUhwVp^_(Qw3XEO` MPgg&ebxsLQ0QkrJ8~^|S literal 0 HcmV?d00001 diff --git a/icons/undo-disabled.png b/icons/undo-disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..99306ac93fe0e56dc04ad579d7d8a77f990b1e77 GIT binary patch literal 842 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf4nJ z2(JfW#^h&xhk=5UC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6dzfD}2F zmSp4?G597Hm1O2A1eF$N=a+3ieP$+5-WXy?X;E@2Lq5KliOF)uwoJ~KH#FK)iZ1O^7C3{Mxwkcv5PXT@d9*+IW7ZIbc(+cR$(8#5j@ z-~pqa=#D49l0x4y^EcK$5c;8|R9}3QTeX{U)i0ikeE~JRd&DOu_RU!MX30ONP}`(P zn*(|uyh1nk?h=?J70_iLb@_?j1%FB7X(?hXCrnJ@^qP2HbX9N|EbxAG@N&btPIi9gT^e#y zQWru$UO3R8*UjF}IPa19+0viooPXHr+TNIiOI;}XxOxY}xrThDMZR_c*$1X|tv6!w zb2+l}eT2~h=11vw801}^)Wj}+!mgy7)c%O!*~ZluWt5B<>{4G{`TwAGm0d(=q&1Vv z6A_7&*O$@+yCxPaUsv>0M8n-F+~)gp~ZUaPwT(3NLbI3(-SkPrdoa>}t zcz#vP(iccLbb3YwZ{&8q7{>ZltQTi1`U~@gevQlVaj$PX@O;)PLsvP2=^Uy%SBOk( zT;;Sm`H Omci52&t;ucLK6U(GF;yP literal 0 HcmV?d00001 diff --git a/icons/undo.png b/icons/undo.png new file mode 100644 index 0000000000000000000000000000000000000000..f709c8c241b83968fc6a3d5b40b34ee649b46230 GIT binary patch literal 908 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf4nJ z2(JfW#^h&xhk=5UC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6dzfD}2F zmSp4?G597Hm1O2A1eF$N=a+3ieP$+5-WXy?X;E@2Lq5KliOF)uwoJ~KH#FK)iZ1O^7CRh}-6Ar*7p&hpK^>LAiKf4i1O#>y^f zaixsAJ4Ehwth>`0@P(g4smc1Ue5txdY)5ur*MbEKdM#YLM8!iLw?wS(2#I>}_45u7 zt&epoGgF>TI#y{m{mh)%lfSD@wlwB+QJUzXBGd__PSkfe&AoBv8*_WZTnF|FotNG# zYC<`a8fMOA^7}rgUUbH^FIFz+R`vX}TR78~G5v*kId{RqGiJZeMY6AFTk>dmky9Dt z@0w?8y3LurI^vU8ub*T0A*rFcqJdT3vNrHGgZszgNmixBzm`m6?0fXQadzpa)&-k@ z%y`CdmD<&_^hKt=YT$abT(xxd6RzIPjJZPmeQaBNZ7d`%xP1(`)Ud6qU5ITYHg z1C6>XYnZeTxIf_iu;`Rm@d`#>ar++r1I!OPm)uYNXKSS@9k ztWtjHS>jw~&-X3cW*9Kek-744x4Ca?i_!tYVp+!}MY0g8Jxh3yL)F zBnaDyf6-6p&sxi>HKSmi-@ZvUr(eEi$luJnRouBxO~!2V-O^&QnDaIT?f=>zhChh1 zO8s~A^y)0n&1q~;yO!FjNQ)nwP;&iD9Mf@+RYzGLB>tN4hduxOD_Nh2k5i5NORCot zbf0-$=g|3ZgG-Q>Ioo?_rIno9U&=SfKG?P7{l4OBicj2wCLai#wDg722alkOBBG#l f15G}GAJ|(?f9z*}cIF~5(KC3u`njxgN@xNA?mm7~ literal 0 HcmV?d00001 diff --git a/panels/project.cpp b/panels/project.cpp index faf05daf6..2a8bde78a 100644 --- a/panels/project.cpp +++ b/panels/project.cpp @@ -83,41 +83,67 @@ Project::Project(QWidget *parent) : toolbar->setSpacing(0); toolbar_widget->setLayout(toolbar); - QPushButton* toolbar_new = new QPushButton("New"); - toolbar_new->setIcon(QIcon(":/icons/tri-down.png")); - toolbar_new->setIconSize(QSize(8, 8)); + QPushButton* toolbar_new = new QPushButton(toolbar_widget); + QIcon icon1; + icon1.addFile(QStringLiteral(":/icons/add-button.png"), QSize(), QIcon::Normal, QIcon::On); + icon1.addFile(QStringLiteral(":/icons/add-button-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); + toolbar_new->setIcon(icon1); toolbar_new->setToolTip("New"); connect(toolbar_new, SIGNAL(clicked(bool)), this, SLOT(make_new_menu())); toolbar->addWidget(toolbar_new); - QPushButton* toolbar_open = new QPushButton("Open"); + QPushButton* toolbar_open = new QPushButton(toolbar_widget); + QIcon icon2; + icon2.addFile(QStringLiteral(":/icons/open.png"), QSize(), QIcon::Normal, QIcon::On); + icon2.addFile(QStringLiteral(":/icons/open-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); + toolbar_open->setIcon(icon2); toolbar_open->setToolTip("Open Project"); connect(toolbar_open, SIGNAL(clicked(bool)), mainWindow, SLOT(open_project())); toolbar->addWidget(toolbar_open); - QPushButton* toolbar_save = new QPushButton("Save"); + QPushButton* toolbar_save = new QPushButton(toolbar_widget); + QIcon icon3; + icon3.addFile(QStringLiteral(":/icons/save.png"), QSize(), QIcon::Normal, QIcon::On); + icon3.addFile(QStringLiteral(":/icons/save-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); + toolbar_save->setIcon(icon3); toolbar_save->setToolTip("Save Project"); connect(toolbar_save, SIGNAL(clicked(bool)), mainWindow, SLOT(save_project())); toolbar->addWidget(toolbar_save); - QPushButton* toolbar_undo = new QPushButton("Undo"); + QPushButton* toolbar_undo = new QPushButton(toolbar_widget); + QIcon icon4; + icon4.addFile(QStringLiteral(":/icons/undo.png"), QSize(), QIcon::Normal, QIcon::On); + icon4.addFile(QStringLiteral(":/icons/undo-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); + toolbar_undo->setIcon(icon4); toolbar_undo->setToolTip("Undo"); connect(toolbar_undo, SIGNAL(clicked(bool)), mainWindow, SLOT(undo())); toolbar->addWidget(toolbar_undo); - QPushButton* toolbar_redo = new QPushButton("Redo"); + QPushButton* toolbar_redo = new QPushButton(toolbar_widget); + QIcon icon5; + icon5.addFile(QStringLiteral(":/icons/redo.png"), QSize(), QIcon::Normal, QIcon::On); + icon5.addFile(QStringLiteral(":/icons/redo-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); + toolbar_redo->setIcon(icon5); toolbar_redo->setToolTip("Redo"); connect(toolbar_redo, SIGNAL(clicked(bool)), mainWindow, SLOT(redo())); toolbar->addWidget(toolbar_redo); toolbar->addStretch(); - QPushButton* toolbar_tree_view = new QPushButton("Tree View"); + QPushButton* toolbar_tree_view = new QPushButton(toolbar_widget); + QIcon icon6; + icon6.addFile(QStringLiteral(":/icons/treeview.png"), QSize(), QIcon::Normal, QIcon::On); + icon6.addFile(QStringLiteral(":/icons/treeview-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); + toolbar_tree_view->setIcon(icon6); toolbar_tree_view->setToolTip("Tree View"); connect(toolbar_tree_view, SIGNAL(clicked(bool)), this, SLOT(set_tree_view())); toolbar->addWidget(toolbar_tree_view); - QPushButton* toolbar_icon_view = new QPushButton("Icon View"); + QPushButton* toolbar_icon_view = new QPushButton(toolbar_widget); + QIcon icon7; + icon7.addFile(QStringLiteral(":/icons/iconview.png"), QSize(), QIcon::Normal, QIcon::On); + icon7.addFile(QStringLiteral(":/icons/iconview-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); + toolbar_icon_view->setIcon(icon7); toolbar_icon_view->setToolTip("Icon View"); connect(toolbar_icon_view, SIGNAL(clicked(bool)), this, SLOT(set_icon_view())); toolbar->addWidget(toolbar_icon_view); @@ -401,7 +427,7 @@ Media* Project::new_folder(QString name) { Media *Project::item_to_media(const QModelIndex &index) { return static_cast(sorter->mapToSource(index).internalPointer()); -// return static_cast(index.internalPointer()); +// return static_cast(index.internalPointer()); } void Project::get_all_media_from_table(QList& items, QList& list, int search_type) { @@ -527,7 +553,7 @@ void Project::delete_selected_media() { // remove if (remove) { panel_effect_controls->clear_effects(true); - if (sequence != NULL) sequence->selections.clear(); + if (sequence != NULL) sequence->selections.clear(); // remove media and parents for (int m=0;m