自動更新忘れ警告機能追加

その他細かい修正
ggslyman · Apr 7, 2014 · 59ab90c · 59ab90c
1 parent 88be9fb
commit 59ab90c
Show file tree

Hide file tree

Showing 10 changed files with 296 additions and 129 deletions.
diff --git a/README.md b/README.md
@@ -89,7 +89,6 @@
 * 複数スレッド読み上げ対応およびレス表示ウィンドウのタブ化
 
 個人的に欲しいかも
-* 字幕設定の保存(PCゲーとHDMI取り込みゲーでサイズを変える為)
 
 他ツールで出来ること
 * 複数スレッドの同時読み上げ
@@ -98,6 +97,11 @@
 
 ##更新履歴
 
+* 14/04/07 2.0.1 Rev.16
+  - 自動更新停止時に警告を表示および読み上げするオプションを追加、設定は通信タブから
+  - Aboutにリビジョン情報を表示するように修正
+  - ヘルプに最新のリリースへのリンクを追加
+
 * 14/04/03 2.0.1 Rev.15
   - ツールバーにレス表示エリアがめり込んでいた問題を解決
 

diff --git a/SpeechCast/FormAbout.cs b/SpeechCast/FormAbout.cs
@@ -20,9 +20,10 @@ public FormAbout()
 
             string ver = asm.GetName().Version.ToString();
             System.Console.WriteLine(ver);
-            Regex rx = new Regex(@"\.\d+$");
-
+            Regex rx = new Regex(@"\.(?<rev>\d+?)$");
+            Match m = rx.Match(ver);
             ver = rx.Replace(ver, "");
+            if (m.Success && Int32.Parse(m.Groups["rev"].Value) > 0) ver += " rev." + m.Groups["rev"].Value;
             labelVersion.Text += ver;
         }
 

diff --git a/SpeechCast/FormAbout.resx b/SpeechCast/FormAbout.resx
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
diff --git a/SpeechCast/FormMain.Designer.cs b/SpeechCast/FormMain.Designer.cs
diff --git a/SpeechCast/FormMain.cs b/SpeechCast/FormMain.cs
@@ -890,7 +890,7 @@ public bool AutoUpdate
                         {
                             CurrentResNumber = responses.Count + 1;
                         }
-
+                        captionTextBuffer = textBoxDefaultCaption.Text;
                         StartSpeaking();
                     }
                     else
@@ -1231,6 +1231,20 @@ private void timer_Tick(object sender, EventArgs e)
                 // 自動更新がOFFならステータスを消去
                 else
                 {
+                    if (diffWeb.TotalMinutes >= UserConfig.AutoReloadAlertInvervalMinutes)
+                    {
+                        gettingWebTime = System.DateTime.Now;
+                        if (UserConfig.AutoReloadAlertCaption)
+                        {
+                            objDate = System.DateTime.Now;
+                            CaptionTextBuffer = textBoxDefaultCaption.Text + UserConfig.AutoReloadAlertMessage;
+                            FormCaption.Instance.CaptionText = CaptionTextBuffer;
+                        }
+                        if (UserConfig.AutoReloadAlertVoice)
+                        {
+                            StartSpeaking(UserConfig.AutoReloadAlertMessage);
+                        }
+                    }
                     communicationStatusString = "";
                 }
             }
@@ -1426,6 +1440,9 @@ private void FormMain_Load(object sender, EventArgs e)
             myToolStripUrl.GripStyle = ToolStripGripStyle.Hidden;
             myToolStripVoice.GripStyle = ToolStripGripStyle.Hidden;
             myToolStripBrowser.GripStyle = ToolStripGripStyle.Hidden;
+
+            speakingCompletedTime = System.DateTime.Now;
+            gettingWebTime = System.DateTime.Now;
             //idx = toolStripComboBoxVolume.Items.IndexOf(UserConfig.SpeakingVolume);
             //if (idx >= 0)
             //{
@@ -1460,6 +1477,7 @@ private void toolStripButtonSettings_Click(object sender, EventArgs e)
                 if (formSettings.ShowDialog() == DialogResult.OK)
                 {
                     formSettings.GetUserConfig(UserConfig);
+                    if (!UserConfig.AutoReloadAlertCaption)CaptionTextBuffer = textBoxDefaultCaption.Text;
                     FormCaption.Instance.Refresh();
                     if (soundPlayerNewResponse != null)
                     {
@@ -1840,6 +1858,11 @@ private void toolStripMenuItemGoSupportBBS_Click(object sender, EventArgs e)
             }
         }
 
+        private void toolStripMenuItemGoLatestRelease_Click(object sender, EventArgs e)
+        {
+            System.Diagnostics.Process.Start("https://github.com/ggslyman/SpeechCast/releases/latest");
+        }
+
         private void toolStripButtonTurbo_Click(object sender, EventArgs e)
         {
             UserConfig.TurboMode = !UserConfig.TurboMode;
@@ -1876,6 +1899,20 @@ private void toolStripStatusLabelCommunication_Click(object sender, EventArgs e)
                 this.splitContainerResCaption.IsSplitterFixed = false;
             }
         }
+        private void toolStripStatusLabelDefaultCaptionButton_Click(object sender, EventArgs e)
+        {
+            if (this.splitContainerResCaption.Panel2.Height > 0)
+            {
+                this.splitContainerResCaption.SplitterDistance = 2000;
+                this.splitContainerResCaption.IsSplitterFixed = true;
+                this.webBrowser.Focus();
+            }
+            else
+            {
+                this.splitContainerResCaption.SplitterDistance = this.splitContainerResCaption.Height - 130;
+                this.splitContainerResCaption.IsSplitterFixed = false;
+            }
+        }
 
         private void toolStripButtonCaptionAutoSmall_Click(object sender, EventArgs e)
         {
@@ -2213,6 +2250,5 @@ private void viewResList(bool visibleFlag)
             }
 
         }
-
     }
 }