Platform: rerun icon for Debug UI

This commit is contained in:
Anton Makeev
2012-12-05 16:31:49 +01:00
parent be6ff887c2
commit ab92f5adf3
14 changed files with 17 additions and 12 deletions
@@ -33,6 +33,7 @@ import com.intellij.ide.actions.ContextHelpAction;
import com.intellij.openapi.actionSystem.Constraints;
import com.intellij.openapi.actionSystem.DefaultActionGroup;
import com.intellij.openapi.project.Project;
import com.intellij.xdebugger.impl.ui.XDebugSessionTab;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
@@ -109,7 +110,7 @@ public class DefaultDebugUIEnvironment implements DebugUIEnvironment {
RestartAction restartAction = new RestartAction(myExecutor,
myRunner,
processHandler,
AllIcons.Actions.StartDebugger,
RestartAction.RERUN_DEBUGGER_ICON,
content,
myExecutionEnvironment);
actionGroup.add(restartAction, Constraints.FIRST);
@@ -504,7 +504,7 @@ public class CyclicDependenciesPanel extends JPanel implements Disposable, DataP
private class RerunAction extends AnAction {
public RerunAction(JComponent comp) {
super(CommonBundle.message("action.rerun"), AnalysisScopeBundle.message("action.rerun.dependency"), AllIcons.Actions.RefreshUsages);
super(CommonBundle.message("action.rerun"), AnalysisScopeBundle.message("action.rerun.dependency"), AllIcons.Actions.Rerun);
registerCustomShortcutSet(CommonShortcuts.getRerun(), comp);
}

Before

Width:  |  Height:  |  Size: 343 B

After

Width:  |  Height:  |  Size: 343 B

@@ -824,7 +824,7 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
private class RerunAction extends AnAction {
public RerunAction(JComponent comp) {
super(InspectionsBundle.message("inspection.action.rerun"), InspectionsBundle.message("inspection.action.rerun"),
AllIcons.Actions.RefreshUsages);
AllIcons.Actions.Rerun);
registerCustomShortcutSet(CommonShortcuts.getRerun(), comp);
}
@@ -41,6 +41,8 @@ import java.util.List;
* @author dyoma
*/
public class RestartAction extends FakeRerunAction implements DumbAware, AnAction.TransparentUpdate, Disposable {
public static final Icon RERUN_ICON = AllIcons.Actions.Rerun;
public static final Icon RERUN_DEBUGGER_ICON = AllIcons.Actions.Rerun;
private ProcessHandler myProcessHandler;
private final ProgramRunner myRunner;
@@ -167,7 +167,8 @@ public class RunContentBuilder extends LogConsoleManagerBase {
private ActionGroup createActionToolbar(final RunContentDescriptor contentDescriptor, final JComponent component) {
final DefaultActionGroup actionGroup = new DefaultActionGroup();
final RestartAction restartAction = new RestartAction(myExecutor, myRunner, getProcessHandler(), AllIcons.Actions.RefreshUsages, contentDescriptor, getEnvironment());
final RestartAction restartAction = new RestartAction(myExecutor, myRunner, getProcessHandler(),
RestartAction.RERUN_ICON, contentDescriptor, getEnvironment());
restartAction.registerShortcut(component);
actionGroup.add(restartAction);
contentDescriptor.setRestarter(new Runnable() {
@@ -690,7 +690,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
private class RerunAction extends AnAction {
public RerunAction(JComponent comp) {
super(CommonBundle.message("action.rerun"), AnalysisScopeBundle.message("action.rerun.dependency"), AllIcons.Actions.RefreshUsages);
super(CommonBundle.message("action.rerun"), AnalysisScopeBundle.message("action.rerun.dependency"), AllIcons.Actions.Rerun);
registerCustomShortcutSet(CommonShortcuts.getRerun(), comp);
}
@@ -559,7 +559,7 @@ public class NewErrorTreeViewPanel extends JPanel implements DataProvider, Occur
private final AnAction myCloseAction;
public RerunAction(@NotNull Runnable rerunAction, @NotNull AnAction closeAction) {
super(IdeBundle.message("action.refresh"), null, AllIcons.Actions.RefreshUsages);
super(IdeBundle.message("action.refresh"), null, AllIcons.Actions.Rerun);
myRerunAction = rerunAction;
myCloseAction = closeAction;
}
@@ -716,7 +716,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra
private class ReRunAction extends AnAction implements DumbAware {
private ReRunAction() {
super(UsageViewBundle.message("action.rerun"), UsageViewBundle.message("action.description.rerun"), AllIcons.Actions.RefreshUsages);
super(UsageViewBundle.message("action.rerun"), UsageViewBundle.message("action.description.rerun"), AllIcons.Actions.Rerun);
registerCustomShortcutSet(CommonShortcuts.getRerun(), myRootPanel);
}
@@ -114,8 +114,8 @@ public class AllIcons {
public static final Icon Redo = IconLoader.getIcon("/actions/redo.png"); // 16x16
public static final Icon RefactoringBulb = IconLoader.getIcon("/actions/refactoringBulb.png"); // 16x16
public static final Icon Refresh = IconLoader.getIcon("/actions/refresh.png"); // 16x16
public static final Icon RefreshUsages = IconLoader.getIcon("/actions/refreshUsages.png"); // 16x16
public static final Icon Replace = IconLoader.getIcon("/actions/replace.png"); // 16x16
public static final Icon Rerun = IconLoader.getIcon("/actions/rerun.png"); // 16x16
public static final Icon Reset_to_default = IconLoader.getIcon("/actions/reset-to-default.png"); // 16x16
public static final Icon Reset = IconLoader.getIcon("/actions/reset.png"); // 16x16
public static final Icon Restart = IconLoader.getIcon("/actions/restart.png"); // 16x16
@@ -65,6 +65,7 @@ public final class IconLoader {
ourDeprecatedIconsReplacements.put("/vcs/refresh.png", "AllIcons.Actions.Refresh");
ourDeprecatedIconsReplacements.put("/actions/sync.png", "AllIcons.Actions.Refresh");
ourDeprecatedIconsReplacements.put("/actions/refreshUsages.png", "AllIcons.Actions.Rerun");
ourDeprecatedIconsReplacements.put("/compiler/error.png", "AllIcons.General.Error");
ourDeprecatedIconsReplacements.put("/compiler/hideWarnings.png", "AllIcons.General.HideWarnings");
@@ -15,6 +15,7 @@
*/
package com.intellij.openapi.diff.impl.dir.actions;
import com.intellij.icons.AllIcons;
import com.intellij.ide.diff.BackgroundOperatingDiffElement;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CustomShortcutSet;
@@ -37,7 +38,7 @@ public class SynchronizeDiff extends DirDiffAction {
public SynchronizeDiff(DirDiffTableModel model, boolean selectedOnly) {
super(model,
selectedOnly ? "Synchronize Selected" : "Synchronize All",
IconLoader.getIcon(selectedOnly ? "/actions/resume.png" : "/actions/refreshUsages.png"));
selectedOnly ? AllIcons.Actions.Resume : AllIcons.Actions.Rerun);
mySelectedOnly = selectedOnly;
}
@@ -149,8 +149,7 @@ public class XDebugSessionTab extends DebuggerSessionTabBase {
final Executor executor = DefaultDebugExecutor.getDebugExecutorInstance();
if (runner != null && env != null) {
RestartAction restartAction = new RestartAction(executor, runner, myRunContentDescriptor.getProcessHandler(),
AllIcons.Actions.StartDebugger,
myRunContentDescriptor, env);
RestartAction.RERUN_DEBUGGER_ICON, myRunContentDescriptor, env);
leftToolbar.add(restartAction);
restartAction.registerShortcut(myUi.getComponent());
}
@@ -31,7 +31,7 @@ public final class RunAction extends AnAction {
private final AntBuildMessageView myAntBuildMessageView;
public RunAction(AntBuildMessageView antBuildMessageView) {
super(AntBundle.message("rerun.ant.action.name"), null, AllIcons.Actions.RefreshUsages);
super(AntBundle.message("rerun.ant.action.name"), null, AllIcons.Actions.Rerun);
myAntBuildMessageView = antBuildMessageView;
}