This commit is contained in:
Konstantin Bulenkov
2011-07-05 13:38:54 +04:00
parent daf92475f7
commit cba78d8b65
3 changed files with 32 additions and 10 deletions
@@ -49,12 +49,12 @@ import com.intellij.openapi.ui.popup.JBPopup;
import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.ui.popup.PopupStep;
import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.wm.IdeFocusManager;
import com.intellij.ui.*;
import com.intellij.ui.awt.RelativePoint;
import com.intellij.ui.table.JBTable;
import com.intellij.util.EventDispatcher;
import com.intellij.util.IconUtil;
import com.intellij.util.PlatformIcons;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
@@ -265,7 +265,7 @@ public class ClasspathPanelImpl extends JPanel implements ClasspathPanel {
private JComponent createTableWithButtons() {
final boolean isAnalyzeShown = ((ApplicationEx)ApplicationManager.getApplication()).isInternal();
final AnActionButton addButton = new AnActionButton(ProjectBundle.message("button.add"), null, SystemInfo.isMac ? PlatformIcons.TABLE_ADD_ROW : PlatformIcons.ADD_ICON) {
final AnActionButton addButton = new AnActionButton(ProjectBundle.message("button.add"), null, IconUtil.getAddRowIcon()) {
@Override
public void actionPerformed(AnActionEvent e) {
initPopupActions();
@@ -335,14 +335,14 @@ public class ClasspathPanelImpl extends JPanel implements ClasspathPanel {
}
};
final AnActionButton removeButton = new AnActionButton(ProjectBundle.message("button.remove"), null, SystemInfo.isMac ? PlatformIcons.TABLE_REMOVE_ROW : PlatformIcons.DELETE_ICON) {
final AnActionButton removeButton = new AnActionButton(ProjectBundle.message("button.remove"), null, IconUtil.getRemoveRowIcon()) {
@Override
public void actionPerformed(AnActionEvent e) {
removeAction.actionPerformed(null);
}
};
myEditButton = new AnActionButton(ProjectBundle.message("module.classpath.button.edit"), null, SystemInfo.isMac ? PlatformIcons.TABLE_EDIT_ROW : PlatformIcons.EDIT) {
myEditButton = new AnActionButton(ProjectBundle.message("module.classpath.button.edit"), null, IconUtil.getEditIcon()) {
@Override
public void actionPerformed(AnActionEvent e) {
final OrderEntry entry = getSelectedEntry();
@@ -362,14 +362,14 @@ public class ClasspathPanelImpl extends JPanel implements ClasspathPanel {
}
};
final AnActionButton upButton = new AnActionButton(ProjectBundle.message("module.classpath.button.move.up"), null, SystemInfo.isMac ? PlatformIcons.TABLE_MOVE_ROW_UP : PlatformIcons.MOVE_UP_ICON) {
final AnActionButton upButton = new AnActionButton(ProjectBundle.message("module.classpath.button.move.up"), null, IconUtil.getMoveRowUpIcon()) {
@Override
public void actionPerformed(AnActionEvent e) {
moveSelectedRows(-1);
}
};
final AnActionButton downButton = new AnActionButton(ProjectBundle.message("module.classpath.button.move.down"), null, SystemInfo.isMac ? PlatformIcons.TABLE_MOVE_ROW_DOWN : PlatformIcons.MOVE_DOWN_ICON) {
final AnActionButton downButton = new AnActionButton(ProjectBundle.message("module.classpath.button.move.down"), null, IconUtil.getMoveRowDownIcon()) {
@Override
public void actionPerformed(AnActionEvent e) {
moveSelectedRows(+1);
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2011 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.util.Iconable;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.ui.IconDeferrer;
import com.intellij.ui.LayeredIcon;
@@ -197,4 +198,25 @@ public class IconUtil {
return image;
}
}
public static Icon getAddRowIcon() {
return SystemInfo.isMac ? PlatformIcons.TABLE_ADD_ROW : PlatformIcons.ADD_ICON;
}
public static Icon getRemoveRowIcon() {
return SystemInfo.isMac ? PlatformIcons.TABLE_REMOVE_ROW : PlatformIcons.DELETE_ICON;
}
public static Icon getMoveRowUpIcon() {
return SystemInfo.isMac ? PlatformIcons.TABLE_MOVE_ROW_UP : PlatformIcons.MOVE_UP_ICON;
}
public static Icon getMoveRowDownIcon() {
return SystemInfo.isMac ? PlatformIcons.TABLE_MOVE_ROW_DOWN : PlatformIcons.MOVE_DOWN_ICON;
}
public static Icon getEditIcon() {
return SystemInfo.isMac ? PlatformIcons.TABLE_EDIT_ROW : PlatformIcons.EDIT;
}
}
@@ -79,7 +79,7 @@ sdk.table.settings=SDK Table
sdk.unknown.name=Unknown SDK
sdk.list.name.required.error=Please specify SDK name
sdk.list.unique.name.required.error=Please specify a different SDK name
button.add=Add...
button.add=Add
button.remove=Remove
sdk.paths.specify.url.button=&Specify URL...
sdk.configure.title=Configure SDK
@@ -202,8 +202,8 @@ modules.order.export.title=Order/Export
modules.classpath.title=Dependencies
modules.order.export.export.column=Export
modules.order.export.scope.column=Scope
module.classpath.button.move.up=Move &Up
module.classpath.button.move.down=Move &Down
module.classpath.button.move.up=Move Up
module.classpath.button.move.down=Move Down
module.remove.confirmation.prompt=Remove {1, choice, 1#Module|2#Modules} {0} from the project?\nNo files will be deleted.
module.remove.command=Detach module from project
module.new.action=New Module