diff --git a/icons/src/general/vcsSmallTab.png b/icons/src/general/vcsSmallTab.png new file mode 100644 index 000000000000..c8a41b461af7 Binary files /dev/null and b/icons/src/general/vcsSmallTab.png differ diff --git a/openapi/src/com/intellij/util/Icons.java b/openapi/src/com/intellij/util/Icons.java index 04527dc725e5..b6fc6fc70baa 100644 --- a/openapi/src/com/intellij/util/Icons.java +++ b/openapi/src/com/intellij/util/Icons.java @@ -101,4 +101,7 @@ public interface Icons { Icon PROJECT_ICON = IconLoader.getIcon("/icon_small.png"); Icon UI_FORM_ICON = IconLoader.getIcon("/fileTypes/uiForm.png"); Icon JSP_ICON = IconLoader.getIcon("/fileTypes/jsp.png"); + Icon SMALL_VCS_CONFIGURABLE = IconLoader.getIcon("/general/smallConfigurableVcs.png"); + Icon VCS_SMALL_TAB = IconLoader.getIcon("/general/vcsSmallTab.png"); + Icon GROUP_BY_PACKAGES = IconLoader.getIcon("/toolbar/folders.png"); } diff --git a/source/com/intellij/openapi/vcs/history/FileHistoryPanel.java b/source/com/intellij/openapi/vcs/history/FileHistoryPanel.java index dcf8e26cb97c..2935eb70f23b 100644 --- a/source/com/intellij/openapi/vcs/history/FileHistoryPanel.java +++ b/source/com/intellij/openapi/vcs/history/FileHistoryPanel.java @@ -33,6 +33,7 @@ import com.intellij.ui.dualView.CellWrapper; import com.intellij.ui.dualView.DualTreeElement; import com.intellij.ui.dualView.DualView; import com.intellij.util.TreeItem; +import com.intellij.util.Icons; import com.intellij.util.text.LineReader; import com.intellij.util.ui.ColumnInfo; import com.intellij.util.ui.IdeaUIManager; @@ -520,7 +521,7 @@ public class FileHistoryPanel extends PanelWithActionsAndCloseButton { private class MyShowAsTreeAction extends ToggleAction { public MyShowAsTreeAction() { - super("Show as Tree", null, IconLoader.getIcon("/general/smallConfigurableVcs.png")); + super("Show as Tree", null, Icons.SMALL_VCS_CONFIGURABLE); } public boolean isSelected(AnActionEvent e) { diff --git a/source/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java b/source/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java index be0705415f6f..976bf57b90b2 100644 --- a/source/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java +++ b/source/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java @@ -70,6 +70,7 @@ import com.intellij.ui.content.ContentManager; import com.intellij.ui.content.ContentManagerAdapter; import com.intellij.ui.content.ContentManagerEvent; import com.intellij.util.ui.EditorAdapter; +import com.intellij.util.Icons; import javax.swing.*; import java.io.File; @@ -158,7 +159,7 @@ public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx impleme toolWindowManager.registerToolWindow(ToolWindowId.VCS, myContentManager.getComponent(), ToolWindowAnchor.BOTTOM); - toolWindow.setIcon(IconLoader.getIcon("/general/smallConfigurableVcs.png")); + toolWindow.setIcon(Icons.VCS_SMALL_TAB); toolWindow.installWatcher(myContentManager); } } diff --git a/source/com/intellij/openapi/vcs/update/UpdateInfoTree.java b/source/com/intellij/openapi/vcs/update/UpdateInfoTree.java index 8af1b8a4ff62..793ae044db76 100644 --- a/source/com/intellij/openapi/vcs/update/UpdateInfoTree.java +++ b/source/com/intellij/openapi/vcs/update/UpdateInfoTree.java @@ -36,7 +36,6 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.PanelWithActionsAndCloseButton; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.*; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.peer.PeerFactory; @@ -44,6 +43,7 @@ import com.intellij.ui.PopupHandler; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.UIHelper; import com.intellij.ui.content.ContentManager; +import com.intellij.util.Icons; import com.intellij.util.ui.Tree; import com.intellij.util.ui.tree.TreeUtil; @@ -213,7 +213,7 @@ public class UpdateInfoTree extends PanelWithActionsAndCloseButton { private class MyGroupByPackagesAction extends ToggleAction { public MyGroupByPackagesAction() { - super("Group by Packages", null, IconLoader.getIcon("/general/smallConfigurableVcs.png")); + super("Group by Packages", null, Icons.GROUP_BY_PACKAGES); } public boolean isSelected(AnActionEvent e) {