From de5a5e66e1fa16430ec8ab55b8464a7b033cea93 Mon Sep 17 00:00:00 2001 From: "Svetlana.Zemlyanskay" Date: Wed, 14 May 2014 19:21:29 +0400 Subject: [PATCH 1/3] Add new icons for new arrangement section rule --- .../icons/src/codeStyle/AddNewSectionRule.png | Bin 0 -> 289 bytes .../icons/src/codeStyle/AddNewSectionRule@2x.png | Bin 0 -> 1632 bytes .../src/codeStyle/AddNewSectionRule@2x_dark.png | Bin 0 -> 1504 bytes .../src/codeStyle/AddNewSectionRule_dark.png | Bin 0 -> 1181 bytes .../src/codeStyle/mac/AddNewSectionRule.png | Bin 0 -> 204 bytes .../src/codeStyle/mac/AddNewSectionRule@2x.png | Bin 0 -> 1272 bytes .../codeStyle/mac/AddNewSectionRule@2x_dark.png | Bin 0 -> 1273 bytes .../src/codeStyle/mac/AddNewSectionRule_dark.png | Bin 0 -> 1097 bytes .../action/AddArrangementSectionRuleAction.java | 2 +- .../util/src/com/intellij/icons/AllIcons.java | 8 ++++++++ 10 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 platform/icons/src/codeStyle/AddNewSectionRule.png create mode 100644 platform/icons/src/codeStyle/AddNewSectionRule@2x.png create mode 100644 platform/icons/src/codeStyle/AddNewSectionRule@2x_dark.png create mode 100644 platform/icons/src/codeStyle/AddNewSectionRule_dark.png create mode 100644 platform/icons/src/codeStyle/mac/AddNewSectionRule.png create mode 100644 platform/icons/src/codeStyle/mac/AddNewSectionRule@2x.png create mode 100644 platform/icons/src/codeStyle/mac/AddNewSectionRule@2x_dark.png create mode 100644 platform/icons/src/codeStyle/mac/AddNewSectionRule_dark.png diff --git a/platform/icons/src/codeStyle/AddNewSectionRule.png b/platform/icons/src/codeStyle/AddNewSectionRule.png new file mode 100644 index 0000000000000000000000000000000000000000..13dfcaa48969a270d0172d1095bae50b735adc43 GIT binary patch literal 289 zcmV++0p9+JP) ngen|h=QJ>f3*4W7MB(obzc6_^4TjG%00000NkvXXu0mjfCf0Q` literal 0 HcmV?d00001 diff --git a/platform/icons/src/codeStyle/AddNewSectionRule@2x.png b/platform/icons/src/codeStyle/AddNewSectionRule@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0116c0779119757e7c6b63e701bc20d92ab98d09 GIT binary patch literal 1632 zcmaJ>X;2eq7~XP3Kp761QP9zKozcLUV{@2fO^Pw$9D@iEqoNYC3q;Ir%r4{*6cNy> z)r{7{R9dT}jr5eBx_iD6p|Mw$%((ol<0t4qTua0`~A$7N9O)oKXTqcUi% zP{mal6c*aErxA4iCARNm@Y!ko!cA;9D`74 zGU%fzjVcyY5GD*1vV|-i7Z!jb2^$u|0x`S<hs)={d=|_@xDo^wg5wWFM>CM(Rv@ zBc&&B(5a~1LZnkNh<5rh1%q)?7AMEcL>G)>(Hc20o9j$z0;p2`Kh$8DM3Yn;_Q~&m z3X^K95#z*RB#~~?(Fd2j&>6~zC`_1^B1~$6*fvqc*i?cd$W+1zDik1dtsX}SGZ{Pv zSE-OFoTRk44vSLCAXTu&wHLvZTn=r9<2=`Y zo%6&N-8|0eWY^M*$-c*My4g*1R}ae=^ks2rjZ(_hmX4bRs??eCfcliOhldyGe{>J? z*%aXS&ZWQUxJQn~&&^NxC**!O$JYNst_;}+b)E)2{BHU*?Ezoa9u)=Knvc)7#Fnhl zm8p3A4^LnBWR&8fhYwVnM=tY;Wb>xZYs1Oy_PEkxU%7112A}nQU3od8w{9aw?HGB~ zQv9J2IC-UBph_q=Bye5#da^ZFAEHGAnKIuGSWBtK+R7yJ6RWG6`ZQS?ha9A6xwVEF zQ1~3V%RUA*+Hr}C_zB>*1k6oJl&@HOFYj4Zpl=;nIn71!L`3f~_4IXh<~`ojKgkUg>QR+V5^aR1A| zKwVPuueU=hdUjHk#bv-RUdmOB+4|k(?;CcX^ZzDcbso+QOaJa~|8~_H>{0_gXV8cXNJTv|{Vgm_@w< z=(hgGu4NB^Hs%xRY)fqZ^k~2C#dVDfE@sUtift`IXNg^252L_=8Fo*`tyJlvG{+EW z*nUK`f8JA1eXYkl1y#zN?-;U{RP`3b{qXl`0rLCYR^oVDNBPJyW4wFP6~rEPzV&?P zb+3lHvYS^p5uWsZ>tC^}+YpMR0d+uBU=U&VkckUN@{EntOsIRE)kVKK@}E0S{l0Vh*+ AY5)KL literal 0 HcmV?d00001 diff --git a/platform/icons/src/codeStyle/AddNewSectionRule@2x_dark.png b/platform/icons/src/codeStyle/AddNewSectionRule@2x_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..93e49dc8e2ee99709b2306b9854cb9cbc7b06bea GIT binary patch literal 1504 zcmaJ>drT8|9KQkurUMJnX%+N15FMkvyOshyskGdc(P#<7su+B5?HzEz_KxczN28NR z2GuyhEt!jp5j4g}mMOBtF^z?ZE;!?o`G}j#W@@H!E)*08MoV`^!2L0H$=&af&*$@f zeR6wBir{w0CAQgqEuSJ@EaQ~ecc|o(4=5Yo|erldPgk zX_9KF9i;OBATouql?i3mwU~o-s>v`$Ejl@g4FGxhB1bxEXaTg-RgB931upm?kf99F zMx7P0ayVVh6nS`hou}C5@YFc;6qLUj%o8z5z)1@vC_1;h+?Z&9CUr4sAHIema1tWa z7@*flm03$boaJdyr`D+)2$}`v=+&qW&B{eHK@EaxVMGg~S{16n5Iu(Kz^Mn4qVZHE zR!S63#ga}2s9F#>42J9L>(%vIHOp7Qs9vv!5e=--s3e5S-QW^PQRQ-{PAd?!+rcxO zz_2bbtVr6~I>7)*nZ7Q;$<4^R+*56m8U~9b2cv2vT+%eqYW;tx(>a573#Ig%eE(C} zZEN6YxRiFYb-Y6wTxDuF6o=tFO$sb;W7+M~T`Z|)1=d~7av+X_D>pJOimi9QI|;X1 zF^kJBkS+&pAqq;Ec& zJUsS$KGNF#cnIh?6AFfMxD?>rD16ILE|Bj#`$@^EACgX-zuVipNHl-cpOw3CXYlIq zi|6IY$8&#uZ`EK?X)Myy6Y)&1-CzcLLw(TwK*(3I+8dYX2>#e)_;zAqxnWN3xY)lb zt_G3K1q(YLOqg1h4pcsRKvuN0#$w~a2P+=OSJ)k7#Y5`yso{LZL@?&LGL!txUEth-qb1$FX>EPGJCBFD-U)plXav&!=E424Ugfo%D1QmK6<-tMP3ay3 zH^oOh>iT?NcFM}}1E_0Qv1f~H;IwV9_58a1310+EBTHiGmP}v7Ku^;*3%o~e9$SBL zf%j#{c&A^t#LLQRl_zV>?UfCvqAhYHH4R+~4n_H`#_Q(x5BoE!=g%+bNx7(q@_RgW zYmMfIQQ(GX|CS+J)#GLIdPysy%Ocbe_g*@fPFj8fidy968x`0y*n-il?46SD3lip%9afGirgaP!XI T$Ctk5!~a~1xtRE>prZL7FySjj literal 0 HcmV?d00001 diff --git a/platform/icons/src/codeStyle/AddNewSectionRule_dark.png b/platform/icons/src/codeStyle/AddNewSectionRule_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..739bc198d88c07b451a9546e15365b6fb14ac54e GIT binary patch literal 1181 zcmaJ>TWs4@7sVx~j5>1!*gF?332C_Hpgg z#w~~jo?0;pji*%;+IT>`RAUcF6Wc@6k_o{OQ{Sq+?1IF@KpGX|rezJsUDNSEuw5S}R7)Lh=o1%LA9aB~&AqE9Ft{HLq(T!CaXlk53 z9hHKTnT8YE$$1N&njg+7^OFj%(*1p)*Aa+-4zUazeaf%}Cr>~{Y5!#BSnOH*xa24eO zn!$0JWcsuO-Q1Hk?AHnd+zK6DP7Cy`OKZWhwoC(=1w9$;E zkiiv?xS>oTZ9y3$D~Hfjql+UG2qSv}nIN48ub$Qn6_xB`J8(%7GKP(1LxCAFP7?t} z(^MfGi41U&a8gXhf*dyxPDWBOkw4DyCsL_on2$ENB2s2_Xy67{ea1~S<+@JLO%hpz zmNpC3K?~_%r(!{Co=dE$-Y!>do(tcU%aUYRcdq}MbK{Db$KCF^mK^qc4-H~=i@2H! z)rKg_b0{MwbIzSYtzPfbF99#0E*H#QEw6WOk99X_{FX8f00 zAH0>QwJ+Y7-v0ot{P0Of)t5NaS`8&?2S4}Jx1X#X?eSH=C_9XQ;hT$x&@0`=RylHi zIkDocUMt7io_{aaQSn?aZ+0#Ar_XZl=e&urF8|M-tv)ck*10cM=>((utB=b0w#DxA pZ&zLijHfUP`kt%436f>XOWplcTL0|&habB?jLg8WcqKLV!9UBQkYNA- literal 0 HcmV?d00001 diff --git a/platform/icons/src/codeStyle/mac/AddNewSectionRule.png b/platform/icons/src/codeStyle/mac/AddNewSectionRule.png new file mode 100644 index 0000000000000000000000000000000000000000..7aaacdfddda91ba0ce7f4f61310473dedc440e2d GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`lRaG=Ln>}1|M>sko>^7Gr=p@_ z!Q=k{J&NW%yg&R^md$0f*ef6@*(p3Zt3gj-KFgzchd(?WyFE=Gun6pDc_gFoj^UA4 z5bqA|BhwpaOqS3;U^s~})!~nPhdgtkkbvk21 zm27huA89F^V|eu2p=NFf^ERfB)(Zc4dj*vz*f4Aqdm>e|mz@ddJO)o!KbLh*2~7aq C%}0a) literal 0 HcmV?d00001 diff --git a/platform/icons/src/codeStyle/mac/AddNewSectionRule@2x.png b/platform/icons/src/codeStyle/mac/AddNewSectionRule@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..b1c0f9d042937ec88cb076a1c8ded720ddf9b7be GIT binary patch literal 1272 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%!-*I5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT-VtFWlg~VrW1CgG|37u|VHY&pf(~1RD?6IsxA(xEJ)Q4 zN-fSWElLK)N18HBGcfG%TLe-Fbd8luesXDUYF>$_i>(q+L@y;X#md>q(AmJu&CSKh z*v-(;)!5O=(ah4>$i&sm(aqVy*&L?VGq1QLF)uk4rZ*Fz*A=f`E9aur#FG4?ko^1{ zSnLI4nurmM>RV-1@@t zsE5blZ*On2*K_n(C0t=#%$IO*@_A2PaS0Dyb+^R{7nU-*2|b=OQHn32CG_}|Ft?_r zCY8uNIX8`FxiOx&6QW?paAbYs4|V~2=FkZabC`;1Dc+>eQ{x-MBM*hL zWuY7@izEL@bewl|W@3AG$%ut%!j0377Hl2=9e=ht$Z#FW&UndSsPaut<+S4i8}sPY*+fIn(?wh*kMjb%suBuW})Aly4*^|8uNIMm@k|l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT-VtFWlg~VrW1CgG|37u|VHY&pf(~1RD?6IsxA(xEJ)Q4 zN-fSWElLK)N18HBGcfG%TLe-Fbd8luesXDUYF>$_i>(q+L@y;X#mdFP$CgZF_J+qF~2xWPRfgb^&|lM{gbGFdb>Sv8Z9z#a(SFt$gr9*+dS ztmCz3F4Pu^Z<@wu!FZ(e#8X=l3x$pIFKkjUYJYUop+-20^CZ(ot4Xs`x0EpO7%*=X z6H#v7>u|^Kvs3kQZ3axKUc5zFCuv!+?Ro(}zhk#&;5^F!FTu Kb6Mw<&;$URaH$CZ literal 0 HcmV?d00001 diff --git a/platform/icons/src/codeStyle/mac/AddNewSectionRule_dark.png b/platform/icons/src/codeStyle/mac/AddNewSectionRule_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..2f6e97411bcb4cf6dcc686d9aee751bfc65a4c47 GIT binary patch literal 1097 zcmaJ=OKj6f7&hC7N`T$+l6b7NgQFGC*q)>zwbjtXc0wbOstS>sO99uOHYV6(>?uhr zkiw#s0yjXrhgG#*Brb&&0&zia2cuab z>nNyb_D#6x@I-%JpD5{~!S)^iJr#*Mun^He#X4boQYFqV`jx2dU-K+jgpg94T@qEu z4gdwa2t>JPNEcuih>0AG!me((4}=96;e`kfBOw@;1W|%f(D+yy%{4}(oSJULqNg}p zB*c+;zFaPIOEBXO20 zT}r`nve{+Fw$~^WEg4_Y93FB4Z&`j`i)fGJ&?gxyqP_gMgZLcs@R+O9evAa0WLmqg z2l9bbjih3I%tAKFsBxCwaE56}vI5hw7)+{iBn@FIA}Zao3}Kh5D6wc*NH@6|+asE- zqbAq<#1+5Fl@u3g1iN{RPc*wXP{ag#MeG1Y0lNlG+rVXSw_n+YP~@7Ykdbz=1r|#q znJa`3tFjo2#?orCTkxgJv1Cf2W;7-zl_Z30gKMmi_7b;S_#&65VtBu=pY^$UMTf^X zm#3B1!{n3RuinOs#LOU!>;`=vU!e!Bf$YkdQF*;c=um~7k7 a+95DKsl7X%Ui$Zt|F|=$e)WcY?5B?u?_~G@ literal 0 HcmV?d00001 diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementSectionRuleAction.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementSectionRuleAction.java index e324ee29e848..db0b66fb5167 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementSectionRuleAction.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementSectionRuleAction.java @@ -35,7 +35,7 @@ public class AddArrangementSectionRuleAction extends AddArrangementRuleAction { @Override public void update(AnActionEvent e) { - e.getPresentation().setIcon(SystemInfoRt.isMac ? AllIcons.ToolbarDecorator.Mac.Add : AllIcons.ToolbarDecorator.Add); + e.getPresentation().setIcon(SystemInfoRt.isMac ? AllIcons.CodeStyle.Mac.AddNewSectionRule : AllIcons.CodeStyle.AddNewSectionRule); final ArrangementMatchingRulesControl control = ArrangementMatchingRulesControl.KEY.getData(e.getDataContext()); if (control == null) { return; diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index 982d4cf79e1d..273306af980e 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -163,6 +163,14 @@ public class AllIcons { } + public static class CodeStyle { + public static final Icon AddNewSectionRule = IconLoader.getIcon("/codeStyle/AddNewSectionRule.png"); // 16x16 + + public static class Mac { + public static final Icon AddNewSectionRule = IconLoader.getIcon("/codeStyle/mac/AddNewSectionRule.png"); // 16x16 + } + } + public static class Css { public static final Icon Atrule = IconLoader.getIcon("/css/atrule.png"); // 16x16 public static final Icon Import = IconLoader.getIcon("/css/import.png"); // 16x16 From 3a483ab5599395d77a6aace926da52bb5e5027dd Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Wed, 14 May 2014 19:20:54 +0400 Subject: [PATCH 2/3] [vcs] Delegate to the fuller constructor --- .../vcs/changes/committed/RepositoryChangesBrowser.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java index 3e3cca72fde0..d59c3cf0d2da 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java @@ -47,12 +47,12 @@ public class RepositoryChangesBrowser extends ChangesBrowser implements DataProv private CommittedChangesBrowserUseCase myUseCase; public RepositoryChangesBrowser(final Project project, final List changeLists) { - super(project, changeLists, Collections.emptyList(), null, false, false, null, MyUseCase.COMMITTED_CHANGES, null); + this(project, changeLists, Collections.emptyList(), null); } public RepositoryChangesBrowser(final Project project, final List changeLists, final List changes, final ChangeList initialListSelection) { - super(project, changeLists, changes, initialListSelection, false, false, null, MyUseCase.COMMITTED_CHANGES, null); + this(project, changeLists, changes, initialListSelection, null); } public RepositoryChangesBrowser(final Project project, final List changeLists, final List changes, From f8958850a0080435742288e9d7196d0265a058b1 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Wed, 14 May 2014 19:32:32 +0400 Subject: [PATCH 3/3] [log] IDEA-124546 enable "Edit Source" from commit list --- .../changes/committed/RepositoryChangesBrowser.java | 12 +++++++++--- .../src/com/intellij/vcs/log/ui/frame/MainFrame.java | 7 ++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java index d59c3cf0d2da..38ada4ef6b40 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java @@ -44,7 +44,9 @@ import java.util.List; * @author yole */ public class RepositoryChangesBrowser extends ChangesBrowser implements DataProvider { + private CommittedChangesBrowserUseCase myUseCase; + private EditSourceAction myEditSourceAction; public RepositoryChangesBrowser(final Project project, final List changeLists) { this(project, changeLists, Collections.emptyList(), null); @@ -64,9 +66,9 @@ public class RepositoryChangesBrowser extends ChangesBrowser implements DataProv super.buildToolBar(toolBarGroup); toolBarGroup.add(new ShowDiffWithLocalAction()); - final MyEditSourceAction editSourceAction = new MyEditSourceAction(); - editSourceAction.registerCustomShortcutSet(CommonShortcuts.getEditSource(), this); - toolBarGroup.add(editSourceAction); + myEditSourceAction = new MyEditSourceAction(); + myEditSourceAction.registerCustomShortcutSet(CommonShortcuts.getEditSource(), this); + toolBarGroup.add(myEditSourceAction); OpenRepositoryVersionAction action = new OpenRepositoryVersionAction(); toolBarGroup.add(action); final RevertSelectedChangesAction revertSelectedChangesAction = new RevertSelectedChangesAction(); @@ -100,6 +102,10 @@ public class RepositoryChangesBrowser extends ChangesBrowser implements DataProv } } + public EditSourceAction getEditSourceAction() { + return myEditSourceAction; + } + private class MyEditSourceAction extends EditSourceAction { private final Icon myEditSourceIcon; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java index 4282f39884fc..26457599ab9d 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java @@ -70,8 +70,9 @@ public class MainFrame extends JPanel implements TypeSafeDataProvider { myBranchesPanel.setVisible(settings.isShowBranchesPanel()); myDetailsPanel = new DetailsPanel(logDataHolder, myGraphTable, vcsLogUI.getColorManager(), initialDataPack); - final ChangesBrowser changesBrowser = new RepositoryChangesBrowser(project, null, Collections.emptyList(), null); + final RepositoryChangesBrowser changesBrowser = new RepositoryChangesBrowser(project, null, Collections.emptyList(), null); changesBrowser.getDiffAction().registerCustomShortcutSet(CommonShortcuts.getDiff(), getGraphTable()); + changesBrowser.getEditSourceAction().registerCustomShortcutSet(CommonShortcuts.getEditSource(), getGraphTable()); setDefaultEmptyText(changesBrowser); myChangesLoadingPane = new JBLoadingPanel(new BorderLayout(), project); myChangesLoadingPane.add(changesBrowser); @@ -230,10 +231,10 @@ public class MainFrame extends JPanel implements TypeSafeDataProvider { else if (VcsLogDataKeys.VCS_LOG_DATA_PROVIDER == key) { sink.put(key, myLogDataHolder); } - else if (VcsDataKeys.CHANGES.equals(key)) { + else if (VcsDataKeys.CHANGES == key || VcsDataKeys.SELECTED_CHANGES == key) { List selectedChanges = getSelectedChanges(); if (selectedChanges != null) { - sink.put(VcsDataKeys.CHANGES, ArrayUtil.toObjectArray(selectedChanges, Change.class)); + sink.put(key, ArrayUtil.toObjectArray(selectedChanges, Change.class)); } } }