diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java index 00fd12591528..b3c6f7a7bad3 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java @@ -21,7 +21,6 @@ import com.intellij.facet.impl.invalid.InvalidFacetType; import com.intellij.facet.impl.ui.facetType.FacetTypeEditor; import com.intellij.facet.ui.FacetEditor; import com.intellij.facet.ui.MultipleFacetSettingsEditor; -import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.components.ServiceManager; @@ -54,7 +53,6 @@ import java.util.List; * @author nik */ public class FacetStructureConfigurable extends BaseStructureConfigurable { - private static final Icon ICON = AllIcons.Modules.Modules;//todo[nik] use facets icon private final ModuleManager myModuleManager; private final Map, FacetTypeEditor> myFacetTypeEditors = new HashMap, FacetTypeEditor>(); private MultipleFacetSettingsEditor myCurrentMultipleSettingsEditor; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java index 0ab0791d8da2..c583216282ec 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java @@ -85,7 +85,6 @@ import java.util.List; */ public class ModuleStructureConfigurable extends BaseStructureConfigurable implements Place.Navigator { private static final Icon COMPACT_EMPTY_MIDDLE_PACKAGES_ICON = AllIcons.ObjectBrowser.CompactEmptyPackages; - private static final Icon ICON = AllIcons.Modules.Modules; private static final Comparator NODE_COMPARATOR = new Comparator() { public int compare(final MyNode o1, final MyNode o2) { final NamedConfigurable configurable1 = o1.getConfigurable(); diff --git a/platform/icons/src/actions/bookmark0.png b/platform/icons/src/actions/bookmark0.png deleted file mode 100644 index 15085ca2d38b..000000000000 Binary files a/platform/icons/src/actions/bookmark0.png and /dev/null differ diff --git a/platform/icons/src/actions/bookmark1.png b/platform/icons/src/actions/bookmark1.png deleted file mode 100644 index af12bcacdeac..000000000000 Binary files a/platform/icons/src/actions/bookmark1.png and /dev/null differ diff --git a/platform/icons/src/actions/bookmark2.png b/platform/icons/src/actions/bookmark2.png deleted file mode 100644 index de00f35bb4fa..000000000000 Binary files a/platform/icons/src/actions/bookmark2.png and /dev/null differ diff --git a/platform/icons/src/actions/bookmark3.png b/platform/icons/src/actions/bookmark3.png deleted file mode 100644 index c8187e920512..000000000000 Binary files a/platform/icons/src/actions/bookmark3.png and /dev/null differ diff --git a/platform/icons/src/actions/bookmark4.png b/platform/icons/src/actions/bookmark4.png deleted file mode 100644 index 2ce7fd18d806..000000000000 Binary files a/platform/icons/src/actions/bookmark4.png and /dev/null differ diff --git a/platform/icons/src/actions/bookmark5.png b/platform/icons/src/actions/bookmark5.png deleted file mode 100644 index 67dedc255c33..000000000000 Binary files a/platform/icons/src/actions/bookmark5.png and /dev/null differ diff --git a/platform/icons/src/actions/bookmark6.png b/platform/icons/src/actions/bookmark6.png deleted file mode 100644 index e50b86ab5da2..000000000000 Binary files a/platform/icons/src/actions/bookmark6.png and /dev/null differ diff --git a/platform/icons/src/actions/bookmark7.png b/platform/icons/src/actions/bookmark7.png deleted file mode 100644 index 6dcfd642385a..000000000000 Binary files a/platform/icons/src/actions/bookmark7.png and /dev/null differ diff --git a/platform/icons/src/actions/bookmark8.png b/platform/icons/src/actions/bookmark8.png deleted file mode 100644 index 17b11ba894e4..000000000000 Binary files a/platform/icons/src/actions/bookmark8.png and /dev/null differ diff --git a/platform/icons/src/actions/bookmark9.png b/platform/icons/src/actions/bookmark9.png deleted file mode 100644 index 1add70ce8080..000000000000 Binary files a/platform/icons/src/actions/bookmark9.png and /dev/null differ diff --git a/platform/icons/src/actions/downBig.png b/platform/icons/src/actions/downBig.png deleted file mode 100644 index 57c80b2d9bac..000000000000 Binary files a/platform/icons/src/actions/downBig.png and /dev/null differ diff --git a/platform/icons/src/actions/upBig.png b/platform/icons/src/actions/upBig.png deleted file mode 100644 index 96d3791dddda..000000000000 Binary files a/platform/icons/src/actions/upBig.png and /dev/null differ diff --git a/platform/icons/src/general/docked.png b/platform/icons/src/general/docked.png deleted file mode 100644 index bed45f5c3611..000000000000 Binary files a/platform/icons/src/general/docked.png and /dev/null differ diff --git a/platform/icons/src/general/dockedInactive.png b/platform/icons/src/general/dockedInactive.png deleted file mode 100644 index 21b1dc3e15ea..000000000000 Binary files a/platform/icons/src/general/dockedInactive.png and /dev/null differ diff --git a/platform/icons/src/general/fileTemplates.png b/platform/icons/src/general/fileTemplates.png deleted file mode 100644 index b93a9dabca11..000000000000 Binary files a/platform/icons/src/general/fileTemplates.png and /dev/null differ diff --git a/platform/icons/src/general/hideSideDown.png b/platform/icons/src/general/hideSideDown.png deleted file mode 100644 index b8a6455c0fbf..000000000000 Binary files a/platform/icons/src/general/hideSideDown.png and /dev/null differ diff --git a/platform/icons/src/general/hideSideDownInactive.png b/platform/icons/src/general/hideSideDownInactive.png deleted file mode 100644 index b09dfa8c443c..000000000000 Binary files a/platform/icons/src/general/hideSideDownInactive.png and /dev/null differ diff --git a/platform/icons/src/general/hideSideLeft.png b/platform/icons/src/general/hideSideLeft.png deleted file mode 100644 index 73d3119c4716..000000000000 Binary files a/platform/icons/src/general/hideSideLeft.png and /dev/null differ diff --git a/platform/icons/src/general/hideSideLeftInactive.png b/platform/icons/src/general/hideSideLeftInactive.png deleted file mode 100644 index df9672336d99..000000000000 Binary files a/platform/icons/src/general/hideSideLeftInactive.png and /dev/null differ diff --git a/platform/icons/src/general/hideSideRight.png b/platform/icons/src/general/hideSideRight.png deleted file mode 100644 index 34eda5356849..000000000000 Binary files a/platform/icons/src/general/hideSideRight.png and /dev/null differ diff --git a/platform/icons/src/general/hideSideRightInactive.png b/platform/icons/src/general/hideSideRightInactive.png deleted file mode 100644 index 1274d5d855af..000000000000 Binary files a/platform/icons/src/general/hideSideRightInactive.png and /dev/null differ diff --git a/platform/icons/src/general/hideSideUp.png b/platform/icons/src/general/hideSideUp.png deleted file mode 100644 index 14ed2473f3cb..000000000000 Binary files a/platform/icons/src/general/hideSideUp.png and /dev/null differ diff --git a/platform/icons/src/general/hideSideUpInactive.png b/platform/icons/src/general/hideSideUpInactive.png deleted file mode 100644 index 6ce74cf00894..000000000000 Binary files a/platform/icons/src/general/hideSideUpInactive.png and /dev/null differ diff --git a/platform/icons/src/general/hideUp.png b/platform/icons/src/general/hideUp.png deleted file mode 100644 index f5cdda7f5bc5..000000000000 Binary files a/platform/icons/src/general/hideUp.png and /dev/null differ diff --git a/platform/icons/src/general/ideFatalError.png b/platform/icons/src/general/ideFatalError.png deleted file mode 100644 index 6e23a2b37aa1..000000000000 Binary files a/platform/icons/src/general/ideFatalError.png and /dev/null differ diff --git a/platform/icons/src/general/importProjects.png b/platform/icons/src/general/importProjects.png deleted file mode 100644 index 8887b8cd2e63..000000000000 Binary files a/platform/icons/src/general/importProjects.png and /dev/null differ diff --git a/platform/icons/src/general/inactiveSeparator.png b/platform/icons/src/general/inactiveSeparator.png deleted file mode 100644 index b94057827075..000000000000 Binary files a/platform/icons/src/general/inactiveSeparator.png and /dev/null differ diff --git a/platform/icons/src/general/liveTemplates.png b/platform/icons/src/general/liveTemplates.png deleted file mode 100644 index bcecd3494359..000000000000 Binary files a/platform/icons/src/general/liveTemplates.png and /dev/null differ diff --git a/platform/icons/src/gutter/bookmark0.png b/platform/icons/src/gutter/bookmark0.png deleted file mode 100644 index e57f2611150c..000000000000 Binary files a/platform/icons/src/gutter/bookmark0.png and /dev/null differ diff --git a/platform/icons/src/gutter/bookmark1.png b/platform/icons/src/gutter/bookmark1.png deleted file mode 100644 index 9330fb787d0b..000000000000 Binary files a/platform/icons/src/gutter/bookmark1.png and /dev/null differ diff --git a/platform/icons/src/gutter/bookmark2.png b/platform/icons/src/gutter/bookmark2.png deleted file mode 100644 index 26c5ae3df075..000000000000 Binary files a/platform/icons/src/gutter/bookmark2.png and /dev/null differ diff --git a/platform/icons/src/gutter/bookmark3.png b/platform/icons/src/gutter/bookmark3.png deleted file mode 100644 index 09c396a28c7f..000000000000 Binary files a/platform/icons/src/gutter/bookmark3.png and /dev/null differ diff --git a/platform/icons/src/gutter/bookmark4.png b/platform/icons/src/gutter/bookmark4.png deleted file mode 100644 index 4a58f30421ab..000000000000 Binary files a/platform/icons/src/gutter/bookmark4.png and /dev/null differ diff --git a/platform/icons/src/gutter/bookmark5.png b/platform/icons/src/gutter/bookmark5.png deleted file mode 100644 index c1b56ffcc2d3..000000000000 Binary files a/platform/icons/src/gutter/bookmark5.png and /dev/null differ diff --git a/platform/icons/src/gutter/bookmark6.png b/platform/icons/src/gutter/bookmark6.png deleted file mode 100644 index 0673fa73bd92..000000000000 Binary files a/platform/icons/src/gutter/bookmark6.png and /dev/null differ diff --git a/platform/icons/src/gutter/bookmark7.png b/platform/icons/src/gutter/bookmark7.png deleted file mode 100644 index 510072e792ca..000000000000 Binary files a/platform/icons/src/gutter/bookmark7.png and /dev/null differ diff --git a/platform/icons/src/gutter/bookmark8.png b/platform/icons/src/gutter/bookmark8.png deleted file mode 100644 index 77b1dd8463c2..000000000000 Binary files a/platform/icons/src/gutter/bookmark8.png and /dev/null differ diff --git a/platform/icons/src/gutter/bookmark9.png b/platform/icons/src/gutter/bookmark9.png deleted file mode 100644 index da7e25ab3734..000000000000 Binary files a/platform/icons/src/gutter/bookmark9.png and /dev/null differ diff --git a/platform/icons/src/modules/LeftTopCornerGeneralTitleBar.png b/platform/icons/src/modules/LeftTopCornerGeneralTitleBar.png deleted file mode 100644 index 76ae3fa04e8d..000000000000 Binary files a/platform/icons/src/modules/LeftTopCornerGeneralTitleBar.png and /dev/null differ diff --git a/platform/icons/src/modules/RightTopCornerGeneralTitleBar.png b/platform/icons/src/modules/RightTopCornerGeneralTitleBar.png deleted file mode 100644 index 0b4cd9da4629..000000000000 Binary files a/platform/icons/src/modules/RightTopCornerGeneralTitleBar.png and /dev/null differ diff --git a/platform/icons/src/modules/globalLibraries.png b/platform/icons/src/modules/globalLibraries.png deleted file mode 100644 index e4d2170f4421..000000000000 Binary files a/platform/icons/src/modules/globalLibraries.png and /dev/null differ diff --git a/platform/icons/src/modules/headerCenter.png b/platform/icons/src/modules/headerCenter.png deleted file mode 100644 index 33d0719258a2..000000000000 Binary files a/platform/icons/src/modules/headerCenter.png and /dev/null differ diff --git a/platform/icons/src/modules/headerCenterSelected.png b/platform/icons/src/modules/headerCenterSelected.png deleted file mode 100644 index a8a3a14b2701..000000000000 Binary files a/platform/icons/src/modules/headerCenterSelected.png and /dev/null differ diff --git a/platform/icons/src/modules/headerLeftCorner.png b/platform/icons/src/modules/headerLeftCorner.png deleted file mode 100644 index 06831ad91019..000000000000 Binary files a/platform/icons/src/modules/headerLeftCorner.png and /dev/null differ diff --git a/platform/icons/src/modules/headerLeftCornerSelected.png b/platform/icons/src/modules/headerLeftCornerSelected.png deleted file mode 100644 index 828d76509c99..000000000000 Binary files a/platform/icons/src/modules/headerLeftCornerSelected.png and /dev/null differ diff --git a/platform/icons/src/modules/headerRightCorner.png b/platform/icons/src/modules/headerRightCorner.png deleted file mode 100644 index 7bc35eb5d1ee..000000000000 Binary files a/platform/icons/src/modules/headerRightCorner.png and /dev/null differ diff --git a/platform/icons/src/modules/headerRightCornerSelected.png b/platform/icons/src/modules/headerRightCornerSelected.png deleted file mode 100644 index 0dede08a4249..000000000000 Binary files a/platform/icons/src/modules/headerRightCornerSelected.png and /dev/null differ diff --git a/platform/icons/src/modules/jbuilder.png b/platform/icons/src/modules/jbuilder.png deleted file mode 100644 index 5ed4d4165c04..000000000000 Binary files a/platform/icons/src/modules/jbuilder.png and /dev/null differ diff --git a/platform/icons/src/modules/jdks.png b/platform/icons/src/modules/jdks.png deleted file mode 100644 index dc6910a37490..000000000000 Binary files a/platform/icons/src/modules/jdks.png and /dev/null differ diff --git a/platform/icons/src/modules/libraryItemAttachmentCenter.png b/platform/icons/src/modules/libraryItemAttachmentCenter.png deleted file mode 100644 index d2a43c2cd5c9..000000000000 Binary files a/platform/icons/src/modules/libraryItemAttachmentCenter.png and /dev/null differ diff --git a/platform/icons/src/modules/libraryLeftSide.png b/platform/icons/src/modules/libraryLeftSide.png deleted file mode 100644 index 7663752f6390..000000000000 Binary files a/platform/icons/src/modules/libraryLeftSide.png and /dev/null differ diff --git a/platform/icons/src/modules/libraryRightSide.png b/platform/icons/src/modules/libraryRightSide.png deleted file mode 100644 index 665c234c8ae2..000000000000 Binary files a/platform/icons/src/modules/libraryRightSide.png and /dev/null differ diff --git a/platform/icons/src/modules/markSource.png b/platform/icons/src/modules/markSource.png deleted file mode 100644 index e5a566259e1d..000000000000 Binary files a/platform/icons/src/modules/markSource.png and /dev/null differ diff --git a/platform/icons/src/modules/markTests.png b/platform/icons/src/modules/markTests.png deleted file mode 100644 index d0e117cd8fe2..000000000000 Binary files a/platform/icons/src/modules/markTests.png and /dev/null differ diff --git a/platform/icons/src/modules/markWebroot.png b/platform/icons/src/modules/markWebroot.png deleted file mode 100644 index 13da6a04cc8b..000000000000 Binary files a/platform/icons/src/modules/markWebroot.png and /dev/null differ diff --git a/platform/icons/src/modules/moduleLibraries.png b/platform/icons/src/modules/moduleLibraries.png deleted file mode 100644 index eada91357baa..000000000000 Binary files a/platform/icons/src/modules/moduleLibraries.png and /dev/null differ diff --git a/platform/icons/src/modules/modules.png b/platform/icons/src/modules/modules.png deleted file mode 100644 index 0b4de554c887..000000000000 Binary files a/platform/icons/src/modules/modules.png and /dev/null differ diff --git a/platform/icons/src/modules/projectLibraries.png b/platform/icons/src/modules/projectLibraries.png deleted file mode 100644 index d2ef2c54e8de..000000000000 Binary files a/platform/icons/src/modules/projectLibraries.png and /dev/null differ diff --git a/platform/icons/src/modules/removeModule.png b/platform/icons/src/modules/removeModule.png deleted file mode 100644 index 65a1b70d615b..000000000000 Binary files a/platform/icons/src/modules/removeModule.png and /dev/null differ diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java index 9d3693307eed..5de53cec78d4 100644 --- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java +++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java @@ -66,7 +66,6 @@ public class AllFileTemplatesConfigurable implements SearchableConfigurable, Con private static final String INCLUDES_TITLE = IdeBundle.message("tab.filetemplates.includes"); private static final String CODE_TITLE = IdeBundle.message("tab.filetemplates.code"); private static final String J2EE_TITLE = IdeBundle.message("tab.filetemplates.j2ee"); - private static final Icon ourIcon = AllIcons.General.FileTemplates; private JPanel myMainPanel; private FileTemplateTab myCurrentTab; diff --git a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java index 1d1e588a2cd9..9afcbb16edde 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java @@ -42,7 +42,6 @@ import com.intellij.ui.awt.RelativePoint; import com.intellij.ui.components.JBLabel; import com.intellij.ui.speedSearch.SpeedSearch; import com.intellij.util.Alarm; -import com.intellij.util.ImageLoader; import com.intellij.util.Processor; import com.intellij.util.ui.ChildFocusWatcher; import com.intellij.util.ui.EmptyIcon; @@ -63,7 +62,7 @@ import java.util.Set; public class AbstractPopup implements JBPopup { private static final Logger LOG = Logger.getInstance("#com.intellij.ui.popup.AbstractPopup"); - private static final Image ourMacCorner = ImageLoader.loadFromResource("/general/macCorner.png"); + private static final Icon ourMacCorner = AllIcons.General.MacCorner; private static final Object SUPPRESS_MAC_CORNER = new Object(); public static final String SHOW_HINTS = "ShowHints"; @@ -897,7 +896,7 @@ public class AbstractPopup implements JBPopup { SwingUtilities.convertPointToScreen(point, e.getComponent()); final Dimension dimension = myContent.getSize(); - dimension.height += myResizable && isToDrawMacCorner() ? ourMacCorner.getHeight(myContent) : 4; + dimension.height += myResizable && isToDrawMacCorner() ? ourMacCorner.getIconHeight() : 4; dimension.width += 4; Point locationOnScreen = myContent.getLocationOnScreen(); final Rectangle bounds = new Rectangle(new Point(locationOnScreen.x - 2, locationOnScreen.y - 2), dimension); @@ -1214,10 +1213,9 @@ public class AbstractPopup implements JBPopup { super.paint(g); if (myResizable && myDrawMacCorner) { - g.drawImage(ourMacCorner, - getX() + getWidth() - ourMacCorner.getWidth(this), - getY() + getHeight() - ourMacCorner.getHeight(this), - this); + ourMacCorner.paintIcon(this, g, + getX() + getWidth() - ourMacCorner.getIconWidth(), + getY() + getHeight() - ourMacCorner.getIconHeight()); } } diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index f1b6ad509b9c..8e4c3a410213 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -11,16 +11,6 @@ public class AllIcons { public static final Icon Annotate = IconLoader.getIcon("/actions/annotate.png"); public static final Icon Apache = IconLoader.getIcon("/actions/apache.png"); public static final Icon Back = IconLoader.getIcon("/actions/back.png"); - public static final Icon Bookmark0 = IconLoader.getIcon("/actions/bookmark0.png"); - public static final Icon Bookmark1 = IconLoader.getIcon("/actions/bookmark1.png"); - public static final Icon Bookmark2 = IconLoader.getIcon("/actions/bookmark2.png"); - public static final Icon Bookmark3 = IconLoader.getIcon("/actions/bookmark3.png"); - public static final Icon Bookmark4 = IconLoader.getIcon("/actions/bookmark4.png"); - public static final Icon Bookmark5 = IconLoader.getIcon("/actions/bookmark5.png"); - public static final Icon Bookmark6 = IconLoader.getIcon("/actions/bookmark6.png"); - public static final Icon Bookmark7 = IconLoader.getIcon("/actions/bookmark7.png"); - public static final Icon Bookmark8 = IconLoader.getIcon("/actions/bookmark8.png"); - public static final Icon Bookmark9 = IconLoader.getIcon("/actions/bookmark9.png"); public static final Icon Breakpoint = IconLoader.getIcon("/actions/breakpoint.png"); public static final Icon Browser_externalJavaDoc = IconLoader.getIcon("/actions/browser-externalJavaDoc.png"); public static final Icon Cancel = IconLoader.getIcon("/actions/cancel.png"); @@ -50,7 +40,6 @@ public class AllIcons { public static final Icon Delete = IconLoader.getIcon("/actions/delete.png"); public static final Icon Diff = IconLoader.getIcon("/actions/diff.png"); public static final Icon DiffWithCurrent = IconLoader.getIcon("/actions/diffWithCurrent.png"); - public static final Icon DownBig = IconLoader.getIcon("/actions/downBig.png"); public static final Icon Dump = IconLoader.getIcon("/actions/dump.png"); public static final Icon Eclipse = IconLoader.getIcon("/actions/eclipse.png"); public static final Icon Edit = IconLoader.getIcon("/actions/edit.png"); @@ -166,7 +155,6 @@ public class AllIcons { public static final Icon Uninstall = IconLoader.getIcon("/actions/uninstall.png"); public static final Icon Unselectall = IconLoader.getIcon("/actions/unselectall.png"); public static final Icon Unshare = IconLoader.getIcon("/actions/unshare.png"); - public static final Icon UpBig = IconLoader.getIcon("/actions/upBig.png"); } @@ -395,8 +383,6 @@ public class AllIcons { public static final Icon Debug = IconLoader.getIcon("/general/debug.png"); public static final Icon DefaultKeymap = IconLoader.getIcon("/general/defaultKeymap.png"); public static final Icon Divider = IconLoader.getIcon("/general/divider.png"); - public static final Icon Docked = IconLoader.getIcon("/general/docked.png"); - public static final Icon DockedInactive = IconLoader.getIcon("/general/dockedInactive.png"); public static final Icon Documentation = IconLoader.getIcon("/general/documentation.png"); public static final Icon Dropdown = IconLoader.getIcon("/general/dropdown.png"); public static final Icon EditColors = IconLoader.getIcon("/general/editColors.png"); @@ -412,7 +398,6 @@ public class AllIcons { public static final Icon ExpandAllHover = IconLoader.getIcon("/general/expandAllHover.png"); public static final Icon ExternalTools = IconLoader.getIcon("/general/externalTools.png"); public static final Icon ExtTools = IconLoader.getIcon("/general/extTools.png"); - public static final Icon FileTemplates = IconLoader.getIcon("/general/fileTemplates.png"); public static final Icon Fix = IconLoader.getIcon("/general/fix.png"); public static final Icon FixInactive = IconLoader.getIcon("/general/fixInactive.png"); public static final Icon Floating = IconLoader.getIcon("/general/floating.png"); @@ -433,24 +418,12 @@ public class AllIcons { public static final Icon HideRightHover = IconLoader.getIcon("/general/hideRightHover.png"); public static final Icon HideRightPart = IconLoader.getIcon("/general/hideRightPart.png"); public static final Icon HideRightPartHover = IconLoader.getIcon("/general/hideRightPartHover.png"); - public static final Icon HideSideDown = IconLoader.getIcon("/general/hideSideDown.png"); - public static final Icon HideSideDownInactive = IconLoader.getIcon("/general/hideSideDownInactive.png"); - public static final Icon HideSideLeft = IconLoader.getIcon("/general/hideSideLeft.png"); - public static final Icon HideSideLeftInactive = IconLoader.getIcon("/general/hideSideLeftInactive.png"); - public static final Icon HideSideRight = IconLoader.getIcon("/general/hideSideRight.png"); - public static final Icon HideSideRightInactive = IconLoader.getIcon("/general/hideSideRightInactive.png"); - public static final Icon HideSideUp = IconLoader.getIcon("/general/hideSideUp.png"); - public static final Icon HideSideUpInactive = IconLoader.getIcon("/general/hideSideUpInactive.png"); public static final Icon HideToolWindow = IconLoader.getIcon("/general/hideToolWindow.png"); public static final Icon HideToolWindowInactive = IconLoader.getIcon("/general/hideToolWindowInactive.png"); - public static final Icon HideUp = IconLoader.getIcon("/general/hideUp.png"); - public static final Icon IdeFatalError = IconLoader.getIcon("/general/ideFatalError.png"); public static final Icon IdeOptions = IconLoader.getIcon("/general/ideOptions.png"); public static final Icon IjLogo = IconLoader.getIcon("/general/ijLogo.png"); public static final Icon ImplementedMethod = IconLoader.getIcon("/general/implementedMethod.png"); public static final Icon ImplementingMethod = IconLoader.getIcon("/general/implementingMethod.png"); - public static final Icon ImportProjects = IconLoader.getIcon("/general/importProjects.png"); - public static final Icon InactiveSeparator = IconLoader.getIcon("/general/inactiveSeparator.png"); public static final Icon InformationDialog = IconLoader.getIcon("/general/informationDialog.png"); public static final Icon InheritedMethod = IconLoader.getIcon("/general/inheritedMethod.png"); public static final Icon InspectionInProgress = IconLoader.getIcon("/general/inspectionInProgress.png"); @@ -459,7 +432,6 @@ public class AllIcons { public static final Icon JetbrainsTvIdea = IconLoader.getIcon("/general/jetbrainsTvIdea.png"); public static final Icon KeyboardShortcut = IconLoader.getIcon("/general/keyboardShortcut.png"); public static final Icon Keymap = IconLoader.getIcon("/general/keymap.png"); - public static final Icon LiveTemplates = IconLoader.getIcon("/general/liveTemplates.png"); public static final Icon Locate = IconLoader.getIcon("/general/locate.png"); public static final Icon LocateHover = IconLoader.getIcon("/general/locateHover.png"); public static final Icon MacCorner = IconLoader.getIcon("/general/macCorner.png"); @@ -571,16 +543,6 @@ public class AllIcons { } public static class Gutter { - public static final Icon Bookmark0 = IconLoader.getIcon("/gutter/bookmark0.png"); - public static final Icon Bookmark1 = IconLoader.getIcon("/gutter/bookmark1.png"); - public static final Icon Bookmark2 = IconLoader.getIcon("/gutter/bookmark2.png"); - public static final Icon Bookmark3 = IconLoader.getIcon("/gutter/bookmark3.png"); - public static final Icon Bookmark4 = IconLoader.getIcon("/gutter/bookmark4.png"); - public static final Icon Bookmark5 = IconLoader.getIcon("/gutter/bookmark5.png"); - public static final Icon Bookmark6 = IconLoader.getIcon("/gutter/bookmark6.png"); - public static final Icon Bookmark7 = IconLoader.getIcon("/gutter/bookmark7.png"); - public static final Icon Bookmark8 = IconLoader.getIcon("/gutter/bookmark8.png"); - public static final Icon Bookmark9 = IconLoader.getIcon("/gutter/bookmark9.png"); public static final Icon Colors = IconLoader.getIcon("/gutter/colors.png"); public static final Icon ImplementedMethod = IconLoader.getIcon("/gutter/implementedMethod.png"); public static final Icon ImplementingMethod = IconLoader.getIcon("/gutter/implementingMethod.png"); @@ -604,6 +566,11 @@ public class AllIcons { } public static final Icon Icon = IconLoader.getIcon("/icon.png"); + public static final Icon Icon_CE = IconLoader.getIcon("/icon_CE.png"); + public static final Icon Icon_CEsmall = IconLoader.getIcon("/icon_CEsmall.png"); + public static final Icon Icon_CEwhite = IconLoader.getIcon("/icon_CEwhite.png"); + public static final Icon Icon_small = IconLoader.getIcon("/icon_small.png"); + public static final Icon Icon_white = IconLoader.getIcon("/icon_white.png"); public static class Icons { @@ -627,11 +594,6 @@ public class AllIcons { } } - public static final Icon Icon_CE = IconLoader.getIcon("/icon_CE.png"); - public static final Icon Icon_CEsmall = IconLoader.getIcon("/icon_CEsmall.png"); - public static final Icon Icon_CEwhite = IconLoader.getIcon("/icon_CEwhite.png"); - public static final Icon Icon_small = IconLoader.getIcon("/icon_small.png"); - public static final Icon Icon_white = IconLoader.getIcon("/icon_white.png"); public static class Ide { public static final Icon DefaultProfile = IconLoader.getIcon("/ide/defaultProfile.png"); @@ -646,9 +608,9 @@ public class AllIcons { } public static final Icon EmptyFatalError = IconLoader.getIcon("/ide/emptyFatalError.png"); + public static final Icon Error_notifications = IconLoader.getIcon("/ide/error_notifications.png"); public static final Icon ErrorPoint = IconLoader.getIcon("/ide/errorPoint.png"); public static final Icon ErrorSign = IconLoader.getIcon("/ide/errorSign.png"); - public static final Icon Error_notifications = IconLoader.getIcon("/ide/error_notifications.png"); public static final Icon FacetDetected = IconLoader.getIcon("/ide/facetDetected.png"); public static final Icon FatalError_read = IconLoader.getIcon("/ide/fatalError-read.png"); public static final Icon FatalError = IconLoader.getIcon("/ide/fatalError.png"); @@ -762,13 +724,13 @@ public class AllIcons { public static final Icon TypeNumeric = IconLoader.getIcon("/javaee/typeNumeric.png"); public static final Icon TypeString = IconLoader.getIcon("/javaee/typeString.png"); public static final Icon UpdateRunningApplication = IconLoader.getIcon("/javaee/updateRunningApplication.png"); + public static final Icon Web_xml = IconLoader.getIcon("/javaee/web_xml.png"); public static final Icon WebModule = IconLoader.getIcon("/javaee/webModule.png"); public static final Icon WebModuleBig = IconLoader.getIcon("/javaee/webModuleBig.png"); public static final Icon WebModuleGroup = IconLoader.getIcon("/javaee/webModuleGroup.png"); public static final Icon WebService = IconLoader.getIcon("/javaee/WebService.png"); public static final Icon WebServiceClient = IconLoader.getIcon("/javaee/WebServiceClient.png"); public static final Icon WebToolWindow = IconLoader.getIcon("/javaee/webToolWindow.png"); - public static final Icon Web_xml = IconLoader.getIcon("/javaee/web_xml.png"); } @@ -801,38 +763,17 @@ public class AllIcons { public static final Icon ExcludeFolder = IconLoader.getIcon("/modules/excludeFolder.png"); public static final Icon ExcludeRootClosed = IconLoader.getIcon("/modules/excludeRootClosed.png"); public static final Icon ExcludeRootOpened = IconLoader.getIcon("/modules/excludeRootOpened.png"); - public static final Icon GlobalLibraries = IconLoader.getIcon("/modules/globalLibraries.png"); - public static final Icon HeaderCenter = IconLoader.getIcon("/modules/headerCenter.png"); - public static final Icon HeaderCenterSelected = IconLoader.getIcon("/modules/headerCenterSelected.png"); - public static final Icon HeaderLeftCorner = IconLoader.getIcon("/modules/headerLeftCorner.png"); - public static final Icon HeaderLeftCornerSelected = IconLoader.getIcon("/modules/headerLeftCornerSelected.png"); - public static final Icon HeaderRightCorner = IconLoader.getIcon("/modules/headerRightCorner.png"); - public static final Icon HeaderRightCornerSelected = IconLoader.getIcon("/modules/headerRightCornerSelected.png"); public static final Icon Javadoc = IconLoader.getIcon("/modules/javadoc.png"); public static final Icon JavaModule = IconLoader.getIcon("/modules/javaModule.png"); - public static final Icon Jbuilder = IconLoader.getIcon("/modules/jbuilder.png"); - public static final Icon Jdks = IconLoader.getIcon("/modules/jdks.png"); - public static final Icon LeftTopCornerGeneralTitleBar = IconLoader.getIcon("/modules/LeftTopCornerGeneralTitleBar.png"); public static final Icon Libraries = IconLoader.getIcon("/modules/libraries.png"); public static final Icon Library = IconLoader.getIcon("/modules/library.png"); - public static final Icon LibraryItemAttachmentCenter = IconLoader.getIcon("/modules/libraryItemAttachmentCenter.png"); - public static final Icon LibraryLeftSide = IconLoader.getIcon("/modules/libraryLeftSide.png"); - public static final Icon LibraryRightSide = IconLoader.getIcon("/modules/libraryRightSide.png"); - public static final Icon MarkSource = IconLoader.getIcon("/modules/markSource.png"); - public static final Icon MarkTests = IconLoader.getIcon("/modules/markTests.png"); - public static final Icon MarkWebroot = IconLoader.getIcon("/modules/markWebroot.png"); public static final Icon Merge = IconLoader.getIcon("/modules/merge.png"); - public static final Icon ModuleLibraries = IconLoader.getIcon("/modules/moduleLibraries.png"); - public static final Icon Modules = IconLoader.getIcon("/modules/modules.png"); public static final Icon ModulesNode = IconLoader.getIcon("/modules/modulesNode.png"); public static final Icon Order = IconLoader.getIcon("/modules/order.png"); public static final Icon Output = IconLoader.getIcon("/modules/output.png"); public static final Icon Paths = IconLoader.getIcon("/modules/paths.png"); public static final Icon PluginModule = IconLoader.getIcon("/modules/pluginModule.png"); - public static final Icon ProjectLibraries = IconLoader.getIcon("/modules/projectLibraries.png"); public static final Icon Remove = IconLoader.getIcon("/modules/remove.png"); - public static final Icon RemoveModule = IconLoader.getIcon("/modules/removeModule.png"); - public static final Icon RightTopCornerGeneralTitleBar = IconLoader.getIcon("/modules/RightTopCornerGeneralTitleBar.png"); public static final Icon SetPackagePrefix = IconLoader.getIcon("/modules/setPackagePrefix.png"); public static final Icon SetPackagePrefixRollover = IconLoader.getIcon("/modules/setPackagePrefixRollover.png"); public static final Icon SourceClosed = IconLoader.getIcon("/modules/sourceClosed.png"); @@ -864,6 +805,10 @@ public class AllIcons { public static final Icon Artifact = IconLoader.getIcon("/nodes/artifact.png"); public static final Icon Aspect = IconLoader.getIcon("/nodes/aspect.png"); public static final Icon BeaSmall = IconLoader.getIcon("/nodes/beaSmall.png"); + public static final Icon C_plocal = IconLoader.getIcon("/nodes/c_plocal.png"); + public static final Icon C_private = IconLoader.getIcon("/nodes/c_private.png"); + public static final Icon C_protected = IconLoader.getIcon("/nodes/c_protected.png"); + public static final Icon C_public = IconLoader.getIcon("/nodes/c_public.png"); public static final Icon Class = IconLoader.getIcon("/nodes/class.png"); public static final Icon ClassInitializer = IconLoader.getIcon("/nodes/classInitializer.png"); public static final Icon CollapseNode = IconLoader.getIcon("/nodes/collapseNode.png"); @@ -871,10 +816,6 @@ public class AllIcons { public static final Icon CopyOfFolder = IconLoader.getIcon("/nodes/copyOfFolder.png"); public static final Icon Cvs_global = IconLoader.getIcon("/nodes/cvs_global.png"); public static final Icon Cvs_roots = IconLoader.getIcon("/nodes/cvs_roots.png"); - public static final Icon C_plocal = IconLoader.getIcon("/nodes/c_plocal.png"); - public static final Icon C_private = IconLoader.getIcon("/nodes/c_private.png"); - public static final Icon C_protected = IconLoader.getIcon("/nodes/c_protected.png"); - public static final Icon C_public = IconLoader.getIcon("/nodes/c_public.png"); public static final Icon DataColumn = IconLoader.getIcon("/nodes/dataColumn.png"); public static final Icon DataConnection = IconLoader.getIcon("/nodes/dataConnection.png"); public static final Icon DataFkColumn = IconLoader.getIcon("/nodes/dataFkColumn.png"); @@ -1137,8 +1078,8 @@ public class AllIcons { public static final Icon Remote = IconLoader.getIcon("/runConfigurations/remote.png"); public static final Icon RerunFailedTests = IconLoader.getIcon("/runConfigurations/rerunFailedTests.png"); public static final Icon SaveTempConfig = IconLoader.getIcon("/runConfigurations/saveTempConfig.png"); - public static final Icon ScrollToStackTrace = IconLoader.getIcon("/runConfigurations/scrollToStackTrace.png"); public static final Icon Scroll_down = IconLoader.getIcon("/runConfigurations/scroll_down.png"); + public static final Icon ScrollToStackTrace = IconLoader.getIcon("/runConfigurations/scrollToStackTrace.png"); public static final Icon SelectFirstDefect = IconLoader.getIcon("/runConfigurations/selectFirstDefect.png"); public static final Icon SourceAtException = IconLoader.getIcon("/runConfigurations/sourceAtException.png"); public static final Icon TestError = IconLoader.getIcon("/runConfigurations/testError.png"); diff --git a/resources/resources.iml b/resources/resources.iml index 534c08b7de85..a54a13ba939e 100644 --- a/resources/resources.iml +++ b/resources/resources.iml @@ -12,6 +12,7 @@ +