diff --git a/.vs/AIProofread/v17/.suo b/.vs/AIProofread/v17/.suo
index 2a77c55..337b919 100644
Binary files a/.vs/AIProofread/v17/.suo and b/.vs/AIProofread/v17/.suo differ
diff --git a/AIProofread/Bridge.cs b/AIProofread/Bridge.cs
index 5fb679b..1cbde49 100644
--- a/AIProofread/Bridge.cs
+++ b/AIProofread/Bridge.cs
@@ -650,6 +650,11 @@ namespace AIProofread
return BridgeResult.Error(1, "请先保存文档");
}
}
+ else
+ {
+ // 静默时 自动保存文档
+ Globals.ThisAddIn.ActiveDocument.Save();
+ }
try
{
File.WriteAllText(Globals.ThisAddIn.ActiveDocument.ProofreadCachePath, cache);
diff --git a/AIProofread/Model/DocumentInfo.cs b/AIProofread/Model/DocumentInfo.cs
index b077ed0..f9b4216 100644
--- a/AIProofread/Model/DocumentInfo.cs
+++ b/AIProofread/Model/DocumentInfo.cs
@@ -98,14 +98,24 @@ namespace AIProofread.Model
}
}
- public void ShowDialog(string message,string confirmText, string confirmAction)
+ public void ShowDialog(string message, string confirmText, string confirmAction)
{
- TaskPane.Control.BeginInvoke(new Action(() => {
+ TaskPane.Control.BeginInvoke(new Action(() =>
+ {
//MessageBox.Show(message, "提示");
FormMessage.ShowMessage(message, confirmText, confirmAction);
}));
}
+ public void ShowLogin(string action)
+ {
+ TaskPane.Control.BeginInvoke(new Action(() =>
+ {
+ FormLogin frm = new FormLogin(action);
+ frm.ShowDialog();
+ }));
+ }
+
///
/// 隐藏面板
///
@@ -550,7 +560,7 @@ namespace AIProofread.Model
if (item.Tag != "i") index++;
if (mark != null)
{
- marks.Add(item.Id, new ProofreadItem(item,correct.Insert, mark, Id));
+ marks.Add(item.Id, new ProofreadItem(item, correct.Insert, mark, Id));
try
{
if (item.Tag == "i")
@@ -572,9 +582,10 @@ namespace AIProofread.Model
// //item.Value.mark.Shading.BackgroundPatternColor = WdColor.wdColorLightOrange;
//}
}
- }catch(Exception e)
+ }
+ catch (Exception e)
{
- Logger.Log(string.Format("mark color error {0}",e.Message));
+ Logger.Log(string.Format("mark color error {0}", e.Message));
}
}
else
@@ -703,7 +714,7 @@ namespace AIProofread.Model
{
hasProcessMark = true;
marks[proofreadId].Process(status);
- }
+ }
}
internal bool Saved()
@@ -712,15 +723,20 @@ namespace AIProofread.Model
{
return true;
}
- if(!hasProofreaded && !CurrentDocument.Saved) // 没有校对前需要提示保存
+ if (!hasProofreaded && !CurrentDocument.Saved) // 没有校对前需要提示保存
{
return false;
}
- if(hasProofreaded && hasProcessMark && !CurrentDocument.Saved)
+ if (hasProofreaded && hasProcessMark && !CurrentDocument.Saved)
{
return false;
}
return true;
}
+
+ internal void Save()
+ {
+ CurrentDocument.Save();
+ }
}
}
diff --git a/AIProofread/ThisAddIn.cs b/AIProofread/ThisAddIn.cs
index df63b8d..e153020 100644
--- a/AIProofread/ThisAddIn.cs
+++ b/AIProofread/ThisAddIn.cs
@@ -357,14 +357,13 @@ namespace AIProofread
/// 显示登录窗口
///
///
- public void ShowLoginForm(string action) {
+ public void ShowLoginForm(string action) {
// 关闭之前的窗口
- if(LoginFormList.Count > 0){
- LoginFormList.ForEach(f => f.Close());
- }
- FormLogin frm = new FormLogin(action);
- LoginFormList.Add(frm);
- frm.Show();
+ //if(LoginFormList.Count > 0){
+ // LoginFormList.ForEach(f => f.Close());
+ //}
+ //LoginFormList.Add(frm);
+ ActiveDocument?.ShowLogin(action);
}
///
diff --git a/AIProofread/obj/Debug/AIProofread.csproj.AssemblyReference.cache b/AIProofread/obj/Debug/AIProofread.csproj.AssemblyReference.cache
index ca38fe7..e6380e4 100644
Binary files a/AIProofread/obj/Debug/AIProofread.csproj.AssemblyReference.cache and b/AIProofread/obj/Debug/AIProofread.csproj.AssemblyReference.cache differ
diff --git a/AIProofread/obj/Debug/AIProofread.csproj.GenerateResource.cache b/AIProofread/obj/Debug/AIProofread.csproj.GenerateResource.cache
index 7134bfb..e3fcc38 100644
Binary files a/AIProofread/obj/Debug/AIProofread.csproj.GenerateResource.cache and b/AIProofread/obj/Debug/AIProofread.csproj.GenerateResource.cache differ
diff --git a/AIProofread/obj/Debug/AIProofread.dll b/AIProofread/obj/Debug/AIProofread.dll
index cf1a057..0d729bf 100644
Binary files a/AIProofread/obj/Debug/AIProofread.dll and b/AIProofread/obj/Debug/AIProofread.dll differ
diff --git a/AIProofread/obj/Debug/AIProofread.pdb b/AIProofread/obj/Debug/AIProofread.pdb
index 781526e..71f004d 100644
Binary files a/AIProofread/obj/Debug/AIProofread.pdb and b/AIProofread/obj/Debug/AIProofread.pdb differ
diff --git a/AIProofread/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/AIProofread/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index 41c8578..43ad1ab 100644
Binary files a/AIProofread/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/AIProofread/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ