diff --git a/platform/core-api/src/com/intellij/util/IconUtil.java b/platform/core-api/src/com/intellij/util/IconUtil.java index 564f9f019844..95cccedcc9e8 100644 --- a/platform/core-api/src/com/intellij/util/IconUtil.java +++ b/platform/core-api/src/com/intellij/util/IconUtil.java @@ -187,24 +187,24 @@ public class IconUtil { } } - public static Icon getAddRowIcon() { - return SystemInfo.isMac ? PlatformIcons.TABLE_ADD_ROW : PlatformIcons.ADD_ICON; + public static Icon getAddIcon() { + return getToolbarDecoratorIcon("add.png"); } - public static Icon getRemoveRowIcon() { - return SystemInfo.isMac ? PlatformIcons.TABLE_REMOVE_ROW : PlatformIcons.DELETE_ICON; + public static Icon getRemoveIcon() { + return getToolbarDecoratorIcon("remove.png"); } - public static Icon getMoveRowUpIcon() { - return SystemInfo.isMac ? PlatformIcons.TABLE_MOVE_ROW_UP : PlatformIcons.MOVE_UP_ICON; + public static Icon getMoveUpIcon() { + return getToolbarDecoratorIcon("moveUp.png"); } - public static Icon getMoveRowDownIcon() { - return SystemInfo.isMac ? PlatformIcons.TABLE_MOVE_ROW_DOWN : PlatformIcons.MOVE_DOWN_ICON; + public static Icon getMoveDownIcon() { + return getToolbarDecoratorIcon("moveDown.png"); } public static Icon getEditIcon() { - return SystemInfo.isMac ? PlatformIcons.TABLE_EDIT_ROW : PlatformIcons.EDIT; + return getToolbarDecoratorIcon("edit.png"); } public static Icon getAddClassIcon() { @@ -216,6 +216,6 @@ public class IconUtil { } private static String getToolbarDecoratorIconsFolder() { - return "/toolbarDecorator/" + (SystemInfo.isMac ? "" : "mac/"); + return "/toolbarDecorator/" + (SystemInfo.isMac ? "mac/" : ""); } } diff --git a/platform/icons/src/toolbarDecorator/add.png b/platform/icons/src/toolbarDecorator/add.png new file mode 100644 index 000000000000..9f1233e6e6c3 Binary files /dev/null and b/platform/icons/src/toolbarDecorator/add.png differ diff --git a/platform/icons/src/toolbarDecorator/edit.png b/platform/icons/src/toolbarDecorator/edit.png new file mode 100644 index 000000000000..c68452ab50fc Binary files /dev/null and b/platform/icons/src/toolbarDecorator/edit.png differ diff --git a/platform/icons/src/toolbarDecorator/mac/add.png b/platform/icons/src/toolbarDecorator/mac/add.png new file mode 100644 index 000000000000..55f7db18f50d Binary files /dev/null and b/platform/icons/src/toolbarDecorator/mac/add.png differ diff --git a/platform/icons/src/toolbarDecorator/mac/edit.png b/platform/icons/src/toolbarDecorator/mac/edit.png new file mode 100644 index 000000000000..4c8b67617c37 Binary files /dev/null and b/platform/icons/src/toolbarDecorator/mac/edit.png differ diff --git a/platform/icons/src/toolbarDecorator/mac/moveDown.png b/platform/icons/src/toolbarDecorator/mac/moveDown.png new file mode 100644 index 000000000000..e674a16f6970 Binary files /dev/null and b/platform/icons/src/toolbarDecorator/mac/moveDown.png differ diff --git a/platform/icons/src/toolbarDecorator/mac/moveUp.png b/platform/icons/src/toolbarDecorator/mac/moveUp.png new file mode 100644 index 000000000000..9d03ded56803 Binary files /dev/null and b/platform/icons/src/toolbarDecorator/mac/moveUp.png differ diff --git a/platform/icons/src/toolbarDecorator/mac/remove.png b/platform/icons/src/toolbarDecorator/mac/remove.png new file mode 100644 index 000000000000..62159bb959fe Binary files /dev/null and b/platform/icons/src/toolbarDecorator/mac/remove.png differ diff --git a/platform/icons/src/toolbarDecorator/moveDown.png b/platform/icons/src/toolbarDecorator/moveDown.png new file mode 100644 index 000000000000..b0782ac407ad Binary files /dev/null and b/platform/icons/src/toolbarDecorator/moveDown.png differ diff --git a/platform/icons/src/toolbarDecorator/moveUp.png b/platform/icons/src/toolbarDecorator/moveUp.png new file mode 100644 index 000000000000..3ab171d9eb5f Binary files /dev/null and b/platform/icons/src/toolbarDecorator/moveUp.png differ diff --git a/platform/icons/src/toolbarDecorator/remove.png b/platform/icons/src/toolbarDecorator/remove.png new file mode 100644 index 000000000000..ee2676e27ebf Binary files /dev/null and b/platform/icons/src/toolbarDecorator/remove.png differ diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java index e346f4a120ea..2810d5a32a68 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 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. @@ -181,7 +181,7 @@ public class FavoritesTreeViewPanel extends JPanel implements DataProvider { .disableUpAction() .addExtraAction(new DeleteFromFavoritesAction() { { - getTemplatePresentation().setIcon(IconUtil.getRemoveRowIcon()); + getTemplatePresentation().setIcon(IconUtil.getRemoveIcon()); } @Override diff --git a/platform/platform-api/src/com/intellij/ui/CommonActionsPanel.java b/platform/platform-api/src/com/intellij/ui/CommonActionsPanel.java index 90ad2778d913..ba0ff5eef1d3 100644 --- a/platform/platform-api/src/com/intellij/ui/CommonActionsPanel.java +++ b/platform/platform-api/src/com/intellij/ui/CommonActionsPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 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. @@ -38,11 +38,11 @@ public class CommonActionsPanel extends JPanel { Icon getIcon() { switch (this) { - case ADD: return IconUtil.getAddRowIcon(); + case ADD: return IconUtil.getAddIcon(); case EDIT: return IconUtil.getEditIcon(); - case REMOVE: return IconUtil.getRemoveRowIcon(); - case UP: return IconUtil.getMoveRowUpIcon(); - case DOWN: return IconUtil.getMoveRowDownIcon(); + case REMOVE: return IconUtil.getRemoveIcon(); + case UP: return IconUtil.getMoveUpIcon(); + case DOWN: return IconUtil.getMoveDownIcon(); } return null; } diff --git a/platform/platform-impl/src/com/intellij/util/ui/ValidatingTableEditor.java b/platform/platform-impl/src/com/intellij/util/ui/ValidatingTableEditor.java index 150f7bfaef26..7c06e6c39075 100644 --- a/platform/platform-impl/src/com/intellij/util/ui/ValidatingTableEditor.java +++ b/platform/platform-impl/src/com/intellij/util/ui/ValidatingTableEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 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. @@ -202,7 +202,7 @@ public abstract class ValidatingTableEditor implements ComponentWithEmptyT }); - myRemoveButton = new AnActionButton(ApplicationBundle.message("button.remove"), IconUtil.getRemoveRowIcon()) { + myRemoveButton = new AnActionButton(ApplicationBundle.message("button.remove"), IconUtil.getRemoveIcon()) { @Override public void actionPerformed(AnActionEvent e) { removeSelected(); diff --git a/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowView.java b/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowView.java index 376a1c31d777..7ca98102182b 100644 --- a/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowView.java +++ b/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowView.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 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. @@ -477,7 +477,7 @@ public abstract class AndroidLogcatToolWindowView implements Disposable { private class MyAddFilterAction extends AnAction { private MyAddFilterAction() { - super(CommonBundle.message("button.add"), AndroidBundle.message("android.logcat.add.logcat.filter.button"), IconUtil.getAddRowIcon()); + super(CommonBundle.message("button.add"), AndroidBundle.message("android.logcat.add.logcat.filter.button"), IconUtil.getAddIcon()); } @Override @@ -503,7 +503,7 @@ public abstract class AndroidLogcatToolWindowView implements Disposable { private class MyRemoveFilterAction extends AnAction { private MyRemoveFilterAction() { super(CommonBundle.message("button.delete"), AndroidBundle.message("android.logcat.remove.logcat.filter.button"), - IconUtil.getRemoveRowIcon()); + IconUtil.getRemoveIcon()); } @Override diff --git a/plugins/android/src/org/jetbrains/android/uipreview/LayoutDeviceConfigurationsDialog.java b/plugins/android/src/org/jetbrains/android/uipreview/LayoutDeviceConfigurationsDialog.java index eb15f0aa6630..55f07edac269 100644 --- a/plugins/android/src/org/jetbrains/android/uipreview/LayoutDeviceConfigurationsDialog.java +++ b/plugins/android/src/org/jetbrains/android/uipreview/LayoutDeviceConfigurationsDialog.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2012 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.jetbrains.android.uipreview; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -72,7 +87,7 @@ public class LayoutDeviceConfigurationsDialog extends DialogWrapper { AnActionButton addButton = new AnActionButton(AndroidBundle.message("android.layout.preview.device.configurations.dialog.add.button"), null, - IconUtil.getAddRowIcon()) { + IconUtil.getAddIcon()) { @Override public void actionPerformed(AnActionEvent e) { doAdd(); @@ -90,7 +105,7 @@ public class LayoutDeviceConfigurationsDialog extends DialogWrapper { myEditButton.setShortcut(CustomShortcutSet.fromString("alt E")); myRemoveButton = new AnActionButton(AndroidBundle.message("android.layout.preview.device.configurations.dialog.remove.button"), null, - IconUtil.getRemoveRowIcon()) { + IconUtil.getRemoveIcon()) { @Override public void actionPerformed(AnActionEvent e) { doRemove();