diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java index 1463218d120f..825397ee1eb7 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java @@ -21,7 +21,6 @@ import com.intellij.compiler.CompilerConfigurationImpl; import com.intellij.compiler.CompilerSettingsFactory; import com.intellij.compiler.impl.rmiCompiler.RmicConfiguration; import com.intellij.compiler.server.BuildManager; -import com.intellij.icons.AllIcons; import com.intellij.openapi.compiler.CompilerBundle; import com.intellij.openapi.compiler.options.ExcludedEntriesConfigurable; import com.intellij.openapi.diagnostic.Logger; @@ -47,7 +46,6 @@ public class CompilerConfigurable implements SearchableConfigurable.Parent, Conf private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.options.CompilerConfigurable"); private final Project myProject; - private static final Icon ICON = AllIcons.General.ConfigurableCompiler; private final CompilerUIConfigurable myCompilerUIConfigurable; private Configurable[] myKids; diff --git a/platform/icons/src/general/configurableAppearance.png b/platform/icons/src/general/configurableAppearance.png deleted file mode 100644 index 1b4b5b259b84..000000000000 Binary files a/platform/icons/src/general/configurableAppearance.png and /dev/null differ diff --git a/platform/icons/src/general/configurableCodeCompletion.png b/platform/icons/src/general/configurableCodeCompletion.png deleted file mode 100644 index 4172c6f2c77f..000000000000 Binary files a/platform/icons/src/general/configurableCodeCompletion.png and /dev/null differ diff --git a/platform/icons/src/general/configurableCodeStyle.png b/platform/icons/src/general/configurableCodeStyle.png deleted file mode 100644 index c8e9673ad162..000000000000 Binary files a/platform/icons/src/general/configurableCodeStyle.png and /dev/null differ diff --git a/platform/icons/src/general/configurableColorsAndFonts.png b/platform/icons/src/general/configurableColorsAndFonts.png deleted file mode 100644 index 109abf130932..000000000000 Binary files a/platform/icons/src/general/configurableColorsAndFonts.png and /dev/null differ diff --git a/platform/icons/src/general/configurableCompiler.png b/platform/icons/src/general/configurableCompiler.png deleted file mode 100644 index d783b40d7c18..000000000000 Binary files a/platform/icons/src/general/configurableCompiler.png and /dev/null differ diff --git a/platform/icons/src/general/configurableCustomization.png b/platform/icons/src/general/configurableCustomization.png deleted file mode 100644 index 1e01d46361db..000000000000 Binary files a/platform/icons/src/general/configurableCustomization.png and /dev/null differ diff --git a/platform/icons/src/general/configurableDebugger.png b/platform/icons/src/general/configurableDebugger.png deleted file mode 100644 index 604ecd6b8de0..000000000000 Binary files a/platform/icons/src/general/configurableDebugger.png and /dev/null differ diff --git a/platform/icons/src/general/configurableEditor.png b/platform/icons/src/general/configurableEditor.png deleted file mode 100644 index 83f4ced93ca5..000000000000 Binary files a/platform/icons/src/general/configurableEditor.png and /dev/null differ diff --git a/platform/icons/src/general/configurableEjb.png b/platform/icons/src/general/configurableEjb.png deleted file mode 100644 index a41e57f3ff98..000000000000 Binary files a/platform/icons/src/general/configurableEjb.png and /dev/null differ diff --git a/platform/icons/src/general/configurableErrorHighlighting.png b/platform/icons/src/general/configurableErrorHighlighting.png deleted file mode 100644 index 0fab4eb86cc9..000000000000 Binary files a/platform/icons/src/general/configurableErrorHighlighting.png and /dev/null differ diff --git a/platform/icons/src/general/configurableExternalResources.png b/platform/icons/src/general/configurableExternalResources.png deleted file mode 100644 index fc2e3ce4871b..000000000000 Binary files a/platform/icons/src/general/configurableExternalResources.png and /dev/null differ diff --git a/platform/icons/src/general/configurableFileTypes.png b/platform/icons/src/general/configurableFileTypes.png deleted file mode 100644 index 9cf50fd55424..000000000000 Binary files a/platform/icons/src/general/configurableFileTypes.png and /dev/null differ diff --git a/platform/icons/src/general/configurableGeneral.png b/platform/icons/src/general/configurableGeneral.png deleted file mode 100644 index 7265a1d6a4fd..000000000000 Binary files a/platform/icons/src/general/configurableGeneral.png and /dev/null differ diff --git a/platform/icons/src/general/configurableGlobalLibraries.png b/platform/icons/src/general/configurableGlobalLibraries.png deleted file mode 100644 index 0578e3de18c1..000000000000 Binary files a/platform/icons/src/general/configurableGlobalLibraries.png and /dev/null differ diff --git a/platform/icons/src/general/configurableIntentionSettings.png b/platform/icons/src/general/configurableIntentionSettings.png deleted file mode 100644 index 184888054fd7..000000000000 Binary files a/platform/icons/src/general/configurableIntentionSettings.png and /dev/null differ diff --git a/platform/icons/src/general/configurableJavadoc.png b/platform/icons/src/general/configurableJavadoc.png deleted file mode 100644 index daf49b0eed09..000000000000 Binary files a/platform/icons/src/general/configurableJavadoc.png and /dev/null differ diff --git a/platform/icons/src/general/configurableLocalVCS.png b/platform/icons/src/general/configurableLocalVCS.png deleted file mode 100644 index fd310b3ed89b..000000000000 Binary files a/platform/icons/src/general/configurableLocalVCS.png and /dev/null differ diff --git a/platform/icons/src/general/configurableMisc.png b/platform/icons/src/general/configurableMisc.png deleted file mode 100644 index b2fb954810e9..000000000000 Binary files a/platform/icons/src/general/configurableMisc.png and /dev/null differ diff --git a/platform/icons/src/general/configurableProjectLibraries.png b/platform/icons/src/general/configurableProjectLibraries.png deleted file mode 100644 index 1bcec889c4a4..000000000000 Binary files a/platform/icons/src/general/configurableProjectLibraries.png and /dev/null differ diff --git a/platform/icons/src/general/configurableProjectPaths.png b/platform/icons/src/general/configurableProjectPaths.png deleted file mode 100644 index a8bba86fa6bf..000000000000 Binary files a/platform/icons/src/general/configurableProjectPaths.png and /dev/null differ diff --git a/platform/icons/src/general/configurableRunDebug.png b/platform/icons/src/general/configurableRunDebug.png deleted file mode 100644 index c01ce35ed6e3..000000000000 Binary files a/platform/icons/src/general/configurableRunDebug.png and /dev/null differ diff --git a/platform/icons/src/general/configurableTodo.png b/platform/icons/src/general/configurableTodo.png deleted file mode 100644 index 2706ee08660e..000000000000 Binary files a/platform/icons/src/general/configurableTodo.png and /dev/null differ diff --git a/platform/icons/src/general/configurableUpdates.png b/platform/icons/src/general/configurableUpdates.png deleted file mode 100644 index 3746a70806ee..000000000000 Binary files a/platform/icons/src/general/configurableUpdates.png and /dev/null differ diff --git a/platform/icons/src/general/configurableValidation.png b/platform/icons/src/general/configurableValidation.png deleted file mode 100644 index 01c425d2f70f..000000000000 Binary files a/platform/icons/src/general/configurableValidation.png and /dev/null differ diff --git a/platform/icons/src/general/configurableVcs.png b/platform/icons/src/general/configurableVcs.png deleted file mode 100644 index f525c2e8ad50..000000000000 Binary files a/platform/icons/src/general/configurableVcs.png and /dev/null differ diff --git a/platform/icons/src/general/configurableWeb.png b/platform/icons/src/general/configurableWeb.png deleted file mode 100644 index a4609722e77a..000000000000 Binary files a/platform/icons/src/general/configurableWeb.png and /dev/null differ diff --git a/platform/icons/src/general/configureEncoding.png b/platform/icons/src/general/configureEncoding.png deleted file mode 100644 index 6f7855d028fb..000000000000 Binary files a/platform/icons/src/general/configureEncoding.png and /dev/null differ diff --git a/platform/icons/src/ide/scopeConfigurable.png b/platform/icons/src/ide/scopeConfigurable.png deleted file mode 100644 index 36107ebb0dfa..000000000000 Binary files a/platform/icons/src/ide/scopeConfigurable.png and /dev/null differ diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java index e42ffbf301b7..b132670a75e3 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java @@ -65,11 +65,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; class RunConfigurable extends BaseConfigurable { - private static final Icon ICON = AllIcons.General.ConfigurableRunDebug; private static final Icon ADD_ICON = IconUtil.getAddIcon(); private static final Icon REMOVE_ICON = IconUtil.getRemoveIcon(); - private static final Icon SAVE_ICON = AllIcons.RunConfigurations.SaveTempConfig; - private static final Icon EDIT_DEFAULTS_ICON = AllIcons.General.IdeOptions; @NonNls private static final String DIVIDER_PROPORTION = "dividerProportion"; private volatile boolean isDisposed = false; @@ -144,7 +141,7 @@ class RunConfigurable extends BaseConfigurable { } else if (userObject instanceof String) { append((String) userObject, SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES); - setIcon(EDIT_DEFAULTS_ICON); + setIcon(AllIcons.General.IdeOptions); } else if (userObject instanceof ConfigurationFactory) { append(((ConfigurationFactory)userObject).getName()); @@ -443,7 +440,7 @@ class RunConfigurable extends BaseConfigurable { group.add(new MyCopyAction()); group.add(new MySaveAction()); group.add(new AnAction(ExecutionBundle.message("run.configuration.edit.default.configuration.settings.button"), - "Edit default settings", EDIT_DEFAULTS_ICON) { + "Edit default settings", AllIcons.General.IdeOptions) { public void actionPerformed(final AnActionEvent e) { TreeNode defaults = TreeUtil.findNodeWithObject("Defaults", myTree.getModel(), myRoot); if (defaults != null) { @@ -1082,7 +1079,7 @@ class RunConfigurable extends BaseConfigurable { private class MySaveAction extends AnAction { public MySaveAction() { - super(ExecutionBundle.message("action.name.save.configuration"), null, SAVE_ICON); + super(ExecutionBundle.message("action.name.save.configuration"), null, AllIcons.RunConfigurations.SaveTempConfig); } public void actionPerformed(final AnActionEvent e) { diff --git a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java index b37b9600a565..9b822b46a033 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java +++ b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java @@ -56,8 +56,6 @@ import java.util.*; * Date: 01-Jul-2006 */ public class ScopeChooserConfigurable extends MasterDetailsComponent implements /*NonDefaultProjectConfigurable,*/ SearchableConfigurable { - private static final Icon SCOPES = AllIcons.Ide.ScopeConfigurable; - private static final Icon SAVE_ICON = AllIcons.RunConfigurations.SaveTempConfig; @NonNls public static final String SCOPE_CHOOSER_CONFIGURABLE_UI_KEY = "ScopeChooserConfigurable.UI"; private final NamedScopesHolder myLocalScopesManager; private final NamedScopesHolder mySharedScopesManager; @@ -475,7 +473,7 @@ public class ScopeChooserConfigurable extends MasterDetailsComponent implements private class MySaveAsAction extends AnAction { public MySaveAsAction() { super(ExecutionBundle.message("action.name.save.as.configuration"), ExecutionBundle.message("action.name.save.as.configuration"), - SAVE_ICON); + AllIcons.RunConfigurations.SaveTempConfig); } public void actionPerformed(AnActionEvent e) { diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index c4aaa351b438..6d3c25b14bbf 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -411,34 +411,7 @@ public class AllIcons { public static final Icon ComboArrowRight = IconLoader.getIcon("/general/comboArrowRight.png"); public static final Icon ComboArrowRightPassive = IconLoader.getIcon("/general/comboArrowRightPassive.png"); public static final Icon ComboUpPassive = IconLoader.getIcon("/general/comboUpPassive.png"); - public static final Icon ConfigurableAppearance = IconLoader.getIcon("/general/configurableAppearance.png"); - public static final Icon ConfigurableCodeCompletion = IconLoader.getIcon("/general/configurableCodeCompletion.png"); - public static final Icon ConfigurableCodeStyle = IconLoader.getIcon("/general/configurableCodeStyle.png"); - public static final Icon ConfigurableColorsAndFonts = IconLoader.getIcon("/general/configurableColorsAndFonts.png"); - public static final Icon ConfigurableCompiler = IconLoader.getIcon("/general/configurableCompiler.png"); - public static final Icon ConfigurableCustomization = IconLoader.getIcon("/general/configurableCustomization.png"); - public static final Icon ConfigurableDebugger = IconLoader.getIcon("/general/configurableDebugger.png"); public static final Icon ConfigurableDefault = IconLoader.getIcon("/general/configurableDefault.png"); - public static final Icon ConfigurableEditor = IconLoader.getIcon("/general/configurableEditor.png"); - public static final Icon ConfigurableEjb = IconLoader.getIcon("/general/configurableEjb.png"); - public static final Icon ConfigurableErrorHighlighting = IconLoader.getIcon("/general/configurableErrorHighlighting.png"); - public static final Icon ConfigurableExternalResources = IconLoader.getIcon("/general/configurableExternalResources.png"); - public static final Icon ConfigurableFileTypes = IconLoader.getIcon("/general/configurableFileTypes.png"); - public static final Icon ConfigurableGeneral = IconLoader.getIcon("/general/configurableGeneral.png"); - public static final Icon ConfigurableGlobalLibraries = IconLoader.getIcon("/general/configurableGlobalLibraries.png"); - public static final Icon ConfigurableIntentionSettings = IconLoader.getIcon("/general/configurableIntentionSettings.png"); - public static final Icon ConfigurableJavadoc = IconLoader.getIcon("/general/configurableJavadoc.png"); - public static final Icon ConfigurableLocalVCS = IconLoader.getIcon("/general/configurableLocalVCS.png"); - public static final Icon ConfigurableMisc = IconLoader.getIcon("/general/configurableMisc.png"); - public static final Icon ConfigurableProjectLibraries = IconLoader.getIcon("/general/configurableProjectLibraries.png"); - public static final Icon ConfigurableProjectPaths = IconLoader.getIcon("/general/configurableProjectPaths.png"); - public static final Icon ConfigurableRunDebug = IconLoader.getIcon("/general/configurableRunDebug.png"); - public static final Icon ConfigurableTodo = IconLoader.getIcon("/general/configurableTodo.png"); - public static final Icon ConfigurableUpdates = IconLoader.getIcon("/general/configurableUpdates.png"); - public static final Icon ConfigurableValidation = IconLoader.getIcon("/general/configurableValidation.png"); - public static final Icon ConfigurableVcs = IconLoader.getIcon("/general/configurableVcs.png"); - public static final Icon ConfigurableWeb = IconLoader.getIcon("/general/configurableWeb.png"); - public static final Icon ConfigureEncoding = IconLoader.getIcon("/general/configureEncoding.png"); public static final Icon CreateNewProject = IconLoader.getIcon("/general/createNewProject.png"); public static final Icon Debug = IconLoader.getIcon("/general/debug.png"); public static final Icon DefaultKeymap = IconLoader.getIcon("/general/defaultKeymap.png"); @@ -732,7 +705,6 @@ public class AllIcons { public static final Icon Rating4 = IconLoader.getIcon("/ide/rating4.png"); public static final Icon Readonly = IconLoader.getIcon("/ide/readonly.png"); public static final Icon Readwrite = IconLoader.getIcon("/ide/readwrite.png"); - public static final Icon ScopeConfigurable = IconLoader.getIcon("/ide/scopeConfigurable.png"); public static class Shadow { public static final Icon Bottom_left = IconLoader.getIcon("/ide/shadow/bottom-left.png"); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java index 72de9b748755..e2fa4f3fa0ba 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java @@ -15,7 +15,6 @@ */ package com.intellij.openapi.vcs.configurable; -import com.intellij.icons.AllIcons; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; @@ -37,7 +36,6 @@ import java.util.Collection; import java.util.List; public class VcsManagerConfigurable extends SearchableConfigurable.Parent.Abstract { - public static final Icon ICON = AllIcons.General.ConfigurableVcs; private final Project myProject; private VcsDirectoryConfigurationPanel myMappings; private VcsGeneralConfigurationPanel myGeneralPanel;