feat: 调整dialog样式

AIProofread/AIProofread.csproj

@@ -496,6 +496,9 @@
   <ItemGroup>
     <None Include="Resources\icon-export.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\icon_close.png" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

AIProofread/Bridge.cs

@@ -51,6 +51,14 @@ namespace AIProofread
 
         public void ShowUpgradeView()
         {
+            if (CurrentUpgrade == null) {
+                CheckPluginUpgrade();
+                if (CurrentUpgrade == null)
+                {
+                    showDialog("获取版本信息失败,请稍后再试");
+                    return;
+                }
+            }
             var needUpgrade = CurrentUpgrade.NeedUpgrade(Config.APP_VERSION);
             if (!needUpgrade)
             {
@@ -114,9 +122,9 @@ namespace AIProofread
         }
 
 
-        public void showDialog(string message)
+        public void showDialog(string message,string confirmText="",string confirmAction="")
         {
-            MessageBox.Show(message);
+            Globals.ThisAddIn.ActiveDocument?.ShowDialog(message,confirmText,confirmAction);
         }
 
         public int getMinWIdth()

AIProofread/Config.cs

@@ -12,7 +12,7 @@ namespace AIProofread
     public class Config
     {
         public static readonly string APP_NAME = "AI校对王";
-        public static readonly string APP_VERSION = "1.2.1";
+        public static readonly string APP_VERSION = "1.2.2";
         public static bool IS_WPS = false;
 
         public static readonly string CONFIG_FILE = AppDomain.CurrentDomain.BaseDirectory + "app.json";

AIProofread/Controls/FormMessage.Designer.cs

@@ -28,90 +28,116 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.LabelMeesage = new System.Windows.Forms.Label();
+            this.LblMeesage = new System.Windows.Forms.Label();
+            this.IconClose = new System.Windows.Forms.PictureBox();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.button3 = new System.Windows.Forms.Button();
-            this.button2 = new System.Windows.Forms.Button();
             this.label1 = new System.Windows.Forms.Label();
+            this.BtnClose = new System.Windows.Forms.Button();
+            this.BtnConfirm = new System.Windows.Forms.Button();
+            ((System.ComponentModel.ISupportInitialize)(this.IconClose)).BeginInit();
             this.panel1.SuspendLayout();
             this.SuspendLayout();
             // 
-            // LabelMeesage
+            // LblMeesage
             // 
-            this.LabelMeesage.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.LblMeesage.BackColor = System.Drawing.Color.Transparent;
-            this.LabelMeesage.Location = new System.Drawing.Point(91, 87);
+            this.LblMeesage.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.LabelMeesage.Name = "LabelMeesage";
+            this.LblMeesage.Location = new System.Drawing.Point(40, 90);
-            this.LabelMeesage.Size = new System.Drawing.Size(264, 70);
+            this.LblMeesage.Name = "LblMeesage";
-            this.LabelMeesage.TabIndex = 4;
+            this.LblMeesage.Size = new System.Drawing.Size(300, 70);
-            this.LabelMeesage.Text = "label1";
+            this.LblMeesage.TabIndex = 4;
-            this.LabelMeesage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.LblMeesage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // IconClose
+            // 
+            this.IconClose.BackColor = System.Drawing.Color.Transparent;
+            this.IconClose.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.IconClose.Image = global::AIProofread.Properties.Resources.icon_close;
+            this.IconClose.Location = new System.Drawing.Point(350, 15);
+            this.IconClose.Name = "IconClose";
+            this.IconClose.Size = new System.Drawing.Size(16, 16);
+            this.IconClose.TabIndex = 1;
+            this.IconClose.TabStop = false;
+            this.IconClose.Click += new System.EventHandler(this.IconClose_Click);
             // 
             // panel1
             // 
             this.panel1.BackgroundImage = global::AIProofread.Properties.Resources.form_bg;
             this.panel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.panel1.Controls.Add(this.IconClose);
             this.panel1.Controls.Add(this.label1);
-            this.panel1.Location = new System.Drawing.Point(1, 1);
+            this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(442, 46);
+            this.panel1.Size = new System.Drawing.Size(380, 46);
             this.panel1.TabIndex = 3;
             // 
-            // button3
-            // 
-            this.button3.BackColor = System.Drawing.Color.White;
-            this.button3.BackgroundImage = global::AIProofread.Properties.Resources.button_default;
-            this.button3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.button3.FlatAppearance.BorderColor = System.Drawing.Color.Gainsboro;
-            this.button3.FlatAppearance.BorderSize = 0;
-            this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.button3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.button3.ForeColor = System.Drawing.Color.Black;
-            this.button3.Location = new System.Drawing.Point(235, 210);
-            this.button3.Name = "button3";
-            this.button3.Size = new System.Drawing.Size(120, 44);
-            this.button3.TabIndex = 2;
-            this.button3.Text = "关闭";
-            this.button3.UseVisualStyleBackColor = false;
-            this.button3.Click += new System.EventHandler(this.button3_Click);
-            // 
-            // button2
-            // 
-            this.button2.BackgroundImage = global::AIProofread.Properties.Resources.button;
-            this.button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.button2.FlatAppearance.BorderSize = 0;
-            this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.button2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.button2.ForeColor = System.Drawing.Color.White;
-            this.button2.Location = new System.Drawing.Point(91, 210);
-            this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(120, 44);
-            this.button2.TabIndex = 1;
-            this.button2.Text = "重新校对";
-            this.button2.UseVisualStyleBackColor = true;
-            this.button2.Click += new System.EventHandler(this.button2_Click);
-            // 
             // label1
             // 
             this.label1.AutoSize = true;
             this.label1.BackColor = System.Drawing.Color.Transparent;
-            this.label1.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(11, 10);
+            this.label1.Location = new System.Drawing.Point(11, 12);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(88, 25);
+            this.label1.Size = new System.Drawing.Size(74, 21);
             this.label1.TabIndex = 0;
             this.label1.Text = "温馨提示";
             // 
+            // BtnClose
+            // 
+            this.BtnClose.BackColor = System.Drawing.Color.White;
+            this.BtnClose.BackgroundImage = global::AIProofread.Properties.Resources.button_default;
+            this.BtnClose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+            this.BtnClose.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.BtnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.BtnClose.FlatAppearance.BorderColor = System.Drawing.Color.Gainsboro;
+            this.BtnClose.FlatAppearance.BorderSize = 0;
+            this.BtnClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent;
+            this.BtnClose.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent;
+            this.BtnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.BtnClose.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.BtnClose.ForeColor = System.Drawing.Color.Black;
+            this.BtnClose.Location = new System.Drawing.Point(200, 214);
+            this.BtnClose.Name = "BtnClose";
+            this.BtnClose.Size = new System.Drawing.Size(120, 44);
+            this.BtnClose.TabIndex = 2;
+            this.BtnClose.Text = "关闭";
+            this.BtnClose.UseVisualStyleBackColor = false;
+            this.BtnClose.Click += new System.EventHandler(this.BtnClose_Click);
+            // 
+            // BtnConfirm
+            // 
+            this.BtnConfirm.BackgroundImage = global::AIProofread.Properties.Resources.button;
+            this.BtnConfirm.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+            this.BtnConfirm.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.BtnConfirm.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.BtnConfirm.FlatAppearance.BorderSize = 0;
+            this.BtnConfirm.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent;
+            this.BtnConfirm.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent;
+            this.BtnConfirm.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.BtnConfirm.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.BtnConfirm.ForeColor = System.Drawing.Color.White;
+            this.BtnConfirm.Location = new System.Drawing.Point(60, 214);
+            this.BtnConfirm.Name = "BtnConfirm";
+            this.BtnConfirm.Size = new System.Drawing.Size(120, 44);
+            this.BtnConfirm.TabIndex = 1;
+            this.BtnConfirm.Text = "重新校对";
+            this.BtnConfirm.UseVisualStyleBackColor = true;
+            this.BtnConfirm.Click += new System.EventHandler(this.BtnConfirm_Click);
+            // 
             // FormMessage
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(444, 286);
+            this.BackColor = System.Drawing.Color.White;
-            this.Controls.Add(this.LabelMeesage);
+            this.ClientSize = new System.Drawing.Size(380, 286);
+            this.Controls.Add(this.LblMeesage);
             this.Controls.Add(this.panel1);
-            this.Controls.Add(this.button3);
+            this.Controls.Add(this.BtnClose);
-            this.Controls.Add(this.button2);
+            this.Controls.Add(this.BtnConfirm);
             this.Name = "FormMessage";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "FormMessage";
+            ((System.ComponentModel.ISupportInitialize)(this.IconClose)).EndInit();
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
             this.ResumeLayout(false);
@@ -119,10 +145,11 @@
         }
 
         #endregion
-        private System.Windows.Forms.Button button2;
+        private System.Windows.Forms.Button BtnConfirm;
-        private System.Windows.Forms.Button button3;
+        private System.Windows.Forms.Button BtnClose;
         private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Label LabelMeesage;
+        private System.Windows.Forms.Label LblMeesage;
         private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.PictureBox IconClose;
     }
 }

AIProofread/Controls/FormMessage.cs

@@ -12,25 +12,73 @@ namespace AIProofread.Controls
 
         private void SetMessage(string message)
         {
-            LabelMeesage.Text = message;
+            LblMeesage.Text = message;
+        }
+        private string currentConfirmText;
+        private string currentConfirmAction;
+        private void SetConfirmText(string confirmText)
+        {
+            currentConfirmText = confirmText;
+            if (confirmText == "proofread")
+            {
+                confirmText = "重新校对";
+            }
+            BtnConfirm.Text = confirmText;
+            BtnConfirm.Visible = true;
+            BtnConfirm.Enabled = true;
         }
 
-        public static DialogResult ShowMessage(string message)
+        private void HideConfirm()
+        {
+            BtnConfirm.Visible = false;
+            BtnConfirm.Enabled = false;
+            BtnClose.Location = new System.Drawing.Point((
+                (this.Width - BtnClose.Width) / 2
+                ), BtnClose.Location.Y);
+        }
+
+        private void ResetButtons()
+        {
+            BtnClose.Location = new System.Drawing.Point(200, BtnClose.Location.Y);
+            BtnConfirm.Location = new System.Drawing.Point(60, BtnConfirm.Location.Y);
+            BtnConfirm.Visible = true;
+            BtnConfirm.Enabled = true;
+        }
+
+        public static DialogResult ShowMessage(string message,string confirmText = "确认",string confirmAction = null)
         {
             FormMessage formMessage = new FormMessage();
             formMessage.SetMessage(message);
+            formMessage.currentConfirmAction = confirmAction;
+
+            if(string.IsNullOrEmpty(confirmText))
+            {
+                formMessage.HideConfirm();
+            }
+            else
+            {
+                formMessage.ResetButtons();
+            }
             return formMessage.ShowDialog();
         }
 
-        private void button3_Click(object sender, EventArgs e)
+        private void BtnClose_Click(object sender, EventArgs e)
         {
-            this.DialogResult = DialogResult.OK;
             this.Close();
         }
 
-        private void button2_Click(object sender, EventArgs e)
+        private void BtnConfirm_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(currentConfirmAction))
+            {
+                string time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                Globals.ThisAddIn.SendMessageToWeb(currentConfirmAction, time);
+            }
+            this.Close();
+        }
+
+        private void IconClose_Click(object sender, EventArgs e)
         {
-            this.DialogResult = DialogResult.Retry;
             this.Close();
         }
     }

AIProofread/Model/DocumentInfo.cs

@@ -98,6 +98,14 @@ namespace AIProofread.Model
             }
         }
 
+        public void ShowDialog(string message,string confirmText, string confirmAction)
+        {
+            TaskPane.Control.BeginInvoke(new Action(() => {
+                //MessageBox.Show(message, "提示");
+                FormMessage.ShowMessage(message, confirmText, confirmAction);
+            }));
+        }
+
         /// <summary>
         /// 隐藏面板
         /// </summary>
@@ -416,7 +424,7 @@ namespace AIProofread.Model
             {
                 if (control.web.CoreWebView2 == null)
                 {
-                    Thread.Sleep(300);
+                    Thread.Sleep(1000);
                 }
                 control.web.CoreWebView2.PostWebMessageAsJson(json);
             }

AIProofread/Properties/Resources.Designer.cs

@@ -140,6 +140,16 @@ namespace AIProofread.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap icon_close {
+            get {
+                object obj = ResourceManager.GetObject("icon_close", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>

AIProofread/Properties/Resources.resx

@@ -118,8 +118,8 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="icon-panel" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="icon-setting-wps" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon-panel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\icon-setting-wps.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icon-user" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon-user.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -133,6 +133,9 @@
   <data name="button" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\button.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="icon-proofread" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon-proofread.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="icon-phone" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon-phone.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -175,15 +178,18 @@
   <data name="icon-refresh-wps" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon-refresh-wps.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="icon-export" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon-export.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="button_default" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\button_default.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="icon-export-wps" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon-export-wps.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="icon-refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon-refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon-setting-wps" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon-setting-wps.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="icon-clear" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon-clear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -199,13 +205,10 @@
   <data name="icon-history" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon-history.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon-proofread" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="icon-panel" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon-proofread.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\icon-panel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon-export-wps" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="icon_close" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon-export-wps.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\icon_close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="icon-export" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon-export.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

AIProofread/Ribbon1.Designer.cs

@@ -271,7 +271,7 @@ namespace AIProofread
             // 
             // BtnTest
             // 
-            this.BtnTest.Label = "button2";
+            this.BtnTest.Label = "打开dialog";
             this.BtnTest.Name = "BtnTest";
             this.BtnTest.Click += new Microsoft.Office.Tools.Ribbon.RibbonControlEventHandler(this.BtnTest_Click);
             // 

AIProofread/Ribbon1.cs

@@ -440,8 +440,10 @@ namespace AIProofread
         private void BtnTest_Click(object sender, RibbonControlEventArgs e)
         {
             // 获取当前系统时间戳
-            int time = (int)(DateTime.Now.Ticks / 10000000);
+            //int time = (int)(DateTime.Now.Ticks / 10000000);
-            BtnTest.Label = "测试按钮" + time;
+            //BtnTest.Label = "测试按钮" + time;
+            var result= MessageBox.Show("Test","xxx");
+
         }
 
         private void ButtonSaveCache_Click(object sender, RibbonControlEventArgs e)