From 629a4778a295534e1483a67bb58b7f7136475464 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jbache@trolltech.com>
Date: Tue, 27 Jan 2009 12:40:49 +0100
Subject: [PATCH 1/5] Fixes:    Improved file icons Details: This patch makes
 use of system icons as a base and draws overlay on top. This should blend a
 bit better into the native icon theme.

---
 src/plugins/coreplugin/fileiconprovider.cpp   |  28 +++++++++++++-----
 src/plugins/coreplugin/fileiconprovider.h     |   4 ++-
 src/plugins/cppeditor/cppplugin.cpp           |   4 +--
 src/plugins/cppeditor/images/qt_cpp.png       | Bin 561 -> 282 bytes
 src/plugins/cppeditor/images/qt_h.png         | Bin 448 -> 492 bytes
 src/plugins/designer/formeditorfactory.cpp    |   2 +-
 src/plugins/designer/images/qt_ui.png         | Bin 666 -> 806 bytes
 .../qt4projectmanager/images/qt_project.png   | Bin 516 -> 613 bytes
 .../profileeditorfactory.cpp                  |   4 +--
 src/plugins/qt4projectmanager/qt4nodes.cpp    |  14 ++++++++-
 src/plugins/resourceeditor/images/qt_qrc.png  | Bin 622 -> 676 bytes
 .../resourceeditor/resourceeditorfactory.cpp  |   4 +--
 12 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/src/plugins/coreplugin/fileiconprovider.cpp b/src/plugins/coreplugin/fileiconprovider.cpp
index bf48ba37013..63947e8ed6c 100644
--- a/src/plugins/coreplugin/fileiconprovider.cpp
+++ b/src/plugins/coreplugin/fileiconprovider.cpp
@@ -32,6 +32,9 @@
 ***************************************************************************/
 
 #include "fileiconprovider.h"
+#include <QtGui/QApplication>
+#include <QtGui/QStyle>
+#include <QtGui/QPainter>
 
 using namespace Core;
 
@@ -48,7 +51,7 @@ using namespace Core;
 FileIconProvider *FileIconProvider::m_instance = 0;
 
 FileIconProvider::FileIconProvider()
-    : m_unknownFileIcon(QLatin1String(":/core/images/unknownfile.png"))
+    : m_unknownFileIcon(qApp->style()->standardIcon(QStyle::SP_FileIcon))
 {
 }
 
@@ -76,7 +79,7 @@ QIcon FileIconProvider::icon(const QFileInfo &fileInfo)
         // same suffix (Mac OS X), but should speed up the retrieval a lot ...
         icon = m_systemIconProvider.icon(fileInfo);
         if (!suffix.isEmpty())
-            registerIconForSuffix(icon, suffix);
+            registerIconOverlayForSuffix(icon, suffix);
 #else
         if (fileInfo.isDir()) {
             icon = m_systemIconProvider.icon(fileInfo);
@@ -89,11 +92,22 @@ QIcon FileIconProvider::icon(const QFileInfo &fileInfo)
     return icon;
 }
 
-/*!
-  Registers an icon for a given suffix, overriding any existing icon.
-  */
-void FileIconProvider::registerIconForSuffix(const QIcon &icon, const QString &suffix)
+// Creates a pixmap with baseicon at size and overlayous overlayIcon over it.
+QPixmap FileIconProvider::overlayIcon(QStyle::StandardPixmap baseIcon, const QIcon &overlayIcon, const QSize &size) const
 {
+    QPixmap iconPixmap = qApp->style()->standardIcon(baseIcon).pixmap(size);
+    QPainter painter(&iconPixmap);
+    painter.drawPixmap(0, 0, overlayIcon.pixmap(size));
+    painter.end();
+    return iconPixmap;
+}
+
+/*!
+  Registers an icon for a given suffix, overlaying the system file icon
+  */
+void FileIconProvider::registerIconOverlayForSuffix(const QIcon &icon, const QString &suffix)
+{
+    QPixmap fileIconPixmap = overlayIcon(QStyle::SP_FileIcon, icon, QSize(16, 16));
     // delete old icon, if it exists
     QList<QPair<QString,QIcon> >::iterator iter = m_cache.begin();
     for (; iter != m_cache.end(); ++iter) {
@@ -103,7 +117,7 @@ void FileIconProvider::registerIconForSuffix(const QIcon &icon, const QString &s
         }
     }
 
-    QPair<QString,QIcon> newEntry(suffix, icon);
+    QPair<QString,QIcon> newEntry(suffix, fileIconPixmap);
     m_cache.append(newEntry);
 }
 
diff --git a/src/plugins/coreplugin/fileiconprovider.h b/src/plugins/coreplugin/fileiconprovider.h
index 8a92666ba4e..5e56228304f 100644
--- a/src/plugins/coreplugin/fileiconprovider.h
+++ b/src/plugins/coreplugin/fileiconprovider.h
@@ -40,6 +40,7 @@
 #include <QtCore/QPair>
 #include <QtGui/QFileIconProvider>
 #include <QtGui/QIcon>
+#include <QtGui/QStyle>
 
 namespace Core {
 
@@ -48,7 +49,8 @@ public:
     ~FileIconProvider(); // used to clear the cache
     QIcon icon(const QFileInfo &fileInfo);
 
-    void registerIconForSuffix(const QIcon &icon, const QString &suffix);
+    QPixmap overlayIcon(QStyle::StandardPixmap baseIcon, const QIcon &overlayIcon, const QSize &size) const;
+    void registerIconOverlayForSuffix(const QIcon &icon, const QString &suffix);
 
     static FileIconProvider *instance();
 
diff --git a/src/plugins/cppeditor/cppplugin.cpp b/src/plugins/cppeditor/cppplugin.cpp
index e600de92c58..efa689995c4 100644
--- a/src/plugins/cppeditor/cppplugin.cpp
+++ b/src/plugins/cppeditor/cppplugin.cpp
@@ -75,9 +75,9 @@ CppPluginEditorFactory::CppPluginEditorFactory(CppPlugin *owner) :
         << QLatin1String(CppEditor::Constants::CPP_SOURCE_MIMETYPE)
         << QLatin1String(CppEditor::Constants::CPP_HEADER_MIMETYPE);
     Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance();
-    iconProvider->registerIconForSuffix(QIcon(":/cppeditor/images/qt_cpp.png"),
+    iconProvider->registerIconOverlayForSuffix(QIcon(":/cppeditor/images/qt_cpp.png"),
                                         QLatin1String("cpp"));
-    iconProvider->registerIconForSuffix(QIcon(":/cppeditor/images/qt_h.png"),
+    iconProvider->registerIconOverlayForSuffix(QIcon(":/cppeditor/images/qt_h.png"),
                                         QLatin1String("h"));
 }
 
diff --git a/src/plugins/cppeditor/images/qt_cpp.png b/src/plugins/cppeditor/images/qt_cpp.png
index 73fd1642b3c23adf39cc99207b5306d91d1f26a1..c938e2d65cf491ff9b2958530dbaa0ef8c10ab73 100644
GIT binary patch
delta 254
zcmdnUGK*<~N<Cw7kh>GZx^prw85kJYlDyqr82*Fcg1yTpGcYi47I;J!Gca%qgD@k*
ztT_@43=Hfgp1!W^HyNe5EF`>s?iXTUV3_6U;uvCaIypgt^|0WL*7%(o>9r3xEj)j9
z`|PrN9~GC(<D8i+S@P3R|N8xK?cY1KQ;*jF&zbQlyWG@s+v&*o8@;|U$6j6H)u?4y
z&n+P#d1XU}-LV4)J_H_nbt#UGtu5XtY`WRwlE#()pC&)N`TV<)fq_9w${cIm<kC#>
zD-#w6{8HK_=T^eFxxxGP{Jlv6f)A2^m8Q1$edX{lXSmC2^6!1bf=dhx3=E#GelF{r
G5}E)fd1);G

delta 536
zcmbQmw2@_kO1)%>YeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d;mK4R1_s8<o-U3d
z6}RS0-k*KjLFD-Upes?HQ^XeTD!bHTcF<X2_VS$8X?${T&L-qXa?2Voy%2P3Ve@hx
z#g8)-qnVFAIlljb5LX*p6L;wx`IHk$?vC3^CdJ%kwqEWf@S^_U?&a3C_n+U}t?v1=
zrmo?)`|7y$`aI&z2V*-9Est7jR`u|A-HV+OI!e<|pJk7(ck$p55Z8D&)l2nVk|K)$
zv&;KkdYvV){Eke~9E>*SyBT&wPIF!4v`|6LO8#U6b4p~}B8|mHzy8|E9CzFqBgeQi
zboJF2vL2IKzNsEQC3U#JK3R5Vq;RyntWK)hgtKWc8Ty%-@+I6j6fTR*iHl3EuzC6D
z`a4sjV%t4`*En4^;qp+MTp<;qHMQ$Ycvz^Y`F1_2{iSR6PhZe``^LXj51yO1>KXq0
z#F;vwZmLwNDoa97V$K=<QxXk^{CgLa-A+`g+hXIo=;igyPv`HQabcV@ucBTd`D3N{
ze6t!Aq2P+|M-QL-=RD(nzGq2Uh2OuD{j#hdPHxN1sVgYB6!cMPy4&KFiPv^461v5n
zKE*fty~#F~S5Dh+AKmisaY43?Kx}}t?&|i%i`7_p_Y1#EW?Ysj<RVfe{M$a}IFr>}
vzNOk+|9M6J_i`)<TKS;<cswH;!(wrJ!P_MZ4u~-@Ffe$!`njxgN@xNAhtTag

diff --git a/src/plugins/cppeditor/images/qt_h.png b/src/plugins/cppeditor/images/qt_h.png
index dec0475219fadbcc93367012be95dd2b3557ac25..3c279d4b4e56a5024ae4d6e8991b183e21a425bb 100644
GIT binary patch
delta 466
zcmX@W{DyggN<Cw7kh>GZx^prw85kJYlDyqr82*Fcg1yTpGcYi47I;J!Gca%qgD@k*
ztT_@43=Hfgp1!W^HyNe5EUaJ5JD0$~z?kFd;uvCadhX=?Ud)aH?e^yG4y>LWO$);I
zIdC0yY7uerm{`*I#IuHZHHTQ(%1>O1N<Wqh<V?9z-}Eh$`CyCn=9_aPX55b1W8B4j
z_}rOub#L;&<t>fT`z-#t#7b|T-*UZg47c8HyDc!Wbw||NAg!rM6IdNC9n4r8wp#Vx
z5ynOAi&h)5HRPD>X6R&Gvvo<3=9C}?jinq-4EMh?t_abxKX;6AN|250Ge(OYl?ofg
z)|!5;k`*kxmt$5xnQ`9p)~(y~HVQCQHaz;P{I_m?|3`_9(_-|tGXy;3In>B#_u$^k
zr%z`1s2z66-g51vP><n~%P%)<<C1tFX2G;;{n103A9xO&i~GZN?beIqhBJS%Zs5yd
zO5e|S@tmr}1KAz(o<<u-b}nOZTP!$v=RU=R{a<r+SS#kWUz@dewRMBHX@dEs$IQ3A
zRe9Q-tM=Zzo;@f2U3B){7?%|DGp;OAYb_ECBocZYU1E}7B+C6YPik;me6aqla6!|D
WSItXbKVx8EVDNPHb6Mw<&;$T~p~`Ro

delta 422
zcmaFEe1Lg^O1)%>YeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d;mK4R1_s6?PZ!6K
zid%Cg@69{pz|(M7B}h}pu_Qrt%^vqDia8S>Fh0l>&=$%UOnoLA5i#SIs&~7`#3qlE
z`RDbf|5Dfz<nLAU?dJS?y~?84?QQ$7R|~LA3wiZR{m6mo@9Te`bqozXb?>uHflRuJ
zPrl3|hFeTKbIoQi%xD#8U@wRiVYU4FyOvc+&YN*cD(9|s&C4=VTxKrQoO3??((=oi
z{#LtIGcZbgF_f9~@oPm($c;@p%|C1WL{FygzU!oYz@X>YjP6VEyJBCISS8#xa|vXb
zKb<?|P`-hL27~W82R@$q>zNxHj%<2hBImp<t~qnogzl^ji*CCz$V@BRep=P$ec2X$
zGwD?VwV!O-uVuTi^EI4gSrxZFaHG{3z5J!30h`3UF4mtdE$q7)Xvgwo&HmdnAN&hv
zkW1>k_0ZwmrlnQ;|4$2NXxC~`@l@bBtY*Bmq_yC$qC#J?)P#~}@_ko+?w2oQk60V_
f;r>_E0}PHEEDoG6c(IUyfq}u()z4*}Q$iB}GWxvg

diff --git a/src/plugins/designer/formeditorfactory.cpp b/src/plugins/designer/formeditorfactory.cpp
index df3c59adfa3..545a6cca27c 100644
--- a/src/plugins/designer/formeditorfactory.cpp
+++ b/src/plugins/designer/formeditorfactory.cpp
@@ -52,7 +52,7 @@ FormEditorFactory::FormEditorFactory()
     m_mimeTypes(QLatin1String(FORM_MIMETYPE))
 {
     Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance();
-    iconProvider->registerIconForSuffix(QIcon(":/formeditor/images/qt_ui.png"),
+    iconProvider->registerIconOverlayForSuffix(QIcon(":/formeditor/images/qt_ui.png"),
                                         QLatin1String("ui"));
 }
 
diff --git a/src/plugins/designer/images/qt_ui.png b/src/plugins/designer/images/qt_ui.png
index 8fb61ee27ff36c0477eb777d5e99cd478969ea31..982b19d6043325c0ed18acf45bd1f94d4d514aa1 100644
GIT binary patch
delta 783
zcmbQmx{PgtN<Cw7kh>GZx^prw85kJYlDyqr82*Fcg1yTpGcYi47I;J!Gca%qgD@k*
ztT_@43=Hfgp1!W^HyNclMdW6@J%53LfoYkii(`nz>E2249>IY!$M=_iUp9MIuIXY?
zzUt_AYY)irD5{=m*A#6E*kDw{>9h2BO~-{5GZZ!})El!bwP#cHxs<iD<qErK$;+Gt
zf|pw=lfAcBem`FQ&eHbDv01FO506(`)Yw0-{_)SE`zRBGO`Z2m%c~5V7+e?(7=GLN
zTRM9L`!AleeU?R>Cc_15nLY)EV-n0ur?780E72Y76&M}ey=s*fXG2{^h6V$}IkSHf
z`5P>Dz1y*mo1y+tkD;3;D?^{*vH-7*%*+f|u3i;fd~wIcix&%z%IscwFMpHWhVOe8
z&W`@X%6On`mf}pN9zy{q1_rCSe4@+!HCZox=2Cq9>FCCbi9Ndye`nO;U|68Rb*Xns
zP=J?UuNxzS@cbB=?RV}?2o8wZXJOls{=P}+z*go4EzT1%o|6__tk1Y`wUYnN^>5ea
zG(CE!AI#kL@FPQ$;5)5`wXqCdnj)@_CQ_|YYuT2&Y_Kcb8&`awq&jgE|K@uFEY3^o
zU3>V|ZwD|6OmcJL5b9(}iDWxpyefa)v(HX(fw%uu=wG{*JR{DwY4XzayrtJyGC6Q4
zt`wQ*!4kDLO!R}z#$4mCuYcB`v^$(OqeHoP*7kDi-xkl?FCL%SFvU`=TQPd=vkK8u
zo&_6IPuezp5EH$BKJ{)!=G%4CIGvaM%V;!QHn)6tZ`}IrFYhGkclFKt@iQss+rzEb
z=1t#OU8)lKT94s);m)o_A?MGWF{!eV+pE#luCrJ1zWepn&)m~rzPNPBXkx16)`<F<
z4b5e{{|439*E2H&e_FI`*|SWA9S^_!{=4x>+!E%nBNbc+)`Y!oh+D7!^=FORu^at|
z4ms7=)%{y=`DKrKyxHutHcLZ(MmO;Wie!3vde%lpMhYvY_)c14`>`Ts;gn5V{s#Q}
q+L|-_tQsT7TONiJKm7kP#bm8Hxqp4a83qOh1`bbGKbLh*2~7YLjA6R~

delta 641
zcmZ3+Hj8zFO1)%>YeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d;mK4R1_mY@PZ!6K
zid%Cg#b*Q+iX7h`o|>t9@o5KF>g~%OFBUf1ia5Dk>GsIqC;3Ip<XUlcr$mSb54WaF
zGw0vRj(J5}W}BV(x`A`H<@5(hH#xqvZ8}>Y{Qm2`yZ80i#nx};_;v8%pC7X4p3k}e
zQ|{Q)BF`V+fBwpxDH~|tlJ}AM_Swyk6&M0VR&KqW+xfgQYi*c!mWh;5CwsHwqwOl5
zOdDIPrQA!7{e67Kqu$3o<4GW!Lv8r}N*lQwIolHV-;dw${{BvDgIBdO9D4=JSN~yQ
zT_JoWPJo5WVD{M^B_EmC>a)-Hzy7t3U3{_Nk;zZni!$aiJ-JrRaOBljD^{J_j>emF
z4m~`0`9?%#Z+gDB%mJT?Gu#;e<ZX@OWou^aUnbx1^ONz<&!4<q9=T4@I>T$Z_7<~3
zXs7zruT{1)%2->M7E1K>CjEUZ6J}g}VeXEm{21j$D;5T(IS8GcKl`j&is*v+t424v
zd>yXaw}jM)-RJ%tanr7~__==hOK(P%z?X}HRvt((S~z2#qxU6c)$n_|+%w{hAN>0w
zbEEvCp2Ky4)VqZqd9m8bt(Vv~ovfU)T1o8MuY&4NniUJnpYLKg5_D3<XeQ6Pxn~kG
zDtPq8!V8OyT9n<-%0^Z*@Ei{CP@3pqRW+CGcwxcWcMogdh|Y@<op?6y(oT);tIQlM
zOdRcpV;Q&K?oG;M|5>wdvv^j+nj`uR*I&0DO>)$mzWDxzsI>-Cy$O-qf^X(+|G$^{
z(x$@?8!o?G@?XW<g>BV|)!*t_e$?3gd2cC@z>sFySE^xJ`JRD+fx*+&&t;ucLK6UN
CO)xzG

diff --git a/src/plugins/qt4projectmanager/images/qt_project.png b/src/plugins/qt4projectmanager/images/qt_project.png
index 25133f5f476aa5ec2e5e8829d80d701560d5d476..3a1bfa5fda47a4a651e977e13d6eed5031b049bc 100644
GIT binary patch
delta 588
zcmZo+dCD?DrJk`k$lZxy-8q?;3=9lxN#5=*4F5rJ!QSPQ85kHi3p^r=85p>QL70(Y
z)*J~21_t&LPhVH|n~c(&7Mx1_iaQw?7@vB&IEGl9Zk@b8J2+6}xV`TqZrQG~jnT%D
zF06v8BJEq;WSUeGIG4_KIpQg99_w`WQfLd0Y*Jx;A=f1N#X`Ppf(Pv#9FO?UeYDu|
z(>=@QmP@`T`mAB+V}G~zdGWdLcdDOv9aZ|j*>Ab=RxwvW2F-@B)vhA0!Et)iHAT3V
zT+Wp0J?2xvb>PghNoRQ))~?lMa9e!wjGr1qeUnT=VWDB$nMsqG0<Lzt7(0hDYE1QV
zKbOw*z$zfLt^Tm$?c28vFPwStwQA0;!XmQ+XKrNMExfm`aCgb~;=QrI*(%<hxxa1G
z#v{wc@9X<8ym~9O`nBY%x3{KW{d%S|N3Ym$6Gt~su=81i(2(Oo@_TpvvSU?H`gmc}
zPM-JoYHTN;O%*$%)c1eSxwG2aAD#N?)t9&R{JGOMN>XYv2YAn3iK+iG>#TfX(Y{H{
z3!>jLZzx_X-Em@L%VdEzMTRUcffXywy?<}M{+q!jBi_xW!}>#QJ&(ZLj{i&@C-g;U
z`ZKg7o=7l|$nRNNu}Dg$^uLl+$E%2@_rF;j3nC&P?b!D0sOa3X^nP>u3N0%S#y9WY
zZQ8Tv%?XCjN>vJr?zz``?c3z<y8YJky2nD#&uM+1H{ad2J?&fBx!TiHdsP|C-p_Fh
u^;DZ&8yXuBI%l_e!4D(;GjAT|zkFTrdFkb=PZ<~(7(8A5T-G@yGywp^{|I3K

delta 490
zcmaFL(!w%9rCzecHKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkD0|VnSPZ!6K
zid!v{Z9NVL2prc}dZ`gxa&a1$m8C{khx6)IKG&##t}Ps0t0(9A1;xa=6ch*)78p6(
z-D&ZfTT)OOa`5a*F{>?Sy=%(Xzn{2ep<K)*nezR=@9z#@TOXkD!{Cmc?D3iJ_<!xw
zkUrX;8Y%MPd(cXjpEY)(-ADKF9-h&)Nch0#J&j2{3#Xn=t?}J<`)$95s-lB{3ggF$
z7^k2+><TOiJ*`|94co$W#F~Gu^k5ZI5PeX-`f8Kc(nSp~zE;VmnH^uuIHMpn?!eaC
zpXY-Z`s2G<5<Z@a5}H<j+4F<#x)aamO3Jf~evmnKB;$@~3&XnCtDFxf^^5oa%{y@K
z*S@UTww}&!zeuj?kDPZtq{fBm$-+eU%YOooMs&0t&A1xV`^lL>=Uv%ukp#JJnLpoN
zw%t4a?Ue!p^VzguhC2@#f}|NPNG5!DTdXJ~A-#)fj{S;BA_?F9mR}Bj;FPSkcy(V<
zS?2TG`HEAe{z;d{w!0`X^2e8NC^k^vRiLWBUW&1=M|ERXROb70Z}xSY-rDACpSE4i
yq37|hy|IT6*)$*i?OMvtwEdHh)(_zX28ZANtsg%+tYlzdVDNPHb6Mw<&;$TPN#Obb

diff --git a/src/plugins/qt4projectmanager/profileeditorfactory.cpp b/src/plugins/qt4projectmanager/profileeditorfactory.cpp
index 21299bb2fea..f3d6b631ab9 100644
--- a/src/plugins/qt4projectmanager/profileeditorfactory.cpp
+++ b/src/plugins/qt4projectmanager/profileeditorfactory.cpp
@@ -56,9 +56,9 @@ ProFileEditorFactory::ProFileEditorFactory(Qt4Manager *manager, TextEditor::Text
     m_actionHandler(handler)
 {
     Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance();
-    iconProvider->registerIconForSuffix(QIcon(":/qt4projectmanager/images/qt_project.png"),
+    iconProvider->registerIconOverlayForSuffix(QIcon(":/qt4projectmanager/images/qt_project.png"),
                                         QLatin1String("pro"));
-    iconProvider->registerIconForSuffix(QIcon(":/qt4projectmanager/images/qt_project.png"),
+    iconProvider->registerIconOverlayForSuffix(QIcon(":/qt4projectmanager/images/qt_project.png"),
                                         QLatin1String("pri"));
 }
 
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index d7a1783feb5..f9990c522fb 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -43,6 +43,7 @@
 #include <projectexplorer/nodesvisitor.h>
 
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/fileiconprovider.h>
 #include <coreplugin/filemanager.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/iversioncontrol.h>
@@ -60,6 +61,7 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QTimer>
 
+#include <QtGui/QPainter>
 #include <QtGui/QMainWindow>
 #include <QtGui/QMessageBox>
 #include <QtGui/QPushButton>
@@ -94,7 +96,17 @@ Qt4PriFileNode::Qt4PriFileNode(Qt4Project *project, Qt4ProFileNode* qt4ProFileNo
 {
     Q_ASSERT(project);
     setFolderName(QFileInfo(filePath).baseName());
-    setIcon(QIcon(":/qt4projectmanager/images/qt_project.png"));
+
+    static QIcon dirIcon;
+    if (dirIcon.isNull()) {
+        // Create a custom Qt dir icon based on the system icon
+        Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance();
+        QPixmap dirIconPixmap = iconProvider->overlayIcon(QStyle::SP_DirIcon,
+                                                          QIcon(":/qt4projectmanager/images/qt_project.png"),
+                                                          QSize(16, 16));
+        dirIcon.addPixmap(dirIconPixmap);
+    }
+    setIcon(dirIcon);
     m_fileWatcher->addFile(filePath);
     connect(m_fileWatcher, SIGNAL(fileChanged(QString)),
             this, SLOT(scheduleUpdate()));
diff --git a/src/plugins/resourceeditor/images/qt_qrc.png b/src/plugins/resourceeditor/images/qt_qrc.png
index d22ca676103cb6a5c2dbc5811bf9d81824be8972..3643f37e1a3ede6454fe3d14224e6fc72f73a5db 100644
GIT binary patch
delta 652
zcmaFIvV?VlN<Cw7kh>GZx^prw85kJYlDyqr82*Fcg1yTpGcYi47I;J!Gca%qgD@k*
ztT_@43=Hfgp1!W^HyNclHTh?3T|S3_fl0;F#WBR<bn9eWpWr}|<MpZsc=Q&yJPJ?p
z`H-FDAZ}{N(?3JR$y4Uy4$Fi`4;JwBE$i%j;IzS@-eT4*$8cq<m5K|S6*D`IB}Knn
z{C=y${oUX1ympemqBZY{j`{OH=l;*B&pT5n^G|%H&$6dyqqrTc9jxXai@H5&@#4ii
z{QUogg&2Dbb<ZA?U=Zp&(&#md;kTogCd01XyZKwTFn4%dP7zG3u9j|?IB_EL`^(oD
zIyj=Tw_MA~%@wR~Qxp~!?&<HpUvS;%XoXGQ-K}S`xDOV}*ql!;E*8FCdh+?_Cq<TK
zW@Z{wy?A&NxLXf>UC4M(Uq@$;jMRb~1qY+N&lJi8trR&XF(oKub?B~LyMFw5_x0%Z
zm*UUEr%iwMe^HH8#ilJutKTw2W%n5V*w-J#CHT;{s_t9ZqZbcWveySQEJ;h>QTdxM
zYx$As{`2MS>b`w7D%iS~amCfFE3Zor8MwHd(5siQDSX2bCEau(U}dD%QJtsrBY#y{
zF|Kpb%UJud);>r{iQx*fBTtL9Uh4e-y|s(CxN2U`S^WMti(^BFOT)i=e9PXQH_@Fp
z=eF^}{o9lIA5_L&E)jfK?PyqA|D7jsMc}CqB_E|Hf3*9uu4!ku{Wk_j0hhDC!wc@p
zPT8c9`y+H?h)wG?wzX>+rgBX1QJcM_ueZ1G%a5H$-(>xZI=}GT;i%|S`<6z9W^5EW
z{qWbisYj&le>%UT#H>te2fGiG&hw-g3(2c?>~gwmZ#>GM;@r<>(fwM9fq{X+)76jF
JWt~$(695uqCujfw

delta 597
zcmZ3&`i^CSO1)%>YeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d;mK4R1_mYpPZ!6K
zid!|owi&^JBL9N6M7Nb>ZVd5xt+Zmt>kyeU6L|Kus3`bpS#g#X2(Yk=Pj5)*b{2db
zwZgDj@6yt{AzWz_oOHS_ewq1w(w=AU|2~O*Z~4@=IQVU2asBz--{-xzuK(^j>Ex0F
z7dJ)gO@Drzzty5acJa~>t&azHEW4bkBGkE~<mWH_NfQoy|LdG!rF`;fQOZB>MFKrS
zJJ+4&+Zgf2Lr6`6uiY!<*7qvgGLNM}i~oK6$fL%@6m<S`#O}L#GRGb5=DVBCZrvH(
zwk$J;pVN2Y-MsF!&6+-!>qWLk`G%|xy_jLrvhMYxN0A*>d(Ul)(AmVh%wbhZ!fiA6
zez(Op?o{-)e_vN5@b(kW?dSgMHcwS~uRphY$zi#GTOqqsBk$NKRYzAf&faM`r*6ZM
z1=F=p?<jk1c4uFozr3BEUER0VzUyjCO@7Op4<;PgD(skA&HZ_~-wA8^ZI2h%Ulq)F
z8=CNERYF<Sq=arSHWAwsEgT+f+jM;G*q7%Y+E63$%YTPl?~U-|9to@FH!vPNIrDME
zuKjCF_H5WCTz9$FLt*&>7xlk!<sV<XlZ>2nTyXxrUv1L2)_k!(kx=^gcsx^=T!Xu}
z!P$K!(->~H-`Bm_yzR8DqR`S7r-cia%sT0pVjyncf69;da`0px1D(ddwVnndH;iS9
zs@=U+e&`-|JvZ~-2icY38T(^<9~^Re;r(Fh+4GOi$}_St{B@hywch(>F9QPugQu&X
J%Q~loCIBpqAI$&&

diff --git a/src/plugins/resourceeditor/resourceeditorfactory.cpp b/src/plugins/resourceeditor/resourceeditorfactory.cpp
index dcdd691c9fc..aefd65f4147 100644
--- a/src/plugins/resourceeditor/resourceeditorfactory.cpp
+++ b/src/plugins/resourceeditor/resourceeditorfactory.cpp
@@ -55,8 +55,8 @@ ResourceEditorFactory::ResourceEditorFactory(ResourceEditorPlugin *plugin) :
     m_context += Core::UniqueIDManager::instance()
                  ->uniqueIdentifier(QLatin1String(ResourceEditor::Constants::C_RESOURCEEDITOR));
     Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance();
-    iconProvider->registerIconForSuffix(QIcon(":/resourceeditor/images/qt_qrc.png"),
-                                        QLatin1String("qrc"));
+    iconProvider->registerIconOverlayForSuffix(QIcon(":/resourceeditor/images/qt_qrc.png"),
+                                               QLatin1String("qrc"));
 }
 
 QString ResourceEditorFactory::kind() const

From cc65b3949a7840aea98d46b7204475efe359c03f Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Tue, 27 Jan 2009 12:24:39 +0100
Subject: [PATCH 2/5] Fixes:    - Resources (templates etc) on Mac

---
 qtcreator.pro                           | 1 -
 {src/app => share/qtcreator}/Info.plist | 0
 share/share.pri                         | 2 +-
 src/app/app.pro                         | 2 ++
 4 files changed, 3 insertions(+), 2 deletions(-)
 rename {src/app => share/qtcreator}/Info.plist (100%)

diff --git a/qtcreator.pro b/qtcreator.pro
index e1e65631d12..7eadc16290f 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -6,7 +6,6 @@ count(TOO_OLD_LIST, 1) {
 }
 
 include(doc/doc.pri)
-include(share/share.pri)
 
 TEMPLATE  = subdirs
 CONFIG   += ordered
diff --git a/src/app/Info.plist b/share/qtcreator/Info.plist
similarity index 100%
rename from src/app/Info.plist
rename to share/qtcreator/Info.plist
diff --git a/share/share.pri b/share/share.pri
index 50fa37a71a0..ece603de416 100644
--- a/share/share.pri
+++ b/share/share.pri
@@ -14,7 +14,7 @@ macx {
     RUNINTERMINAL.path = Contents/Resources
     RUNINTERMINAL.files = $$PWD/qtcreator/runInTerminal.command
     QMAKE_BUNDLE_DATA += SNIPPETS TEMPLATES DESIGNER SCHEMES GDBDEBUGGER LICENSE RUNINTERMINAL
-    QMAKE_INFO_PLIST = $$PWD/qtcreator/info.plist
+    QMAKE_INFO_PLIST = $$PWD/qtcreator/Info.plist
 }
 
 win32 {
diff --git a/src/app/app.pro b/src/app/app.pro
index cc8ccbe1af1..14a3cdf35c0 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -38,3 +38,5 @@ macx {
         ICON = qtcreator.icns
 }
 
+include(../../share/share.pri)
+

From 822d8810199b0ab0003423f2de6e8a7a8749c3a9 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Tue, 27 Jan 2009 12:41:37 +0100
Subject: [PATCH 3/5] Fixes:    - Creator documentation on Mac

---
 doc/doc.pri | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/doc.pri b/doc/doc.pri
index 4ed0de99375..3c23ab8a951 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -27,7 +27,8 @@ linux-* {
 }
 
 macx {
-    cp_docs.commands = $${QMAKE_COPY_DIR} $${OUT_PWD}/doc $${OUT_PWD}/bin/QtCreator.app/Contents/Resources
+    DOC_DIR = $${OUT_PWD}/bin/QtCreator.app/Contents/Resources/doc 
+    cp_docs.commands = mkdir -p $${DOC_DIR} ; $${QMAKE_COPY} $${QCH_FILE} $${DOC_DIR}
     cp_docs.depends += qch_docs
     docs.depends = cp_docs
     QMAKE_EXTRA_TARGETS += html_docs qch_docs cp_docs docs

From bd15f2b308eebf54be1ed4dea23f1b8f349f41c1 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jbache@trolltech.com>
Date: Tue, 27 Jan 2009 12:49:44 +0100
Subject: [PATCH 4/5] Fixes:    Set alternate base on light themes Details: Not
 all themes have ok contrast for alternate base and we want to keep it light,
 so I'm enforcing it for themes with white background.

---
 src/plugins/projectexplorer/projecttreewidget.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp
index f08885ab6b9..1da33786a2f 100644
--- a/src/plugins/projectexplorer/projecttreewidget.cpp
+++ b/src/plugins/projectexplorer/projecttreewidget.cpp
@@ -48,6 +48,7 @@
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QToolButton>
 #include <QtGui/QFocusEvent>
+#include <QtGui/QPalette>
 
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;
@@ -74,6 +75,11 @@ public:
         setUniformRowHeights(true);
         setTextElideMode(Qt::ElideNone);
         setAlternatingRowColors(true);
+        QPalette pal = palette();
+        if (pal.base().color() == Qt::white) { // Leave dark themes as they are
+            pal.setBrush(QPalette::AlternateBase, QColor(239, 239, 239));
+            setPalette(pal);
+        }
         setProperty("AlternateEmpty", true); // Let Manhattan to override style default
 //        setExpandsOnDoubleClick(false);
     }

From 4038641db3eb272e555c5c39b796e28d1a6083f2 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jbache@trolltech.com>
Date: Tue, 27 Jan 2009 13:00:27 +0100
Subject: [PATCH 5/5] Fixes:    Desaturate qt file icon a bit

---
 .../qt4projectmanager/images/qt_project.png     | Bin 613 -> 623 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/plugins/qt4projectmanager/images/qt_project.png b/src/plugins/qt4projectmanager/images/qt_project.png
index 3a1bfa5fda47a4a651e977e13d6eed5031b049bc..fc05f588abbc08d7d4f5f45c1603021e60de1355 100644
GIT binary patch
delta 537
zcmaFL@}6ZvVm-GtC)cuNA`A?S?>$`{Lo80WPTrp#94K<!zV~A*M{8POfyc=OEqO}Y
z7P&>KcwAtas=%qFXH`}hWYp0*Ay6QyAR|-TA~i#3iSq_UKCZvqyE?j8Bv+VZ+}r)!
zrhWQ%504e>?+WVYoc~#Oes8(j{PUmpXKalU&Yt(2QGhkWM5?}Gp1EPyQKg+ReGxit
zd*kMF^)sz_<+5oNQ-Ib~1_>Uv;Hf=~ZjOu!6FpicWR@*rP%@gfVpRtRL#xxnBma6B
znOK#a_TOI~qu1^by7czjqKE%(zGMh}diP$m+3eRgdw2iJUA^<8^oAy5M;8lLhhO(9
z`@Yr1NipY`UEjIO=6qOj{o~(BYNp$#c*e?wibe!~e4hP#=V6ToL$#b+kIq)|@z?3-
zqy}wXbt>k+S%1DQr)Y|{_LkMMarI{sdkU2q6*6XZ@e3^u+x%7A=UiAALq@nY!=7E6
z-%BL>xifLEd;P0Zi=nS7$@lfI-~QGNdsgTt_b7%W-2S#<)A}P4#$Ruh@z-x_{%e11
zMg_}((%7oK^Y%ZC-sp0~^5s9*BZ7kWn{sbk^cjad2sc|-@b}ovfT9Ps9p?S}qLeOm
zGhN9topka^z$}I%u4gyyN|OD1S2g<Pve>sD{v0+HyL9N)IZ>A->sQ66HRV@+JZQ-v
wXXmY~<f8g7(k0Ec<)YyyqyEsZPwjQ{gbM#GU9hf|fq{X+)78&qol`;+0CiLKumAu6

delta 527
zcmaFQ@|0ylVm+q?rxL&7P6h_Xr=Bj3Ar_}wC-2V=4iq_V@B4^bwySJov~i>htDve#
z`xZBuCY1!vrE^`5c#50HI-R`~+QK87R9MJ0Nq(`AFPq>&dk4oOzH=WfcKmeD^10=b
z?}<KZ*!kGs?R{Q+?)#nU=UqpY{%`hMZoE~@RggimA#Am)h--atoZfUz5w0bdGo^Zu
z`BZQnIJ0chS)PWqYjqji7GFH$r^Zm<B$H5BXxMgU(qyK9tDP>!&Y_GNQ@z~Jr87OS
z3J7gGta$tOZNm#^UVN>Zv#YSk?7*2D*>(%>tt;GJ^1XO(>~FS;cW3Tz+qCh>a`F56
zJ`AtkO09k^`ReVh=~us=>8#JuD>mH3(ajU=eAXZ|<hYRh-d(@!SQV5$Uf8sg=l#7J
z+sS8B#m*@8{oix$toHUtr+#|%<!wEG?zD}Pl$y)|-m_O?zRWr+Us$wn67z!Sx6B)g
z*GhMs*w`{zpiPk>i%Vd|N^|euo3H<7u*rybbLp`DP+QL<Ft_7BQ^yH?(V6}X^(~1f
z5)35rdzMx#l9DO?uO!v+Dx&HAZx+Xbh{#7fwmmy4I=3vn-`u`J%gTfC&AWG-_Uw6c
zg5k4LmBONX?zLX~Hu-PA^}Oz}(DQRz-{;MD_ia!6R(7uT^weHe2DA5b+(JFoCfA0>
o287PpZC>!hi2ux+hxspG7kplN`RY>!1_lNWPgg&ebxsLQ0K`A|u>b%7