From 31bea611fe1ecea9ff29f64cfe4003e96395eb14 Mon Sep 17 00:00:00 2001
From: Mikhail Golubev <mikhail.golubev@jetbrains.com>
Date: Tue, 17 Feb 2015 17:43:57 +0300
Subject: [PATCH] PY-3369 Show different icons for functions and methods

Actual function icon is taken from database-openapi.
---
 python/gen/icons/PythonIcons.java                 |   1 +
 .../icons/com/jetbrains/python/function.png       | Bin 0 -> 403 bytes
 .../icons/com/jetbrains/python/function@2x.png    | Bin 0 -> 847 bytes
 .../jetbrains/python/psi/impl/PyFunctionImpl.java |   5 ++++-
 4 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 python/resources/icons/com/jetbrains/python/function.png
 create mode 100644 python/resources/icons/com/jetbrains/python/function@2x.png

diff --git a/python/gen/icons/PythonIcons.java b/python/gen/icons/PythonIcons.java
index 584c8a9561e4..c6b70836416f 100644
--- a/python/gen/icons/PythonIcons.java
+++ b/python/gen/icons/PythonIcons.java
@@ -47,6 +47,7 @@ public class PythonIcons {
 
     }
     public static final Icon Dotnet = load("/icons/com/jetbrains/python/dotnet.png"); // 16x16
+    public static final Icon Function = load("/icons/com/jetbrains/python/function.png"); // 16x16
     public static final Icon InterpreterGear = load("/icons/com/jetbrains/python/interpreterGear.png"); // 16x16
     public static final Icon IpythonNotebook = load("/icons/com/jetbrains/python/IpythonNotebook.png"); // 16x16
     public static final Icon Jython = load("/icons/com/jetbrains/python/jython.png"); // 16x16
diff --git a/python/resources/icons/com/jetbrains/python/function.png b/python/resources/icons/com/jetbrains/python/function.png
new file mode 100644
index 0000000000000000000000000000000000000000..82adbe1dc0b472e281f51ab0a38fd6f9f2a0e2a9
GIT binary patch
literal 403
zcmV;E0c`$>P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00046Nkl<Zc-p0t
z%}&BV6oq*R<;6;k?yb>R&<IEs!G<ar6)K<v11ix-jBntk8-u#!70~$81zOYNy#<;M
zEo@kP&E(uOC%1QIA^;+@;C_19xSu&9O}r5OAsr$$ta;wB0I9c^_^>Jk*f(`J4=op7
zvqrT~*E1nNde>El&7e(TaE(2q5P!ftr`xR>aDU~|Osr#5Sw^>V>}l+I8*~!&2c#@x
zA80oOR+kp>sP6`J_VS$k0Uf(>3f$H`?zT3dEXYW&t)N@V3pMugko^IDT%Q50a{)z`
zVdi!Mx<g*t^CJc{se{Y1fFj3WYHC1tnr;W*;xAMSz(r9&iAgXs$$-vY+Vd<9@h}6_
zjsz5m0@Cq-&ff7MM)_!LBL`ITQ~5LW&|@52BrWOKMGYwHp>T~oVHascjQFw+wqc)S
x;gmENUbDuvX;*ptF})JMghf0N>cq!13;)ol;K@n(cJKfI002ovPDHLkV1jDqv5Noz

literal 0
HcmV?d00001

diff --git a/python/resources/icons/com/jetbrains/python/function@2x.png b/python/resources/icons/com/jetbrains/python/function@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..92f589d42d89b2f4e276020562b035d585ce0110
GIT binary patch
literal 847
zcmV-V1F-ywP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80009PNkl<Zc-qaE
zOHUI~6vtcqB&_69fJ@oh77~fkKt_<K8iI*21f+!Y!J`9(QVJHU1q8)M)U_xZb!XxR
zJ^%>@6KWG^q<_!3y;CNnGj~QvVDU>}=G_1Jcg}sB>jB_7PdpdKz^_oh3NKMhgorQ1
z4sj^ik<Y?1#*2?HJ!VeoxiL^hG!t6{9I_?HRGrp9HSyID-Wv-d|6~e<7ik>5T}JW4
z8j9~%@%MFBJmYtJ<3Y0#9$Wpt2CfjhrNl!x$ff{F21=@eV|k1;u`A2s%D`1wTkKCq
zQGB;jO6~$4lS_;lCJv>hBLkO-91r}H(p@J$32R6btXZQnaLK6o{>&)Azubb{S_bKd
zedxV)6Ix><;=Ok*V_8d@_$G5$8fZ3ZUZjZynrK$c_T8t%4TANde*8@8ma(j5niDNn
z2E4{nJIEw}H(6VHZZwJHgRPn}mSIiP67^OxP-pyltUp(xH8cn&dO97&Gp4UlSIGeH
zaL6aefmazzHX=bx-Rq*{0YP`ubp+cqEI)c+JC0#(X&_X|z-NA0csc{DEn4y^^jKgR
z7|@!<|34-pw&NJqmIgK|8Q}dKM@zKftfrM{fq+2o>2MU!u(mX?Q^|nXc#6yOz{-LW
zE#MdE-R+Lz1*C0kOx6aL<|r_wq->z;j-z-1Y1<hnl^{cNAe&U8`TYXDv&~UF!`gNw
zC{4oo81O8iMDzOudS|Pnc&3nw*-pZ+ScY+0A(?3<Wdj|pj^Y{Cwp)g!jVL+@EXI{+
zKA%8uzwIcVVQssO=y)qmM1l0AEt>C|KyTNSu?%aPw&E(Q!>C1kg~$Mk^Ao^A>`Y)S
z)>Iuv#&OI?CUO%&fK8kMtR<6wR~^S5*))_IlGrei8aowveb`k)Vo+ah$+$O|r8$ut
zbp?;fjSrbyvU;~oX}$3!xPAvyBP1Mk1jm|co;#V`O<P_g>juL}J{CkFK7yl}Ffbbt
z@ZbE5-~B#LY}CAlV$S4ZvhCtxvR%HIB*Gr%GzQE@xWA7On-#8RoAO<)jJ4Ifc$d@j
Z;vXdyhb9k55{Uo+002ovPDHLkV1k!Le!>6%

literal 0
HcmV?d00001

diff --git a/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java b/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
index 2e8e7196a80c..68ad9386e4a4 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
@@ -131,8 +131,11 @@ public class PyFunctionImpl extends PyBaseElementImpl<PyFunctionStub> implements
         }
         return PlatformIcons.PROPERTY_ICON;
       }
+      if (getContainingClass() != null) {
+        return PlatformIcons.METHOD_ICON;
+      }
     }
-    return PlatformIcons.METHOD_ICON;
+    return PythonIcons.Python.Function;
   }
 
   @Nullable