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

commit message history action moved

Browse Source
This commit is contained in:
Dmitry Avdeev
2009-09-16 16:45:02 +04:00
parent 8a0745c9f7
commit e165cbc18b
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-api/src/com/intellij/openapi/vcs/ui/CommitMessage.java
+16 -1
View File
@@ -18,6 +18,8 @@ package com.intellij.openapi.vcs.ui;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.ActionGroup;
import com.intellij.openapi.actionSystem.ActionManager;
import com.intellij.openapi.actionSystem.ActionPlaces;
import com.intellij.openapi.actionSystem.ActionToolbar;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.vcs.VcsBundle;
import com.intellij.ui.SeparatorFactory;
@@ -36,8 +38,21 @@ public class CommitMessage extends JPanel implements Disposable {
final JScrollPane scrollPane = new JScrollPane(myCommentArea);
scrollPane.setPreferredSize(myCommentArea.getPreferredSize());
add(scrollPane, BorderLayout.CENTER);
JPanel labelPanel = new JPanel(new BorderLayout());
labelPanel.setBorder(BorderFactory.createEmptyBorder());
JComponent separator = SeparatorFactory.createSeparator(VcsBundle.message("label.commit.comment"), myCommentArea);
add(separator, BorderLayout.NORTH);
JPanel separatorPanel = new JPanel(new BorderLayout());
separatorPanel.add(separator, BorderLayout.SOUTH);
separatorPanel.add(Box.createVerticalGlue(), BorderLayout.NORTH);
labelPanel.add(separatorPanel, BorderLayout.CENTER);
ActionToolbar toolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.UNKNOWN, getToolbarActions(), true);
toolbar.setReservePlaceAutoPopupIcon(false);
toolbar.getComponent().setBorder(BorderFactory.createEmptyBorder());
labelPanel.add(toolbar.getComponent(), BorderLayout.EAST);
add(labelPanel, BorderLayout.NORTH);
setBorder(BorderFactory.createEmptyBorder());
final TextComponentUndoProvider textComponentUndoProvider = new TextComponentUndoProvider(myCommentArea);
Disposer.register(this, textComponentUndoProvider);
}
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
+1
View File
@@ -721,6 +721,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
mySplitter.setFirstComponent(myBrowser);
mySplitter.setSecondComponent(myCommitMessageArea);
mySplitter.setProportion(calcSplitterProportion());
mySplitter.setDividerWidth(3);
rootPane.add(mySplitter, BorderLayout.CENTER);
JComponent browserHeader = myBrowser.getHeaderPanel();
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/MultipleChangeListBrowser.java
-2
View File
@@ -22,7 +22,6 @@ import com.intellij.openapi.vcs.VcsBundle;
import com.intellij.openapi.vcs.changes.*;
import com.intellij.openapi.vcs.changes.actions.MoveChangesToAnotherListAction;
import com.intellij.openapi.vcs.changes.actions.RollbackDialogAction;
import com.intellij.openapi.vcs.ui.CommitMessage;
import com.intellij.ui.ColoredListCellRenderer;
import com.intellij.ui.SimpleTextAttributes;
import com.intellij.util.EventDispatcher;
@@ -326,7 +325,6 @@ public class MultipleChangeListBrowser extends ChangesBrowser {
myBrowser.addToolbarAction(editSourceAction);
myBrowser.addToolbarAction(ActionManager.getInstance().getAction("Vcs.CheckinProjectToolbar"));
myBrowser.addToolbarActions(CommitMessage.getToolbarActions());
final List<AnAction> actions = AdditionalLocalChangeActionsInstaller.calculateActions(myProject, myBrowser.getAllChanges());
if (actions != null) {