From a9ec8e7258f1a14f6a631d2801d3d709a4c6683e Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Sun, 8 Feb 2015 15:55:11 +0300 Subject: [PATCH] [vcs-log] correct collapse all/expand all actions text and icons in linear bek mode --- .../impl/resources/icons/CollapseMerges.png | Bin 0 -> 229 bytes .../resources/icons/CollapseMerges@2x.png | Bin 0 -> 371 bytes .../icons/CollapseMerges@2x_dark.png | Bin 0 -> 314 bytes .../resources/icons/CollapseMerges_dark.png | Bin 0 -> 231 bytes .../impl/resources/icons/ExpandMerges.png | Bin 0 -> 230 bytes .../impl/resources/icons/ExpandMerges@2x.png | Bin 0 -> 377 bytes .../resources/icons/ExpandMerges@2x_dark.png | Bin 0 -> 339 bytes .../resources/icons/ExpandMerges_dark.png | Bin 0 -> 232 bytes .../com/intellij/vcs/log/ui/VcsLogUiImpl.java | 13 ++++++++--- .../intellij/vcs/log/ui/frame/MainFrame.java | 21 ++++++++++++++++++ .../vcs-log/impl/src/icons/VcsLogIcons.java | 2 ++ 11 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 platform/vcs-log/impl/resources/icons/CollapseMerges.png create mode 100644 platform/vcs-log/impl/resources/icons/CollapseMerges@2x.png create mode 100644 platform/vcs-log/impl/resources/icons/CollapseMerges@2x_dark.png create mode 100644 platform/vcs-log/impl/resources/icons/CollapseMerges_dark.png create mode 100644 platform/vcs-log/impl/resources/icons/ExpandMerges.png create mode 100644 platform/vcs-log/impl/resources/icons/ExpandMerges@2x.png create mode 100644 platform/vcs-log/impl/resources/icons/ExpandMerges@2x_dark.png create mode 100644 platform/vcs-log/impl/resources/icons/ExpandMerges_dark.png diff --git a/platform/vcs-log/impl/resources/icons/CollapseMerges.png b/platform/vcs-log/impl/resources/icons/CollapseMerges.png new file mode 100644 index 0000000000000000000000000000000000000000..8f7aa5c6fb8c02b05ef4966074e53c1ef9e67e86 GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~69rWt%aH#1X!#0vWq{+ z+sAN5viS6aLII0j^$&8Bbf#?GDj_Lw;i1p|p9fAJoM7TDRrkgD(wErXBIiVRTy68< zT5$fH+oUfyBPF)Ix3pmhoE)@qDP!D$WL|Oc5{K;Hd%quw;AXzT_h9DS$@QBU>Wfsa Uw|Vzf0c~gSboFyt=akR{09}|+Pyhe` literal 0 HcmV?d00001 diff --git a/platform/vcs-log/impl/resources/icons/CollapseMerges@2x.png b/platform/vcs-log/impl/resources/icons/CollapseMerges@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..75be03ec2788fd6c79aa3719a06667cfef687ca4 GIT binary patch literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&kwgiGxQ)BewtiTLuP322U5qkch)?r|1STI|{V!=WTt+ zC1LZ?Ur2a^jG_cjXmM-Kx(lH%4sbF}a&kziUbVxKrS+IggXBgfd*ke;7w7%T_s=u8 z<#iNbIoN1hp2D()4bjHccSY|%S#qDNJlc4+ zXvh1bXJ#E-SnnA8VV-cpzW3jvV|EyBZjZZfATG_s{a}ZS&H1ytm#|4NPM;+9?%&;X z{y7Z#2QpXwXj40Opmm9RdHnTvjnxnKgzYg-&^2Ig+ZiUn;`qV-C-bc9843}XrU65T Ofx*+&&t;ucLK6TWF_I(z literal 0 HcmV?d00001 diff --git a/platform/vcs-log/impl/resources/icons/CollapseMerges@2x_dark.png b/platform/vcs-log/impl/resources/icons/CollapseMerges@2x_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..f678b1b8cf6b1456223b7a3e9829987a85efef72 GIT binary patch literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&kwgiGxSgQcvYx98l=Er;B4q#NoG-6~zu22)NWw+{@*0 z=T37w%UMMa{zkn?$8FsnJS?0XWgsXjGE2$f&GnlzPo^+C3a}j9pR{}H-wk{JJ1M93 zmc2Oh=IkH79n6_t9Je`dFkfF2D&`QxzNTTFiOcyt%-14U?_gBG|A66)_u2TCh?KPo98C}GE1CSy#4WLO@?-&eiNVv=&t;uc GLK6T)ka_0- literal 0 HcmV?d00001 diff --git a/platform/vcs-log/impl/resources/icons/CollapseMerges_dark.png b/platform/vcs-log/impl/resources/icons/CollapseMerges_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..e5af04bfcd721ace92204d1a5ee528edc63b0aea GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~69rWcMCQJ2)LeK%rCv6 zHCmW+*5+q?oUIAM+gY_Y@O#YT`TQ&~#o+*F`T4v2b7XjK>)-y{Uw32Pwynzwq8`La zCs{W{mxWDwTbZ8dQT3#N-^JJK=rryRZ1e6H6gslUsMdaqlgLhF@MPqzopr09u1hH2?qr literal 0 HcmV?d00001 diff --git a/platform/vcs-log/impl/resources/icons/ExpandMerges.png b/platform/vcs-log/impl/resources/icons/ExpandMerges.png new file mode 100644 index 0000000000000000000000000000000000000000..c49336a3ffd69b8611087bc51c79680cf29c77d8 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~69S)XjwjdyT3;IjKtP1%xGY4N5d8ks8}tev!MlesGok3;yx ztBlEpoRuB-XKZukyHP*m=!Zf_{w>?K+l$H_kgm8{XJ)C%WIRDjYl+f6`{yb$mF+6w UlHcrlfz~s4y85}Sb4q9e070orvH$=8 literal 0 HcmV?d00001 diff --git a/platform/vcs-log/impl/resources/icons/ExpandMerges@2x.png b/platform/vcs-log/impl/resources/icons/ExpandMerges@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..27c572c6919b7a8fb5aaeb2e09908a0ed0f67737 GIT binary patch literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&kwgiGxQ|I{f2>Z43;IY@RNTArXh)PTA?qK--}b22 zLGcaS{SBLZy{tEW&@>6wxbdu})$`tgC=bmgopXaDekrgW^xAT=F-NblfcyHH@OOv) zSpR=xFTmm`@Wm&~I^?R91hcX6?pI0+RvAAKT5vtI*JD)`?;XbU-61BMr|kT` z`|;wqhTmL280@M!4j2~9+ScQ6=FRe!Nvqy5=O0)g={&jP)%>NV7mlPb+!1^8ZJBS4 zF6+B}0uxzy8jA%hi@v8Gf9Kzj{$N3_c!=)&)rF5ZW{A9~W0J{>a&ZK@`~4rrJFQ_| Ui})Ot0|SY{)78&qol`;+07$c!_y7O^ literal 0 HcmV?d00001 diff --git a/platform/vcs-log/impl/resources/icons/ExpandMerges@2x_dark.png b/platform/vcs-log/impl/resources/icons/ExpandMerges@2x_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..22ff8c99a712108ef1ac45bac9663be0d6060eb7 GIT binary patch literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&kwgiGxR5uvI8p3n=u!)5S3);_%xkwtS3%B5vn>rl^=L z5MSH$WZhw{8EwtDnm{r-UW|3ci5Y literal 0 HcmV?d00001 diff --git a/platform/vcs-log/impl/resources/icons/ExpandMerges_dark.png b/platform/vcs-log/impl/resources/icons/ExpandMerges_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..6d5d8f1c562ea481239c388cc7bf29ad96dc598b GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~69Z-*^&aSMyI;9}lf;XL zWeTeqf8_{W66l{X$%*U7yctI~>|VecH))%_XjTHN-J~`xRo4WTWldbcV)pZk1?w2r WY8IT)UUClT00vK2KbLh*2~7Z+Tuq7q literal 0 HcmV?d00001 diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java index 13a39fbfe08c..8a12d72fdf05 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java @@ -114,7 +114,12 @@ public class VcsLogUiImpl implements VcsLogUi, Disposable { ApplicationManager.getApplication().invokeLater(new Runnable() { @Override public void run() { - assert updater != null : "Action:" + title + "\nController: " + myVisiblePack.getVisibleGraph().getActionController() + "\nAnswer:" + answer; + assert updater != null : "Action:" + + title + + "\nController: " + + myVisiblePack.getVisibleGraph().getActionController() + + "\nAnswer:" + + answer; updater.run(); getTable().handleAnswer(answer, true, null); } @@ -124,11 +129,13 @@ public class VcsLogUiImpl implements VcsLogUi, Disposable { } public void expandAll() { - performLongAction(new GraphAction.GraphActionImpl(null, GraphAction.Type.BUTTON_EXPAND), "Expanding linear branches..."); + performLongAction(new GraphAction.GraphActionImpl(null, GraphAction.Type.BUTTON_EXPAND), + "Expanding " + (getBekType() == PermanentGraph.SortType.LinearBek ? "merges..." : "linear branches...")); } public void collapseAll() { - performLongAction(new GraphAction.GraphActionImpl(null, GraphAction.Type.BUTTON_COLLAPSE), "Collapsing linear branches..."); + performLongAction(new GraphAction.GraphActionImpl(null, GraphAction.Type.BUTTON_COLLAPSE), + "Collapsing " + (getBekType() == PermanentGraph.SortType.LinearBek ? "merges..." : "linear branches...")); } public void setLongEdgeVisibility(boolean visibility) { 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 b01b494680f2..40fb93f38ea5 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 @@ -25,6 +25,7 @@ import com.intellij.vcs.log.*; import com.intellij.vcs.log.data.VcsLogDataHolder; import com.intellij.vcs.log.data.VcsLogUiProperties; import com.intellij.vcs.log.data.VisiblePack; +import com.intellij.vcs.log.graph.PermanentGraph; import com.intellij.vcs.log.graph.impl.facade.bek.BekSorter; import com.intellij.vcs.log.ui.VcsLogUiImpl; import com.intellij.vcs.log.ui.filter.VcsLogClassicFilterUi; @@ -195,6 +196,16 @@ public class MainFrame extends JPanel implements TypeSafeDataProvider { if (!myFilterUi.getFilters().isEmpty()) { e.getPresentation().setEnabled(false); } + if (myUI.getBekType() == PermanentGraph.SortType.LinearBek) { + e.getPresentation().setIcon(VcsLogIcons.CollapseMerges); + e.getPresentation().setText("Collapse all merges"); + e.getPresentation().setDescription("Collapse all merges"); + } + else { + e.getPresentation().setIcon(VcsLogIcons.CollapseBranches); + e.getPresentation().setText("Collapse all linear branches"); + e.getPresentation().setDescription("Collapse all linear branches"); + } } }; @@ -210,6 +221,16 @@ public class MainFrame extends JPanel implements TypeSafeDataProvider { if (!myFilterUi.getFilters().isEmpty()) { e.getPresentation().setEnabled(false); } + if (myUI.getBekType() == PermanentGraph.SortType.LinearBek) { + e.getPresentation().setIcon(VcsLogIcons.ExpandMerges); + e.getPresentation().setText("Expand all merges"); + e.getPresentation().setDescription("Expand all merges"); + } + else { + e.getPresentation().setIcon(VcsLogIcons.ExpandBranches); + e.getPresentation().setText("Expand all linear branches"); + e.getPresentation().setDescription("Expand all linear branches"); + } } }; diff --git a/platform/vcs-log/impl/src/icons/VcsLogIcons.java b/platform/vcs-log/impl/src/icons/VcsLogIcons.java index 9f0d4f42d0a2..50b0c14614dd 100644 --- a/platform/vcs-log/impl/src/icons/VcsLogIcons.java +++ b/platform/vcs-log/impl/src/icons/VcsLogIcons.java @@ -15,6 +15,8 @@ public class VcsLogIcons { public static final Icon Branch = load("/icons/branch.png"); // 16x16 public static final Icon CollapseBranches = load("/icons/CollapseBranches.png"); // 16x16 + public static final Icon CollapseMerges = load("/icons/CollapseMerges.png"); // 16x16 public static final Icon ExpandBranches = load("/icons/ExpandBranches.png"); // 16x16 + public static final Icon ExpandMerges = load("/icons/ExpandMerges.png"); // 16x16 public static final Icon ShowHideLongEdges = load("/icons/ShowHideLongEdges.png"); // 16x16 }