From 238e1fb89f53cd6ecb388433c86a3f4d37808737 Mon Sep 17 00:00:00 2001 From: Evgeny Zakrevsky Date: Wed, 21 Mar 2012 20:39:16 +0400 Subject: [PATCH] IDEA-83174 Please merge checkbox icons. [reviewed by Kirill Safonov] --- .../codeInsight/NullableNotNullDialog.java | 3 ++- platform/icons/src/actions/check.png | Bin 224 -> 0 bytes platform/icons/src/actions/check_16.png | Bin 128 -> 0 bytes platform/icons/src/actions/checked_16x16.png | Bin 259 -> 0 bytes .../icons/src/actions/checked_16x16_selected.png | Bin 262 -> 0 bytes platform/icons/src/gutter/check.png | Bin 303 -> 0 bytes .../src/com/intellij/ide/bookmarks/Bookmark.java | 4 ++-- .../openapi/util/registry/RegistryUi.java | 3 ++- .../vcs/changes/ChangesFragmentedDiffPanel.java | 3 ++- .../src/git4idea/history/wholeTree/GitLogUI.java | 4 ++-- .../src/git4idea/ui/branch/GitBranchPopup.java | 3 ++- .../designer/actions/AbstractComboBoxAction.java | 9 ++++++--- 12 files changed, 18 insertions(+), 11 deletions(-) delete mode 100644 platform/icons/src/actions/check.png delete mode 100644 platform/icons/src/actions/check_16.png delete mode 100644 platform/icons/src/actions/checked_16x16.png delete mode 100644 platform/icons/src/actions/checked_16x16_selected.png delete mode 100644 platform/icons/src/gutter/check.png diff --git a/java/openapi/src/com/intellij/codeInsight/NullableNotNullDialog.java b/java/openapi/src/com/intellij/codeInsight/NullableNotNullDialog.java index 97e9f50f3fca..979faaeef5d3 100644 --- a/java/openapi/src/com/intellij/codeInsight/NullableNotNullDialog.java +++ b/java/openapi/src/com/intellij/codeInsight/NullableNotNullDialog.java @@ -27,6 +27,7 @@ import com.intellij.psi.PsiClass; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.ui.*; import com.intellij.ui.components.JBList; +import com.intellij.util.PlatformIcons; import com.intellij.util.ui.EmptyIcon; import javax.swing.*; @@ -43,7 +44,7 @@ import java.util.Set; * Date: 1/25/11 */ public class NullableNotNullDialog extends DialogWrapper { - private static final Icon SELECT_ICON = IconLoader.getIcon("/actions/checked.png"); + private static final Icon SELECT_ICON = PlatformIcons.CHECK_ICON; private static final Icon SELECTED_ICON = IconLoader.getIcon("/diff/currentLine.png"); private final Project myProject; diff --git a/platform/icons/src/actions/check.png b/platform/icons/src/actions/check.png deleted file mode 100644 index 11b01be231438c7d3be0c79b82ef909bb5449260..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhEa{HEjtmUzPnffIy#(?lOI#yL zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i<5dAc};RNPAX^Z&m+^F{`Rh8Yqb z3=E7eQyv{S;4GmpJuP2p`ZdCbE+!_8^dM>eH(9~5peBpqDA b$iu_Xc}PRh)XPyDXe5KDtDnm{r-UW|jxZ^x diff --git a/platform/icons/src/actions/checked_16x16.png b/platform/icons/src/actions/checked_16x16.png deleted file mode 100644 index d55c1fc133c906ecd2bc7abdf4b73a00e8dd1683..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf)y_Zq^AohUlv6UZK#A5=V>{x$j?=R7ag#Oek>2rdV&37crzWaRT yMz9R?zN4IzLmxGs-F|G}Sv$kSjO*>|C-J|@7Jd-r-&p~44uhwwpUXO@geCwCqh6i> diff --git a/platform/icons/src/actions/checked_16x16_selected.png b/platform/icons/src/actions/checked_16x16_selected.png deleted file mode 100644 index 2dfa1eda3c128d47ebb667b95770c88316789635..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfexUz}HLIPz_Kc=?>djt*}Z6V)$s*Y~X`KI?qv>lw?oa;X#|(54gQu&X%Q~loCIBBz BVQv5b diff --git a/platform/icons/src/gutter/check.png b/platform/icons/src/gutter/check.png deleted file mode 100644 index 5990f9d731a01548f1c5e6f080e57ca4a90386c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kmUKs7M+S!VC(K#9UIO`&C9V-A z!TD(=<%vb942~)JNvR5+xryniL8*x;m4zo$ZGegndb&7bO#G zF+ZK(D8azU^2wP)U^SDf{31;@%>(&@&94u6{1-oD!M<{$XHT diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/Bookmark.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/Bookmark.java index 18594584c712..a94ac1a097e4 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/Bookmark.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/Bookmark.java @@ -34,13 +34,13 @@ import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; import com.intellij.ui.LightColors; +import com.intellij.util.PlatformIcons; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -48,7 +48,7 @@ import javax.swing.*; import java.awt.*; public class Bookmark { - private static final Icon TICK = IconLoader.getIcon("/gutter/check.png"); + private static final Icon TICK = PlatformIcons.CHECK_ICON; private final VirtualFile myFile; private final OpenFileDescriptor myTarget; diff --git a/platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java b/platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java index 7bf7557a3f42..df38b816c4f5 100644 --- a/platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java +++ b/platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java @@ -29,6 +29,7 @@ import com.intellij.openapi.ui.ShadowAction; import com.intellij.openapi.util.IconLoader; import com.intellij.ui.*; import com.intellij.ui.table.JBTable; +import com.intellij.util.PlatformIcons; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.Nullable; @@ -56,7 +57,7 @@ public class RegistryUi implements Disposable { private final JPanel myContent = new JPanel(); - private static final Icon RESTART_ICON = IconLoader.getIcon("/gutter/check.png"); + private static final Icon RESTART_ICON = PlatformIcons.CHECK_ICON; private final RestoreDefaultsAction myRestoreDefaultsAction; private final MyTableModel myModel; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java index 256384dbc560..d6bdb2c34109 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java @@ -55,6 +55,7 @@ import com.intellij.openapi.vcs.VcsDataKeys; import com.intellij.pom.Navigatable; import com.intellij.ui.awt.RelativePoint; import com.intellij.util.BeforeAfter; +import com.intellij.util.PlatformIcons; import com.intellij.util.ui.ButtonlessScrollBarUI; import com.intellij.util.ui.UIUtil; import com.intellij.vcsUtil.VcsUtil; @@ -578,7 +579,7 @@ public class ChangesFragmentedDiffPanel implements Disposable { } } - private final static Icon ourIcon = IconLoader.findIcon("/actions/checked.png"); + private final static Icon ourIcon = PlatformIcons.CHECK_ICON; private class PopupAction extends DumbAwareAction { private Component myParent; diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java b/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java index f1ba2ff9281b..88cffe6edc3d 100644 --- a/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java +++ b/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java @@ -1438,7 +1438,7 @@ public class GitLogUI implements Disposable { // todo test action private class TestIndexAction extends DumbAwareAction { private TestIndexAction() { - super("Test Index", "Test Index", IconLoader.getIcon("/actions/checked.png")); + super("Test Index", "Test Index", PlatformIcons.CHECK_ICON); } @Override @@ -1891,7 +1891,7 @@ public class GitLogUI implements Disposable { public MyTreeSettings() { myIcon = IconLoader.getIcon("/general/comboArrow.png"); - myMarkIcon = IconLoader.findIcon("/actions/checked.png"); + myMarkIcon = PlatformIcons.CHECK_ICON; myMultiColorAction = new DumbAwareAction("Multicolour") { @Override diff --git a/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopup.java b/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopup.java index f3f8c364d111..2dbd288d1e86 100644 --- a/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopup.java +++ b/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopup.java @@ -32,6 +32,7 @@ import com.intellij.openapi.util.IconLoader; import com.intellij.ui.popup.PopupFactoryImpl; import com.intellij.ui.popup.WizardPopup; import com.intellij.ui.popup.list.ListPopupImpl; +import com.intellij.util.PlatformIcons; import git4idea.GitUtil; import git4idea.GitVcs; import git4idea.config.GitVcsSettings; @@ -271,7 +272,7 @@ class GitBranchPopup { super(GitUIUtil.getShortRepositoryName(repository), true); myRepository = repository; if (repository.equals(currentRepository)) { - getTemplatePresentation().setIcon(IconLoader.getIcon("/actions/checked.png")); + getTemplatePresentation().setIcon(PlatformIcons.CHECK_ICON); } } diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/AbstractComboBoxAction.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/AbstractComboBoxAction.java index ddc1a4dff076..c7c230fe6c0a 100644 --- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/AbstractComboBoxAction.java +++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/AbstractComboBoxAction.java @@ -15,11 +15,14 @@ */ package com.intellij.designer.actions; -import com.intellij.openapi.actionSystem.*; +import com.intellij.openapi.actionSystem.AnAction; +import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.DefaultActionGroup; +import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.actionSystem.ex.ComboBoxAction; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.ListPopup; -import com.intellij.openapi.util.IconLoader; +import com.intellij.util.PlatformIcons; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -32,7 +35,7 @@ import java.util.List; * @author Alexander Lobas */ public abstract class AbstractComboBoxAction extends ComboBoxAction { - private static final Icon CHECKED = IconLoader.getIcon("/actions/check.png"); + private static final Icon CHECKED = PlatformIcons.CHECK_ICON; private List myItems = Collections.emptyList(); private T mySelection;