From 1993fea826590feeda4a427f6fa53a2d386fd979 Mon Sep 17 00:00:00 2001 From: Olesya Smirnova Date: Fri, 4 Mar 2005 20:14:44 +0300 Subject: [PATCH] http://www.jetbrains.net/jira/browse/IDEADEV-514 fixed --- icons/src/general/vcsSmallTab.png | Bin 0 -> 699 bytes openapi/src/com/intellij/util/Icons.java | 3 +++ .../openapi/vcs/history/FileHistoryPanel.java | 3 ++- .../vcs/impl/ProjectLevelVcsManagerImpl.java | 3 ++- .../openapi/vcs/update/UpdateInfoTree.java | 4 ++-- 5 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 icons/src/general/vcsSmallTab.png diff --git a/icons/src/general/vcsSmallTab.png b/icons/src/general/vcsSmallTab.png new file mode 100644 index 0000000000000000000000000000000000000000..c8a41b461af715e87ab3ba1f4c0d4fdf11603856 GIT binary patch literal 699 zcmV;s0!00ZP)m^DPqtJ39lzVSZ z1FrxJ!{=YW8SdPB%wTjljiErxl;O#j-xz)Z2p}d9@&3bi2G)-s7!K^a%W(J73x?PYfVGc{$23d}m<=`w1X`z&8B_hD33M8UrsE3&Xb`zZot_YcU)= z@af-qg$gD{Oh4@g2q2cXZ{F-*w_%SaQv5N0`0#;Yhg>}qD4sHs{L%ds3J^ey|ADrE zfQ@Teij#xIq}Uh-&TYF7F+2`y0|)!D)Nc&!8xVf_c4759fB*vf$7+*k>d%&PXGY~w#mY#FjZb%ZWcce8-t*zDA;CxUIB&^$M(-MwK55Q`S#t9 h&mTX){B#T;zyR~CB2u90%I*LF002ovPDHLkV1l51KC%D+ literal 0 HcmV?d00001 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) {