Merge branch 'dev-2.x'

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [v2.8.1](https://github.com/YiiGuxing/TranslationPlugin/tree/v2.8.1) (2020-04-07)
+
+- 修复了一些Bug
+
 ## [v2.8.0](https://github.com/YiiGuxing/TranslationPlugin/tree/v2.8.0) (2020-03-23)
 
 - 谷歌翻译新增拼写检查功能

README.md

@@ -178,11 +178,9 @@ FAQ
 更新日志
 --------
 
-## [v2.8.0](https://github.com/YiiGuxing/TranslationPlugin/tree/v2.8.0) (2020-03-23)
+## [v2.8.1](https://github.com/YiiGuxing/TranslationPlugin/tree/v2.8.1) (2020-04-07)
 
-- 谷歌翻译新增拼写检查功能
-- 翻译与替换功能支持自动单词拆分
-- 单词本自动聚焦新增的单词
+- 修复了一些Bug
 
 [完整的更新历史记录](./CHANGELOG.md)
 

src/main/kotlin/cn/yiiguxing/plugin/translate/action/TranslateAction.kt

@@ -66,11 +66,16 @@ open class TranslateAction(checkSelection: Boolean = false) : AutoSelectAction(c
         val balloon = TranslationUIManager.showBalloon(editor, text, tracker, Balloon.Position.below)
 
         if (highlighters.isNotEmpty()) {
-            Disposer.register(balloon, Disposable {
+            val disposable = Disposable {
                 for (highlighter in highlighters) {
                     highlightManager.removeSegmentHighlighter(editor, highlighter)
                 }
-            })
+            }
+            if (balloon.disposed) {
+                disposable.dispose()
+            } else {
+                Disposer.register(balloon, disposable)
+            }
         }
     }
 

src/main/kotlin/cn/yiiguxing/plugin/translate/ui/ProcessComponent.kt

@@ -35,7 +35,7 @@ class ProcessComponent(text: String, insets: Insets = JBUI.emptyInsets()) : JPan
 
     init {
         isOpaque = false
-        layout = GridLayoutManager(1, 2, insets, JBUI.scale(5), 0)
+        layout = GridLayoutManager(1, 2, insets, JBUI.scale(10), 0)
 
         add(icon, GridConstraints().apply {
             column = 0

src/main/kotlin/cn/yiiguxing/plugin/translate/ui/SupportDialog.kt

@@ -62,8 +62,8 @@ class SupportDialog private constructor() : DialogWrapper(null) {
             捐赠金额：
             支付平台：支付宝/微信支付
             支付宝用户名/微信用户名/单号（后5位）：</i></b><br/>
-            您提供的名字、网站和捐赠总额将会被添加到<a href="#patrons"><b>Patrons/捐赠者</b></a>列表中，列表将按捐赠总额列出前50名捐赠者。<br/>
             邮箱地址：<a href="#e-mail"><b>yii.guxing@gmail.com</b></a> (点击发送邮件)<br/>
+            您提供的名字、网站和捐赠总额将会被添加到<a href="#patrons"><b>Patrons/捐赠者</b></a>列表中，列表将按捐赠总额列出前50名捐赠者。<br/>
             感谢您的慷慨捐赠！
         """.trimIndent()
         JBPopupFactory.getInstance()

src/main/kotlin/cn/yiiguxing/plugin/translate/ui/icon/ProcessIcon.kt

@@ -3,34 +3,14 @@ package cn.yiiguxing.plugin.translate.ui.icon
 import com.intellij.openapi.util.IconLoader
 import com.intellij.util.ui.AnimatedIcon
 
-internal class ProcessIcon : AnimatedIcon("Querying Process",
-        ICONS,
-        STEP_PASSIVE,
-        CYCLE_LENGTH) {
+internal class ProcessIcon : AnimatedIcon(
+    "Querying Process", ICONS, STEP_PASSIVE, CYCLE_LENGTH
+) {
     companion object {
-        private const val CYCLE_LENGTH = 800
+        private const val CYCLE_LENGTH = 400
 
-        private val ICONS = arrayOf(
-                IconLoader.getIcon("/process/fs/step_1@2x.png"),
-                IconLoader.getIcon("/process/fs/step_2@2x.png"),
-                IconLoader.getIcon("/process/fs/step_3@2x.png"),
-                IconLoader.getIcon("/process/fs/step_4@2x.png"),
-                IconLoader.getIcon("/process/fs/step_5@2x.png"),
-                IconLoader.getIcon("/process/fs/step_6@2x.png"),
-                IconLoader.getIcon("/process/fs/step_7@2x.png"),
-                IconLoader.getIcon("/process/fs/step_8@2x.png"),
-                IconLoader.getIcon("/process/fs/step_9@2x.png"),
-                IconLoader.getIcon("/process/fs/step_10@2x.png"),
-                IconLoader.getIcon("/process/fs/step_11@2x.png"),
-                IconLoader.getIcon("/process/fs/step_12@2x.png"),
-                IconLoader.getIcon("/process/fs/step_13@2x.png"),
-                IconLoader.getIcon("/process/fs/step_14@2x.png"),
-                IconLoader.getIcon("/process/fs/step_15@2x.png"),
-                IconLoader.getIcon("/process/fs/step_16@2x.png"),
-                IconLoader.getIcon("/process/fs/step_17@2x.png"),
-                IconLoader.getIcon("/process/fs/step_18@2x.png")
-        )
+        private val ICONS = Array(9) { IconLoader.getIcon("/icons/spinner/step_${it}.png") }
 
-        private val STEP_PASSIVE = IconLoader.getIcon("/process/fs/step_passive@2x.png")
+        private val STEP_PASSIVE = IconLoader.getIcon("/icons/spinner/step_passive.png")
     }
 }

src/main/resources/META-INF/plugin.xml

@@ -44,9 +44,7 @@
     <!--suppress PluginXmlValidity -->
     <change-notes><![CDATA[
       <ul>
-        <li>谷歌翻译新增拼写检查功能</li>
-        <li>翻译与替换功能支持自动单词拆分</li>
-        <li>单词本自动聚焦新增的单词</li>
+        <li>修复了一些Bug</li>
       </ul>
       <a href="https://github.com/YiiGuxing/TranslationPlugin/blob/master/CHANGELOG.md"><b>Full Changelog History</b></a>
     ]]></change-notes>