From 6d7bb54e774510f1efbe38ffdb6ddcede48b734a Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 3 Nov 2016 16:35:55 +0100 Subject: [PATCH] AutoTest: Use themed test result icons Task-number: QTCREATORBUG-16663 Change-Id: I087024bf2882690233032e555a825e397c945d3e Reviewed-by: Christian Stenger --- src/plugins/autotest/autotest.qrc | 10 ------ src/plugins/autotest/autotesticons.h | 34 ++++++++++++++++++ .../autotest/images/blacklisted_fail.png | Bin 520 -> 0 bytes .../autotest/images/blacklisted_pass.png | Bin 519 -> 0 bytes src/plugins/autotest/images/debug.png | Bin 621 -> 0 bytes src/plugins/autotest/images/fail.png | Bin 600 -> 0 bytes src/plugins/autotest/images/fatal.png | Bin 597 -> 0 bytes src/plugins/autotest/images/pass.png | Bin 595 -> 0 bytes src/plugins/autotest/images/skip.png | Bin 368 -> 0 bytes src/plugins/autotest/images/warn.png | Bin 621 -> 0 bytes src/plugins/autotest/images/xfail.png | Bin 547 -> 0 bytes src/plugins/autotest/images/xpass.png | Bin 599 -> 0 bytes src/plugins/autotest/testresultmodel.cpp | 29 +++++++-------- 13 files changed, 49 insertions(+), 24 deletions(-) delete mode 100644 src/plugins/autotest/images/blacklisted_fail.png delete mode 100644 src/plugins/autotest/images/blacklisted_pass.png delete mode 100644 src/plugins/autotest/images/debug.png delete mode 100644 src/plugins/autotest/images/fail.png delete mode 100644 src/plugins/autotest/images/fatal.png delete mode 100644 src/plugins/autotest/images/pass.png delete mode 100644 src/plugins/autotest/images/skip.png delete mode 100644 src/plugins/autotest/images/warn.png delete mode 100644 src/plugins/autotest/images/xfail.png delete mode 100644 src/plugins/autotest/images/xpass.png diff --git a/src/plugins/autotest/autotest.qrc b/src/plugins/autotest/autotest.qrc index f92f835e599..6bd7eac6d79 100644 --- a/src/plugins/autotest/autotest.qrc +++ b/src/plugins/autotest/autotest.qrc @@ -5,16 +5,6 @@ images/sort@2x.png images/leafsort.png images/leafsort@2x.png - images/debug.png - images/fail.png - images/fatal.png - images/pass.png - images/skip.png - images/warn.png - images/xfail.png - images/xpass.png - images/blacklisted_fail.png - images/blacklisted_pass.png images/benchmark.png images/runselected_boxes.png images/runselected_boxes@2x.png diff --git a/src/plugins/autotest/autotesticons.h b/src/plugins/autotest/autotesticons.h index f7845b071f8..ae4a1527cfd 100644 --- a/src/plugins/autotest/autotesticons.h +++ b/src/plugins/autotest/autotesticons.h @@ -38,5 +38,39 @@ const Utils::Icon RUN_SELECTED_OVERLAY({ {QLatin1String(":/images/runselected_boxes.png"), Utils::Theme::BackgroundColorDark}, {QLatin1String(":/images/runselected_tickmarks.png"), Utils::Theme::IconsBaseColor}}); +const Utils::Icon RESULT_PASS({ + {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestPassTextColor}}, + Utils::Icon::Tint); +const Utils::Icon RESULT_FAIL({ + {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestFailTextColor}}, + Utils::Icon::Tint); +const Utils::Icon RESULT_XFAIL({ + {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestXFailTextColor}}, + Utils::Icon::Tint); +const Utils::Icon RESULT_XPASS({ + {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestXPassTextColor}}, + Utils::Icon::Tint); +const Utils::Icon RESULT_SKIP({ + {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestSkipTextColor}}, + Utils::Icon::Tint); +const Utils::Icon RESULT_BLACKLISTEDPASS({ + {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestPassTextColor}, + {":/projectexplorer/images/buildstepdisable.png", Utils::Theme::PanelTextColorDark}}, + Utils::Icon::Tint | Utils::Icon::PunchEdges); +const Utils::Icon RESULT_BLACKLISTEDFAIL({ + {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestFailTextColor}, + {":/projectexplorer/images/buildstepdisable.png", Utils::Theme::PanelTextColorDark}}, + Utils::Icon::Tint | Utils::Icon::PunchEdges); +const Utils::Icon RESULT_BENCHMARK(":/images/benchmark.png"); +const Utils::Icon RESULT_MESSAGEDEBUG({ + {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestDebugTextColor}}, + Utils::Icon::Tint); +const Utils::Icon RESULT_MESSAGEWARN({ + {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestWarnTextColor}}, + Utils::Icon::Tint); +const Utils::Icon RESULT_MESSAGEFATAL({ + {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestFatalTextColor}}, + Utils::Icon::Tint); + } // namespace Icons } // namespace Autotest diff --git a/src/plugins/autotest/images/blacklisted_fail.png b/src/plugins/autotest/images/blacklisted_fail.png deleted file mode 100644 index 695e1f9246856f97b9fd7f952f2bce22a5407761..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 520 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7&wIK!hFJ72y?oYNBthW# z$Mc(4?p~LFAxQ7XB)KKsimEOFF71A@Jqm}aFW3uwu`l_YArQMNx_t!)lcUQ^p%f3X zD$bkElb&viTATUqa^n1yvw5}#(<{^Vo&S^ejMLEVfAOq;Wi0|mi+kiB-x2gH-_RSL zy6oMtA7315l3CrIC8Sc4W_a6bENU=g+4K0IhZ)x)Cpp*kw|@BG*<(C2b?v=(Yg6nuH1-{JEi4K;@ia$QXT<~SO+6+|WvgF4lGcjwH&U{i zKE0LYZ;yUy#ah7+Rn6U^Q!d|#y5ws5RcXnoeM!8l&zLi%6=vJAnyWuATctLg!Tz$w z^&7f|+u1t|?YI?fZasOG<#o?<(yiB3-+$T_Jg@E1&x}|i;56TA>wf0;%X%iKZm#sM z*?g+?tAzHY*VS!~Hf}se{F2N!PQT&4_JFO3RPmwxb;%qLrOrJ_sj84OHazy6J?Z~< c>;G(DvUkjAcbp>3z`(%Z>FVdQ&MBb@0Iag@R{#J2 diff --git a/src/plugins/autotest/images/blacklisted_pass.png b/src/plugins/autotest/images/blacklisted_pass.png deleted file mode 100644 index bac3ffb1342bbfa8d291fcfc41f7fc2ce95427d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 519 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7&w08yhFJ72z3l5P5+HKy ztPvLH7igJvVexV6*iEx8G<{3C)W8#U z_wow;IsDfjm7MW>8gxanG$t%}R>c~Vy{p!q3V1$Y;yJ;)Z|}}2zUJHiO|V5E@AR&x z9;;+rMYCS4e{FupX3gS7htmo#JH2H}zr)}BFjA&pcsC2P((g?Xr)m`Q>$2~?xwa-o z(VbCJQkU&idBI7(vJI{GZyeB13rp)cYIt?wtuMb!R!6um<$lV>I@@zgoY1L-yIhR7 zTZP}c#y0Kp?OjPb52k15MI7bIx-6Hlc?-AV#ituvT!Wvoz5iH{|7u-@^~Dg?=G--j zo(Ib(SF;%&yRO(Ge(laj<<4@UB3Z4;2lI08J^rCvx8RMCGsoQ-M?AkSl`hbE7_N5N z{>0Bm%U>5-K3n>-x-+<!5W$hxpz_7s0>KU5XTmJt&CU7V==HO8lyVg#L$3GhH e9j<%6-$7v0(SyCorx_R+7(8A5T-G@yGywpiwe&{- diff --git a/src/plugins/autotest/images/debug.png b/src/plugins/autotest/images/debug.png deleted file mode 100644 index e18bd157e4a53187cb30ea2ec9b3a948c8445ec0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 621 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUm z*zlT}=>-N#xw%Prc!=BC$+)^og@ouvM#@J;DW#@b6c#EcCCNob$|onQ=HytHmZ}#Q ztCyE+R8(k`mb$jLs}&Y%R#k;`cB&T^#!Q~9T~%e-+^kVq2@zK>E7Pv6)vB-8s;$+m zt##{Ybc=__s6)VD5u8dy2I&s~)r1k4lHf+e)v?*)z=A6x& zbGK~C+q$)2+qRBWmHFJE4F?b_CxH+S5=z3cYv-FNQnyLa!_unIyQw9tS3~N1I977}|Sr0n;9dck`IB>JfJMut) zu)oyflmF|F>Q@*F2`hF)YIUv|VVy;AjiPR7f4^RsE!^M5V> z6uWg#&f1_`%kKUC=$>qUp)B_L(S5Zyvc9a?Iwi=fHZGfIM)A4FZ_7?w2OgcWSkLG4 z+AhEH9kap`Pt}WGj9~t1er&^&$}6W{v!u=wZ(rQj&to8$5qYjqHela9aVCjhiI%c-SRB7Bd2n#H`qyid!yWfCpKWfuXv(AdL$_xM2%eYS zk#*ptL-p^E+ak`a`u#V)?&i1O$5&o?9s7E=wuO380*l(@f`w~0Prh(~LDtrGi|b+w zr9U3a<9*Jby<5F?+qAo(2X}ZpvZ?8Cj4|nT$k$((GAW_nepjNxtYe+~_GLdT`0-+8 z#+NTX8zXKo@*Ga#dBpHworE}T;`C?Ft(n(%{Ste<*3A|~)9_-ulW#OI;4!YA1OYe|FDkU*11u*V}tc2hw-UZe41hd+xyZ@(&5s@0c!o>F#gb{MlgZ_3uRve_PUn z4Zel0yi^wV?N_g`Qg~J366QY3gz&^NPCL8sSGlim**4a9-cQTP_wuAA`@Vnrba?ugeXp;$|6&fYxotb=^TRvwPMSymyA;$raV$K0NLO~5 z^28H6Gpz0^%KXbH-JL&Av|FG5%6C5l#UmRZ8{{9D`md3(XQSbyn>v3_s&E|K9`y3% zqfejyevgix$}Aispk&XP|9HY>CdQz{hb3B>ninrV!pp2HpkQlM6n*{c<;f?X9Mzwe z`i`;hP>oCx!^M!U9f=dpJeANA@p%3@s9aC_n5w+TfspqHH8ejiae4Pf!CJP?l27+^ z((%%XclBlkMXAZm`?S4)<=i)>yv2^Uw`E?*`V$j>{Iks#2ZrTA2Umt=Mv5t3w|&Yi zbs}y-?E2*VJfXg$3>jClID8l9-kz~ksBEXtVG~>V7l+gnwu#@2i)LP0Alq&i>(0@5 zJLge|R*rbL$ceCIvtl)IjqSU$<$o-=@{8+C&Y|wZQnmrnAD(ERsS7`K z?`-$sy2o1t%!3Q;SkgsGtT%+Tx3Vscd%xaR{sY0xVp`EZIc3%V~5-g zy_05oS_10F*^R}Y-K}^(x4M39$uSWwo8840&ktADx@sOx)cH~F;KFpKpk3}<>*0r+ z3vJ)MnD_7K-J<)c^V06UJDva5Vcm(qa|YgB*|AmP&a%#5Tz_?JJucAlrs&(zPrsl3 zj$XgL=(p8`)sr3>$#+b?;Ii2MlK(9a;|!jpHXoCV9(}6Idu9|WmD!ao+!3JjM)sk} z<|CdAC9m(!NSy4V;&{tra@R5rwx%`LuYK(Qd3^2bYsm?03JeODizYMXz1iRt)!|{_ z_T*G~GOfy+Iw|v6PvuXPk7Lf>rlgvv}`A;P;-Q%=xp872@SAkb?bDLrt*yN;Z?tS+7C|@Jw4Yv6Zm&6Cmf*ciw^!9Z**H6MrK#e!si|4)C(kbl zrG^bUhV#HPfgCnyLUgIp8s!Z ae#;D7rPd$vXBZe57(8A5T-G@yGywq9U!=GI diff --git a/src/plugins/autotest/images/warn.png b/src/plugins/autotest/images/warn.png deleted file mode 100644 index a813c1dc9a6478e754aa3f62c40e14bf0f7c814c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 621 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!toOgvp2Lo9liPWJYg5-4)K z{(JQqZ)sggmv+VYr;8T|O*(Lb>voGk)0YKiiY$Vn8Z4@7Z;1%*SQW-9rg24WQV)+) z*7Q`bwN(==BUc*C>N39n_g(qzC&zy@bp0z3`(ALa|ML#_jI}@IBTvgZaXfzI%BS9S zQ?j$=HP7w?g>xR9P6@KJy=(ZZz_q4~^?3A=w%Y0!cS26qU5@is2x*hmI=1E0N1KBu zZa=xZZ(sRa^IiM=*Q|K(L@=;u#mscq)+4P38=E;>?-vi_UxKe?3B{$s6D6Ee@Btfsjn~-oI16wDr>L#=8G3ujW}DNu4(1sZ)={WS>bYo>MeV1y9*OWxn|I z?(*&P^KLT>uVB|YoEzqu{PM*TkBQ3e({$9-b}gH1H*sH{#4(>QQD1Vtx^Dec-cmWu zBbl+sxUaLb)wNGX(ujp)!$G!tiSIi$zp!BvV>Dsdx=7FP@E`eW9Lg;mf@(dTp7U&i zeI_b6ws2h2e7)@F4V&xC6OzyEpK&gKYv$!eu5+zISD9o!dZfhe!Y#*p?yGW(#XI&l z8{K=Q`1oG0dHitU;^gGbhyBE-W%zw(?CO)>a9S@q$MBd010SE1lxfx!&CMs(L|0bS zIyA38P-&miYs#|FPnMavb&(^p^lTwjtFq+`4IKx##6M0*WwpO-v;UHfkGBkQIAXLXD0a7tlNP%3EGS-nS2>iE&e%%|@t zy!*Z)@%oB+D_NIWb{;fjnXbj!RWl{}Q`v&@{m=h!H%IX?tu&5(#=yY9;OXk;vd$@? F2>^vX?UMii diff --git a/src/plugins/autotest/images/xpass.png b/src/plugins/autotest/images/xpass.png deleted file mode 100644 index 964bb4a181e56ac6bb3c5b60fdfaab16755f9f3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 599 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!to{$Gm-I&?lq=ic2r=kwz`{mN0<|J2v4l~zi!Y51IJ zA=T@~ADNrGF8g-;bDQ^%-{yRKyY0_e*%*LdUEWSQEBwyY#@qWLeOSnLK6X=1Gw|xVd>)4({VV`pEf#Rs&-}{F66%7MmL- zCvvz23#Szu^Y%F}S>ONSfdcQ_w-KEz&MU7>mF_FHVYy@wQ*P|FaH`X9yT;dxR)vP_ z>{)m9!o2pSTMZL#AATrUb}%6J?<=iUK?n843ZFk$dK2dbufW+e59*5;BpJH2B-G084>`pARe0Z(+9l7G)_*@> z`A)Y2e7%-X_8+>2>C~`&>^LMjriXTE={|qm9B;E7gB#!Hgh)p$= Result::MessageInternal) {