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

IDEA-174999 Improve wording in the Line Separators Warning dialog

Browse Source 
- Remove Read more link
- Improve description of actions
- Adjust font size
This commit is contained in:
Dmitriy Smirnov
2017-08-22 12:20:05 +03:00
parent 42f216ce2e
commit 03f841f79a
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/crlf/GitCrlfDialog.java
+3 -7
View File
@@ -15,12 +15,10 @@
*/
package git4idea.crlf;
import com.intellij.ide.BrowserUtil;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.ui.components.JBCheckBox;
import com.intellij.ui.components.JBLabel;
import com.intellij.ui.components.labels.LinkLabel;
import com.intellij.util.ui.GridBag;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
@@ -68,14 +66,13 @@ public class GitCrlfDialog extends DialogWrapper {
protected JComponent createCenterPanel() {
JLabel description = new JBLabel(
"<html>You are about to commit CRLF line separators to the Git repository.<br/>" +
"It is recommended to set core.autocrlf Git attribute to <code>" + RECOMMENDED_VALUE +
"It is recommended to set the <code>core.autocrlf</code> Git attribute to <code>" + RECOMMENDED_VALUE +
"</code> to avoid line separator issues.</html>");
JLabel additionalDescription = new JBLabel(
"<html>Fix and Commit: <code>git config --global core.autocrlf " + RECOMMENDED_VALUE + "</code> will be called,<br/>" +
"Commit as Is: the config value won't be set.</html>", UIUtil.ComponentStyle.SMALL);
"<html>If you choose <b>Fix and Commit</b>, <code>git config --global core.autocrlf " + RECOMMENDED_VALUE + "</code> will be executed.<br/>" +
"If you choose <b>Commit as Is</b>, the config value won't be changed.</html>");
JLabel readMore = LinkLabel.create("Read more", () -> BrowserUtil.browse("https://help.github.com/articles/dealing-with-line-endings"));
JLabel icon = new JLabel(UIUtil.getWarningIcon(), SwingConstants.LEFT);
myDontWarn = new JBCheckBox("Don't warn again");
@@ -89,7 +86,6 @@ public class GitCrlfDialog extends DialogWrapper {
rootPanel.add(icon, g.nextLine().next().coverColumn(4));
rootPanel.add(description, g.next());
rootPanel.add(readMore, g.nextLine().next().next());
rootPanel.add(additionalDescription, g.nextLine().next().next().pady(DEFAULT_HGAP));
rootPanel.add(myDontWarn, g.nextLine().next().next().insets(0, 0, 0, 0));