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
zcmV+c0{;E=1DgbpB!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0005K
zNkl<Zc-o{>OG`pQ6#nLFEqg&Jfnu#H=mkOBTnYVvBygj<fr1dDwnYTdHtILDawG0r
zv~ur8C^Jc+l;}ZrA5Q1qJ0sUen;JOG>wMpQXU;iH2!a0$zkga(DivHuB4Jt{lJNn)
zI@wjcT;5X$;cysCDLB`(37SsUgy754L3qp}yJZY_zy*=)DgsS{hixzc`J!~zH#YG3
z@PMzI8<;~w4#_$_HVf>K(o3a6lk?F$fmg`Eq>XJxCga|moxwB=N56f(>XL9pq6qjB
zT^Q2IjKv@pNq<YB03)Awz=r$;dtPwE=3Sqt%T3$ogD;&1v(HXXop9RnAG~v477Tfz
zZEnIpH|LxUXS02&FiRyg<8h$b?D_*&BE9aX*MA$<(-WQ(3A7rGeg$?2nq}c78ts-$
zq*J*Ze1QOJ+uP9V^}!*0OF6x<j-*oXheD`sZJ|{zcY5x6(|C1HMWRb3%0w`TG0yRr
zOya#*>}27QF$d#Sa9jgM1!FuwDN?UbQ!P{v4)99pRFzpH@S6*Es?l4@lXgK70U!62
za@(`66ZoU2lsg2nnPzCY|4TDjvYB=VHq&3nj{pMzEZfJTidP-P00000NkvXXu0mjf
Dd|T>_
delta 475
zcmV<10VMvL1oZ=uB!2;OQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru*#-&<3l0#&gP8yT0d+}4K~y-)rIXJ}TTu{)zd2X)
zXXPAPA|V9Cg%xZ|p%h&B2wISU7Tom-e1l6ux21Uk7cT3fd4Gs3vg)R^ii*B~a1UK5
z5|VLY?@fBWu|fxCb7p?uoEc`s%=jOhD|+mR6jHya3P6%1vjH6u+k3TIT<*t-#o)d7
zA%mD%=AXbW*H-M<IXfxxM#I`*fT}8HhNLt2EMl#-6>g8uXE*E|<rm8w{yZfHud2bN
z-`?F=FBXer;(wC&$nP6IZmiRWB!uASo-*ljtwvO>f(YZ`a5}W~I6#DIvxzu2>0*9<
zIwP71kWz_iy*_E-kJ)I1{A&+fr9x$Ku~-~M(@$gfpmG#ZuGJoh(^$?Tmu}cWe?YzU
zo=T(fSI>D{c>9`z{(xBA2O!BZV|d;@>Y?x6JSy%U^;C$FO>F#KRnN0U^4=3dc-Dri
z{hjSXK=<pndogyZs%OAt6Z4QFKnz>JFIBxrk4p0AoI-$?IsG*d(#q*E-2sWnjazMh
Ree(bS002ovPDHLkV1l8^+4KMa
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
zcmV<H0Tlk61*Qa$B#|^Ee*wrzL_t(|+MJVZD+Ey(hVOkr>-B>o(zc6iEE%-B$PD3|
zmrRsRt$b4K51_WTw)_B*e<37)z$f_uUN<2xUnIqD?Cdb^8CKEmgi}w?nRA}!y6<y3
z15MMAE9S=#VmQretjICKvL&A>#)!gXSWWgq-TmWk<{84=e*&<<f5sFMB>{49+Gge=
zmxEBJIOuj(CeSa{8sCI^eg*hcUle=1z{?G+$`vMpQ?}3h_?3f6U#H}8Rj7dS2&C@O
z8>rUTCkSsb1$>>os}XAQ7U6|$#unZZ7YGI?v%2`{KyK^kYO1SJVOJkf<j8}gz|Q#t
zM4=ot&N`VQf*Bwxe+GD0REL^EaiQG^C`qneKnxhYv8(`+<yOJp;;Blr;Q>f1DAfTD
zI#(6o`3^naBDh=)qpbC3a}bk!^;EhhAobzEVMU1!APnj=_s${un)TYHOp`@_&xU%d
zZ)0}E$)Y&$_6k09ZfhSoGY4TMUM#O4A|5~NTieujGY%qBVLM-I@``G@I*;+1MtJ22
z;nibfZmgwWfW#TZwgzNgr-gspP_tLqnH#PFo=&N*{!qquHx^!MSrb;aFL82uFrWkW
hx$DRO#@@RC0|4wZ$Wx{QO9=n~002ovPDHLkV1lA+=)3>`
delta 608
zcmV-m0-yb+1e^tsBn<>-K}|sb0M^*lPgpXMAt!$VE=fc|RCwBA`v3nw11@}ghMxli
z0|OHfGvZPMmcRy1%<^}*fBwww-y-Tk@h$uJ0)@WMPUXc=%rYm9532#v((2O<jcr*j
z-numj$aMnZr$GD*T^$oP&6)-_<qR)AXlU@TG4Or<tk9cdQ4SR5OP&3hi6{eJ-M(F>
zrzC&J(6{<H1Be#>{W=;bECIyq1PxHpHeVvj&Lgz)^katNb$1w6o_frnEWpb%qr_?=
zP+9=!3TB)J7}$6!KEHH1Twhh1f#Kh8h~WR<3?M%Ht2_1qj>@J$5iXnte0=k2x{91U
z3opkX1_qctKpMo?R#IU0G!d-_iU<K+!GeEbfR2@$!<%b2+)a%YA%V@r2sHpmGyY-#
ziSxgEV3Z$e<P8+%0UE-HV!-SBcNUvj8Zt2a{mQ_=%D_+*AO{vN@|OojHZc1CeqjK~
z8%h3Z0t$;UfK@>a&@^)@XZi6{Mo~ckC<635J5ZQ|g`qc56-Wd9zz)Pre;GjXqAY)Z
zgu4rDih<hrLD32};Q94Sb*47@pu`3=7w9r}7KXm9PZ)~l-v-klKE%H73?OwPzn;Xy
zqLsNQ*?9>c54W*~p*qmNAe*@v7&v(uERAFt__$daisFpGd<IS)pmJ^oE)h|NFQ2}%
zm>J4yY(4U5JLAGkk$=Cwer06%1N2BIj(mXv7=bQiVPs(D;Qqhyu23K-B!z$&=vf9S
uSileoKndj;C_cXd@jYl}Ar<@t2rvMj!^8<wYIxrO0000<MNUMnLSTZ{7Y@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) {
--
GitLab