allow win10 ms pinyin export

studyzy · Mar 22, 2017 · 401f0ab · 401f0ab
1 parent 05f75de
commit 401f0ab
Show file tree

Hide file tree

Showing 7 changed files with 184 additions and 239 deletions.
diff --git a/IME WL Converter/IME WL Converter/Entities/WordLibrary.cs b/IME WL Converter/IME WL Converter/Entities/WordLibrary.cs
@@ -123,6 +123,16 @@ public string[] PinYin
             }
         }
 
+        public int GetPinYinLength()
+        {
+            int len = 0;
+            foreach (var s in PinYin)
+            {
+                len += s.Length;
+            }
+            return len;
+
+        }
         /// <summary>
         ///     词的拼音字符串，可以单独设置的一个属性，如果没有设置该属性，而获取该属性，则返回PinYin属性和“'”组合的字符串
         /// </summary>

diff --git a/IME WL Converter/IME WL Converter/Forms/MainForm.cs b/IME WL Converter/IME WL Converter/Forms/MainForm.cs
@@ -524,7 +524,7 @@ private void backgroundWorker1_RunWorkerCompleted(object sender, RunWorkerComple
                 richTextBox1.Text = fileContent;
                 //btnExport.Enabled = true;
             }
-            if (!mergeTo1File)
+            if (!mergeTo1File ||  export is Win10MsPinyin)//微软拼音是二进制文件，不需要再提示保存
             {
                 MessageBox.Show("转换完成!");
                 return;

diff --git a/IME WL Converter/IME WL Converter/IME WL Converter.csproj b/IME WL Converter/IME WL Converter/IME WL Converter.csproj
@@ -181,8 +181,8 @@
     <Compile Include="Helpers\ZhuyinHelper.cs" />
     <Compile Include="IME\CangjiePlatform.cs" />
     <Compile Include="IME\MsPinyin.cs" />
+    <Compile Include="IME\Win10MsPinyin.cs" />
     <Compile Include="IME\ShouxinPinyin.cs" />
-    <Compile Include="IME\MsPinyin2.cs" />
     <Compile Include="IME\XiaoxiaoErbi.cs" />
     <Compile Include="IME\UserDefinePhrase.cs" />
     <Compile Include="IME\YahooKeyKey.cs" />

diff --git a/IME WL Converter/IME WL Converter/IME/MsPinyin2.cs b/IME WL Converter/IME WL Converter/IME/MsPinyin2.cs