From 26c1aec5df80da7f79b471b0bbaf246a1d51c4f9 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 19 Oct 2017 13:16:33 +0300 Subject: [PATCH] Related to DSGN-4505: change expect / actual icons to the new ones --- .../org/jetbrains/kotlin/idea/KotlinIcons.java | 6 +++--- .../org/jetbrains/kotlin/idea/icons/actual.png | Bin 0 -> 328 bytes .../org/jetbrains/kotlin/idea/icons/actual@2x.png | Bin 0 -> 527 bytes .../org/jetbrains/kotlin/idea/icons/expect.png | Bin 0 -> 302 bytes .../org/jetbrains/kotlin/idea/icons/expect@2x.png | Bin 0 -> 404 bytes .../jetbrains/kotlin/idea/icons/fromHeader.png | Bin 267 -> 0 bytes .../jetbrains/kotlin/idea/icons/fromHeader@2x.png | Bin 383 -> 0 bytes .../org/jetbrains/kotlin/idea/icons/fromImpl.png | Bin 272 -> 0 bytes .../jetbrains/kotlin/idea/icons/fromImpl@2x.png | Bin 369 -> 0 bytes 9 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/actual.png create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/actual@2x.png create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/expect.png create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/expect@2x.png delete mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/fromHeader.png delete mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/fromHeader@2x.png delete mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/fromImpl.png delete mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/fromImpl@2x.png diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java index 37d5ff12fcb..ee7855b19e9 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java @@ -48,9 +48,9 @@ public interface KotlinIcons { Icon TYPE_ALIAS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/typeAlias.png"); Icon SUSPEND_CALL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/suspendCall.png"); - // TODO: change icon files themselves! - Icon FROM_EXPECTED = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/fromHeader.png"); - Icon FROM_ACTUAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/fromImpl.png"); + + Icon FROM_EXPECTED = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/actual.png"); + Icon FROM_ACTUAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/expect.png"); Icon LAUNCH = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_launch_configuration.png"); diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/actual.png b/idea/resources/org/jetbrains/kotlin/idea/icons/actual.png new file mode 100644 index 0000000000000000000000000000000000000000..19cb3efc3455407a0ad54605ca55f1af7fc864a5 GIT binary patch literal 328 zcmV-O0k{5%P)PbXFRCwBAV4x5%ViWwb-j)kUWdgAp zROl8EPv;3d{EeUiP|Za^EQ==f7>N7O4PhiwGfqPoNzjbd5Jr5OGpE0{1JTnnMGxUJ zgbAh=UGu41KZJh#{?7`+AU2u-vQRw?Fay-k-MRhTH+f@a_NSUMY%f7NCukz9>m*4rikDN88# zI8Wf=1$1)&n&k|XID(N%mXqxWMk-oPmLnLcY&pq}V5EWNBsqeSMwS!p2u2!OPLv}U z$+i5{tsg=YHh(k)u?u|pPn)T6yd%dEOyv4}`?+uO*w{FLCDcs94j{(z$8Y{{-hBF7 zjGdM74~P$9gT%;j1QR)NzVYN&u#Yum*j^eavOh%@Bh?X1NS22YWBJE#|5(o6{V5G% zN80h+b24aK6Kysuy0yzYniAmB2uY4E(`TIYMyeP{%SrL}+pu{IG!2B5`29hH( zXISD*gm@F**>B2V6Eq+`2LVT2&WFfyqyXd~J5DGHKv@qM%;3a!{KgL{5C*Y-{Ql1h zjUG;r8Uk4o1omQt05qQ-CpPOneEmlVhF^a8%S%F*1eFP^u!R8F5x@k(fGs3oSr5eS zj2Auxihp$Z@`Z2hU|AAf9#?^ckp^&u1T34WOS8VhW;jR;lrZsRNvx$I)gXVTU{WJzL+;=x-P4T|b`P&7yeMU!k$G)f0WvwTo=OsL&88wCIX1^^<&6S(|Bie9Ip0ZdT*HcDPBu@8XA?|=+ w$K{W1%5n{oy&;|+A)cq6q^NZ<=%6DJJ4?op00i_>zopr0PZJr^8f$< literal 0 HcmV?d00001 diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/expect@2x.png b/idea/resources/org/jetbrains/kotlin/idea/icons/expect@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..247cce8dfaea7783a7f98a068fcddd5ff5e620ec GIT binary patch literal 404 zcmV;F0c-w=P)NCukyH&|*4qjLDPJJg z2VyR$@HZg72*jIt0uR5XnFD~9%L1t)B#Y4j$RT||M?9vw1BkGkEJrX>*>aK{!AJwk zNpb`ujVveH5sWmnoG3>yl4|*>TR(*G*`_YT_KBa1=?}4vU?kP&QN1tS@j0Ntm;bbx z8pk_gLxPD$!Hx}p%q)W10S7E-B^=R~f=K?$>A-eB3V=W1ZDTpX239*)jC?z3OqK`)D0c%lAa%DvA8gXz| y$Ah9lGANp4gQ8J7D4OMiqGLju;yHD}bxEqgD&|Ig!? zFr9tEvlV>;8d*waCrZ89YAL@cGp%72YvhRoETy}oBn>&P9d^mIN@!v`rfc-&o>SSu zl8gfe3)mkWTz&s(V$K$aIevRHmUuZW@(NN@H-5;f(7d4SAqxW|8$)_#`2E%m^REFN O&fw|l=d#Wzp$PyO5@j&} diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/fromHeader@2x.png b/idea/resources/org/jetbrains/kotlin/idea/icons/fromHeader@2x.png deleted file mode 100644 index d10f7fd316746f5513de57098c39281a399c46ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 383 zcmV-_0f7FAP)NCukyH&|*4qjLDPJJg z2VyR$@HZg72*jIt0uR5XnFD~9%L1t)B#Y4j$RT||M?9vw1BkGkEJrX>*>aK{!AJwk zNpb`ujVveH5sWmnoG3>y(%5o>j$kCm@~GaI?%2ea6^rjA)e%hO_*`9@^%XH1QF z$l}XAC%)#F7cQuZ*|fb{Xd|_9`h*percC4!Y+J_LG?P=GVJF+PM+J-x49pBosR0!y TLaeRgTe~DWM4f!l7e^ diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/fromImpl@2x.png b/idea/resources/org/jetbrains/kotlin/idea/icons/fromImpl@2x.png deleted file mode 100644 index 363ee4dd861372c15d8be0479e9c442e6c28141d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmV-%0gnEOP)NCukyH&|*4qjLDPJJg z2VyR$@HZg72*jIt0uR5XnFD~9%L1t)B#Y4j$RT||M?9vw1BkGkEJrX>*>aK{!AJwk zNpb`ujVveH5sWmnoG3>y(%5o>j$kC!@~GaI?jU+uvG`76#0fcqiN-!h1|Tzwpmtz7 z09wM)%5ro^2xAKYUm9DE>|csJ