From 7a9f96d80cd4bed3c549611a30dcb1eed867c9fc Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Fri, 4 Apr 2014 12:20:16 +0200 Subject: [PATCH] shared icon introduced (IDEA-120989) --- build/order.txt | 1 - .../DependencyValidationManagerImpl.java | 4 +++- platform/icons/src/ide/sharedScope.png | Bin 554 -> 0 bytes platform/icons/src/ide/sharedScope@2x.png | Bin 1290 -> 0 bytes platform/icons/src/ide/sharedScope@2x_dark.png | Bin 1359 -> 0 bytes platform/icons/src/ide/sharedScope_dark.png | Bin 647 -> 0 bytes platform/icons/src/nodes/shared.png | Bin 0 -> 167 bytes platform/icons/src/nodes/shared@2x.png | Bin 0 -> 299 bytes platform/icons/src/nodes/shared@2x_dark.png | Bin 0 -> 304 bytes platform/icons/src/nodes/shared_dark.png | Bin 0 -> 243 bytes .../intellij/execution/impl/RunConfigurable.java | 7 ++----- .../util/src/com/intellij/icons/AllIcons.java | 2 +- 12 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 platform/icons/src/ide/sharedScope.png delete mode 100644 platform/icons/src/ide/sharedScope@2x.png delete mode 100644 platform/icons/src/ide/sharedScope@2x_dark.png delete mode 100644 platform/icons/src/ide/sharedScope_dark.png create mode 100644 platform/icons/src/nodes/shared.png create mode 100644 platform/icons/src/nodes/shared@2x.png create mode 100644 platform/icons/src/nodes/shared@2x_dark.png create mode 100644 platform/icons/src/nodes/shared_dark.png diff --git a/build/order.txt b/build/order.txt index f93a7f28e863..ff0a75037144 100644 --- a/build/order.txt +++ b/build/order.txt @@ -4148,7 +4148,6 @@ com/intellij/psi/search/scope/packageSet/ParsingException.class:/lib/openapi.jar com/intellij/packageDependencies/DependencyValidationManagerImpl.class:/lib/idea.jar com/intellij/psi/search/scope/packageSet/NamedScope.class:/lib/openapi.jar com/intellij/psi/search/scope/packageSet/NamedScope$UnnamedScope.class:/lib/openapi.jar -ide/sharedScope.png:/lib/icons.jar com/intellij/packageDependencies/DependencyValidationManagerImpl$1.class:/lib/idea.jar com/intellij/ide/startup/impl/StartupManagerImpl$4.class:/lib/idea.jar com/intellij/psi/search/scope/packageSet/PackageSetFactory.class:/lib/openapi.jar diff --git a/platform/analysis-impl/src/com/intellij/packageDependencies/DependencyValidationManagerImpl.java b/platform/analysis-impl/src/com/intellij/packageDependencies/DependencyValidationManagerImpl.java index 5948e948a86b..0cb4eb11da5e 100644 --- a/platform/analysis-impl/src/com/intellij/packageDependencies/DependencyValidationManagerImpl.java +++ b/platform/analysis-impl/src/com/intellij/packageDependencies/DependencyValidationManagerImpl.java @@ -25,6 +25,7 @@ import com.intellij.openapi.util.*; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiFile; import com.intellij.psi.search.scope.packageSet.*; +import com.intellij.ui.LayeredIcon; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.text.UniqueNameGenerator; import com.intellij.util.ui.UIUtil; @@ -46,6 +47,7 @@ import java.util.*; ) public class DependencyValidationManagerImpl extends DependencyValidationManager { private static final Logger LOG = Logger.getInstance("#com.intellij.packageDependencies.DependencyValidationManagerImpl"); + public static final Icon SHARED_SCOPE_ICON = new LayeredIcon(AllIcons.Ide.LocalScope, AllIcons.Nodes.Shared); private final List myRules = new ArrayList(); private final NamedScopeManager myNamedScopeManager; @@ -194,7 +196,7 @@ public class DependencyValidationManagerImpl extends DependencyValidationManager @Override public Icon getIcon() { - return AllIcons.Ide.SharedScope; + return SHARED_SCOPE_ICON; } @Override diff --git a/platform/icons/src/ide/sharedScope.png b/platform/icons/src/ide/sharedScope.png deleted file mode 100644 index d80399c64021974384172659742a3ded8c0a7e3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 554 zcmV+_0@eMAP)k8CCo4bM1gn>4g(lH zfEt44AAw`PSqJ|+^=$iZT)8|NW8vxYs2Sh{JKVxEI;08n^DQrt9YY}tr-987&fKrgA*x1-*Fav-t zn2v0KAP}zr;xza6HFBO4cbxEy|v3sis(2zFI sDSIzD_iq0I%VeOy0^)^8hQPxB0KClpoOz*Y2mk;807*qoM6N<$f~Oe*q5uE@ diff --git a/platform/icons/src/ide/sharedScope@2x.png b/platform/icons/src/ide/sharedScope@2x.png deleted file mode 100644 index 940dacd3a88d912afc8c0a617bdcd397e815af0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1290 zcmV+l1@-!gP)ApJ^+7ZWR;f`Ci9SgwlKNr_g0>nIwpuDB0gDxj zsCa>@Xibwfd!NfWerGdVW+yYdv-{E$zRc{IGw1)#f4=ko{|JmRaxt6GBrrNU+ROVH zpgi9urfCXsU7ytJ4yo5%yIyxEJlESzDSI45KI@gh zwZLBB%65Y^LnT(mAe2(#dpdFI9;sAnq+F_ATB|yrc%J_}qinKU0>i*q;QF?W`iyWX ziK0YARU(qC5Jgpps;Z>4T#-t}%Il8f+92^_S^`^wm5XV_;WMgxSiK+!7y3j+B1T3h zf+RF%DgIY}pk?-M&BS{1# zU{4^t)D068pC-o>8Czo67WBac->2`nb$2~Hu}orCc{gx%x50olR!0*7g%CxNLBb%0 zsjU@7VXPT{!UXsRKGaJz!m2ugZ-ERFx}`&)@@}wJq67wjwY?DF`=17UjjEy&P1i5O ziMcaMV5rx4&f2&?3Vte7UBOWm?~01>x}FKZy^N+yY6AWwN#dHgF-qX7-aWvU5(w~9 zm5p|aqKK0rUmqo4_F|h$VBnA0{$|JG;$o^7*Z1>R9&RDv0(uw5YrxyUhvClt#>8aS z_xnxvQyBl~ zbY^Jsw4FOBO5%8ju@?Vl7{+(uD^ASi;UXnWV7|>{b>PjD_HCcmBr~rY>UPsgCl~Cu zA1J>Tin!+rg~F<2^b_!VOfEPFy!y4Z#gar}PB*o6*-J7lsW;S?fc#1Vl4n*YC3yxO zaA15XDI0P{KNtGV-8Ol`xOFp(A4Vdvxp5Oo#i_Y*1oE!yl4`a3G6Xotvnq@|65~yN zRCWP>MzbMT^{L?gV_@RAe#=f#7LS^?X=m5i#6;;ONpd5(#I%JH*dv2`C-I}XD?TejIKB6!J5c~KET z%614sT!@D3wggV?-}x&dR}NyEVKlzrU_NV?pu$`5L2x@0a~hH>-!JyuQ#kVE)*T3) z_riVitBMOo!%2*v>mPt$fRmA_&IF{+MEZ}ne4KV__rH_B3Gx~VK3FzX%hmpYv$I_aKG zP^BoM#0RlxluEK-OyXu^Vw!Gd#{Zpc(%s2yGFgRQ_%XY8XXpIyIp>~xMsQu1T+JcO z3FzqPDCPeKm^_}YO5=JFdY|03W<@CJB_+bMRF5@E!MY9tEd@$x8Hk+4WCZV*jZn4%qMH$(m{)X|rFz`cmt;>lAmtA5jtsQ)MDi@gb65%`k2%SpeMYI^hpBNs@R@tn&+4 zRk{bDh^znwn65?C-xw`~vJ{?*B^wCmuOo z_~3qi=~Y#Aq_VPd7gowoPz_<4$Y!%&q*AH3ZQH&MbMN?*Fue@pe}FyUt0KRrDk>_T zfpK2aHE)j#g25Quo=hg6#Mj?~>cDVF<9(A3-Hj&X*+uTj!uaj{Lnf1Hg;(wwA0L0w zJKGt%3zxrw1pE-f_@^f`m4{AdlAYL2&5L$ASTVnjj*j+u?oFrra`U{A$>i7m`IUhu ziad{}*x~NcYkxr*JsXLzI*QXSWSO=-mt?b-@+$5~kbs}T0I2dk<48{0oPIC#FQs_G8Qvf6wt-vR-A481>4J|T+kC+KDx zbTksCrQ-x+JcYfZb*={pY@rzwe1hV9VX;_jM3xKcoLV5DrDeWHAe~Jgbju2RaITf2 zXf$1~^>Xssu%ZGAzQ^Nn-hv&_b^UPA{WS0)3Trl_dM#XE!McIgCJAqCsu(@!Hsx2;M>4kMUdyhmj4PXsHs6o@Jun4+N1V^&{!Mwe{#ajMA7tWO!Mov7W9yq| z>R^z^^G^P5I5jyH-zHs9{P#69G_20O#%(F$;mhDG*jZg&Js@1|*Yke`7y#Cn24m(6 RSnL1*002ovPDHLkV1kY@g+BlQ diff --git a/platform/icons/src/ide/sharedScope_dark.png b/platform/icons/src/ide/sharedScope_dark.png deleted file mode 100644 index bce25010a6e39a6c805a7c246da77d767d1c247d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 647 zcmV;20(kw2P)^@RCwBalTBz7K@`W|W@mP1Kf1LN z5lfN9fJAa=#E*CqlzI@V6hyG-O~HeRXrR`DAb8MA4h1iI5EP|W(Lx3Br06N2Akm09 zD4rCg6v2R->_^uBhHSd6O&rn z!66f3=BUurH+yF0N7f1)02hIhRGiShIc^Y8fKnw{CRJC-u=K55@P+*4hcfG|+XT+_ z+6UhY$O9dhI5N@{KM8V4W$GSf4-_+ye8JN+t4VbGh72{CTLY8iva#V{d#4Ki32=fhq7h zIf#IKwOTzJf&OT-+3X%;IkE234^N+dR=2Mt#@}1{rUgj{;&g+S{ozVVm^t|11p%_WDQ<51hVt& zV2;qZ@}B$1f?t2+1^&Aps=x3dU*TWtk+#!;uNwYey?S*vyAg|nUAlp(sjBzqmzS4o zmK}(fP*zZAQ0bL6%UR&1^vC)_r@ᅢ(&e_@8p_?DhZ{%yV|55Yf>+A3~%i?DS zd#b*6rLhX06L8oTKNYD$*o)2B~U?0~;8MnFISNg6k7*g%y;_;)}PAvOn8S6AcJ(AwHc)ol1@phMsf zJ|BMl`juhMoH-1yUcI7OL4-2|kS!Mz6Qh{}eiLJPN=gd-9DvPoZf>g*=*?nkvT+@k>1Z_xCqX@v}1r4O%jo6K08uib_tII<=GU$ov;| pY>i8ns4U|B!N{E(!=P}0;gGqW=wvfRH=qL