From eb7eebe0456e2c33b173bf890737c482b06c5c31 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Fri, 18 Jan 2013 12:29:01 +0400 Subject: [PATCH] Create patch dialog: make the description text a bit softer. --- .../diff/impl/patch/SelectFilesToAddTextsToPatchPanel.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/SelectFilesToAddTextsToPatchPanel.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/SelectFilesToAddTextsToPatchPanel.java index 8daf785c65ea..55b97a0feaa2 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/SelectFilesToAddTextsToPatchPanel.java +++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/SelectFilesToAddTextsToPatchPanel.java @@ -184,9 +184,10 @@ public class SelectFilesToAddTextsToPatchPanel implements RefreshablePanel { myPanel = new JPanel(new GridBagLayout()); final GridBagConstraints gb = new GridBagConstraints(0, 0, 1, 1, 1, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0); - final String sb = "Base revision text should be included into patch, if it is about to be used in projects under DVCS." + - "
In DVCS commits can be reordered, so there could exist no revision any more with the text matching patch context." + - "

Only modified files texts needs to be added. Add/delete changes are self-descriptive."; + final String sb = "Base revision texts are worth including into the patch, if it is about to be used in projects under DVCS." + + "
In DVCS commits can be reordered, " + + "so there can be no revision with the text matching the patch context anymore." + + "

Only modified files texts need to be added. Added and deleted files are self-descriptive."; myBaseRevisionTextShouldLabel = new JBLabel(sb, UIUtil.ComponentStyle.SMALL, UIUtil.FontColor.BRIGHTER); myPanel.add(myBaseRevisionTextShouldLabel, gb);