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

Default Icon added for EditSource action; IDE standard actions reused instead on new creation.

Browse Source
This commit is contained in:
Nadya Zabrodina
2014-11-10 14:58:08 +03:00
parent 520f12e7d3
commit e7049c4145
2 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLog.java
+2 -18
View File
@@ -15,13 +15,7 @@
*/
package com.intellij.dvcs.push.ui;
import com.intellij.icons.AllIcons;
import com.intellij.ide.actions.EditSourceAction;
import com.intellij.idea.ActionsBundle;
import com.intellij.openapi.actionSystem.CommonShortcuts;
import com.intellij.openapi.actionSystem.DataKey;
import com.intellij.openapi.actionSystem.DataSink;
import com.intellij.openapi.actionSystem.TypeSafeDataProvider;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.Splitter;
import com.intellij.openapi.vcs.VcsDataKeys;
@@ -174,7 +168,7 @@ public class PushLog extends JPanel implements TypeSafeDataProvider {
new ChangesBrowser(project, null, Collections.<Change>emptyList(), null, false, true, null, ChangesBrowser.MyUseCase.LOCAL_CHANGES,
null);
myChangesBrowser.getDiffAction().registerCustomShortcutSet(CommonShortcuts.getDiff(), myTree);
myChangesBrowser.addToolbarAction(createEditSourceAction());
myChangesBrowser.addToolbarAction(ActionManager.getInstance().getAction(IdeActions.ACTION_EDIT_SOURCE));
setDefaultEmptyText();
Splitter splitter = new Splitter(false, 0.7f);
@@ -185,16 +179,6 @@ public class PushLog extends JPanel implements TypeSafeDataProvider {
add(splitter);
}
@NotNull
private EditSourceAction createEditSourceAction() {
final EditSourceAction editAction = new EditSourceAction();
editAction.registerCustomShortcutSet(CommonShortcuts.getEditSource(), myChangesBrowser.getViewer());
editAction.getTemplatePresentation().setIcon(AllIcons.Actions.EditSource);
editAction.getTemplatePresentation().setText("Edit Source");
editAction.getTemplatePresentation().setDescription(ActionsBundle.actionText("EditSource"));
return editAction;
}
private void updateChangesView() {
int[] rows = myTree.getSelectionRows();
if (rows != null && rows.length != 0) {
platform/platform-resources/src/idea/PlatformActions.xml
+1 -1
View File
@@ -279,7 +279,7 @@
<group id="ViewMenu" popup="true" compact="true">
<group id="ToolWindowsGroup" class="com.intellij.ide.actions.ToolWindowsGroup" popup="true"/>
<action id="EditSource" class="com.intellij.ide.actions.EditSourceAction"/>
<action id="EditSource" class="com.intellij.ide.actions.EditSourceAction" icon="AllIcons.Actions.EditSource"/>
<action id="ViewSource" class="com.intellij.ide.actions.ViewSourceAction"/>
<separator/>
<group id="ViewRecentActions">