MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Do not use home-made icons in production code

Browse Source
This commit is contained in:
Konstantin Bulenkov
2016-09-12 22:53:13 +02:00
parent d14a90084d
commit 466f58fee5
6 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/icons/src/vcs/silentShelve.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 442 B

platform/icons/src/vcs/silentShelve@2x.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 776 B

platform/icons/src/vcs/silentUnshelve.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 300 B

platform/icons/src/vcs/silentUnshelve@2x.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 505 B

platform/platform-resources/src/idea/VcsActions.xml
+15 -8
View File
@@ -93,14 +93,20 @@
icon="AllIcons.Actions.Submit1"/>
<action id="ChangesView.Move" class="com.intellij.openapi.vcs.changes.actions.MoveChangesToAnotherListAction"
icon="AllIcons.Actions.MoveToAnotherChangelist"/>
<action id="ChangesView.ShelveSilently" class="com.intellij.openapi.vcs.changes.actions.ShelveSilentlyAction"
text="Shelve Silently" description="Shelve changes to appropriate shelved changelists" icon="AllIcons.Vcs.SilentShelve">
<keyboard-shortcut first-keystroke="control alt H" keymap="$default"/>
</action>
<action id="ChangesView.Diff" class="com.intellij.openapi.vcs.changes.actions.diff.ShowDiffAction"
icon="AllIcons.Actions.Diff" use-shortcut-of="Diff.ShowDiff"/>
</group>
<action id="ChangesView.ShelveSilently" class="com.intellij.openapi.vcs.changes.actions.ShelveSilentlyAction"
text="Shelve Silently" description="Shelve changes to appropriate shelved changelists">
<keyboard-shortcut first-keystroke="control alt H" keymap="$default"/>
</action>
<action id="ChangesView.UnshelveSilently" class="com.intellij.openapi.vcs.changes.actions.UnshelveSilentlyAction"
text="Unshelve Silently" description="Unshelve changes to appropriate changelists">
<keyboard-shortcut first-keystroke="control alt U" keymap="$default"/>
</action>
<group id="AlienCommitChangesDialog.AdditionalActions"/>
<group id="ChangesViewPopupMenu">
@@ -126,6 +132,7 @@
<action id="ChangesView.Rename" class="com.intellij.openapi.vcs.changes.actions.RenameChangeListAction"/>
<reference ref="ChangesView.CreatePatch"/>
<reference ref="ChangesView.Shelve"/>
<reference ref="ChangesView.ShelveSilently"/>
<separator/>
<reference ref="ChangesView.Refresh"/>
<separator/>
@@ -144,6 +151,7 @@
<group id="ShelvedChangesPopupMenu" popup="true">
<action id="ShelveChanges.UnshelveWithDialog" class="com.intellij.openapi.vcs.changes.shelf.UnshelveWithDialogAction"
text="Unshelve..." description="Correct paths where to apply patches and unshelve"/>
<reference id="ChangesView.UnshelveSilently"/>
<action id="ShelvedChanges.Restore" class="com.intellij.openapi.vcs.changes.shelf.RestoreShelvedChange"/>
<action id="ShelvedChanges.Diff" class="com.intellij.openapi.vcs.changes.shelf.DiffShelvedChangesAction"
icon="AllIcons.Actions.Diff" use-shortcut-of="Diff.ShowDiff"/>
@@ -163,10 +171,6 @@
<group id="ShelvedChangesToolbar">
<reference ref="ShelvedChanges.Diff"/>
<action id="ChangesView.UnshelveSilently" class="com.intellij.openapi.vcs.changes.actions.UnshelveSilentlyAction"
text="Unshelve Silently" description="Unshelve changes to appropriate changelists" icon="AllIcons.Vcs.SilentUnshelve">
<keyboard-shortcut first-keystroke="control alt U" keymap="$default"/>
</action>
<reference ref="ChangesView.CreatePatchFromChanges"/>
<reference ref="ShelvedChanges.ShowHideDeleted" />
<reference ref="ShelvedChanges.CleanMarkedToDelete"/>
@@ -174,6 +178,7 @@
<group id="ShelvedChangesToolbarGear" popup="true" icon="AllIcons.General.SecondaryGroup">
<reference ref="ShelveChanges.UnshelveWithDialog"/>
<reference ref="ChangesView.UnshelveSilently"/>
<reference ref="ShelvedChanges.Restore"/>
<reference ref="ShelvedChanges.ImportPatches"/>
<separator/>
@@ -296,7 +301,9 @@
<group id="Shelve.KeymapGroup" text="Shelve">
<reference ref="ChangesView.Shelve"/>
<reference ref="ChangesView.ShelveSilently"/>
<reference ref="ShelveChanges.UnshelveWithDialog"/>
<reference ref="ChangesView.UnshelveSilently"/>
<reference ref="ShelvedChanges.Restore"/>
<reference ref="ShelvedChanges.ImportPatches"/>
<separator/>
platform/util/src/com/intellij/icons/AllIcons.java
-2
View File
@@ -1240,8 +1240,6 @@ public class AllIcons {
public static final Icon Not_equal = IconLoader.getIcon("/vcs/not_equal.png"); // 16x16
public static final Icon Remove = IconLoader.getIcon("/vcs/remove.png"); // 16x16
public static final Icon ResetStrip = IconLoader.getIcon("/vcs/resetStrip.png"); // 16x16
public static final Icon SilentShelve = IconLoader.getIcon("/vcs/silentShelve.png"); // 16x16
public static final Icon SilentUnshelve = IconLoader.getIcon("/vcs/silentUnshelve.png"); // 16x16
public static final Icon StripDown = IconLoader.getIcon("/vcs/stripDown.png"); // 16x16
public static final Icon StripNull = IconLoader.getIcon("/vcs/stripNull.png"); // 16x16
public static final Icon StripUp = IconLoader.getIcon("/vcs/stripUp.png"); // 16x16