feature: 优化新UI、优化国际化

Author: AutismSuperman

build.gradle

@@ -35,7 +35,7 @@ intellij {
     updateSinceUntilBuild = false
     buildSearchableOptions.enabled = false
     //plugins=["com.intellij.zh:203.392"]
-    plugins=["com.intellij.ja:203.392"]
+    //plugins=["com.intellij.ja:203.392"]
 
     runIde {
         jvmArgs = project.runIdeJvmArgs.split(',').toList()

gradle.properties

@@ -11,4 +11,4 @@ platformVersion = 2020.3
 
 # ko,ja,eb,zh
 # ,-Dide.browser.jcef.log.level=verbose,-Duser.language=en
-runIdeJvmArgs = -Dfile.encoding=utf-8,-Duser.language=ko
+runIdeJvmArgs = -Dfile.encoding=utf-8

src/main/java/com/fulinlin/ui/commit/CommitCaret.java

@@ -0,0 +1,49 @@
+package com.fulinlin.ui.commit;
+
+import javax.swing.text.BadLocationException;
+import javax.swing.text.DefaultCaret;
+import javax.swing.text.JTextComponent;
+import java.awt.*;
+
+class CommitCaret extends DefaultCaret {
+
+    public CommitCaret() {
+        setBlinkRate(500); // 设置光标的闪烁速率为500毫秒
+    }
+
+    @Override
+    protected synchronized void damage(Rectangle r) {
+        if (r != null) {
+            JTextComponent comp = getComponent();
+            x = r.x;
+            y = r.y;
+            width = 2; // 设置光标的宽度
+            height = r.height;
+            comp.repaint();
+        }
+    }
+
+    @Override
+    public void paint(Graphics g) {
+        JTextComponent comp = getComponent();
+        if (comp == null)
+            return;
+        int dot = getDot();
+        Rectangle r;
+        try {
+            r = comp.modelToView(dot);
+            if (r == null)
+                return;
+        } catch (BadLocationException e) {
+            return;
+        }
+        if ((x != r.x) || (y != r.y)) {
+            repaint(); // 防止不完全擦除
+            damage(r);
+            return;
+        }
+        if (isVisible())
+            g.fillRect(r.x, r.y, width, r.height); // 画一个矩形作为光标
+    }
+
+}

src/main/java/com/fulinlin/ui/commit/CommitPanel.form

@@ -97,7 +97,7 @@
         </properties>
         <border type="none"/>
         <children>
-          <component id="f9906" class="javax.swing.JTextPane" binding="longDescription">
+          <component id="a8ba1" class="com.intellij.ui.EditorTextField" binding="longDescription">
             <constraints/>
             <properties/>
           </component>
@@ -122,7 +122,7 @@
         </properties>
         <border type="none"/>
         <children>
-          <component id="fee2d" class="javax.swing.JTextPane" binding="breakingChanges">
+          <component id="92010" class="com.intellij.ui.EditorTextField" binding="breakingChanges">
             <constraints/>
             <properties/>
           </component>

src/main/java/com/fulinlin/ui/commit/CommitPanel.java

@@ -4,8 +4,9 @@
 import com.fulinlin.model.CommitTemplate;
 import com.fulinlin.model.TypeAlias;
 import com.fulinlin.storage.GitCommitMessageHelperSettings;
-import com.intellij.ide.ui.laf.darcula.ui.DarculaTextBorder;
+import com.intellij.ide.ui.laf.darcula.ui.DarculaEditorTextFieldBorder;
 import com.intellij.openapi.project.Project;
+import com.intellij.ui.EditorTextField;
 
 import javax.swing.*;
 import java.util.List;
@@ -16,8 +17,8 @@ public class CommitPanel {
     private JComboBox<TypeAlias> changeType;
     private JTextField changeScope;
     private JTextField shortDescription;
-    private JTextPane longDescription;
-    private JTextPane breakingChanges;
+    private EditorTextField longDescription;
+    private EditorTextField breakingChanges;
     private JTextField closedIssues;
     private JLabel typeDescriptionLabel;
     private JLabel scopeDescriptionLabel;
@@ -28,7 +29,22 @@ public class CommitPanel {
     private JScrollPane longDescriptionScrollPane;
     private JScrollPane breakingChangesScrollPane;
 
+
     public CommitPanel(Project project, GitCommitMessageHelperSettings settings, CommitTemplate commitMessageTemplate) {
+        longDescription.setOneLineMode(false);
+        longDescription.ensureWillComputePreferredSize();
+        longDescription.addSettingsProvider(uEditor -> {
+            uEditor.setVerticalScrollbarVisible(true);
+            uEditor.setHorizontalScrollbarVisible(true);
+            uEditor.setBorder(null);
+        });
+        breakingChanges.setOneLineMode(false);
+        breakingChanges.ensureWillComputePreferredSize();
+        breakingChanges.addSettingsProvider(uEditor -> {
+            uEditor.setVerticalScrollbarVisible(true);
+            uEditor.setHorizontalScrollbarVisible(true);
+            uEditor.setBorder(null);
+        });
         //parameter
         List<TypeAlias> typeAliases = settings.getDateSettings().getTypeAliases();
         for (TypeAlias type : typeAliases) {
@@ -68,8 +84,8 @@ JPanel getMainPanel() {
         changeDescriptionLabel.setText(PluginBundle.get("commit.changes.field"));
         longDescriptionScrollPane.setBorder(BorderFactory.createEmptyBorder());
         breakingChangesScrollPane.setBorder(BorderFactory.createEmptyBorder());
-        longDescription.setBorder(new CommitDarculaTextBorder());
-        breakingChanges.setBorder(new CommitDarculaTextBorder());
+        longDescription.setBorder(new DarculaEditorTextFieldBorder());
+        breakingChanges.setBorder(new DarculaEditorTextFieldBorder());
         return mainPanel;
     }
 
@@ -99,4 +115,5 @@ CommitTemplate getCommitMessageTemplate() {
         return commitTemplate;
     }
 
+
 }