diff --git a/README.md b/README.md index bc7f0c9..197b340 100644 --- 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 index 39e2e14..cc46bd7 100644 --- 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(@"\.(?\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 index 19dc0dd..d58980a 100644 --- a/SpeechCast/FormAbout.resx +++ b/SpeechCast/FormAbout.resx @@ -112,9 +112,9 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/SpeechCast/FormMain.Designer.cs b/SpeechCast/FormMain.Designer.cs index 18cf487..fe4fcb8 100644 --- a/SpeechCast/FormMain.Designer.cs +++ b/SpeechCast/FormMain.Designer.cs @@ -33,6 +33,7 @@ private void InitializeComponent() this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabelResNumber = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabelCommunication = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelDefaultCaptionButton = new System.Windows.Forms.ToolStripStatusLabel(); this.panel1 = new System.Windows.Forms.Panel(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); @@ -102,6 +103,7 @@ private void InitializeComponent() this.toolStripMenuItemCopyboard = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItemHelp = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItemGoSupportBBS = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItemGoLatestRelease = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripMenuItemAbout = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); @@ -171,10 +173,11 @@ private void InitializeComponent() // this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripStatusLabelResNumber, - this.toolStripStatusLabelCommunication}); - this.statusStrip1.Location = new System.Drawing.Point(0, 681); + this.toolStripStatusLabelCommunication, + this.toolStripStatusLabelDefaultCaptionButton}); + this.statusStrip1.Location = new System.Drawing.Point(0, 680); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(949, 22); + this.statusStrip1.Size = new System.Drawing.Size(949, 23); this.statusStrip1.TabIndex = 4; this.statusStrip1.Text = "statusStrip1"; // @@ -187,7 +190,7 @@ private void InitializeComponent() this.toolStripStatusLabelResNumber.BorderStyle = System.Windows.Forms.Border3DStyle.Sunken; this.toolStripStatusLabelResNumber.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; this.toolStripStatusLabelResNumber.Name = "toolStripStatusLabelResNumber"; - this.toolStripStatusLabelResNumber.Size = new System.Drawing.Size(80, 17); + this.toolStripStatusLabelResNumber.Size = new System.Drawing.Size(80, 18); // // toolStripStatusLabelCommunication // @@ -197,18 +200,25 @@ private void InitializeComponent() | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom))); this.toolStripStatusLabelCommunication.BorderStyle = System.Windows.Forms.Border3DStyle.Sunken; this.toolStripStatusLabelCommunication.Name = "toolStripStatusLabelCommunication"; - this.toolStripStatusLabelCommunication.Size = new System.Drawing.Size(854, 17); + this.toolStripStatusLabelCommunication.Size = new System.Drawing.Size(726, 18); this.toolStripStatusLabelCommunication.Spring = true; this.toolStripStatusLabelCommunication.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.toolStripStatusLabelCommunication.Click += new System.EventHandler(this.toolStripStatusLabelCommunication_Click); // + // toolStripStatusLabelDefaultCaptionButton + // + this.toolStripStatusLabelDefaultCaptionButton.Name = "toolStripStatusLabelDefaultCaptionButton"; + this.toolStripStatusLabelDefaultCaptionButton.Size = new System.Drawing.Size(128, 18); + this.toolStripStatusLabelDefaultCaptionButton.Text = "代替字幕入力欄を表示"; + this.toolStripStatusLabelDefaultCaptionButton.Click += new System.EventHandler(this.toolStripStatusLabelDefaultCaptionButton_Click); + // // panel1 // this.panel1.Controls.Add(this.splitContainer1); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 127); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(949, 554); + this.panel1.Size = new System.Drawing.Size(949, 553); this.panel1.TabIndex = 5; // // splitContainer1 @@ -225,7 +235,7 @@ private void InitializeComponent() // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.splitContainerResCaption); - this.splitContainer1.Size = new System.Drawing.Size(949, 554); + this.splitContainer1.Size = new System.Drawing.Size(949, 553); this.splitContainer1.SplitterDistance = 300; this.splitContainer1.TabIndex = 0; // @@ -244,8 +254,8 @@ private void InitializeComponent() // splitContainer2.Panel2 // this.splitContainer2.Panel2.Controls.Add(this.textBoxLog); - this.splitContainer2.Size = new System.Drawing.Size(300, 554); - this.splitContainer2.SplitterDistance = 308; + this.splitContainer2.Size = new System.Drawing.Size(300, 553); + this.splitContainer2.SplitterDistance = 307; this.splitContainer2.TabIndex = 0; // // listViewResponses @@ -261,7 +271,7 @@ private void InitializeComponent() this.listViewResponses.Location = new System.Drawing.Point(0, 0); this.listViewResponses.MultiSelect = false; this.listViewResponses.Name = "listViewResponses"; - this.listViewResponses.Size = new System.Drawing.Size(300, 308); + this.listViewResponses.Size = new System.Drawing.Size(300, 307); this.listViewResponses.TabIndex = 0; this.listViewResponses.UseCompatibleStateImageBehavior = false; this.listViewResponses.View = System.Windows.Forms.View.Details; @@ -312,8 +322,8 @@ private void InitializeComponent() // this.splitContainerResCaption.Panel2.Controls.Add(this.splitContainerpkCaption); this.splitContainerResCaption.Panel2MinSize = 0; - this.splitContainerResCaption.Size = new System.Drawing.Size(645, 554); - this.splitContainerResCaption.SplitterDistance = 407; + this.splitContainerResCaption.Size = new System.Drawing.Size(645, 553); + this.splitContainerResCaption.SplitterDistance = 406; this.splitContainerResCaption.TabIndex = 3; // // webBrowser @@ -322,7 +332,7 @@ private void InitializeComponent() this.webBrowser.Location = new System.Drawing.Point(0, 0); this.webBrowser.MinimumSize = new System.Drawing.Size(20, 20); this.webBrowser.Name = "webBrowser"; - this.webBrowser.Size = new System.Drawing.Size(643, 405); + this.webBrowser.Size = new System.Drawing.Size(643, 404); this.webBrowser.TabIndex = 5; // // splitContainerpkCaption @@ -890,6 +900,7 @@ private void InitializeComponent() // this.toolStripMenuItemHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripMenuItemGoSupportBBS, + this.toolStripMenuItemGoLatestRelease, this.toolStripSeparator3, this.toolStripMenuItemAbout}); this.toolStripMenuItemHelp.Name = "toolStripMenuItemHelp"; @@ -899,19 +910,26 @@ private void InitializeComponent() // toolStripMenuItemGoSupportBBS // this.toolStripMenuItemGoSupportBBS.Name = "toolStripMenuItemGoSupportBBS"; - this.toolStripMenuItemGoSupportBBS.Size = new System.Drawing.Size(178, 22); + this.toolStripMenuItemGoSupportBBS.Size = new System.Drawing.Size(232, 22); this.toolStripMenuItemGoSupportBBS.Text = "サポート掲示板"; this.toolStripMenuItemGoSupportBBS.Click += new System.EventHandler(this.toolStripMenuItemGoSupportBBS_Click); // + // toolStripMenuItemGoLatestRelease + // + this.toolStripMenuItemGoLatestRelease.Name = "toolStripMenuItemGoLatestRelease"; + this.toolStripMenuItemGoLatestRelease.Size = new System.Drawing.Size(232, 22); + this.toolStripMenuItemGoLatestRelease.Text = "最新のバージョンを確認する"; + this.toolStripMenuItemGoLatestRelease.Click += new System.EventHandler(this.toolStripMenuItemGoLatestRelease_Click); + // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(175, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(229, 6); // // toolStripMenuItemAbout // this.toolStripMenuItemAbout.Name = "toolStripMenuItemAbout"; - this.toolStripMenuItemAbout.Size = new System.Drawing.Size(178, 22); + this.toolStripMenuItemAbout.Size = new System.Drawing.Size(232, 22); this.toolStripMenuItemAbout.Text = "バージョン情報(&A)"; this.toolStripMenuItemAbout.Click += new System.EventHandler(this.toolStripMenuItemAbout_Click); // @@ -1422,6 +1440,8 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripButton toolStripButtonListToggle; private System.Windows.Forms.ToolStripLabel toolStripLabel7; private System.Windows.Forms.ToolStripTextBox toolStripTextBoxThreadKeyword; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelDefaultCaptionButton; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemGoLatestRelease; } } diff --git a/SpeechCast/FormMain.cs b/SpeechCast/FormMain.cs index 2dc13b1..b839912 100644 --- 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) } } - } } diff --git a/SpeechCast/FormSettings.Designer.cs b/SpeechCast/FormSettings.Designer.cs index 85e210b..2db6d57 100644 --- a/SpeechCast/FormSettings.Designer.cs +++ b/SpeechCast/FormSettings.Designer.cs @@ -118,23 +118,29 @@ private void InitializeComponent() this.checkBoxPlaySoundSync = new System.Windows.Forms.CheckBox(); this.label20 = new System.Windows.Forms.Label(); this.checkBoxPlaySoundNewResponse = new System.Windows.Forms.CheckBox(); + this.tabPageBrowser = new System.Windows.Forms.TabPage(); + this.label30 = new System.Windows.Forms.Label(); + this.label29 = new System.Windows.Forms.Label(); + this.numericUpDownViewerYoutubePlayerWidth = new System.Windows.Forms.NumericUpDown(); + this.numericUpDownViewerYoutubePlayerHeight = new System.Windows.Forms.NumericUpDown(); + this.label27 = new System.Windows.Forms.Label(); + this.labelAutoScrollSpeed = new System.Windows.Forms.Label(); + this.label28 = new System.Windows.Forms.Label(); + this.trackBarAutoScrollSpeed = new System.Windows.Forms.TrackBar(); this.tabPage4 = new System.Windows.Forms.TabPage(); this.checkBoxDebug = new System.Windows.Forms.CheckBox(); this.buttonRefernceEditor = new System.Windows.Forms.Button(); this.label8 = new System.Windows.Forms.Label(); this.textBoxEditorFilePath = new System.Windows.Forms.TextBox(); - this.tabPageBrowser = new System.Windows.Forms.TabPage(); - this.labelAutoScrollSpeed = new System.Windows.Forms.Label(); - this.label28 = new System.Windows.Forms.Label(); - this.trackBarAutoScrollSpeed = new System.Windows.Forms.TrackBar(); - this.label27 = new System.Windows.Forms.Label(); - this.numericUpDownViewerYoutubePlayerHeight = new System.Windows.Forms.NumericUpDown(); - this.numericUpDownViewerYoutubePlayerWidth = new System.Windows.Forms.NumericUpDown(); - this.label29 = new System.Windows.Forms.Label(); - this.label30 = new System.Windows.Forms.Label(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.checkBoxAutoReloadAlertVoice = new System.Windows.Forms.CheckBox(); + this.checkBoxAutoReloadAlertCaption = new System.Windows.Forms.CheckBox(); + this.numericUpDownAutoReloadAlertTime = new System.Windows.Forms.NumericUpDown(); + this.label31 = new System.Windows.Forms.Label(); this.buttonRunEditorAAMode = new SpeechCast.Controls.ButtonRunEditor(); this.buttonRunEditorNGWord = new SpeechCast.Controls.ButtonRunEditor(); this.buttonRunEditorPronounciation = new SpeechCast.Controls.ButtonRunEditor(); + this.textBoxAutoReloadAlertMessage = new System.Windows.Forms.TextBox(); this.panel1.SuspendLayout(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); @@ -159,11 +165,13 @@ private void InitializeComponent() this.tabPage6.SuspendLayout(); this.tabPage8.SuspendLayout(); this.panelPlaySound.SuspendLayout(); - this.tabPage4.SuspendLayout(); this.tabPageBrowser.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.trackBarAutoScrollSpeed)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownViewerYoutubePlayerHeight)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownViewerYoutubePlayerWidth)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownViewerYoutubePlayerHeight)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.trackBarAutoScrollSpeed)).BeginInit(); + this.tabPage4.SuspendLayout(); + this.groupBox3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownAutoReloadAlertTime)).BeginInit(); this.SuspendLayout(); // // panel1 @@ -990,6 +998,7 @@ private void InitializeComponent() // // tabPage3 // + this.tabPage3.Controls.Add(this.groupBox3); this.tabPage3.Controls.Add(this.checkBoxUseProxy); this.tabPage3.Controls.Add(this.checkBoxGZipCompression); this.tabPage3.Controls.Add(this.label10); @@ -1226,6 +1235,103 @@ private void InitializeComponent() this.checkBoxPlaySoundNewResponse.UseVisualStyleBackColor = true; this.checkBoxPlaySoundNewResponse.CheckedChanged += new System.EventHandler(this.checkBoxPlaySoundNewResponse_CheckedChanged); // + // tabPageBrowser + // + this.tabPageBrowser.Controls.Add(this.label30); + this.tabPageBrowser.Controls.Add(this.label29); + this.tabPageBrowser.Controls.Add(this.numericUpDownViewerYoutubePlayerWidth); + this.tabPageBrowser.Controls.Add(this.numericUpDownViewerYoutubePlayerHeight); + this.tabPageBrowser.Controls.Add(this.label27); + this.tabPageBrowser.Controls.Add(this.labelAutoScrollSpeed); + this.tabPageBrowser.Controls.Add(this.label28); + this.tabPageBrowser.Controls.Add(this.trackBarAutoScrollSpeed); + this.tabPageBrowser.Location = new System.Drawing.Point(4, 22); + this.tabPageBrowser.Name = "tabPageBrowser"; + this.tabPageBrowser.Padding = new System.Windows.Forms.Padding(3); + this.tabPageBrowser.Size = new System.Drawing.Size(438, 370); + this.tabPageBrowser.TabIndex = 8; + this.tabPageBrowser.Text = "ブラウザ"; + this.tabPageBrowser.UseVisualStyleBackColor = true; + // + // label30 + // + this.label30.AutoSize = true; + this.label30.Location = new System.Drawing.Point(141, 80); + this.label30.Name = "label30"; + this.label30.Size = new System.Drawing.Size(17, 12); + this.label30.TabIndex = 17; + this.label30.Text = "幅"; + // + // label29 + // + this.label29.AutoSize = true; + this.label29.Location = new System.Drawing.Point(261, 80); + this.label29.Name = "label29"; + this.label29.Size = new System.Drawing.Size(25, 12); + this.label29.TabIndex = 16; + this.label29.Text = "高さ"; + // + // numericUpDownViewerYoutubePlayerWidth + // + this.numericUpDownViewerYoutubePlayerWidth.Location = new System.Drawing.Point(164, 78); + this.numericUpDownViewerYoutubePlayerWidth.Maximum = new decimal(new int[] { + 5000, + 0, + 0, + 0}); + this.numericUpDownViewerYoutubePlayerWidth.Name = "numericUpDownViewerYoutubePlayerWidth"; + this.numericUpDownViewerYoutubePlayerWidth.Size = new System.Drawing.Size(75, 19); + this.numericUpDownViewerYoutubePlayerWidth.TabIndex = 15; + // + // numericUpDownViewerYoutubePlayerHeight + // + this.numericUpDownViewerYoutubePlayerHeight.Location = new System.Drawing.Point(292, 78); + this.numericUpDownViewerYoutubePlayerHeight.Maximum = new decimal(new int[] { + 5000, + 0, + 0, + 0}); + this.numericUpDownViewerYoutubePlayerHeight.Name = "numericUpDownViewerYoutubePlayerHeight"; + this.numericUpDownViewerYoutubePlayerHeight.Size = new System.Drawing.Size(75, 19); + this.numericUpDownViewerYoutubePlayerHeight.TabIndex = 14; + // + // label27 + // + this.label27.AutoSize = true; + this.label27.Location = new System.Drawing.Point(9, 80); + this.label27.Name = "label27"; + this.label27.Size = new System.Drawing.Size(122, 12); + this.label27.TabIndex = 13; + this.label27.Text = "Youtubeプレイヤーサイズ"; + // + // labelAutoScrollSpeed + // + this.labelAutoScrollSpeed.AutoSize = true; + this.labelAutoScrollSpeed.Location = new System.Drawing.Point(116, 22); + this.labelAutoScrollSpeed.Name = "labelAutoScrollSpeed"; + this.labelAutoScrollSpeed.Size = new System.Drawing.Size(11, 12); + this.labelAutoScrollSpeed.TabIndex = 12; + this.labelAutoScrollSpeed.Text = "0"; + // + // label28 + // + this.label28.AutoSize = true; + this.label28.Location = new System.Drawing.Point(9, 22); + this.label28.Name = "label28"; + this.label28.Size = new System.Drawing.Size(99, 12); + this.label28.TabIndex = 11; + this.label28.Text = "自動スクロール速度"; + // + // trackBarAutoScrollSpeed + // + this.trackBarAutoScrollSpeed.Location = new System.Drawing.Point(143, 9); + this.trackBarAutoScrollSpeed.Minimum = 1; + this.trackBarAutoScrollSpeed.Name = "trackBarAutoScrollSpeed"; + this.trackBarAutoScrollSpeed.Size = new System.Drawing.Size(272, 45); + this.trackBarAutoScrollSpeed.TabIndex = 10; + this.trackBarAutoScrollSpeed.Value = 1; + this.trackBarAutoScrollSpeed.ValueChanged += new System.EventHandler(this.trackBarAutoScrollSpeed_ValueChanged); + // // tabPage4 // this.tabPage4.Controls.Add(this.checkBoxDebug); @@ -1276,101 +1382,70 @@ private void InitializeComponent() this.textBoxEditorFilePath.Size = new System.Drawing.Size(272, 19); this.textBoxEditorFilePath.TabIndex = 3; // - // tabPageBrowser - // - this.tabPageBrowser.Controls.Add(this.label30); - this.tabPageBrowser.Controls.Add(this.label29); - this.tabPageBrowser.Controls.Add(this.numericUpDownViewerYoutubePlayerWidth); - this.tabPageBrowser.Controls.Add(this.numericUpDownViewerYoutubePlayerHeight); - this.tabPageBrowser.Controls.Add(this.label27); - this.tabPageBrowser.Controls.Add(this.labelAutoScrollSpeed); - this.tabPageBrowser.Controls.Add(this.label28); - this.tabPageBrowser.Controls.Add(this.trackBarAutoScrollSpeed); - this.tabPageBrowser.Location = new System.Drawing.Point(4, 22); - this.tabPageBrowser.Name = "tabPageBrowser"; - this.tabPageBrowser.Padding = new System.Windows.Forms.Padding(3); - this.tabPageBrowser.Size = new System.Drawing.Size(438, 370); - this.tabPageBrowser.TabIndex = 8; - this.tabPageBrowser.Text = "ブラウザ"; - this.tabPageBrowser.UseVisualStyleBackColor = true; - // - // labelAutoScrollSpeed - // - this.labelAutoScrollSpeed.AutoSize = true; - this.labelAutoScrollSpeed.Location = new System.Drawing.Point(116, 22); - this.labelAutoScrollSpeed.Name = "labelAutoScrollSpeed"; - this.labelAutoScrollSpeed.Size = new System.Drawing.Size(11, 12); - this.labelAutoScrollSpeed.TabIndex = 12; - this.labelAutoScrollSpeed.Text = "0"; - // - // label28 - // - this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(9, 22); - this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(99, 12); - this.label28.TabIndex = 11; - this.label28.Text = "自動スクロール速度"; - // - // trackBarAutoScrollSpeed - // - this.trackBarAutoScrollSpeed.Location = new System.Drawing.Point(143, 9); - this.trackBarAutoScrollSpeed.Minimum = 1; - this.trackBarAutoScrollSpeed.Name = "trackBarAutoScrollSpeed"; - this.trackBarAutoScrollSpeed.Size = new System.Drawing.Size(272, 45); - this.trackBarAutoScrollSpeed.TabIndex = 10; - this.trackBarAutoScrollSpeed.Value = 1; - // - // label27 - // - this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(9, 80); - this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(122, 12); - this.label27.TabIndex = 13; - this.label27.Text = "Youtubeプレイヤーサイズ"; - // - // numericUpDownViewerYoutubePlayerHeight - // - this.numericUpDownViewerYoutubePlayerHeight.Location = new System.Drawing.Point(292, 78); - this.numericUpDownViewerYoutubePlayerHeight.Maximum = new decimal(new int[] { - 5000, + // groupBox3 + // + this.groupBox3.Controls.Add(this.textBoxAutoReloadAlertMessage); + this.groupBox3.Controls.Add(this.label31); + this.groupBox3.Controls.Add(this.numericUpDownAutoReloadAlertTime); + this.groupBox3.Controls.Add(this.checkBoxAutoReloadAlertCaption); + this.groupBox3.Controls.Add(this.checkBoxAutoReloadAlertVoice); + this.groupBox3.Location = new System.Drawing.Point(20, 132); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(410, 72); + this.groupBox3.TabIndex = 6; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "自動更新忘れ警告"; + // + // checkBoxAutoReloadAlertVoice + // + this.checkBoxAutoReloadAlertVoice.AutoSize = true; + this.checkBoxAutoReloadAlertVoice.Location = new System.Drawing.Point(13, 18); + this.checkBoxAutoReloadAlertVoice.Name = "checkBoxAutoReloadAlertVoice"; + this.checkBoxAutoReloadAlertVoice.Size = new System.Drawing.Size(93, 16); + this.checkBoxAutoReloadAlertVoice.TabIndex = 0; + this.checkBoxAutoReloadAlertVoice.Text = "音声読み上げ"; + this.checkBoxAutoReloadAlertVoice.UseVisualStyleBackColor = true; + // + // checkBoxAutoReloadAlertCaption + // + this.checkBoxAutoReloadAlertCaption.AutoSize = true; + this.checkBoxAutoReloadAlertCaption.Location = new System.Drawing.Point(112, 18); + this.checkBoxAutoReloadAlertCaption.Name = "checkBoxAutoReloadAlertCaption"; + this.checkBoxAutoReloadAlertCaption.Size = new System.Drawing.Size(66, 16); + this.checkBoxAutoReloadAlertCaption.TabIndex = 1; + this.checkBoxAutoReloadAlertCaption.Text = "レス表示"; + this.checkBoxAutoReloadAlertCaption.UseVisualStyleBackColor = true; + // + // numericUpDownAutoReloadAlertTime + // + this.numericUpDownAutoReloadAlertTime.Location = new System.Drawing.Point(344, 17); + this.numericUpDownAutoReloadAlertTime.Maximum = new decimal(new int[] { + 30, 0, 0, 0}); - this.numericUpDownViewerYoutubePlayerHeight.Name = "numericUpDownViewerYoutubePlayerHeight"; - this.numericUpDownViewerYoutubePlayerHeight.Size = new System.Drawing.Size(75, 19); - this.numericUpDownViewerYoutubePlayerHeight.TabIndex = 14; - // - // numericUpDownViewerYoutubePlayerWidth - // - this.numericUpDownViewerYoutubePlayerWidth.Location = new System.Drawing.Point(164, 78); - this.numericUpDownViewerYoutubePlayerWidth.Maximum = new decimal(new int[] { - 5000, + this.numericUpDownAutoReloadAlertTime.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDownAutoReloadAlertTime.Name = "numericUpDownAutoReloadAlertTime"; + this.numericUpDownAutoReloadAlertTime.Size = new System.Drawing.Size(53, 19); + this.numericUpDownAutoReloadAlertTime.TabIndex = 7; + this.numericUpDownAutoReloadAlertTime.Value = new decimal(new int[] { + 5, 0, 0, 0}); - this.numericUpDownViewerYoutubePlayerWidth.Name = "numericUpDownViewerYoutubePlayerWidth"; - this.numericUpDownViewerYoutubePlayerWidth.Size = new System.Drawing.Size(75, 19); - this.numericUpDownViewerYoutubePlayerWidth.TabIndex = 15; - // - // label29 // - this.label29.AutoSize = true; - this.label29.Location = new System.Drawing.Point(261, 80); - this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(25, 12); - this.label29.TabIndex = 16; - this.label29.Text = "高さ"; + // label31 // - // label30 - // - this.label30.AutoSize = true; - this.label30.Location = new System.Drawing.Point(141, 80); - this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(17, 12); - this.label30.TabIndex = 17; - this.label30.Text = "幅"; + this.label31.AutoSize = true; + this.label31.Location = new System.Drawing.Point(184, 19); + this.label31.Name = "label31"; + this.label31.Size = new System.Drawing.Size(154, 12); + this.label31.TabIndex = 8; + this.label31.Text = "警告を表示するまでの時間(分)"; // // buttonRunEditorAAMode // @@ -1408,6 +1483,13 @@ private void InitializeComponent() this.buttonRunEditorPronounciation.TextBox = this.TextBoxPronounciations; this.buttonRunEditorPronounciation.GetEditorFilePath += new SpeechCast.Controls.GetEditorFilePathEventHandler(this.buttonRunEditor_GetEditorFilePath); // + // textBoxAutoReloadAlertMessage + // + this.textBoxAutoReloadAlertMessage.Location = new System.Drawing.Point(13, 42); + this.textBoxAutoReloadAlertMessage.Name = "textBoxAutoReloadAlertMessage"; + this.textBoxAutoReloadAlertMessage.Size = new System.Drawing.Size(384, 19); + this.textBoxAutoReloadAlertMessage.TabIndex = 20; + // // FormSettings // this.AcceptButton = this.buttonOK; @@ -1458,13 +1540,16 @@ private void InitializeComponent() this.tabPage8.PerformLayout(); this.panelPlaySound.ResumeLayout(false); this.panelPlaySound.PerformLayout(); - this.tabPage4.ResumeLayout(false); - this.tabPage4.PerformLayout(); this.tabPageBrowser.ResumeLayout(false); this.tabPageBrowser.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.trackBarAutoScrollSpeed)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownViewerYoutubePlayerHeight)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownViewerYoutubePlayerWidth)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownViewerYoutubePlayerHeight)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.trackBarAutoScrollSpeed)).EndInit(); + this.tabPage4.ResumeLayout(false); + this.tabPage4.PerformLayout(); + this.groupBox3.ResumeLayout(false); + this.groupBox3.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownAutoReloadAlertTime)).EndInit(); this.ResumeLayout(false); } @@ -1578,5 +1663,11 @@ private void InitializeComponent() private System.Windows.Forms.Label labelAutoScrollSpeed; private System.Windows.Forms.Label label28; private System.Windows.Forms.TrackBar trackBarAutoScrollSpeed; + private System.Windows.Forms.GroupBox groupBox3; + private System.Windows.Forms.Label label31; + public System.Windows.Forms.NumericUpDown numericUpDownAutoReloadAlertTime; + private System.Windows.Forms.CheckBox checkBoxAutoReloadAlertCaption; + private System.Windows.Forms.CheckBox checkBoxAutoReloadAlertVoice; + private System.Windows.Forms.TextBox textBoxAutoReloadAlertMessage; } } \ No newline at end of file diff --git a/SpeechCast/FormSettings.cs b/SpeechCast/FormSettings.cs index 4e30eca..a60d040 100644 --- a/SpeechCast/FormSettings.cs +++ b/SpeechCast/FormSettings.cs @@ -121,6 +121,10 @@ public void SetUserConfig(UserConfig userConfig) this.checkBoxHideCaptionTitle.Checked = userConfig.HideCaptionTitle; this.VoiceVolme = userConfig.SpeakingVolume; this.checkBoxDebug.Checked = userConfig.OutputDebugLog; + this.checkBoxAutoReloadAlertCaption.Checked = userConfig.AutoReloadAlertCaption; + this.checkBoxAutoReloadAlertVoice.Checked = userConfig.AutoReloadAlertVoice; + this.numericUpDownAutoReloadAlertTime.Value = userConfig.AutoReloadAlertInvervalMinutes; + this.textBoxAutoReloadAlertMessage.Text = userConfig.AutoReloadAlertMessage; numericUpDownViewerYoutubePlayerHeight.Value = userConfig.ViewerYoutubePlayerHeight; numericUpDownViewerYoutubePlayerWidth.Value = userConfig.ViewerYoutubePlayerWidth; UpdateUI(); @@ -200,6 +204,10 @@ public void GetUserConfig(UserConfig userConfig) userConfig.OutputDebugLog = this.checkBoxDebug.Checked; userConfig.ViewerYoutubePlayerHeight = (int)numericUpDownViewerYoutubePlayerHeight.Value; userConfig.ViewerYoutubePlayerWidth = (int)numericUpDownViewerYoutubePlayerWidth.Value; + userConfig.AutoReloadAlertCaption = this.checkBoxAutoReloadAlertCaption.Checked; + userConfig.AutoReloadAlertVoice = this.checkBoxAutoReloadAlertVoice.Checked; + userConfig.AutoReloadAlertInvervalMinutes = (int)this.numericUpDownAutoReloadAlertTime.Value; + userConfig.AutoReloadAlertMessage = this.textBoxAutoReloadAlertMessage.Text; } diff --git a/SpeechCast/Properties/AssemblyInfo.cs b/SpeechCast/Properties/AssemblyInfo.cs index 482347a..32ad31b 100644 --- a/SpeechCast/Properties/AssemblyInfo.cs +++ b/SpeechCast/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を // 既定値にすることができます: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.1.15")] -[assembly: AssemblyFileVersion("2.0.1.15")] +[assembly: AssemblyVersion("2.0.1.16")] +[assembly: AssemblyFileVersion("2.0.1.16")] diff --git a/SpeechCast/Resources/resView.html b/SpeechCast/Resources/resView.html index 588b36b..89c7354 100644 --- a/SpeechCast/Resources/resView.html +++ b/SpeechCast/Resources/resView.html @@ -8,7 +8,7 @@ objResArea.appendChild(element); } function clearRes() { - var objResArea = document.getElementById("resArea");; + var objResArea = document.getElementById("resArea"); objResArea.innerHTML = ""; } diff --git a/SpeechCast/UseConfig.cs b/SpeechCast/UseConfig.cs index 82e6348..14e8a40 100644 --- a/SpeechCast/UseConfig.cs +++ b/SpeechCast/UseConfig.cs @@ -227,6 +227,13 @@ public void SupplementSettings() /// public int AutoGettingWebInvervalMillsec = 10000; + /// + /// 自動更新忘れ関連 + /// + public bool AutoReloadAlertVoice = false; + public bool AutoReloadAlertCaption = false; + public int AutoReloadAlertInvervalMinutes = 5; + public string AutoReloadAlertMessage = "レス自動更新がONになっていません"; /// /// 次スレ自動開始 ///