From 2cad8ebd16b29b96657e0a9f81f6278f3f9785e1 Mon Sep 17 00:00:00 2001 From: Andrey Vlasovskikh Date: Wed, 16 Jan 2013 16:48:14 +0400 Subject: [PATCH] Moved Python-related icons to resources/icons/ folders --- .../python/facet/PythonFacetType.java | 2 +- .../facet/PythonFrameworkSupportProvider.java | 2 +- python/psi-api/python-psi-api.iml | 1 + .../icons/com/jetbrains/python/pythonFile.png | Bin 0 -> 612 bytes .../com/jetbrains/python/PythonFileType.java | 7 ++----- .../psi-api/src/icons/PythonPsiApiIcons.java | 17 +++++++++++++++++ .../resources/icons/com/jetbrains/rest/rst.png | Bin 0 -> 458 bytes python/rest/src/icons/RestIcons.java | 2 +- python/src/com/jetbrains/pyqt/tsFile.png | Bin 316 -> 0 bytes python/src/com/jetbrains/pyqt/uiForm.png | Bin 879 -> 0 bytes .../jetbrains/python/PythonModuleTypeBase.java | 4 ++-- .../python/buildout/BuildoutFacetType.java | 2 +- .../buildout/config/BuildoutCfgFileType.java | 2 +- ...pecialMethodNamesCompletionContributor.java | 2 +- .../PythonDebugLanguageConsoleView.java | 2 +- .../python/console/RunPythonConsoleAction.java | 3 +-- .../python/psi/impl/PyFunctionImpl.java | 6 +++--- .../python/run/PythonConfigurationType.java | 2 +- .../jetbrains/python/sdk/PythonSdkType.java | 2 +- .../sdk/flavors/IronPythonSdkFlavor.java | 2 +- .../python/sdk/flavors/JythonSdkFlavor.java | 2 +- .../python/sdk/flavors/PyPySdkFlavor.java | 2 +- .../python/sdk/flavors/PythonSdkFlavor.java | 2 +- .../sdk/flavors/VirtualEnvSdkFlavor.java | 2 +- .../structureView/PyStructureViewElement.java | 6 +++--- .../testing/PythonTestConfigurationType.java | 2 +- 26 files changed, 44 insertions(+), 30 deletions(-) create mode 100644 python/psi-api/resources/icons/com/jetbrains/python/pythonFile.png create mode 100644 python/psi-api/src/icons/PythonPsiApiIcons.java create mode 100644 python/rest/resources/icons/com/jetbrains/rest/rst.png delete mode 100644 python/src/com/jetbrains/pyqt/tsFile.png delete mode 100644 python/src/com/jetbrains/pyqt/uiForm.png diff --git a/python/pluginSrc/com/jetbrains/python/facet/PythonFacetType.java b/python/pluginSrc/com/jetbrains/python/facet/PythonFacetType.java index b1f0f0f7e991..9f761daceec5 100644 --- a/python/pluginSrc/com/jetbrains/python/facet/PythonFacetType.java +++ b/python/pluginSrc/com/jetbrains/python/facet/PythonFacetType.java @@ -57,7 +57,7 @@ public class PythonFacetType extends FacetType { diff --git a/python/pluginSrc/com/jetbrains/python/facet/PythonFrameworkSupportProvider.java b/python/pluginSrc/com/jetbrains/python/facet/PythonFrameworkSupportProvider.java index 98586d34b5df..67b1be902efc 100644 --- a/python/pluginSrc/com/jetbrains/python/facet/PythonFrameworkSupportProvider.java +++ b/python/pluginSrc/com/jetbrains/python/facet/PythonFrameworkSupportProvider.java @@ -22,7 +22,7 @@ public class PythonFrameworkSupportProvider extends FrameworkSupportProvider { @Override public Icon getIcon() { - return PythonIcons.Python.Icons.Python; + return PythonIcons.Python.Python; } @NotNull diff --git a/python/psi-api/python-psi-api.iml b/python/psi-api/python-psi-api.iml index 5e3914f028e3..e64340eea3fa 100644 --- a/python/psi-api/python-psi-api.iml +++ b/python/psi-api/python-psi-api.iml @@ -4,6 +4,7 @@ + diff --git a/python/psi-api/resources/icons/com/jetbrains/python/pythonFile.png b/python/psi-api/resources/icons/com/jetbrains/python/pythonFile.png new file mode 100644 index 0000000000000000000000000000000000000000..ccd74ff4320c0411c2a5690ac76bdbe0e9d66264 GIT binary patch literal 612 zcmV-q0-ODbP)pFGFBUV~Q_BU`bwzY=5X=b){TzqE~C5QfHn~W}QM= zlU8n#|NsAUgv;gd`{?ui{Qdr0ZKwVI|L5`g^7#G!{{Qau`C*W@=<@vT^Z4oW{9})= zJ8_;ZWt_ssoBR3Y^Z5NdbfH3ZpFnV$H)fJDV34r0ZtB%QI&z*haHBtPn^Ss|PjirG zgOkg{Qt8JVFlCfPbe+1yeBsqd+|5Yg%|GeKCE&CgQGBRphm_peMeE!y>d7hNz9rYM zAIzj3;OO$QzrEnfFyzG}(z8R_$btL({_FMqx69?{@cN~>(`b9c=komY`u^ts|MmL* z;rjjU=FIK&{pIfZ`~3Ie!bQ}p6TX-fvXdp*%%0xq_~7gL-|G0^>-ez7*Vg3sl&IQW zaH~FYm@{pcTa2~p_54nLs^aPE^7sAh^ZclXlQIAR02FjmPE!Es*z4Z_A{aQ=EYsiL z-{0Tg+s-E?1Kt1t0I5ktK~xx5ZH+Ms!ax)S=f&VIS{Mu{B6yD=SO``&V&T0!fY{qw zr%PueF&0000et`u+v4op;FMiZ$g3pN`(L3=>HdF{~TxkQHlRki~n1V|67m$W0e17mH%v-{cW24 zc%l1vqWplS`+=nSgOaI;sriYg_>ivnk+1lcvGc%Q*hkq|3Ff05nlJ+>Hk4fZ{X?w5nuh|?Ed5I|K#lchS*S^8Z3ra9y45d;kCd3v^OWQvm7h^7{Jv`uqF*Nm34I0001uNklUV!$X&uPsNMX)W>VMZ&4IND$U zjAvm`{0&=`fo)?f8cz2MHni0#->4XwyJZ&Hw-a07*qoM6N<$f}%D3 AJpcdz literal 0 HcmV?d00001 diff --git a/python/rest/src/icons/RestIcons.java b/python/rest/src/icons/RestIcons.java index 810d775edecd..7be4044574bc 100644 --- a/python/rest/src/icons/RestIcons.java +++ b/python/rest/src/icons/RestIcons.java @@ -13,5 +13,5 @@ public class RestIcons { return IconLoader.getIcon(path, RestIcons.class); } - public static final Icon Rst = load("/com/jetbrains/rest/res/rst.png"); // 16x16 + public static final Icon Rst = load("/icons/com/jetbrains/rest/rst.png"); // 16x16 } diff --git a/python/src/com/jetbrains/pyqt/tsFile.png b/python/src/com/jetbrains/pyqt/tsFile.png deleted file mode 100644 index 1b9450576c8a1f9aad5651b0860f93cd69eb6494..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}T7XZ8E0AUgP+;(qX7Z6^@Rly# zp~2`a14n{kT5{>~IwgvRx$gGW9-b3a68Z~sH>sEG)TrHS+Iq-&!jahNr{m_I&t7r4 za^sD*U3aFOe!A|;%RP7AoqYP~`nzvWzWx66|NsB(+^2T}E#fQ*@(X5AFlgwXzyJLE zh(_T~pkR%si(`m{BM#rbx^y@>X57WJeuJaV;bX&hN2n= zyM`YDQGr??%zmBx{I*!dGTXlX-fr37zih9co47D4+j7;ck9VCsGWXBhG0A~3ghT%j z8^`I&Z82Ne67Sype9w42vy}6B6SfNmR~RlNF#P+#A1`QbSMVpG5EKlau6{1-oD!M< DS6_Q> diff --git a/python/src/com/jetbrains/pyqt/uiForm.png b/python/src/com/jetbrains/pyqt/uiForm.png deleted file mode 100644 index d5d91a05a089219209e15a8d4e535f508c6f82f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 879 zcmV-#1CacQP)nGY}7B45QRiz2=Gan zW(h>Wgbzwa{Ne|a`4;ThV6nZ-nABN7Bh1^T6-S$PYwvn{Jhx$6(fI%PJm>t*|2cX7 z1P@eGQ)BP#?d>y}OoTCpYU#ROo}8S#p3mpAgb>R6<%J$uD7fA3j%YOclhtaadRb?L zRN4S2d%jJ?sN5j#E6%N95qr_0=59zFg*+QO`^m$7p z5*Z7=9NbYX7Bj|02%6UL{TPwi&Ax7VJ=5A>aERKwake+i-XLhvL&fSw0trA z`PI;Cp{F!Wt3Vb3qQ@g&36Cqmb9?EUj=PL73zpl2iVMNkh*~O;x;yQq))k$Wv5D~4 zgQq{*#wS>E;1xyr+wa3l=;A@TQcAI>TaQ2%WqdVt27hPsxKF3BMc9k2Yo90Stg3C_ z_N1IjrQ%BfuP9&n;hGY>u$#6?4eXuAKg3}8D0cc@N0ZQq@$>~W5(&@9uTu3dwb;|$ z)0s>rr^v#O8i4TVgtG6mU9{WR%HHfhhT|iLu&?8Nn5_ht@1De#rWdet!$F#!NoaCc zPav5{ECD31SH3#_qq6_}F52dGu(zN104KhA1AErL1(T_a5p@uK?%n8b*i3KzoYuC# zav-2i|5*i)yz=<{coCT{^H{%i8$8g@Op?8Ff+GG8F z0adMX&>~6lwTX!G;+bb@OVj3 zxP9}slA2A@IW5c9Ecd`(TZdvnL*iBpE1k_)R^J4k6q?J;YU|ed{sY()i^U>#yPdK! zd$7tnN_q(lCRi(m9;V8U<9}o<4o~I0&sTBq z3t0$-APBBdDD extends Modu } public Icon getBigIcon() { - return PythonIcons.Python.Icons.Python_24; + return PythonIcons.Python.Python_24; } public Icon getNodeIcon(final boolean isOpened) { - return PythonIcons.Python.Icons.PythonClosed; + return PythonIcons.Python.PythonClosed; } } diff --git a/python/src/com/jetbrains/python/buildout/BuildoutFacetType.java b/python/src/com/jetbrains/python/buildout/BuildoutFacetType.java index 8447c8956857..721baca8787f 100644 --- a/python/src/com/jetbrains/python/buildout/BuildoutFacetType.java +++ b/python/src/com/jetbrains/python/buildout/BuildoutFacetType.java @@ -50,6 +50,6 @@ public class BuildoutFacetType extends FacetType imp final Property property = getProperty(); if (property != null) { if (property.getGetter().valueOrNull() == this) { - return PythonIcons.Python.Icons.PropertyGetter; + return PythonIcons.Python.PropertyGetter; } if (property.getSetter().valueOrNull() == this) { - return PythonIcons.Python.Icons.PropertySetter; + return PythonIcons.Python.PropertySetter; } if (property.getDeleter().valueOrNull() == this) { - return PythonIcons.Python.Icons.PropertyDeleter; + return PythonIcons.Python.PropertyDeleter; } return PlatformIcons.PROPERTY_ICON; } diff --git a/python/src/com/jetbrains/python/run/PythonConfigurationType.java b/python/src/com/jetbrains/python/run/PythonConfigurationType.java index dd1501cf292d..4832f40dad3b 100644 --- a/python/src/com/jetbrains/python/run/PythonConfigurationType.java +++ b/python/src/com/jetbrains/python/run/PythonConfigurationType.java @@ -48,7 +48,7 @@ public class PythonConfigurationType implements ConfigurationType { } public Icon getIcon() { - return PythonIcons.Python.Icons.Python; + return PythonIcons.Python.Python; } public ConfigurationFactory[] getConfigurationFactories() { diff --git a/python/src/com/jetbrains/python/sdk/PythonSdkType.java b/python/src/com/jetbrains/python/sdk/PythonSdkType.java index c42eb430951f..4aaba6f4c176 100644 --- a/python/src/com/jetbrains/python/sdk/PythonSdkType.java +++ b/python/src/com/jetbrains/python/sdk/PythonSdkType.java @@ -94,7 +94,7 @@ public class PythonSdkType extends SdkType { } public Icon getIcon() { - return PythonIcons.Python.Icons.Python; + return PythonIcons.Python.Python; } @NotNull diff --git a/python/src/com/jetbrains/python/sdk/flavors/IronPythonSdkFlavor.java b/python/src/com/jetbrains/python/sdk/flavors/IronPythonSdkFlavor.java index 8e1138db9847..7b3b32d1ba6d 100644 --- a/python/src/com/jetbrains/python/sdk/flavors/IronPythonSdkFlavor.java +++ b/python/src/com/jetbrains/python/sdk/flavors/IronPythonSdkFlavor.java @@ -84,6 +84,6 @@ public class IronPythonSdkFlavor extends PythonSdkFlavor { @Override public Icon getIcon() { - return PythonIcons.Python.Icons.Dotnet; + return PythonIcons.Python.Dotnet; } } diff --git a/python/src/com/jetbrains/python/sdk/flavors/JythonSdkFlavor.java b/python/src/com/jetbrains/python/sdk/flavors/JythonSdkFlavor.java index eca1b1776f99..8a8640481041 100644 --- a/python/src/com/jetbrains/python/sdk/flavors/JythonSdkFlavor.java +++ b/python/src/com/jetbrains/python/sdk/flavors/JythonSdkFlavor.java @@ -66,6 +66,6 @@ public class JythonSdkFlavor extends PythonSdkFlavor { @Override public Icon getIcon() { - return PythonIcons.Python.Icons.Jython; + return PythonIcons.Python.Jython; } } diff --git a/python/src/com/jetbrains/python/sdk/flavors/PyPySdkFlavor.java b/python/src/com/jetbrains/python/sdk/flavors/PyPySdkFlavor.java index a56007fc8e6d..9342d32ecb6f 100644 --- a/python/src/com/jetbrains/python/sdk/flavors/PyPySdkFlavor.java +++ b/python/src/com/jetbrains/python/sdk/flavors/PyPySdkFlavor.java @@ -77,6 +77,6 @@ public class PyPySdkFlavor extends PythonSdkFlavor { @Override public Icon getIcon() { - return PythonIcons.Python.Icons.Pypy; + return PythonIcons.Python.Pypy; } } diff --git a/python/src/com/jetbrains/python/sdk/flavors/PythonSdkFlavor.java b/python/src/com/jetbrains/python/sdk/flavors/PythonSdkFlavor.java index 5fad2e1107c8..000f67ba2d8c 100644 --- a/python/src/com/jetbrains/python/sdk/flavors/PythonSdkFlavor.java +++ b/python/src/com/jetbrains/python/sdk/flavors/PythonSdkFlavor.java @@ -229,6 +229,6 @@ public abstract class PythonSdkFlavor { } public Icon getIcon() { - return PythonIcons.Python.Icons.Python; + return PythonIcons.Python.Python; } } diff --git a/python/src/com/jetbrains/python/sdk/flavors/VirtualEnvSdkFlavor.java b/python/src/com/jetbrains/python/sdk/flavors/VirtualEnvSdkFlavor.java index b3790d2fc1eb..ed48bb673e4a 100644 --- a/python/src/com/jetbrains/python/sdk/flavors/VirtualEnvSdkFlavor.java +++ b/python/src/com/jetbrains/python/sdk/flavors/VirtualEnvSdkFlavor.java @@ -118,6 +118,6 @@ public class VirtualEnvSdkFlavor extends CPythonSdkFlavor { @Override public Icon getIcon() { - return PythonIcons.Python.Icons.Virtualenv; + return PythonIcons.Python.Virtualenv; } } diff --git a/python/src/com/jetbrains/python/structureView/PyStructureViewElement.java b/python/src/com/jetbrains/python/structureView/PyStructureViewElement.java index 66b4fab74450..a976ada169d7 100644 --- a/python/src/com/jetbrains/python/structureView/PyStructureViewElement.java +++ b/python/src/com/jetbrains/python/structureView/PyStructureViewElement.java @@ -275,13 +275,13 @@ public class PyStructureViewElement implements StructureViewTreeElement { icon.setIcon(normal_icon, 0); Icon overlay = null; if (myVisibility == Visibility.PRIVATE || myVisibility == Visibility.PROTECTED) { - overlay = PythonIcons.Python.Icons.Nodes.Lock; + overlay = PythonIcons.Python.Nodes.Lock; } else if (myVisibility == Visibility.PREDEFINED) { - overlay = PythonIcons.Python.Icons.Nodes.Cyan_dot; + overlay = PythonIcons.Python.Nodes.Cyan_dot; } else if (myVisibility == Visibility.INVISIBLE) { - overlay = PythonIcons.Python.Icons.Nodes.Red_inv_triangle; + overlay = PythonIcons.Python.Nodes.Red_inv_triangle; } if (overlay != null) { icon.setIcon(overlay, 1); diff --git a/python/src/com/jetbrains/python/testing/PythonTestConfigurationType.java b/python/src/com/jetbrains/python/testing/PythonTestConfigurationType.java index 3a4de2fbc86c..987c9b2b8544 100644 --- a/python/src/com/jetbrains/python/testing/PythonTestConfigurationType.java +++ b/python/src/com/jetbrains/python/testing/PythonTestConfigurationType.java @@ -121,7 +121,7 @@ public class PythonTestConfigurationType implements ConfigurationType { @Override public Icon getIcon() { - return PythonIcons.Python.Icons.PythonTests; + return PythonIcons.Python.PythonTests; } @NotNull