diff --git a/build/order.txt b/build/order.txt index f93a7f28e863..ff0a75037144 100644 --- a/build/order.txt +++ b/build/order.txt @@ -4148,7 +4148,6 @@ com/intellij/psi/search/scope/packageSet/ParsingException.class:/lib/openapi.jar com/intellij/packageDependencies/DependencyValidationManagerImpl.class:/lib/idea.jar com/intellij/psi/search/scope/packageSet/NamedScope.class:/lib/openapi.jar com/intellij/psi/search/scope/packageSet/NamedScope$UnnamedScope.class:/lib/openapi.jar -ide/sharedScope.png:/lib/icons.jar com/intellij/packageDependencies/DependencyValidationManagerImpl$1.class:/lib/idea.jar com/intellij/ide/startup/impl/StartupManagerImpl$4.class:/lib/idea.jar com/intellij/psi/search/scope/packageSet/PackageSetFactory.class:/lib/openapi.jar diff --git a/platform/analysis-impl/src/com/intellij/packageDependencies/DependencyValidationManagerImpl.java b/platform/analysis-impl/src/com/intellij/packageDependencies/DependencyValidationManagerImpl.java index 5948e948a86b..0cb4eb11da5e 100644 --- a/platform/analysis-impl/src/com/intellij/packageDependencies/DependencyValidationManagerImpl.java +++ b/platform/analysis-impl/src/com/intellij/packageDependencies/DependencyValidationManagerImpl.java @@ -25,6 +25,7 @@ import com.intellij.openapi.util.*; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiFile; import com.intellij.psi.search.scope.packageSet.*; +import com.intellij.ui.LayeredIcon; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.text.UniqueNameGenerator; import com.intellij.util.ui.UIUtil; @@ -46,6 +47,7 @@ import java.util.*; ) public class DependencyValidationManagerImpl extends DependencyValidationManager { private static final Logger LOG = Logger.getInstance("#com.intellij.packageDependencies.DependencyValidationManagerImpl"); + public static final Icon SHARED_SCOPE_ICON = new LayeredIcon(AllIcons.Ide.LocalScope, AllIcons.Nodes.Shared); private final List myRules = new ArrayList(); private final NamedScopeManager myNamedScopeManager; @@ -194,7 +196,7 @@ public class DependencyValidationManagerImpl extends DependencyValidationManager @Override public Icon getIcon() { - return AllIcons.Ide.SharedScope; + return SHARED_SCOPE_ICON; } @Override diff --git a/platform/icons/src/ide/sharedScope.png b/platform/icons/src/ide/sharedScope.png deleted file mode 100644 index d80399c64021..000000000000 Binary files a/platform/icons/src/ide/sharedScope.png and /dev/null differ diff --git a/platform/icons/src/ide/sharedScope@2x.png b/platform/icons/src/ide/sharedScope@2x.png deleted file mode 100644 index 940dacd3a88d..000000000000 Binary files a/platform/icons/src/ide/sharedScope@2x.png and /dev/null differ diff --git a/platform/icons/src/ide/sharedScope@2x_dark.png b/platform/icons/src/ide/sharedScope@2x_dark.png deleted file mode 100644 index 775601cec359..000000000000 Binary files a/platform/icons/src/ide/sharedScope@2x_dark.png and /dev/null differ diff --git a/platform/icons/src/ide/sharedScope_dark.png b/platform/icons/src/ide/sharedScope_dark.png deleted file mode 100644 index bce25010a6e3..000000000000 Binary files a/platform/icons/src/ide/sharedScope_dark.png and /dev/null differ diff --git a/platform/icons/src/nodes/shared.png b/platform/icons/src/nodes/shared.png new file mode 100644 index 000000000000..b7c6eb8772c4 Binary files /dev/null and b/platform/icons/src/nodes/shared.png differ diff --git a/platform/icons/src/nodes/shared@2x.png b/platform/icons/src/nodes/shared@2x.png new file mode 100644 index 000000000000..1715515eb082 Binary files /dev/null and b/platform/icons/src/nodes/shared@2x.png differ diff --git a/platform/icons/src/nodes/shared@2x_dark.png b/platform/icons/src/nodes/shared@2x_dark.png new file mode 100644 index 000000000000..850a06d1d940 Binary files /dev/null and b/platform/icons/src/nodes/shared@2x_dark.png differ diff --git a/platform/icons/src/nodes/shared_dark.png b/platform/icons/src/nodes/shared_dark.png new file mode 100644 index 000000000000..6702efd84dce Binary files /dev/null and b/platform/icons/src/nodes/shared_dark.png 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 1220d5db0df6..44ca0a7fb6e7 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java @@ -33,7 +33,6 @@ import com.intellij.openapi.ui.popup.ListPopupStep; import com.intellij.openapi.ui.popup.PopupStep; import com.intellij.openapi.ui.popup.util.BaseListPopupStep; import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Trinity; import com.intellij.openapi.wm.IdeFocusManager; @@ -77,7 +76,7 @@ class RunConfigurable extends BaseConfigurable { private static final Icon ADD_ICON = IconUtil.getAddIcon(); private static final Icon REMOVE_ICON = IconUtil.getRemoveIcon(); - private static final Icon SHARED_ICON = IconLoader.getTransparentIcon(AllIcons.Nodes.Symlink, .6f); + private static final Icon SHARED_ICON = AllIcons.Nodes.Shared; private static final Icon NON_SHARED_ICON = EmptyIcon.ICON_16; @NonNls private static final String DIVIDER_PROPORTION = "dividerProportion"; @NonNls private static final Object DEFAULTS = new Object() { @@ -203,9 +202,7 @@ class RunConfigurable extends BaseConfigurable { } if (shared != null) { Icon icon = getIcon(); - LayeredIcon layeredIcon = new LayeredIcon(2); - layeredIcon.setIcon(icon, 0, 0, 0); - layeredIcon.setIcon(shared ? SHARED_ICON : NON_SHARED_ICON, 1, 8, 0); + LayeredIcon layeredIcon = new LayeredIcon(icon, shared ? SHARED_ICON : NON_SHARED_ICON); setIcon(layeredIcon); setIconTextGap(0); } else { diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index efaf45b11ef6..b11ef0de0acb 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -629,7 +629,6 @@ public class AllIcons { public static final Icon Top = IconLoader.getIcon("/ide/shadow/top.png"); // 1x20 } - public static final Icon SharedScope = IconLoader.getIcon("/ide/sharedScope.png"); // 16x16 public static final Icon Statusbar_arrows = IconLoader.getIcon("/ide/statusbar_arrows.png"); // 7x10 public static final Icon UpDown = IconLoader.getIcon("/ide/upDown.png"); // 16x16 public static final Icon Warning_notifications = IconLoader.getIcon("/ide/warning_notifications.png"); // 16x16 @@ -848,6 +847,7 @@ public class AllIcons { public static final Icon Rw_access = IconLoader.getIcon("/nodes/rw-access.png"); // 13x9 public static final Icon SecurityRole = IconLoader.getIcon("/nodes/SecurityRole.png"); // 16x16 public static final Icon Servlet = IconLoader.getIcon("/nodes/servlet.png"); // 16x16 + public static final Icon Shared = IconLoader.getIcon("/nodes/shared.png"); // 16x16 public static final Icon SortBySeverity = IconLoader.getIcon("/nodes/sortBySeverity.png"); // 16x16 public static final Icon SourceFolder = IconLoader.getIcon("/nodes/sourceFolder.png"); // 16x16 public static final Icon Static = IconLoader.getIcon("/nodes/static.png"); // 16x16