shared icon introduced (IDEA-120989)

This commit is contained in:
Anna Kozlova
2014-04-04 12:43:15 +02:00
parent 0afb68102e
commit 7a9f96d80c
12 changed files with 6 additions and 8 deletions
-1
View File
@@ -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
@@ -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<DependencyRule> myRules = new ArrayList<DependencyRule>();
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
Binary file not shown.

Before

Width:  |  Height:  |  Size: 554 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 647 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 299 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 304 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 243 B

@@ -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 {
@@ -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