[log] Remove temp icons, use some existing ones
Until new icons are ready, use collapseAll/expandAll icons.
|
Before Width: | Height: | Size: 700 B |
|
Before Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 756 B |
|
Before Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 336 B |
@@ -1,21 +0,0 @@
|
||||
package com.intellij.vcs.log.ui;
|
||||
|
||||
import com.intellij.openapi.util.IconLoader;
|
||||
|
||||
import javax.swing.Icon;
|
||||
|
||||
public class GitLogIcons {
|
||||
public static final Icon CHERRY_PICK = IconLoader.getIcon("/cherry-pick-32.png");
|
||||
public static final Icon MOVE = IconLoader.getIcon("/move-32.png");
|
||||
public static final Icon REBASE = IconLoader.getIcon("/arrow-32.png");
|
||||
public static final Icon REBASE_INTERACTIVE = IconLoader.getIcon("/edit-32.png");
|
||||
public static final Icon FIX_UP = IconLoader.getIcon("/fixup-32.png");
|
||||
public static final Icon FORBIDDEN = IconLoader.getIcon("/forbidden-32.png");
|
||||
|
||||
public static final Icon APPLY = IconLoader.getIcon("/apply-16.png");
|
||||
public static final Icon CANCEL = IconLoader.getIcon("/cancel-16.png");
|
||||
//public static final Icon SPIDER = IconLoader.getIcon("/spider-16.png");
|
||||
public static final Icon SPIDER = IconLoader.getIcon("/spider-1-16.png");
|
||||
//public static final Icon SPIDER = IconLoader.getIcon("/spider-16-2.png");
|
||||
public static final Icon WEB = IconLoader.getIcon("/web-16.png");
|
||||
}
|
||||
@@ -10,7 +10,6 @@ import com.intellij.ui.SeparatorComponent;
|
||||
import com.intellij.ui.SeparatorOrientation;
|
||||
import com.intellij.vcs.log.data.VcsLogDataHolder;
|
||||
import com.intellij.vcs.log.data.VcsLogUiProperties;
|
||||
import com.intellij.vcs.log.ui.GitLogIcons;
|
||||
import com.intellij.vcs.log.ui.VcsLogUI;
|
||||
import com.intellij.vcs.log.ui.filter.VcsLogClassicFilterUi;
|
||||
import com.intellij.vcs.log.ui.filter.VcsLogFilterUi;
|
||||
@@ -64,14 +63,14 @@ public class MainFrame {
|
||||
}
|
||||
|
||||
private JComponent createActionsToolbar() {
|
||||
AnAction hideBranchesAction = new DumbAwareAction("Collapse linear branches", "Collapse linear branches", GitLogIcons.SPIDER) {
|
||||
AnAction hideBranchesAction = new DumbAwareAction("Collapse linear branches", "Collapse linear branches", AllIcons.Actions.Collapseall) {
|
||||
@Override
|
||||
public void actionPerformed(AnActionEvent e) {
|
||||
myUI.hideAll();
|
||||
}
|
||||
};
|
||||
|
||||
AnAction showBranchesAction = new DumbAwareAction("Expand all branches", "Expand all branches", GitLogIcons.WEB) {
|
||||
AnAction showBranchesAction = new DumbAwareAction("Expand all branches", "Expand all branches", AllIcons.Actions.Expandall) {
|
||||
@Override
|
||||
public void actionPerformed(AnActionEvent e) {
|
||||
myUI.showAll();
|
||||
@@ -90,8 +89,9 @@ public class MainFrame {
|
||||
}
|
||||
};
|
||||
|
||||
AnAction showFullPatchAction = new ToggleAction("Show full patch", "Expand all branches even if they occupy a lot of space",
|
||||
AllIcons.Actions.Expandall) {
|
||||
AnAction showFullPatchAction = new ToggleAction("Show long edges",
|
||||
"Show long branch edges even if commits are invisible in the current view.",
|
||||
AllIcons.Ide.UpDown) {
|
||||
@Override
|
||||
public boolean isSelected(AnActionEvent e) {
|
||||
return !myUI.areLongEdgesHidden();
|
||||
|
||||