From 2be85d55200610c932fb2ac37465629156dd9662 Mon Sep 17 00:00:00 2001
From: Jamling <li.jamling@gmail.com>
Date: Mon, 14 May 2018 09:50:55 +0800
Subject: [PATCH] release 3.2.0

---
 README.md                                           |  6 +++---
 cn.ieclipse.smartqq.feature/feature.xml             |  2 +-
 cn.ieclipse.smartqq/META-INF/MANIFEST.MF            |  2 +-
 .../cn/ieclipse/smartim/console/TabComposite.java   | 13 +++++++------
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index c86a368..204fa72 100644
--- a/README.md
+++ b/README.md
@@ -29,11 +29,11 @@ Intellij IDEA上的插件请移步这里: https://github.com/Jamling/SmartQQ4Int
 | 文本消息          | Y         |          Y | Y           |
 | 聊天记录          | Y         |          Y | Y           |
 | 消息提醒          | N         |          Y | O           |
-| 接收表情          | O         |   Y        |           X |
+| 接收表情          | O         |          Y |           X |
 | 图灵机器人        | Y         |          Y |           X |
 | 发送文件          | Y         |          Y |           Y |
-| 消息群发          | Y         |          Y |            Y|
-| 代码评审          | X         |          Y |            Y|
+| 消息群发          | Y         |          Y |           Y |
+| 代码评审          | X         |          Y |           Y |
 
 ## 安装
 
diff --git a/cn.ieclipse.smartqq.feature/feature.xml b/cn.ieclipse.smartqq.feature/feature.xml
index 744d130..99267f3 100644
--- a/cn.ieclipse.smartqq.feature/feature.xml
+++ b/cn.ieclipse.smartqq.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="cn.ieclipse.smartqq.feature"
       label="SmartQQ"
-      version="3.1.4.qualifier"
+      version="3.2.0.qualifier"
       provider-name="ieclipse.cn"
       plugin="cn.ieclipse.smartqq">
 
diff --git a/cn.ieclipse.smartqq/META-INF/MANIFEST.MF b/cn.ieclipse.smartqq/META-INF/MANIFEST.MF
index 059f10f..7f0ac4e 100644
--- a/cn.ieclipse.smartqq/META-INF/MANIFEST.MF
+++ b/cn.ieclipse.smartqq/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SmartQQ
 Bundle-SymbolicName: cn.ieclipse.smartqq;singleton:=true
-Bundle-Version: 3.1.4.qualifier
+Bundle-Version: 3.2.0.qualifier
 Bundle-Activator: cn.ieclipse.smartim.IMPlugin
 Bundle-Vendor: ieclipse.cn
 Require-Bundle: org.eclipse.ui,
diff --git a/cn.ieclipse.smartqq/src/cn/ieclipse/smartim/console/TabComposite.java b/cn.ieclipse.smartqq/src/cn/ieclipse/smartim/console/TabComposite.java
index dfa414b..b59d93b 100644
--- a/cn.ieclipse.smartqq/src/cn/ieclipse/smartim/console/TabComposite.java
+++ b/cn.ieclipse.smartqq/src/cn/ieclipse/smartim/console/TabComposite.java
@@ -68,8 +68,8 @@ public TabComposite(Composite parent) {
         setLayout(gridLayout);
         
         toolBar = new ToolBar(this, SWT.FLAT | SWT.VERTICAL);
-        toolBar.setBackground(SWTResourceManager
-                .getColor(SWT.COLOR_WIDGET_BACKGROUND));
+        toolBar.setBackground(
+                SWTResourceManager.getColor(SWT.COLOR_WIDGET_BACKGROUND));
         toolBar.setLayoutData(
                 new GridData(SWT.CENTER, SWT.FILL, false, false, 1, 1));
                 
@@ -102,8 +102,8 @@ public void controlMoved(ControlEvent e) {
         sashForm.setWeights(new int[] { 100, 1 });
         sashForm.pack();
         sashForm.layout();
-//        sashForm.setBackground(
-//                SWTResourceManager.getColor(SWT.COLOR_WIDGET_BACKGROUND));
+        // sashForm.setBackground(
+        // SWTResourceManager.getColor(SWT.COLOR_WIDGET_BACKGROUND));
         setBackground(SWTResourceManager.getColor(SWT.COLOR_WIDGET_BACKGROUND));
         
         text.addKeyListener(inputListener);
@@ -332,9 +332,10 @@ public void appendHistory(String text, String msg) {
                 try {
                     plain = IMUtils.HTML_TAG_REGEX.matcher(msg).replaceAll("");
                 } catch (Exception e) {
-                    
+                
                 }
-                IMPlugin.getDefault().warn("添加聊天记录 " + plain + " 失败");
+                IMPlugin.getDefault().warn("添加聊天记录 " + plain + " 失败，估计您的浏览器内核（"
+                        + browser.getBrowserType() + "）太低，请尝试升级浏览器后再试");
             }
         }
     }