From 4ae45cf22eaaf71d763d0702d04c19b3aa8cc221 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Fri, 19 Feb 2010 13:06:28 +0100
Subject: [PATCH] New Error and Warning icons.

---
 .../projectexplorer/images/compile_error.png    | Bin 501 -> 539 bytes
 .../projectexplorer/images/compile_warning.png  | Bin 668 -> 550 bytes
 src/plugins/projectexplorer/projectexplorer.qrc |   4 ++--
 src/plugins/projectexplorer/taskwindow.cpp      |   9 ++++++++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/plugins/projectexplorer/images/compile_error.png b/src/plugins/projectexplorer/images/compile_error.png
index 51a2779fcead2cca0a84d4af77bf0ab290c51e97..bd63cc3e568a266d4da6ca94f6a7b6f30dcc7416 100644
GIT binary patch
delta 513
zcmey$Jey^LO1)%>YeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d;mK4R1_s8xo-U3d
z6}OfIdwV-Miu`+)rCaT&*_gCe>jkUh?HJC#4JrkTcQ-Z(EZ*kIa?$LS`IaK(chOsl
z-n(fSdoG;v!m&)=@A*Az<?HUVr7X_8uDM^6e$LW|qwzn_{`#m8EzuZvrNk(?Ngo;a
zS=|iX6LT+^{b7NGkEX@-Eu6FbuC+WkeaW%njMDB@p7H~%6W?et`8KuZ8ZiD`RC3MS
z?8DCw4eMu1&v16;J85NW#{Fi(CGVw9lRsayX$(Jca7k~jo7&@hbLJj2;c?$zyYJPc
z0@p<xKZIf>E}iT-svzcB@4b*gd4BnUwm&S@aRrB;#m--G+V}SJX8pNro6r0C&n>w1
zNq$dpyckdA!rZ(=_U6y$@TPCBU1{L0YVx>n!Ob_nn8TI!zFU61Ui#W);d#QGTcmpH
zSj#wOr9M=ZdOOW$N$^gYnns4K+qW;g{(4Zc#@ll5#=a#%AKIN(<mE05)hn-hS9Q6f
z)ZcZHx9TYugAT)UA7}VH+8gmE<>5p__Q#<GG0bkP$u<s}LF@g4bwl|1K6t$hnHs75
zVK#T!s*BO5CYL!1GRl9SQgnOsI^iFSmrt=~*)%gPW9NTw<H$`j%h=5>#~<%!U}n&{
XeSA?@xa<)I1_lOCS3j3^P6<r_d|T>_

delta 475
zcmbQu@|AglN<Cw7kh>GZx^prw85kJYlDyqr82*Fcg1yTpGcYi47I;J!Gca%qgD@k*
ztT_@43=Hfgp1!W^H`%zjxcLMQH_v2XU@Y}?aSX9Iy>#+<ujoL5_WhROpVObpL@6n<
z9BCEJ@m?qr^MfO5LW9_yubef_-cH+>Rx*j}y<SvV-=VYV)v_&JUHcje_+vGMCKV>W
z_pREy(TP2+IIZsf9LcmJXMV`f)~<TfAriEI1((AlmCcN@g14);M#a24-g)%F-tUUd
zGa{eOKcII#?9B~JYt2t?hi@e`tkOzrTVnh}Cu!|g(Y*fi>E>@_o{FEA`Ddfbwtm&Y
zrT6dMjnEhCPI**6>HCTI(sp@kF1M+)Ja|6O=w;Dbw~)0>9FHFsSZ(=Y;n0$`xzob@
zWl~+8mGUgk2|=A%d+jnG_TS8C`IF5bv(zcIaASmw>t+As?+c1V0@q!Y>$n_oPHB4H
z4aa(iy<g{fE&dpOzB0Pv_pIiB4H0+P6;2u@SKPCGwebBt8?AS8Uqd=3`sVzJ4L!fv
z_0v6Jr;2NBtN+e@>*VnL_4aDRvQ?|n52Ofxo}lEw6MaBGbgxIh*Qe)moEoNE{xuc2
fbn2zyUB=E6z0tY#wVxRn7#KWV{an^LB{Ts5p~>0w

diff --git a/src/plugins/projectexplorer/images/compile_warning.png b/src/plugins/projectexplorer/images/compile_warning.png
index a42077a82a1d0e874dd6360cce2bd8324c74e3e6..f76393b5dae79b16d8cbc5ec11387547b5d37a48 100644
GIT binary patch
delta 491
zcmbQkx{PIl%0v^Ddd3r;E{-7;x8_XF)n*BlXnSAl`1)(J(xq+PIXaSCcAwyRID5L!
z6yLQqL2vjMY}>Z&55vTIMV0yk>OUFd%oX+HRgUJpd1LTSGVJ2JmSF$$GmGav-}S!O
zirM$_1np<X1(GbzX0174cxaRAe9dDWhf*SZzd7Cg`#A5J<e@wDOdAf?9}^K&Wh^SV
zmG(?&dUL>Xix*{KY8UjcO5Ja%s$=~T5-(D{=fG*+HK#<?nu52T|NUcXvuFJBCxxLa
z8a{C>d3RBI#kK3|9QlT<HFNi_7R>r2_OLbgnAklbaSk^1&AWcQbjW-CB5T#^pu}+b
zz$Yh~7autHli6jVjOjV6nMzHP3R?AS72zT6vz!VS-sRBnTo>!WBe8em8iq+v!w%km
zw9;$yLq-p6jjN1&R^g%#e)8GgQ`!;3yLipl^kRX@HD5z^sVRJYcp%ZWlTU%?mGSp;
zioa%ky|vV5vTObMwyM?n$z?}QF0%OWjmxeiFI(Qym_1Q7PG`NmlAQgU=-XGyjQNy;
z60PI2KXqm8vg-dh%dO%m$HS}1$$4v*#y1?1JhF`~C2o0Z{q2Cw;WuVVuVb9&w{qRT
zfMez6VsTlK!eQI=3yZ1@7BGL?`TF?(WA}D5Ff+U{J`uc($(xgbfq}u()z4*}Q$iB}
DqHE~9

delta 608
zcmZ3+GKY173NK5#qpu?a!?hb%{3DDeDyr8r>3O<1hE&{2`t|?6J+od-P1}5CW@ct#
z0pmwO%+n6A`JMSxzN7x%nRoY<UO9f${r#P(b>Dfvr$+<M7^(O2uV%b->D6W4-rPvN
zd%H|IPn0q}TJG?NJ62ZM?CdNyv!^`zb{QETHW+@W{kP`A?BqZ`k!Rj>|IX~xV2-=H
zFLv2-mHOisw*RtV?hyO;*Gfu5hw;c87T$o1X7Ng=&M9yC^d-6NQE9nE*u1JU3v>>g
zHeP%rODQ0V;RRRP95#s?6<T)tODtpJLuWNUyr19k;QxId1-sv?t-mq$om%D~s5ghL
zrsi|juC6&Y-1^7m+1O^-I!GP49u}1F%|vi5dlv^|?7^n`#D>19vk%YCHoxQBE2`Ld
z_6Ub5gNO0IB!<q<`>PYC$Y(y`6?w`ib*Llh!0X@TVzVQqj12z#J$2x~sRIEb3hZL~
zpQf|BnHl{0Uzf;mQrh!h786&uVMC}R?*)@$t@NKCgWUoh88n!_SX&3oXl`9-9w_R;
z{PzIg5ubWVhfj-i>g!u}bLVt5-umHqk<0AC&#&I4%glZ)IKpNk{=%qCtZm;~e~GT=
z_t`Eh*d5vTo=2fnY5%+<hZjxVsd2NCQ=WhO#<qo47xpX6-YF?zQ7Ng@n<DvRN2Fxe
zqn-mbY<_YJit^a>1Owaj=kMD*L-JHsj_s!m>&J(DCf4uYSC^XdgZYbxdS6W=lSHFl
zN@7aFvj_k7e_R)!prO**An_uSO*7(v0H*`zQ%McG{fr-NGtv}A|FCcvFw8%Egflp+
S;ywcd1B0ilpUXO@geCyi7Y@e&

diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc
index 1ac214079e3..d7057873954 100644
--- a/src/plugins/projectexplorer/projectexplorer.qrc
+++ b/src/plugins/projectexplorer/projectexplorer.qrc
@@ -5,9 +5,7 @@
         <file>images/clean.png</file>
         <file>images/clean_small.png</file>
         <file>images/closetab.png</file>
-        <file>images/compile_error.png</file>
         <file>images/compile_unspecified.png</file>
-        <file>images/compile_warning.png</file>
         <file>images/debugger_start.png</file>
         <file>images/debugger_start_small.png</file>
         <file>images/filtericon.png</file>
@@ -28,5 +26,7 @@
         <file>images/rightselection.png</file>
         <file>images/midselection.png</file>
         <file>images/targetremovebutton.png</file>
+        <file>images/compile_error.png</file>
+        <file>images/compile_warning.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp
index 5dce13258fb..00e0982c2f1 100644
--- a/src/plugins/projectexplorer/taskwindow.cpp
+++ b/src/plugins/projectexplorer/taskwindow.cpp
@@ -48,6 +48,11 @@
 #include <QtGui/QStyledItemDelegate>
 #include <QtGui/QSortFilterProxyModel>
 
+namespace {
+    const int TASK_ICON_SIZE = 16;
+    const int TASK_ICON_MARGIN = 2;
+}
+
 namespace ProjectExplorer {
 namespace Internal {
 
@@ -769,6 +774,8 @@ QSize TaskDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelInd
     } else {
         s.setHeight(fontHeight + 3);
     }
+    if (s.height() < TASK_ICON_SIZE + 2 * TASK_ICON_MARGIN)
+        s.setHeight(TASK_ICON_SIZE + 2 * TASK_ICON_MARGIN);
     return s;
 }
 
@@ -817,7 +824,7 @@ void TaskDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
     TaskModel *model = static_cast<TaskFilterModel *>(view->model())->taskModel();
     TaskWindow::TaskType type = TaskWindow::TaskType(index.data(TaskModel::Type).toInt());
     QIcon icon = model->iconFor(type);
-    painter->drawPixmap(2, opt.rect.top() + 2, icon.pixmap(16, 16));
+    painter->drawPixmap(TASK_ICON_MARGIN, opt.rect.top() + TASK_ICON_MARGIN, icon.pixmap(TASK_ICON_SIZE, TASK_ICON_SIZE));
 
     int width = opt.rect.width() - model->sizeOfFile() - model->sizeOfLineNumber() - 12 - 22;
     if (!selected) {