From e8ea873365a9a958af18a0edb0dfdf194847be09 Mon Sep 17 00:00:00 2001 From: ggslyman Date: Sun, 20 Apr 2014 20:31:19 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AC=E3=82=B9=E8=A1=A8=E7=A4=BA=E6=AC=84?= =?UTF-8?q?=E6=9C=AB=E5=B0=BE=E7=A7=BB=E5=8B=95=E9=96=A2=E9=80=A3=E3=81=AE?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 + SpeechCast/FormMain.Designer.cs | 25 +- SpeechCast/FormMain.cs | 20 +- SpeechCast/FormMain.resx | 12 + SpeechCast/FormSettings.Designer.cs | 807 +++++++++++++++----------- SpeechCast/FormSettings.cs | 2 + SpeechCast/Properties/AssemblyInfo.cs | 4 +- SpeechCast/Resources/move-bottom.png | Bin 0 -> 432 bytes SpeechCast/UseConfig.cs | 5 + 9 files changed, 527 insertions(+), 351 deletions(-) create mode 100644 SpeechCast/Resources/move-bottom.png diff --git a/README.md b/README.md index 9554ce5..f198856 100644 --- a/README.md +++ b/README.md @@ -97,6 +97,9 @@ ##更新履歴 +* 14/04/20 2.0.1 Rev.19 + - ブックマークからスレを開いたときにレス表示欄を末尾まで移動するオプションおよび、レス表示欄の最下段までのスクロールボタンを追加 + * 14/04/20 2.0.1 Rev.18 - レス表示領域の表示倍率ボタンと設定保存を追加 diff --git a/SpeechCast/FormMain.Designer.cs b/SpeechCast/FormMain.Designer.cs index 0d36c5d..f90be1d 100644 --- a/SpeechCast/FormMain.Designer.cs +++ b/SpeechCast/FormMain.Designer.cs @@ -147,6 +147,7 @@ private void InitializeComponent() this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripButtonZoomOutnResView = new System.Windows.Forms.ToolStripButton(); this.toolStripButtonZoomInResView = new System.Windows.Forms.ToolStripButton(); + this.toolStripButtonMoveBottom = new System.Windows.Forms.ToolStripButton(); this.statusStrip1.SuspendLayout(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); @@ -335,7 +336,7 @@ private void InitializeComponent() this.splitContainerResCaption.Panel2.Controls.Add(this.splitContainerpkCaption); this.splitContainerResCaption.Panel2MinSize = 0; this.splitContainerResCaption.Size = new System.Drawing.Size(861, 706); - this.splitContainerResCaption.SplitterDistance = 555; + this.splitContainerResCaption.SplitterDistance = 554; this.splitContainerResCaption.SplitterWidth = 5; this.splitContainerResCaption.TabIndex = 3; // @@ -346,7 +347,7 @@ private void InitializeComponent() this.webBrowser.Margin = new System.Windows.Forms.Padding(4); this.webBrowser.MinimumSize = new System.Drawing.Size(27, 25); this.webBrowser.Name = "webBrowser"; - this.webBrowser.Size = new System.Drawing.Size(859, 553); + this.webBrowser.Size = new System.Drawing.Size(859, 552); this.webBrowser.TabIndex = 5; // // splitContainerpkCaption @@ -377,7 +378,7 @@ private void InitializeComponent() this.splitContainerpkCaption.Panel2.Controls.Add(this.buttonCaptionNum1); this.splitContainerpkCaption.Panel2.Controls.Add(this.comboBoxCaptionNum2); this.splitContainerpkCaption.Panel2.Controls.Add(this.comboBoxCaptionNum1); - this.splitContainerpkCaption.Size = new System.Drawing.Size(859, 144); + this.splitContainerpkCaption.Size = new System.Drawing.Size(859, 145); this.splitContainerpkCaption.SplitterDistance = 109; this.splitContainerpkCaption.SplitterWidth = 5; this.splitContainerpkCaption.TabIndex = 1; @@ -1269,7 +1270,8 @@ private void InitializeComponent() this.toolStripTextBoxThreadKeyword, this.toolStripSeparator11, this.toolStripButtonZoomOutnResView, - this.toolStripButtonZoomInResView}); + this.toolStripButtonZoomInResView, + this.toolStripButtonMoveBottom}); this.myToolStripBrowser.Location = new System.Drawing.Point(0, 85); this.myToolStripBrowser.Name = "myToolStripBrowser"; this.myToolStripBrowser.Size = new System.Drawing.Size(1265, 30); @@ -1316,7 +1318,7 @@ private void InitializeComponent() this.toolStripButtonZoomOutnResView.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonZoomOutnResView.Name = "toolStripButtonZoomOutnResView"; this.toolStripButtonZoomOutnResView.Size = new System.Drawing.Size(23, 27); - this.toolStripButtonZoomOutnResView.Text = "toolStripButton19"; + this.toolStripButtonZoomOutnResView.Text = "レスを縮小"; this.toolStripButtonZoomOutnResView.Click += new System.EventHandler(this.toolStripButtonZoomOutnResView_Click); // // toolStripButtonZoomInResView @@ -1326,9 +1328,19 @@ private void InitializeComponent() this.toolStripButtonZoomInResView.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonZoomInResView.Name = "toolStripButtonZoomInResView"; this.toolStripButtonZoomInResView.Size = new System.Drawing.Size(23, 27); - this.toolStripButtonZoomInResView.Text = "toolStripButton20"; + this.toolStripButtonZoomInResView.Text = "レスを拡大"; this.toolStripButtonZoomInResView.Click += new System.EventHandler(this.toolStripButtonZoomInnResView_Click); // + // toolStripButtonMoveBottom + // + this.toolStripButtonMoveBottom.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButtonMoveBottom.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonMoveBottom.Image"))); + this.toolStripButtonMoveBottom.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButtonMoveBottom.Name = "toolStripButtonMoveBottom"; + this.toolStripButtonMoveBottom.Size = new System.Drawing.Size(23, 27); + this.toolStripButtonMoveBottom.Text = "最新のレスまで移動"; + this.toolStripButtonMoveBottom.Click += new System.EventHandler(this.toolStripButtonMoveBottom_Click); + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); @@ -1504,6 +1516,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripSeparator toolStripSeparator11; private System.Windows.Forms.ToolStripButton toolStripButtonZoomOutnResView; private System.Windows.Forms.ToolStripButton toolStripButtonZoomInResView; + private System.Windows.Forms.ToolStripButton toolStripButtonMoveBottom; } } diff --git a/SpeechCast/FormMain.cs b/SpeechCast/FormMain.cs index f13cd07..ae789f5 100644 --- a/SpeechCast/FormMain.cs +++ b/SpeechCast/FormMain.cs @@ -717,13 +717,18 @@ await Task.Run(() => // JavaScriptでの差分追加処理 if (webBrowser.Document != null) { + Object[] objArray = new Object[1]; + objArray[0] = UserConfig.magnification; + webBrowser.Document.InvokeScript("setZoom", objArray); for (int idx = oldResCount; idx < responses.Count; idx++) { - Object[] objArray = new Object[1]; objArray[0] = responses[idx].Html; webBrowser.Document.InvokeScript("addRes", objArray); - objArray[0] = UserConfig.magnification; - webBrowser.Document.InvokeScript("setZoom", objArray); + } + if (moveScrollBottom) + { + webBrowser.Document.Window.ScrollTo(0, webBrowser.Document.Body.ScrollRectangle.Height); + moveScrollBottom = false; } } } @@ -1683,11 +1688,11 @@ private void AddBookmarkMenu(ToolStripItemCollection menuItems , Bookmarks.Folde } } - + private bool moveScrollBottom = false; private void toolStripMenuItemBookmark_Click(object sender, EventArgs e) { string url = (string) ((sender as ToolStripMenuItem).Tag); - + if (UserConfig.enableMoveBottomFromBookmarks) moveScrollBottom = true; toolStripTextBoxURL.Text = url; GetFromURL(); @@ -2264,5 +2269,10 @@ private void toolStripButtonZoomInnResView_Click(object sender, EventArgs e) objArray[0] = UserConfig.magnification; webBrowser.Document.InvokeScript("setZoom", objArray); } + + private void toolStripButtonMoveBottom_Click(object sender, EventArgs e) + { + webBrowser.Document.Window.ScrollTo(0, webBrowser.Document.Body.ScrollRectangle.Height); + } } } diff --git a/SpeechCast/FormMain.resx b/SpeechCast/FormMain.resx index 5c187e9..8af762d 100644 --- a/SpeechCast/FormMain.resx +++ b/SpeechCast/FormMain.resx @@ -972,6 +972,18 @@ fydglystLaWgoCBNHzUNJYEpSL03/CUNJQFgeak7n1FmZGTIbdfPz0/TbjiJx8dHwsASHR0tBFHT1dVV rnTLnW5nZ8fxJH5weHgov/e6ujq57+NbAH0AAwye1toMqZdEbm4ujv8eWkmgy9o78jsEyyT++81/gCT4 x44kfQNnfZRX3I/oxwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFOSURBVFhH7ZSxyoJQGIYriaBc6hpcWoTWoFlob2i3oc2l + pRtw8AYa2h2CxsBZ8AK6AcdwEQcNKu39+wL/5ZzI6GQQPvDgy0G/90PEWlH6/T5ul0L2ej26iqVaoFqg + WqBaoFrg9xe4XC4wDAPj8ZirLMtM0SObzSZ3BjmbzZAkCd3HEgQBBoMBM1CUiqLA933Kj4miCKPRiHn4 + XVVVxeFwoPyc4/F4f123KMThcIgwDCkX53w+YzqdMsNeVdM0xHFM+XWyLMN8PmeGFnUymeB0OlF+j+Vy + yQx/pq7rSNOUshgsy0K9XmeKeC4WC1yvV8piWa/XkCSJKcylBU3TpPw5NpsNWq0WU95oNLBarT5bnuM4 + Djqdzn85/fls2y6nPMfzPHS7XbTbbex2u3LLc/b7PVzX/U65MLbbLb4p7XD/kL4o97BMuYdlyj0syRr+ + AO3hoBnT5oXcAAAAAElFTkSuQmCC diff --git a/SpeechCast/FormSettings.Designer.cs b/SpeechCast/FormSettings.Designer.cs index 2db6d57..b667d91 100644 --- a/SpeechCast/FormSettings.Designer.cs +++ b/SpeechCast/FormSettings.Designer.cs @@ -88,6 +88,7 @@ private void InitializeComponent() this.checkBoxReduceFontSizeByWindowWidth = new System.Windows.Forms.CheckBox(); this.checkBoxReduceFontSizeByWindowHeight = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.buttonRunEditorAAMode = new SpeechCast.Controls.ButtonRunEditor(); this.textBoxAAModeConditions = new System.Windows.Forms.TextBox(); this.label = new System.Windows.Forms.Label(); this.numericUpDownAAModeTextLength = new System.Windows.Forms.NumericUpDown(); @@ -98,14 +99,22 @@ private void InitializeComponent() this.comboBoxAAFontSize = new System.Windows.Forms.ComboBox(); this.comboBoxAAFontName = new System.Windows.Forms.ComboBox(); this.tabPage3 = new System.Windows.Forms.TabPage(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.textBoxAutoReloadAlertMessage = new System.Windows.Forms.TextBox(); + this.label31 = new System.Windows.Forms.Label(); + this.numericUpDownAutoReloadAlertTime = new System.Windows.Forms.NumericUpDown(); + this.checkBoxAutoReloadAlertCaption = new System.Windows.Forms.CheckBox(); + this.checkBoxAutoReloadAlertVoice = new System.Windows.Forms.CheckBox(); this.checkBoxUseProxy = new System.Windows.Forms.CheckBox(); this.checkBoxGZipCompression = new System.Windows.Forms.CheckBox(); this.label10 = new System.Windows.Forms.Label(); this.NumericUpDownAutoGettingWebInverval = new System.Windows.Forms.NumericUpDown(); this.label9 = new System.Windows.Forms.Label(); this.tabPage5 = new System.Windows.Forms.TabPage(); + this.buttonRunEditorNGWord = new SpeechCast.Controls.ButtonRunEditor(); this.TextBoxNGWords = new System.Windows.Forms.TextBox(); this.tabPage6 = new System.Windows.Forms.TabPage(); + this.buttonRunEditorPronounciation = new SpeechCast.Controls.ButtonRunEditor(); this.TextBoxPronounciations = new System.Windows.Forms.TextBox(); this.label12 = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label(); @@ -132,15 +141,7 @@ private void InitializeComponent() this.buttonRefernceEditor = new System.Windows.Forms.Button(); this.label8 = new System.Windows.Forms.Label(); this.textBoxEditorFilePath = new System.Windows.Forms.TextBox(); - 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.checkBoxEnableMoveBottomFromBookmarks = new System.Windows.Forms.CheckBox(); this.panel1.SuspendLayout(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); @@ -160,6 +161,8 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.numericUpDownAAModeTextLength)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownAAFontBorderSize)).BeginInit(); this.tabPage3.SuspendLayout(); + this.groupBox3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownAutoReloadAlertTime)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NumericUpDownAutoGettingWebInverval)).BeginInit(); this.tabPage5.SuspendLayout(); this.tabPage6.SuspendLayout(); @@ -170,8 +173,6 @@ private void InitializeComponent() ((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 @@ -179,26 +180,29 @@ private void InitializeComponent() this.panel1.Controls.Add(this.buttonCancel); this.panel1.Controls.Add(this.buttonOK); this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel1.Location = new System.Drawing.Point(0, 396); + this.panel1.Location = new System.Drawing.Point(0, 495); + this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(446, 40); + this.panel1.Size = new System.Drawing.Size(595, 50); this.panel1.TabIndex = 0; // // buttonCancel // this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.buttonCancel.Location = new System.Drawing.Point(267, 6); + this.buttonCancel.Location = new System.Drawing.Point(356, 8); + this.buttonCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(75, 23); + this.buttonCancel.Size = new System.Drawing.Size(100, 29); this.buttonCancel.TabIndex = 1; this.buttonCancel.Text = "キャンセル"; this.buttonCancel.UseVisualStyleBackColor = true; // // buttonOK // - this.buttonOK.Location = new System.Drawing.Point(99, 6); + this.buttonOK.Location = new System.Drawing.Point(132, 8); + this.buttonOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonOK.Name = "buttonOK"; - this.buttonOK.Size = new System.Drawing.Size(75, 23); + this.buttonOK.Size = new System.Drawing.Size(100, 29); this.buttonOK.TabIndex = 0; this.buttonOK.Text = "OK"; this.buttonOK.UseVisualStyleBackColor = true; @@ -217,9 +221,10 @@ private void InitializeComponent() this.tabControl1.Controls.Add(this.tabPage4); this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.tabControl1.Location = new System.Drawing.Point(0, 0); + this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(446, 396); + this.tabControl1.Size = new System.Drawing.Size(595, 495); this.tabControl1.TabIndex = 1; // // tabPage1 @@ -250,10 +255,11 @@ private void InitializeComponent() this.tabPage1.Controls.Add(this.label2); this.tabPage1.Controls.Add(this.NumericUpDownSpeakingInvervalMillsec); this.tabPage1.Controls.Add(this.label1); - this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Location = new System.Drawing.Point(4, 25); + this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(438, 370); + this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPage1.Size = new System.Drawing.Size(587, 466); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "音声"; this.tabPage1.UseVisualStyleBackColor = true; @@ -261,9 +267,10 @@ private void InitializeComponent() // label25 // this.label25.AutoSize = true; - this.label25.Location = new System.Drawing.Point(277, 74); + this.label25.Location = new System.Drawing.Point(369, 92); + this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(34, 12); + this.label25.Size = new System.Drawing.Size(47, 15); this.label25.TabIndex = 25; this.label25.Text = "msec."; // @@ -274,31 +281,34 @@ private void InitializeComponent() 0, 0, 0}); - this.numericUpDownDefaultCaptinoDispInvervalMillsec.Location = new System.Drawing.Point(176, 72); + this.numericUpDownDefaultCaptinoDispInvervalMillsec.Location = new System.Drawing.Point(235, 90); + this.numericUpDownDefaultCaptinoDispInvervalMillsec.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.numericUpDownDefaultCaptinoDispInvervalMillsec.Maximum = new decimal(new int[] { 100000, 0, 0, 0}); this.numericUpDownDefaultCaptinoDispInvervalMillsec.Name = "numericUpDownDefaultCaptinoDispInvervalMillsec"; - this.numericUpDownDefaultCaptinoDispInvervalMillsec.Size = new System.Drawing.Size(95, 19); + this.numericUpDownDefaultCaptinoDispInvervalMillsec.Size = new System.Drawing.Size(127, 25); this.numericUpDownDefaultCaptinoDispInvervalMillsec.TabIndex = 24; // // label26 // this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(17, 74); + this.label26.Location = new System.Drawing.Point(23, 92); + this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(93, 12); + this.label26.Size = new System.Drawing.Size(127, 15); this.label26.TabIndex = 23; this.label26.Text = "字幕が消える時間"; // // label22 // this.label22.AutoSize = true; - this.label22.Location = new System.Drawing.Point(277, 51); + this.label22.Location = new System.Drawing.Point(369, 64); + this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(34, 12); + this.label22.Size = new System.Drawing.Size(47, 15); this.label22.TabIndex = 22; this.label22.Text = "msec."; // @@ -309,38 +319,42 @@ private void InitializeComponent() 0, 0, 0}); - this.NumericUpDownTurboSpeakingInvervalMillsec.Location = new System.Drawing.Point(176, 49); + this.NumericUpDownTurboSpeakingInvervalMillsec.Location = new System.Drawing.Point(235, 61); + this.NumericUpDownTurboSpeakingInvervalMillsec.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.NumericUpDownTurboSpeakingInvervalMillsec.Maximum = new decimal(new int[] { 100000, 0, 0, 0}); this.NumericUpDownTurboSpeakingInvervalMillsec.Name = "NumericUpDownTurboSpeakingInvervalMillsec"; - this.NumericUpDownTurboSpeakingInvervalMillsec.Size = new System.Drawing.Size(95, 19); + this.NumericUpDownTurboSpeakingInvervalMillsec.Size = new System.Drawing.Size(127, 25); this.NumericUpDownTurboSpeakingInvervalMillsec.TabIndex = 21; // // label23 // this.label23.AutoSize = true; - this.label23.Location = new System.Drawing.Point(17, 51); + this.label23.Location = new System.Drawing.Point(23, 64); + this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(156, 12); + this.label23.Size = new System.Drawing.Size(223, 15); this.label23.TabIndex = 20; this.label23.Text = "レス読み上げ間隔(ターボモード)"; // // textTestSentence // - this.textTestSentence.Location = new System.Drawing.Point(19, 228); + this.textTestSentence.Location = new System.Drawing.Point(25, 285); + this.textTestSentence.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textTestSentence.Name = "textTestSentence"; - this.textTestSentence.Size = new System.Drawing.Size(371, 19); + this.textTestSentence.Size = new System.Drawing.Size(493, 25); this.textTestSentence.TabIndex = 19; this.textTestSentence.Text = "読み上げ速度テスト用テキストです"; // // button1 // - this.button1.Location = new System.Drawing.Point(176, 253); + this.button1.Location = new System.Drawing.Point(235, 316); + this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(145, 23); + this.button1.Size = new System.Drawing.Size(193, 29); this.button1.TabIndex = 18; this.button1.Text = "読み上げテスト(ターボ)"; this.button1.UseVisualStyleBackColor = true; @@ -348,9 +362,10 @@ private void InitializeComponent() // // buttonVoiceTest // - this.buttonVoiceTest.Location = new System.Drawing.Point(19, 253); + this.buttonVoiceTest.Location = new System.Drawing.Point(25, 316); + this.buttonVoiceTest.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonVoiceTest.Name = "buttonVoiceTest"; - this.buttonVoiceTest.Size = new System.Drawing.Size(145, 23); + this.buttonVoiceTest.Size = new System.Drawing.Size(193, 29); this.buttonVoiceTest.TabIndex = 17; this.buttonVoiceTest.Text = "読み上げテスト"; this.buttonVoiceTest.UseVisualStyleBackColor = true; @@ -358,14 +373,15 @@ private void InitializeComponent() // // numericUpDownTurboThreshold // - this.numericUpDownTurboThreshold.Location = new System.Drawing.Point(232, 292); + this.numericUpDownTurboThreshold.Location = new System.Drawing.Point(309, 365); + this.numericUpDownTurboThreshold.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.numericUpDownTurboThreshold.Minimum = new decimal(new int[] { 2, 0, 0, 0}); this.numericUpDownTurboThreshold.Name = "numericUpDownTurboThreshold"; - this.numericUpDownTurboThreshold.Size = new System.Drawing.Size(75, 19); + this.numericUpDownTurboThreshold.Size = new System.Drawing.Size(100, 25); this.numericUpDownTurboThreshold.TabIndex = 16; this.numericUpDownTurboThreshold.Value = new decimal(new int[] { 10, @@ -376,46 +392,51 @@ private void InitializeComponent() // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(17, 294); + this.label14.Location = new System.Drawing.Point(23, 368); + this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(127, 12); + this.label14.Size = new System.Drawing.Size(184, 15); this.label14.TabIndex = 15; this.label14.Text = "ターボを開始するレス件数"; // // labelTurboSpeakingRate // this.labelTurboSpeakingRate.AutoSize = true; - this.labelTurboSpeakingRate.Location = new System.Drawing.Point(110, 187); + this.labelTurboSpeakingRate.Location = new System.Drawing.Point(147, 234); + this.labelTurboSpeakingRate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelTurboSpeakingRate.Name = "labelTurboSpeakingRate"; - this.labelTurboSpeakingRate.Size = new System.Drawing.Size(11, 12); + this.labelTurboSpeakingRate.Size = new System.Drawing.Size(15, 15); this.labelTurboSpeakingRate.TabIndex = 14; this.labelTurboSpeakingRate.Text = "0"; // // label21 // this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(17, 186); + this.label21.Location = new System.Drawing.Point(23, 232); + this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(87, 12); + this.label21.Size = new System.Drawing.Size(121, 15); this.label21.TabIndex = 13; this.label21.Text = "話す速度(ターボ)"; // // TrackBarTurboSpeakingRate // this.TrackBarTurboSpeakingRate.LargeChange = 2; - this.TrackBarTurboSpeakingRate.Location = new System.Drawing.Point(160, 177); + this.TrackBarTurboSpeakingRate.Location = new System.Drawing.Point(213, 221); + this.TrackBarTurboSpeakingRate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.TrackBarTurboSpeakingRate.Minimum = -10; this.TrackBarTurboSpeakingRate.Name = "TrackBarTurboSpeakingRate"; - this.TrackBarTurboSpeakingRate.Size = new System.Drawing.Size(222, 45); + this.TrackBarTurboSpeakingRate.Size = new System.Drawing.Size(296, 56); this.TrackBarTurboSpeakingRate.TabIndex = 12; this.TrackBarTurboSpeakingRate.Scroll += new System.EventHandler(this.TrackBarTurboSpeakingRate_Scroll); // // label18 // this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(277, 97); + this.label18.Location = new System.Drawing.Point(369, 121); + this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(34, 12); + this.label18.Size = new System.Drawing.Size(47, 15); this.label18.TabIndex = 11; this.label18.Text = "msec."; // @@ -426,38 +447,42 @@ private void InitializeComponent() 0, 0, 0}); - this.numericUpDownAAModeInvervalMillsec.Location = new System.Drawing.Point(176, 95); + this.numericUpDownAAModeInvervalMillsec.Location = new System.Drawing.Point(235, 119); + this.numericUpDownAAModeInvervalMillsec.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.numericUpDownAAModeInvervalMillsec.Maximum = new decimal(new int[] { 100000, 0, 0, 0}); this.numericUpDownAAModeInvervalMillsec.Name = "numericUpDownAAModeInvervalMillsec"; - this.numericUpDownAAModeInvervalMillsec.Size = new System.Drawing.Size(95, 19); + this.numericUpDownAAModeInvervalMillsec.Size = new System.Drawing.Size(127, 25); this.numericUpDownAAModeInvervalMillsec.TabIndex = 10; // // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(17, 97); + this.label19.Location = new System.Drawing.Point(23, 121); + this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(147, 12); + this.label19.Size = new System.Drawing.Size(202, 15); this.label19.TabIndex = 9; this.label19.Text = "AAモードで字幕が消える時間"; // // checkBoxSpeaksResNumber // this.checkBoxSpeaksResNumber.AutoSize = true; - this.checkBoxSpeaksResNumber.Location = new System.Drawing.Point(19, 318); + this.checkBoxSpeaksResNumber.Location = new System.Drawing.Point(25, 398); + this.checkBoxSpeaksResNumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.checkBoxSpeaksResNumber.Name = "checkBoxSpeaksResNumber"; - this.checkBoxSpeaksResNumber.Size = new System.Drawing.Size(129, 16); + this.checkBoxSpeaksResNumber.Size = new System.Drawing.Size(179, 19); this.checkBoxSpeaksResNumber.TabIndex = 8; this.checkBoxSpeaksResNumber.Text = "レス番号を読み上げる"; this.checkBoxSpeaksResNumber.UseVisualStyleBackColor = true; // // NumericUpDownMaxSpeakingCharacterCount // - this.NumericUpDownMaxSpeakingCharacterCount.Location = new System.Drawing.Point(232, 344); + this.NumericUpDownMaxSpeakingCharacterCount.Location = new System.Drawing.Point(309, 430); + this.NumericUpDownMaxSpeakingCharacterCount.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.NumericUpDownMaxSpeakingCharacterCount.Maximum = new decimal(new int[] { 1000, 0, @@ -469,7 +494,7 @@ private void InitializeComponent() 0, 0}); this.NumericUpDownMaxSpeakingCharacterCount.Name = "NumericUpDownMaxSpeakingCharacterCount"; - this.NumericUpDownMaxSpeakingCharacterCount.Size = new System.Drawing.Size(75, 19); + this.NumericUpDownMaxSpeakingCharacterCount.Size = new System.Drawing.Size(100, 25); this.NumericUpDownMaxSpeakingCharacterCount.TabIndex = 7; this.NumericUpDownMaxSpeakingCharacterCount.Value = new decimal(new int[] { 10, @@ -480,46 +505,51 @@ private void InitializeComponent() // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(17, 346); + this.label4.Location = new System.Drawing.Point(23, 432); + this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(65, 12); + this.label4.Size = new System.Drawing.Size(82, 15); this.label4.TabIndex = 6; this.label4.Text = "文字数制限"; // // labelSpeakingRate // this.labelSpeakingRate.AutoSize = true; - this.labelSpeakingRate.Location = new System.Drawing.Point(110, 136); + this.labelSpeakingRate.Location = new System.Drawing.Point(147, 170); + this.labelSpeakingRate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelSpeakingRate.Name = "labelSpeakingRate"; - this.labelSpeakingRate.Size = new System.Drawing.Size(11, 12); + this.labelSpeakingRate.Size = new System.Drawing.Size(15, 15); this.labelSpeakingRate.TabIndex = 5; this.labelSpeakingRate.Text = "0"; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(17, 136); + this.label3.Location = new System.Drawing.Point(23, 170); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(51, 12); + this.label3.Size = new System.Drawing.Size(67, 15); this.label3.TabIndex = 4; this.label3.Text = "話す速度"; // // TrackBarSpeakingRate // this.TrackBarSpeakingRate.LargeChange = 2; - this.TrackBarSpeakingRate.Location = new System.Drawing.Point(160, 126); + this.TrackBarSpeakingRate.Location = new System.Drawing.Point(213, 158); + this.TrackBarSpeakingRate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.TrackBarSpeakingRate.Minimum = -10; this.TrackBarSpeakingRate.Name = "TrackBarSpeakingRate"; - this.TrackBarSpeakingRate.Size = new System.Drawing.Size(222, 45); + this.TrackBarSpeakingRate.Size = new System.Drawing.Size(296, 56); this.TrackBarSpeakingRate.TabIndex = 3; this.TrackBarSpeakingRate.ValueChanged += new System.EventHandler(this.trackBarSpeakingRate_ValueChanged); // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(277, 28); + this.label2.Location = new System.Drawing.Point(369, 35); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(34, 12); + this.label2.Size = new System.Drawing.Size(47, 15); this.label2.TabIndex = 2; this.label2.Text = "msec."; // @@ -530,22 +560,24 @@ private void InitializeComponent() 0, 0, 0}); - this.NumericUpDownSpeakingInvervalMillsec.Location = new System.Drawing.Point(176, 26); + this.NumericUpDownSpeakingInvervalMillsec.Location = new System.Drawing.Point(235, 32); + this.NumericUpDownSpeakingInvervalMillsec.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.NumericUpDownSpeakingInvervalMillsec.Maximum = new decimal(new int[] { 100000, 0, 0, 0}); this.NumericUpDownSpeakingInvervalMillsec.Name = "NumericUpDownSpeakingInvervalMillsec"; - this.NumericUpDownSpeakingInvervalMillsec.Size = new System.Drawing.Size(95, 19); + this.NumericUpDownSpeakingInvervalMillsec.Size = new System.Drawing.Size(127, 25); this.NumericUpDownSpeakingInvervalMillsec.TabIndex = 1; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(17, 28); + this.label1.Location = new System.Drawing.Point(23, 35); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(92, 12); + this.label1.Size = new System.Drawing.Size(127, 15); this.label1.TabIndex = 0; this.label1.Text = "レス読み上げ間隔"; // @@ -566,10 +598,11 @@ private void InitializeComponent() this.tabPage2.Controls.Add(this.label6); this.tabPage2.Controls.Add(this.ComboBoxFontName); this.tabPage2.Controls.Add(this.label5); - this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Location = new System.Drawing.Point(4, 25); + this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(438, 370); + this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPage2.Size = new System.Drawing.Size(587, 466); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "字幕"; this.tabPage2.UseVisualStyleBackColor = true; @@ -577,9 +610,10 @@ private void InitializeComponent() // label24 // this.label24.AutoSize = true; - this.label24.Location = new System.Drawing.Point(11, 180); + this.label24.Location = new System.Drawing.Point(15, 225); + this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(311, 12); + this.label24.Size = new System.Drawing.Size(416, 15); this.label24.TabIndex = 16; this.label24.Text = "※ 字幕調整時には代替字幕に日本語を入力しての調整を推奨"; // @@ -589,18 +623,21 @@ private void InitializeComponent() this.groupBox2.Controls.Add(this.buttonCaptionIndentPaddingLeft); this.groupBox2.Controls.Add(this.buttonCaptionIndentPaddingDown); this.groupBox2.Controls.Add(this.buttonCaptionIndentPaddingUp); - this.groupBox2.Location = new System.Drawing.Point(13, 109); + this.groupBox2.Location = new System.Drawing.Point(17, 136); + this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(147, 66); + this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox2.Size = new System.Drawing.Size(196, 82); this.groupBox2.TabIndex = 15; this.groupBox2.TabStop = false; this.groupBox2.Text = "字幕表示位置の微調整"; // // buttonCaptionIndentPaddingRight // - this.buttonCaptionIndentPaddingRight.Location = new System.Drawing.Point(88, 27); + this.buttonCaptionIndentPaddingRight.Location = new System.Drawing.Point(117, 34); + this.buttonCaptionIndentPaddingRight.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonCaptionIndentPaddingRight.Name = "buttonCaptionIndentPaddingRight"; - this.buttonCaptionIndentPaddingRight.Size = new System.Drawing.Size(24, 21); + this.buttonCaptionIndentPaddingRight.Size = new System.Drawing.Size(32, 26); this.buttonCaptionIndentPaddingRight.TabIndex = 18; this.buttonCaptionIndentPaddingRight.Text = "→"; this.buttonCaptionIndentPaddingRight.UseVisualStyleBackColor = true; @@ -608,9 +645,10 @@ private void InitializeComponent() // // buttonCaptionIndentPaddingLeft // - this.buttonCaptionIndentPaddingLeft.Location = new System.Drawing.Point(40, 27); + this.buttonCaptionIndentPaddingLeft.Location = new System.Drawing.Point(53, 34); + this.buttonCaptionIndentPaddingLeft.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonCaptionIndentPaddingLeft.Name = "buttonCaptionIndentPaddingLeft"; - this.buttonCaptionIndentPaddingLeft.Size = new System.Drawing.Size(24, 21); + this.buttonCaptionIndentPaddingLeft.Size = new System.Drawing.Size(32, 26); this.buttonCaptionIndentPaddingLeft.TabIndex = 17; this.buttonCaptionIndentPaddingLeft.Text = "←"; this.buttonCaptionIndentPaddingLeft.UseVisualStyleBackColor = true; @@ -618,9 +656,10 @@ private void InitializeComponent() // // buttonCaptionIndentPaddingDown // - this.buttonCaptionIndentPaddingDown.Location = new System.Drawing.Point(64, 37); + this.buttonCaptionIndentPaddingDown.Location = new System.Drawing.Point(85, 46); + this.buttonCaptionIndentPaddingDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonCaptionIndentPaddingDown.Name = "buttonCaptionIndentPaddingDown"; - this.buttonCaptionIndentPaddingDown.Size = new System.Drawing.Size(24, 21); + this.buttonCaptionIndentPaddingDown.Size = new System.Drawing.Size(32, 26); this.buttonCaptionIndentPaddingDown.TabIndex = 16; this.buttonCaptionIndentPaddingDown.Text = "↓"; this.buttonCaptionIndentPaddingDown.UseVisualStyleBackColor = true; @@ -628,9 +667,10 @@ private void InitializeComponent() // // buttonCaptionIndentPaddingUp // - this.buttonCaptionIndentPaddingUp.Location = new System.Drawing.Point(64, 18); + this.buttonCaptionIndentPaddingUp.Location = new System.Drawing.Point(85, 22); + this.buttonCaptionIndentPaddingUp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonCaptionIndentPaddingUp.Name = "buttonCaptionIndentPaddingUp"; - this.buttonCaptionIndentPaddingUp.Size = new System.Drawing.Size(24, 21); + this.buttonCaptionIndentPaddingUp.Size = new System.Drawing.Size(32, 26); this.buttonCaptionIndentPaddingUp.TabIndex = 15; this.buttonCaptionIndentPaddingUp.Text = "↑"; this.buttonCaptionIndentPaddingUp.UseVisualStyleBackColor = true; @@ -639,18 +679,20 @@ private void InitializeComponent() // checkBoxHideCaptionTitle // this.checkBoxHideCaptionTitle.AutoSize = true; - this.checkBoxHideCaptionTitle.Location = new System.Drawing.Point(216, 84); + this.checkBoxHideCaptionTitle.Location = new System.Drawing.Point(288, 105); + this.checkBoxHideCaptionTitle.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.checkBoxHideCaptionTitle.Name = "checkBoxHideCaptionTitle"; - this.checkBoxHideCaptionTitle.Size = new System.Drawing.Size(193, 16); + this.checkBoxHideCaptionTitle.Size = new System.Drawing.Size(274, 19); this.checkBoxHideCaptionTitle.TabIndex = 12; this.checkBoxHideCaptionTitle.Text = "SpeechCastタイトルを非表示にする"; this.checkBoxHideCaptionTitle.UseVisualStyleBackColor = true; // // buttonFontColor // - this.buttonFontColor.Location = new System.Drawing.Point(263, 20); + this.buttonFontColor.Location = new System.Drawing.Point(351, 25); + this.buttonFontColor.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonFontColor.Name = "buttonFontColor"; - this.buttonFontColor.Size = new System.Drawing.Size(109, 23); + this.buttonFontColor.Size = new System.Drawing.Size(145, 29); this.buttonFontColor.TabIndex = 11; this.buttonFontColor.Text = "フォント色"; this.buttonFontColor.UseVisualStyleBackColor = true; @@ -659,9 +701,10 @@ private void InitializeComponent() // checkBoxFontVertical // this.checkBoxFontVertical.AutoSize = true; - this.checkBoxFontVertical.Location = new System.Drawing.Point(153, 84); + this.checkBoxFontVertical.Location = new System.Drawing.Point(204, 105); + this.checkBoxFontVertical.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.checkBoxFontVertical.Name = "checkBoxFontVertical"; - this.checkBoxFontVertical.Size = new System.Drawing.Size(57, 16); + this.checkBoxFontVertical.Size = new System.Drawing.Size(74, 19); this.checkBoxFontVertical.TabIndex = 10; this.checkBoxFontVertical.Text = "縦書き"; this.checkBoxFontVertical.UseVisualStyleBackColor = true; @@ -670,49 +713,54 @@ private void InitializeComponent() // checkBoxShowCaptionImmediately // this.checkBoxShowCaptionImmediately.AutoSize = true; - this.checkBoxShowCaptionImmediately.Location = new System.Drawing.Point(270, 55); + this.checkBoxShowCaptionImmediately.Location = new System.Drawing.Point(360, 69); + this.checkBoxShowCaptionImmediately.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.checkBoxShowCaptionImmediately.Name = "checkBoxShowCaptionImmediately"; - this.checkBoxShowCaptionImmediately.Size = new System.Drawing.Size(124, 16); + this.checkBoxShowCaptionImmediately.Size = new System.Drawing.Size(164, 19); this.checkBoxShowCaptionImmediately.TabIndex = 8; this.checkBoxShowCaptionImmediately.Text = "字幕を瞬間表示する"; this.checkBoxShowCaptionImmediately.UseVisualStyleBackColor = true; // // panelPreview // - this.panelPreview.Location = new System.Drawing.Point(13, 201); + this.panelPreview.Location = new System.Drawing.Point(17, 251); + this.panelPreview.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panelPreview.Name = "panelPreview"; - this.panelPreview.Size = new System.Drawing.Size(404, 163); + this.panelPreview.Size = new System.Drawing.Size(539, 204); this.panelPreview.TabIndex = 9; this.panelPreview.Paint += new System.Windows.Forms.PaintEventHandler(this.panelPreview_Paint); // // NumericUpDownFontBorderSize // - this.NumericUpDownFontBorderSize.Location = new System.Drawing.Point(73, 84); + this.NumericUpDownFontBorderSize.Location = new System.Drawing.Point(97, 105); + this.NumericUpDownFontBorderSize.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.NumericUpDownFontBorderSize.Maximum = new decimal(new int[] { 10, 0, 0, 0}); this.NumericUpDownFontBorderSize.Name = "NumericUpDownFontBorderSize"; - this.NumericUpDownFontBorderSize.Size = new System.Drawing.Size(62, 19); + this.NumericUpDownFontBorderSize.Size = new System.Drawing.Size(83, 25); this.NumericUpDownFontBorderSize.TabIndex = 7; this.NumericUpDownFontBorderSize.ValueChanged += new System.EventHandler(this.ComboBoxFontName_SelectedIndexChanged); // // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(11, 91); + this.label7.Location = new System.Drawing.Point(15, 114); + this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(56, 12); + this.label7.Size = new System.Drawing.Size(82, 15); this.label7.TabIndex = 6; this.label7.Text = "縁のサイズ"; // // CheckBoxFontItalic // this.CheckBoxFontItalic.AutoSize = true; - this.CheckBoxFontItalic.Location = new System.Drawing.Point(216, 55); + this.CheckBoxFontItalic.Location = new System.Drawing.Point(288, 69); + this.CheckBoxFontItalic.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.CheckBoxFontItalic.Name = "CheckBoxFontItalic"; - this.CheckBoxFontItalic.Size = new System.Drawing.Size(48, 16); + this.CheckBoxFontItalic.Size = new System.Drawing.Size(59, 19); this.CheckBoxFontItalic.TabIndex = 5; this.CheckBoxFontItalic.Text = "斜体"; this.CheckBoxFontItalic.UseVisualStyleBackColor = true; @@ -721,9 +769,10 @@ private void InitializeComponent() // CheckBoxFontBold // this.CheckBoxFontBold.AutoSize = true; - this.CheckBoxFontBold.Location = new System.Drawing.Point(153, 55); + this.CheckBoxFontBold.Location = new System.Drawing.Point(204, 69); + this.CheckBoxFontBold.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.CheckBoxFontBold.Name = "CheckBoxFontBold"; - this.CheckBoxFontBold.Size = new System.Drawing.Size(48, 16); + this.CheckBoxFontBold.Size = new System.Drawing.Size(59, 19); this.CheckBoxFontBold.TabIndex = 4; this.CheckBoxFontBold.Text = "太字"; this.CheckBoxFontBold.UseVisualStyleBackColor = true; @@ -745,10 +794,11 @@ private void InitializeComponent() "52", "62", "74"}); - this.ComboBoxFontSize.Location = new System.Drawing.Point(73, 53); + this.ComboBoxFontSize.Location = new System.Drawing.Point(97, 66); + this.ComboBoxFontSize.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ComboBoxFontSize.MaxDropDownItems = 12; this.ComboBoxFontSize.Name = "ComboBoxFontSize"; - this.ComboBoxFontSize.Size = new System.Drawing.Size(61, 20); + this.ComboBoxFontSize.Size = new System.Drawing.Size(80, 23); this.ComboBoxFontSize.TabIndex = 3; this.ComboBoxFontSize.SelectedIndexChanged += new System.EventHandler(this.ComboBoxFontName_SelectedIndexChanged); this.ComboBoxFontSize.TextUpdate += new System.EventHandler(this.ComboBoxFontName_SelectedIndexChanged); @@ -756,9 +806,10 @@ private void InitializeComponent() // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(9, 56); + this.label6.Location = new System.Drawing.Point(12, 70); + this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(34, 12); + this.label6.Size = new System.Drawing.Size(52, 15); this.label6.TabIndex = 2; this.label6.Text = "サイズ"; // @@ -766,18 +817,20 @@ private void InitializeComponent() // this.ComboBoxFontName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ComboBoxFontName.FormattingEnabled = true; - this.ComboBoxFontName.Location = new System.Drawing.Point(73, 23); + this.ComboBoxFontName.Location = new System.Drawing.Point(97, 29); + this.ComboBoxFontName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ComboBoxFontName.Name = "ComboBoxFontName"; - this.ComboBoxFontName.Size = new System.Drawing.Size(159, 20); + this.ComboBoxFontName.Size = new System.Drawing.Size(211, 23); this.ComboBoxFontName.TabIndex = 1; this.ComboBoxFontName.SelectedIndexChanged += new System.EventHandler(this.ComboBoxFontName_SelectedIndexChanged); // // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(9, 26); + this.label5.Location = new System.Drawing.Point(12, 32); + this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(50, 12); + this.label5.Size = new System.Drawing.Size(82, 15); this.label5.TabIndex = 0; this.label5.Text = "フォント名"; // @@ -797,35 +850,39 @@ private void InitializeComponent() this.tabPage7.Controls.Add(this.numericUpDownAAFontBorderSize); this.tabPage7.Controls.Add(this.comboBoxAAFontSize); this.tabPage7.Controls.Add(this.comboBoxAAFontName); - this.tabPage7.Location = new System.Drawing.Point(4, 22); + this.tabPage7.Location = new System.Drawing.Point(4, 25); + this.tabPage7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabPage7.Name = "tabPage7"; - this.tabPage7.Padding = new System.Windows.Forms.Padding(3); - this.tabPage7.Size = new System.Drawing.Size(438, 370); + this.tabPage7.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPage7.Size = new System.Drawing.Size(587, 466); this.tabPage7.TabIndex = 6; this.tabPage7.Text = "AAモード"; this.tabPage7.UseVisualStyleBackColor = true; // // textBoxSpeakingTextWhenAAMode // - this.textBoxSpeakingTextWhenAAMode.Location = new System.Drawing.Point(144, 123); + this.textBoxSpeakingTextWhenAAMode.Location = new System.Drawing.Point(192, 154); + this.textBoxSpeakingTextWhenAAMode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBoxSpeakingTextWhenAAMode.Name = "textBoxSpeakingTextWhenAAMode"; - this.textBoxSpeakingTextWhenAAMode.Size = new System.Drawing.Size(261, 19); + this.textBoxSpeakingTextWhenAAMode.Size = new System.Drawing.Size(347, 25); this.textBoxSpeakingTextWhenAAMode.TabIndex = 14; // // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(15, 126); + this.label13.Location = new System.Drawing.Point(20, 158); + this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(110, 12); + this.label13.Size = new System.Drawing.Size(142, 15); this.label13.TabIndex = 13; this.label13.Text = "固定読み上げ文字列"; // // buttonAAFontColor // - this.buttonAAFontColor.Location = new System.Drawing.Point(263, 91); + this.buttonAAFontColor.Location = new System.Drawing.Point(351, 114); + this.buttonAAFontColor.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonAAFontColor.Name = "buttonAAFontColor"; - this.buttonAAFontColor.Size = new System.Drawing.Size(109, 23); + this.buttonAAFontColor.Size = new System.Drawing.Size(145, 29); this.buttonAAFontColor.TabIndex = 12; this.buttonAAFontColor.Text = "フォント色"; this.buttonAAFontColor.UseVisualStyleBackColor = true; @@ -834,9 +891,10 @@ private void InitializeComponent() // checkBoxSpeaksResNumberWhenAAMode // this.checkBoxSpeaksResNumberWhenAAMode.AutoSize = true; - this.checkBoxSpeaksResNumberWhenAAMode.Location = new System.Drawing.Point(264, 65); + this.checkBoxSpeaksResNumberWhenAAMode.Location = new System.Drawing.Point(352, 81); + this.checkBoxSpeaksResNumberWhenAAMode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.checkBoxSpeaksResNumberWhenAAMode.Name = "checkBoxSpeaksResNumberWhenAAMode"; - this.checkBoxSpeaksResNumberWhenAAMode.Size = new System.Drawing.Size(129, 16); + this.checkBoxSpeaksResNumberWhenAAMode.Size = new System.Drawing.Size(179, 19); this.checkBoxSpeaksResNumberWhenAAMode.TabIndex = 10; this.checkBoxSpeaksResNumberWhenAAMode.Text = "レス番号を読み上げる"; this.checkBoxSpeaksResNumberWhenAAMode.UseVisualStyleBackColor = true; @@ -844,9 +902,10 @@ private void InitializeComponent() // checkBoxSpeakTextBetweenBraces // this.checkBoxSpeakTextBetweenBraces.AutoSize = true; - this.checkBoxSpeakTextBetweenBraces.Location = new System.Drawing.Point(264, 43); + this.checkBoxSpeakTextBetweenBraces.Location = new System.Drawing.Point(352, 54); + this.checkBoxSpeakTextBetweenBraces.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.checkBoxSpeakTextBetweenBraces.Name = "checkBoxSpeakTextBetweenBraces"; - this.checkBoxSpeakTextBetweenBraces.Size = new System.Drawing.Size(141, 16); + this.checkBoxSpeakTextBetweenBraces.Size = new System.Drawing.Size(207, 19); this.checkBoxSpeakTextBetweenBraces.TabIndex = 6; this.checkBoxSpeakTextBetweenBraces.Text = "「」の中だけは読み上げる"; this.checkBoxSpeakTextBetweenBraces.UseVisualStyleBackColor = true; @@ -854,9 +913,10 @@ private void InitializeComponent() // checkBoxReduceFontSizeByWindowWidth // this.checkBoxReduceFontSizeByWindowWidth.AutoSize = true; - this.checkBoxReduceFontSizeByWindowWidth.Location = new System.Drawing.Point(10, 73); + this.checkBoxReduceFontSizeByWindowWidth.Location = new System.Drawing.Point(13, 91); + this.checkBoxReduceFontSizeByWindowWidth.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.checkBoxReduceFontSizeByWindowWidth.Name = "checkBoxReduceFontSizeByWindowWidth"; - this.checkBoxReduceFontSizeByWindowWidth.Size = new System.Drawing.Size(217, 16); + this.checkBoxReduceFontSizeByWindowWidth.Size = new System.Drawing.Size(314, 19); this.checkBoxReduceFontSizeByWindowWidth.TabIndex = 7; this.checkBoxReduceFontSizeByWindowWidth.Text = "字幕枠の幅に合わせてフォントを縮小する"; this.checkBoxReduceFontSizeByWindowWidth.UseVisualStyleBackColor = true; @@ -864,9 +924,10 @@ private void InitializeComponent() // checkBoxReduceFontSizeByWindowHeight // this.checkBoxReduceFontSizeByWindowHeight.AutoSize = true; - this.checkBoxReduceFontSizeByWindowHeight.Location = new System.Drawing.Point(10, 95); + this.checkBoxReduceFontSizeByWindowHeight.Location = new System.Drawing.Point(13, 119); + this.checkBoxReduceFontSizeByWindowHeight.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.checkBoxReduceFontSizeByWindowHeight.Name = "checkBoxReduceFontSizeByWindowHeight"; - this.checkBoxReduceFontSizeByWindowHeight.Size = new System.Drawing.Size(225, 16); + this.checkBoxReduceFontSizeByWindowHeight.Size = new System.Drawing.Size(329, 19); this.checkBoxReduceFontSizeByWindowHeight.TabIndex = 8; this.checkBoxReduceFontSizeByWindowHeight.Text = "字幕枠の高さに合わせてフォントを縮小する"; this.checkBoxReduceFontSizeByWindowHeight.UseVisualStyleBackColor = true; @@ -877,36 +938,54 @@ private void InitializeComponent() this.groupBox1.Controls.Add(this.textBoxAAModeConditions); this.groupBox1.Controls.Add(this.label); this.groupBox1.Controls.Add(this.numericUpDownAAModeTextLength); - this.groupBox1.Location = new System.Drawing.Point(10, 150); + this.groupBox1.Location = new System.Drawing.Point(13, 188); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(407, 139); + this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox1.Size = new System.Drawing.Size(543, 174); this.groupBox1.TabIndex = 9; this.groupBox1.TabStop = false; this.groupBox1.Text = "AAモードになる条件"; // + // buttonRunEditorAAMode + // + this.buttonRunEditorAAMode.AutoSize = true; + this.buttonRunEditorAAMode.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.buttonRunEditorAAMode.EditorErrorMessage = "エディターが見つかりません。\\nその他タブで設定してください。"; + this.buttonRunEditorAAMode.Location = new System.Drawing.Point(459, 55); + this.buttonRunEditorAAMode.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.buttonRunEditorAAMode.Name = "buttonRunEditorAAMode"; + this.buttonRunEditorAAMode.Size = new System.Drawing.Size(70, 38); + this.buttonRunEditorAAMode.TabIndex = 3; + this.buttonRunEditorAAMode.TextBox = this.textBoxAAModeConditions; + this.buttonRunEditorAAMode.GetEditorFilePath += new SpeechCast.Controls.GetEditorFilePathEventHandler(this.buttonRunEditor_GetEditorFilePath); + // // textBoxAAModeConditions // this.textBoxAAModeConditions.AcceptsReturn = true; - this.textBoxAAModeConditions.Location = new System.Drawing.Point(7, 44); + this.textBoxAAModeConditions.Location = new System.Drawing.Point(9, 55); + this.textBoxAAModeConditions.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBoxAAModeConditions.MaxLength = 0; this.textBoxAAModeConditions.Multiline = true; this.textBoxAAModeConditions.Name = "textBoxAAModeConditions"; this.textBoxAAModeConditions.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.textBoxAAModeConditions.Size = new System.Drawing.Size(336, 89); + this.textBoxAAModeConditions.Size = new System.Drawing.Size(447, 110); this.textBoxAAModeConditions.TabIndex = 2; // // label // this.label.AutoSize = true; - this.label.Location = new System.Drawing.Point(73, 21); + this.label.Location = new System.Drawing.Point(97, 26); + this.label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label.Name = "label"; - this.label.Size = new System.Drawing.Size(204, 12); + this.label.Size = new System.Drawing.Size(276, 15); this.label.TabIndex = 1; this.label.Text = "文字以上または、下記文字列を含む場合"; // // numericUpDownAAModeTextLength // - this.numericUpDownAAModeTextLength.Location = new System.Drawing.Point(7, 19); + this.numericUpDownAAModeTextLength.Location = new System.Drawing.Point(9, 24); + this.numericUpDownAAModeTextLength.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.numericUpDownAAModeTextLength.Maximum = new decimal(new int[] { 1000, 0, @@ -918,7 +997,7 @@ private void InitializeComponent() 0, 0}); this.numericUpDownAAModeTextLength.Name = "numericUpDownAAModeTextLength"; - this.numericUpDownAAModeTextLength.Size = new System.Drawing.Size(60, 19); + this.numericUpDownAAModeTextLength.Size = new System.Drawing.Size(80, 25); this.numericUpDownAAModeTextLength.TabIndex = 0; this.numericUpDownAAModeTextLength.Value = new decimal(new int[] { 10, @@ -929,40 +1008,44 @@ private void InitializeComponent() // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(283, 20); + this.label15.Location = new System.Drawing.Point(377, 25); + this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(56, 12); + this.label15.Size = new System.Drawing.Size(82, 15); this.label15.TabIndex = 2; this.label15.Text = "縁のサイズ"; // // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(8, 47); + this.label16.Location = new System.Drawing.Point(11, 59); + this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(34, 12); + this.label16.Size = new System.Drawing.Size(52, 15); this.label16.TabIndex = 4; this.label16.Text = "サイズ"; // // label17 // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(8, 20); + this.label17.Location = new System.Drawing.Point(11, 25); + this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(50, 12); + this.label17.Size = new System.Drawing.Size(82, 15); this.label17.TabIndex = 0; this.label17.Text = "フォント名"; // // numericUpDownAAFontBorderSize // - this.numericUpDownAAFontBorderSize.Location = new System.Drawing.Point(345, 18); + this.numericUpDownAAFontBorderSize.Location = new System.Drawing.Point(460, 22); + this.numericUpDownAAFontBorderSize.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.numericUpDownAAFontBorderSize.Maximum = new decimal(new int[] { 10, 0, 0, 0}); this.numericUpDownAAFontBorderSize.Name = "numericUpDownAAFontBorderSize"; - this.numericUpDownAAFontBorderSize.Size = new System.Drawing.Size(62, 19); + this.numericUpDownAAFontBorderSize.Size = new System.Drawing.Size(83, 25); this.numericUpDownAAFontBorderSize.TabIndex = 3; // // comboBoxAAFontSize @@ -981,19 +1064,21 @@ private void InitializeComponent() "52", "62", "74"}); - this.comboBoxAAFontSize.Location = new System.Drawing.Point(74, 43); + this.comboBoxAAFontSize.Location = new System.Drawing.Point(99, 54); + this.comboBoxAAFontSize.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.comboBoxAAFontSize.MaxDropDownItems = 12; this.comboBoxAAFontSize.Name = "comboBoxAAFontSize"; - this.comboBoxAAFontSize.Size = new System.Drawing.Size(61, 20); + this.comboBoxAAFontSize.Size = new System.Drawing.Size(80, 23); this.comboBoxAAFontSize.TabIndex = 5; // // comboBoxAAFontName // this.comboBoxAAFontName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxAAFontName.FormattingEnabled = true; - this.comboBoxAAFontName.Location = new System.Drawing.Point(74, 17); + this.comboBoxAAFontName.Location = new System.Drawing.Point(99, 21); + this.comboBoxAAFontName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.comboBoxAAFontName.Name = "comboBoxAAFontName"; - this.comboBoxAAFontName.Size = new System.Drawing.Size(143, 20); + this.comboBoxAAFontName.Size = new System.Drawing.Size(189, 23); this.comboBoxAAFontName.TabIndex = 1; // // tabPage3 @@ -1004,20 +1089,101 @@ private void InitializeComponent() this.tabPage3.Controls.Add(this.label10); this.tabPage3.Controls.Add(this.NumericUpDownAutoGettingWebInverval); this.tabPage3.Controls.Add(this.label9); - this.tabPage3.Location = new System.Drawing.Point(4, 22); + this.tabPage3.Location = new System.Drawing.Point(4, 25); + this.tabPage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabPage3.Name = "tabPage3"; - this.tabPage3.Padding = new System.Windows.Forms.Padding(3); - this.tabPage3.Size = new System.Drawing.Size(438, 370); + this.tabPage3.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPage3.Size = new System.Drawing.Size(587, 466); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "通信"; this.tabPage3.UseVisualStyleBackColor = true; // + // 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(27, 165); + this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox3.Size = new System.Drawing.Size(547, 90); + this.groupBox3.TabIndex = 6; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "自動更新忘れ警告"; + // + // textBoxAutoReloadAlertMessage + // + this.textBoxAutoReloadAlertMessage.Location = new System.Drawing.Point(17, 52); + this.textBoxAutoReloadAlertMessage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBoxAutoReloadAlertMessage.Name = "textBoxAutoReloadAlertMessage"; + this.textBoxAutoReloadAlertMessage.Size = new System.Drawing.Size(511, 25); + this.textBoxAutoReloadAlertMessage.TabIndex = 20; + // + // label31 + // + this.label31.AutoSize = true; + this.label31.Location = new System.Drawing.Point(245, 24); + this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label31.Name = "label31"; + this.label31.Size = new System.Drawing.Size(214, 15); + this.label31.TabIndex = 8; + this.label31.Text = "警告を表示するまでの時間(分)"; + // + // numericUpDownAutoReloadAlertTime + // + this.numericUpDownAutoReloadAlertTime.Location = new System.Drawing.Point(459, 21); + this.numericUpDownAutoReloadAlertTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.numericUpDownAutoReloadAlertTime.Maximum = new decimal(new int[] { + 30, + 0, + 0, + 0}); + this.numericUpDownAutoReloadAlertTime.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDownAutoReloadAlertTime.Name = "numericUpDownAutoReloadAlertTime"; + this.numericUpDownAutoReloadAlertTime.Size = new System.Drawing.Size(71, 25); + this.numericUpDownAutoReloadAlertTime.TabIndex = 7; + this.numericUpDownAutoReloadAlertTime.Value = new decimal(new int[] { + 5, + 0, + 0, + 0}); + // + // checkBoxAutoReloadAlertCaption + // + this.checkBoxAutoReloadAlertCaption.AutoSize = true; + this.checkBoxAutoReloadAlertCaption.Location = new System.Drawing.Point(149, 22); + this.checkBoxAutoReloadAlertCaption.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.checkBoxAutoReloadAlertCaption.Name = "checkBoxAutoReloadAlertCaption"; + this.checkBoxAutoReloadAlertCaption.Size = new System.Drawing.Size(89, 19); + this.checkBoxAutoReloadAlertCaption.TabIndex = 1; + this.checkBoxAutoReloadAlertCaption.Text = "レス表示"; + this.checkBoxAutoReloadAlertCaption.UseVisualStyleBackColor = true; + // + // checkBoxAutoReloadAlertVoice + // + this.checkBoxAutoReloadAlertVoice.AutoSize = true; + this.checkBoxAutoReloadAlertVoice.Location = new System.Drawing.Point(17, 22); + this.checkBoxAutoReloadAlertVoice.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.checkBoxAutoReloadAlertVoice.Name = "checkBoxAutoReloadAlertVoice"; + this.checkBoxAutoReloadAlertVoice.Size = new System.Drawing.Size(119, 19); + this.checkBoxAutoReloadAlertVoice.TabIndex = 0; + this.checkBoxAutoReloadAlertVoice.Text = "音声読み上げ"; + this.checkBoxAutoReloadAlertVoice.UseVisualStyleBackColor = true; + // // checkBoxUseProxy // this.checkBoxUseProxy.AutoSize = true; - this.checkBoxUseProxy.Location = new System.Drawing.Point(20, 106); + this.checkBoxUseProxy.Location = new System.Drawing.Point(27, 132); + this.checkBoxUseProxy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.checkBoxUseProxy.Name = "checkBoxUseProxy"; - this.checkBoxUseProxy.Size = new System.Drawing.Size(270, 16); + this.checkBoxUseProxy.Size = new System.Drawing.Size(416, 19); this.checkBoxUseProxy.TabIndex = 5; this.checkBoxUseProxy.Text = "インターネットオプションで設定したプロキシを使用する"; this.checkBoxUseProxy.UseVisualStyleBackColor = true; @@ -1025,9 +1191,10 @@ private void InitializeComponent() // checkBoxGZipCompression // this.checkBoxGZipCompression.AutoSize = true; - this.checkBoxGZipCompression.Location = new System.Drawing.Point(21, 73); + this.checkBoxGZipCompression.Location = new System.Drawing.Point(28, 91); + this.checkBoxGZipCompression.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.checkBoxGZipCompression.Name = "checkBoxGZipCompression"; - this.checkBoxGZipCompression.Size = new System.Drawing.Size(327, 16); + this.checkBoxGZipCompression.Size = new System.Drawing.Size(472, 19); this.checkBoxGZipCompression.TabIndex = 4; this.checkBoxGZipCompression.Text = "GZip圧縮を有効にする（サーバーが対応している必要があります）"; this.checkBoxGZipCompression.UseVisualStyleBackColor = true; @@ -1035,9 +1202,10 @@ private void InitializeComponent() // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(190, 36); + this.label10.Location = new System.Drawing.Point(253, 45); + this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(34, 12); + this.label10.Size = new System.Drawing.Size(47, 15); this.label10.TabIndex = 3; this.label10.Text = "msec."; // @@ -1048,7 +1216,8 @@ private void InitializeComponent() 0, 0, 0}); - this.NumericUpDownAutoGettingWebInverval.Location = new System.Drawing.Point(102, 34); + this.NumericUpDownAutoGettingWebInverval.Location = new System.Drawing.Point(136, 42); + this.NumericUpDownAutoGettingWebInverval.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.NumericUpDownAutoGettingWebInverval.Maximum = new decimal(new int[] { 1000000, 0, @@ -1060,7 +1229,7 @@ private void InitializeComponent() 0, 0}); this.NumericUpDownAutoGettingWebInverval.Name = "NumericUpDownAutoGettingWebInverval"; - this.NumericUpDownAutoGettingWebInverval.Size = new System.Drawing.Size(82, 19); + this.NumericUpDownAutoGettingWebInverval.Size = new System.Drawing.Size(109, 25); this.NumericUpDownAutoGettingWebInverval.TabIndex = 1; this.NumericUpDownAutoGettingWebInverval.Value = new decimal(new int[] { 10000, @@ -1071,9 +1240,10 @@ private void InitializeComponent() // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(19, 36); + this.label9.Location = new System.Drawing.Point(25, 45); + this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(77, 12); + this.label9.Size = new System.Drawing.Size(97, 15); this.label9.TabIndex = 0; this.label9.Text = "自動更新間隔"; // @@ -1081,23 +1251,38 @@ private void InitializeComponent() // this.tabPage5.Controls.Add(this.buttonRunEditorNGWord); this.tabPage5.Controls.Add(this.TextBoxNGWords); - this.tabPage5.Location = new System.Drawing.Point(4, 22); + this.tabPage5.Location = new System.Drawing.Point(4, 25); + this.tabPage5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabPage5.Name = "tabPage5"; - this.tabPage5.Padding = new System.Windows.Forms.Padding(3); - this.tabPage5.Size = new System.Drawing.Size(438, 370); + this.tabPage5.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPage5.Size = new System.Drawing.Size(587, 466); this.tabPage5.TabIndex = 4; this.tabPage5.Text = "NGWord"; this.tabPage5.UseVisualStyleBackColor = true; // + // buttonRunEditorNGWord + // + this.buttonRunEditorNGWord.AutoSize = true; + this.buttonRunEditorNGWord.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.buttonRunEditorNGWord.EditorErrorMessage = "エディターが見つかりません。\\nその他タブで設定してください。"; + this.buttonRunEditorNGWord.Location = new System.Drawing.Point(492, 32); + this.buttonRunEditorNGWord.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.buttonRunEditorNGWord.Name = "buttonRunEditorNGWord"; + this.buttonRunEditorNGWord.Size = new System.Drawing.Size(70, 38); + this.buttonRunEditorNGWord.TabIndex = 1; + this.buttonRunEditorNGWord.TextBox = this.TextBoxNGWords; + this.buttonRunEditorNGWord.GetEditorFilePath += new SpeechCast.Controls.GetEditorFilePathEventHandler(this.buttonRunEditor_GetEditorFilePath); + // // TextBoxNGWords // this.TextBoxNGWords.AcceptsReturn = true; - this.TextBoxNGWords.Location = new System.Drawing.Point(9, 26); + this.TextBoxNGWords.Location = new System.Drawing.Point(12, 32); + this.TextBoxNGWords.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.TextBoxNGWords.MaxLength = 0; this.TextBoxNGWords.Multiline = true; this.TextBoxNGWords.Name = "TextBoxNGWords"; this.TextBoxNGWords.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.TextBoxNGWords.Size = new System.Drawing.Size(358, 230); + this.TextBoxNGWords.Size = new System.Drawing.Size(476, 286); this.TextBoxNGWords.TabIndex = 0; // // tabPage6 @@ -1106,39 +1291,56 @@ private void InitializeComponent() this.tabPage6.Controls.Add(this.label12); this.tabPage6.Controls.Add(this.label11); this.tabPage6.Controls.Add(this.TextBoxPronounciations); - this.tabPage6.Location = new System.Drawing.Point(4, 22); + this.tabPage6.Location = new System.Drawing.Point(4, 25); + this.tabPage6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabPage6.Name = "tabPage6"; - this.tabPage6.Size = new System.Drawing.Size(438, 370); + this.tabPage6.Size = new System.Drawing.Size(587, 466); this.tabPage6.TabIndex = 5; this.tabPage6.Text = "読み方"; this.tabPage6.UseVisualStyleBackColor = true; // + // buttonRunEditorPronounciation + // + this.buttonRunEditorPronounciation.AutoSize = true; + this.buttonRunEditorPronounciation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.buttonRunEditorPronounciation.EditorErrorMessage = "エディターが見つかりません。\\nその他タブで設定してください。"; + this.buttonRunEditorPronounciation.Location = new System.Drawing.Point(492, 58); + this.buttonRunEditorPronounciation.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.buttonRunEditorPronounciation.Name = "buttonRunEditorPronounciation"; + this.buttonRunEditorPronounciation.Size = new System.Drawing.Size(70, 38); + this.buttonRunEditorPronounciation.TabIndex = 4; + this.buttonRunEditorPronounciation.TextBox = this.TextBoxPronounciations; + this.buttonRunEditorPronounciation.GetEditorFilePath += new SpeechCast.Controls.GetEditorFilePathEventHandler(this.buttonRunEditor_GetEditorFilePath); + // // TextBoxPronounciations // this.TextBoxPronounciations.AcceptsReturn = true; - this.TextBoxPronounciations.Location = new System.Drawing.Point(3, 46); + this.TextBoxPronounciations.Location = new System.Drawing.Point(4, 58); + this.TextBoxPronounciations.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.TextBoxPronounciations.MaxLength = 0; this.TextBoxPronounciations.Multiline = true; this.TextBoxPronounciations.Name = "TextBoxPronounciations"; this.TextBoxPronounciations.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.TextBoxPronounciations.Size = new System.Drawing.Size(362, 213); + this.TextBoxPronounciations.Size = new System.Drawing.Size(481, 265); this.TextBoxPronounciations.TabIndex = 1; // // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(10, 28); + this.label12.Location = new System.Drawing.Point(13, 35); + this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(182, 12); + this.label12.Size = new System.Drawing.Size(260, 15); this.label12.TabIndex = 3; this.label12.Text = "（単語部分には正規表現が使えます）"; // // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(8, 9); + this.label11.Location = new System.Drawing.Point(11, 11); + this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(206, 12); + this.label11.Size = new System.Drawing.Size(296, 15); this.label11.TabIndex = 2; this.label11.Text = "単語/読み方　を複数行入力してください。"; // @@ -1146,10 +1348,11 @@ private void InitializeComponent() // this.tabPage8.Controls.Add(this.panelPlaySound); this.tabPage8.Controls.Add(this.checkBoxPlaySoundNewResponse); - this.tabPage8.Location = new System.Drawing.Point(4, 22); + this.tabPage8.Location = new System.Drawing.Point(4, 25); + this.tabPage8.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabPage8.Name = "tabPage8"; - this.tabPage8.Padding = new System.Windows.Forms.Padding(3); - this.tabPage8.Size = new System.Drawing.Size(438, 370); + this.tabPage8.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPage8.Size = new System.Drawing.Size(587, 466); this.tabPage8.TabIndex = 7; this.tabPage8.Text = "サウンド"; this.tabPage8.UseVisualStyleBackColor = true; @@ -1162,16 +1365,18 @@ private void InitializeComponent() this.panelPlaySound.Controls.Add(this.listBoxNewResponseSoundFilePathes); this.panelPlaySound.Controls.Add(this.checkBoxPlaySoundSync); this.panelPlaySound.Controls.Add(this.label20); - this.panelPlaySound.Location = new System.Drawing.Point(26, 44); + this.panelPlaySound.Location = new System.Drawing.Point(35, 55); + this.panelPlaySound.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panelPlaySound.Name = "panelPlaySound"; - this.panelPlaySound.Size = new System.Drawing.Size(393, 282); + this.panelPlaySound.Size = new System.Drawing.Size(524, 352); this.panelPlaySound.TabIndex = 4; // // buttonResSoundTest // - this.buttonResSoundTest.Location = new System.Drawing.Point(271, 202); + this.buttonResSoundTest.Location = new System.Drawing.Point(361, 252); + this.buttonResSoundTest.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonResSoundTest.Name = "buttonResSoundTest"; - this.buttonResSoundTest.Size = new System.Drawing.Size(80, 22); + this.buttonResSoundTest.Size = new System.Drawing.Size(107, 28); this.buttonResSoundTest.TabIndex = 10; this.buttonResSoundTest.Text = "テスト"; this.buttonResSoundTest.UseVisualStyleBackColor = true; @@ -1179,9 +1384,10 @@ private void InitializeComponent() // // buttonNewResponseSoundFilePathesRemove // - this.buttonNewResponseSoundFilePathesRemove.Location = new System.Drawing.Point(174, 202); + this.buttonNewResponseSoundFilePathesRemove.Location = new System.Drawing.Point(232, 252); + this.buttonNewResponseSoundFilePathesRemove.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonNewResponseSoundFilePathesRemove.Name = "buttonNewResponseSoundFilePathesRemove"; - this.buttonNewResponseSoundFilePathesRemove.Size = new System.Drawing.Size(80, 22); + this.buttonNewResponseSoundFilePathesRemove.Size = new System.Drawing.Size(107, 28); this.buttonNewResponseSoundFilePathesRemove.TabIndex = 9; this.buttonNewResponseSoundFilePathesRemove.Text = "削除"; this.buttonNewResponseSoundFilePathesRemove.UseVisualStyleBackColor = true; @@ -1189,9 +1395,10 @@ private void InitializeComponent() // // buttonNewResponseSoundFilePathesAdd // - this.buttonNewResponseSoundFilePathesAdd.Location = new System.Drawing.Point(69, 202); + this.buttonNewResponseSoundFilePathesAdd.Location = new System.Drawing.Point(92, 252); + this.buttonNewResponseSoundFilePathesAdd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonNewResponseSoundFilePathesAdd.Name = "buttonNewResponseSoundFilePathesAdd"; - this.buttonNewResponseSoundFilePathesAdd.Size = new System.Drawing.Size(80, 22); + this.buttonNewResponseSoundFilePathesAdd.Size = new System.Drawing.Size(107, 28); this.buttonNewResponseSoundFilePathesAdd.TabIndex = 8; this.buttonNewResponseSoundFilePathesAdd.Text = "追加"; this.buttonNewResponseSoundFilePathesAdd.UseVisualStyleBackColor = true; @@ -1200,17 +1407,19 @@ private void InitializeComponent() // listBoxNewResponseSoundFilePathes // this.listBoxNewResponseSoundFilePathes.FormattingEnabled = true; - this.listBoxNewResponseSoundFilePathes.ItemHeight = 12; - this.listBoxNewResponseSoundFilePathes.Location = new System.Drawing.Point(69, 6); + this.listBoxNewResponseSoundFilePathes.ItemHeight = 15; + this.listBoxNewResponseSoundFilePathes.Location = new System.Drawing.Point(92, 8); + this.listBoxNewResponseSoundFilePathes.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.listBoxNewResponseSoundFilePathes.Name = "listBoxNewResponseSoundFilePathes"; - this.listBoxNewResponseSoundFilePathes.Size = new System.Drawing.Size(306, 184); + this.listBoxNewResponseSoundFilePathes.Size = new System.Drawing.Size(407, 229); this.listBoxNewResponseSoundFilePathes.TabIndex = 7; // // checkBoxPlaySoundSync // - this.checkBoxPlaySoundSync.Location = new System.Drawing.Point(5, 230); + this.checkBoxPlaySoundSync.Location = new System.Drawing.Point(7, 288); + this.checkBoxPlaySoundSync.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.checkBoxPlaySoundSync.Name = "checkBoxPlaySoundSync"; - this.checkBoxPlaySoundSync.Size = new System.Drawing.Size(370, 36); + this.checkBoxPlaySoundSync.Size = new System.Drawing.Size(493, 45); this.checkBoxPlaySoundSync.TabIndex = 4; this.checkBoxPlaySoundSync.Text = "サウンド再生が終了してから、読み上げを開始する(オンにするとサウンド再生が終了するまで、UIが反応しなくなります)"; this.checkBoxPlaySoundSync.UseVisualStyleBackColor = true; @@ -1218,18 +1427,20 @@ private void InitializeComponent() // label20 // this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(3, 11); + this.label20.Location = new System.Drawing.Point(4, 14); + this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(41, 12); + this.label20.Size = new System.Drawing.Size(52, 15); this.label20.TabIndex = 2; this.label20.Text = "着信音"; // // checkBoxPlaySoundNewResponse // this.checkBoxPlaySoundNewResponse.AutoSize = true; - this.checkBoxPlaySoundNewResponse.Location = new System.Drawing.Point(9, 22); + this.checkBoxPlaySoundNewResponse.Location = new System.Drawing.Point(12, 28); + this.checkBoxPlaySoundNewResponse.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.checkBoxPlaySoundNewResponse.Name = "checkBoxPlaySoundNewResponse"; - this.checkBoxPlaySoundNewResponse.Size = new System.Drawing.Size(204, 16); + this.checkBoxPlaySoundNewResponse.Size = new System.Drawing.Size(313, 19); this.checkBoxPlaySoundNewResponse.TabIndex = 0; this.checkBoxPlaySoundNewResponse.Text = "新着レスがあったとき、サウンドを鳴らす"; this.checkBoxPlaySoundNewResponse.UseVisualStyleBackColor = true; @@ -1237,6 +1448,7 @@ private void InitializeComponent() // // tabPageBrowser // + this.tabPageBrowser.Controls.Add(this.checkBoxEnableMoveBottomFromBookmarks); this.tabPageBrowser.Controls.Add(this.label30); this.tabPageBrowser.Controls.Add(this.label29); this.tabPageBrowser.Controls.Add(this.numericUpDownViewerYoutubePlayerWidth); @@ -1245,10 +1457,11 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(4, 25); + this.tabPageBrowser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabPageBrowser.Name = "tabPageBrowser"; - this.tabPageBrowser.Padding = new System.Windows.Forms.Padding(3); - this.tabPageBrowser.Size = new System.Drawing.Size(438, 370); + this.tabPageBrowser.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPageBrowser.Size = new System.Drawing.Size(587, 466); this.tabPageBrowser.TabIndex = 8; this.tabPageBrowser.Text = "ブラウザ"; this.tabPageBrowser.UseVisualStyleBackColor = true; @@ -1256,78 +1469,86 @@ private void InitializeComponent() // label30 // this.label30.AutoSize = true; - this.label30.Location = new System.Drawing.Point(141, 80); + this.label30.Location = new System.Drawing.Point(188, 100); + this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(17, 12); + this.label30.Size = new System.Drawing.Size(22, 15); this.label30.TabIndex = 17; this.label30.Text = "幅"; // // label29 // this.label29.AutoSize = true; - this.label29.Location = new System.Drawing.Point(261, 80); + this.label29.Location = new System.Drawing.Point(348, 100); + this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(25, 12); + this.label29.Size = new System.Drawing.Size(37, 15); this.label29.TabIndex = 16; this.label29.Text = "高さ"; // // numericUpDownViewerYoutubePlayerWidth // - this.numericUpDownViewerYoutubePlayerWidth.Location = new System.Drawing.Point(164, 78); + this.numericUpDownViewerYoutubePlayerWidth.Location = new System.Drawing.Point(219, 98); + this.numericUpDownViewerYoutubePlayerWidth.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 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.Size = new System.Drawing.Size(100, 25); this.numericUpDownViewerYoutubePlayerWidth.TabIndex = 15; // // numericUpDownViewerYoutubePlayerHeight // - this.numericUpDownViewerYoutubePlayerHeight.Location = new System.Drawing.Point(292, 78); + this.numericUpDownViewerYoutubePlayerHeight.Location = new System.Drawing.Point(389, 98); + this.numericUpDownViewerYoutubePlayerHeight.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 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.Size = new System.Drawing.Size(100, 25); this.numericUpDownViewerYoutubePlayerHeight.TabIndex = 14; // // label27 // this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(9, 80); + this.label27.Location = new System.Drawing.Point(12, 100); + this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(122, 12); + this.label27.Size = new System.Drawing.Size(177, 15); this.label27.TabIndex = 13; this.label27.Text = "Youtubeプレイヤーサイズ"; // // labelAutoScrollSpeed // this.labelAutoScrollSpeed.AutoSize = true; - this.labelAutoScrollSpeed.Location = new System.Drawing.Point(116, 22); + this.labelAutoScrollSpeed.Location = new System.Drawing.Point(155, 28); + this.labelAutoScrollSpeed.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelAutoScrollSpeed.Name = "labelAutoScrollSpeed"; - this.labelAutoScrollSpeed.Size = new System.Drawing.Size(11, 12); + this.labelAutoScrollSpeed.Size = new System.Drawing.Size(15, 15); this.labelAutoScrollSpeed.TabIndex = 12; this.labelAutoScrollSpeed.Text = "0"; // // label28 // this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(9, 22); + this.label28.Location = new System.Drawing.Point(12, 28); + this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(99, 12); + this.label28.Size = new System.Drawing.Size(139, 15); this.label28.TabIndex = 11; this.label28.Text = "自動スクロール速度"; // // trackBarAutoScrollSpeed // - this.trackBarAutoScrollSpeed.Location = new System.Drawing.Point(143, 9); + this.trackBarAutoScrollSpeed.Location = new System.Drawing.Point(191, 11); + this.trackBarAutoScrollSpeed.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trackBarAutoScrollSpeed.Minimum = 1; this.trackBarAutoScrollSpeed.Name = "trackBarAutoScrollSpeed"; - this.trackBarAutoScrollSpeed.Size = new System.Drawing.Size(272, 45); + this.trackBarAutoScrollSpeed.Size = new System.Drawing.Size(363, 56); this.trackBarAutoScrollSpeed.TabIndex = 10; this.trackBarAutoScrollSpeed.Value = 1; this.trackBarAutoScrollSpeed.ValueChanged += new System.EventHandler(this.trackBarAutoScrollSpeed_ValueChanged); @@ -1338,10 +1559,11 @@ private void InitializeComponent() this.tabPage4.Controls.Add(this.buttonRefernceEditor); this.tabPage4.Controls.Add(this.label8); this.tabPage4.Controls.Add(this.textBoxEditorFilePath); - this.tabPage4.Location = new System.Drawing.Point(4, 22); + this.tabPage4.Location = new System.Drawing.Point(4, 25); + this.tabPage4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabPage4.Name = "tabPage4"; - this.tabPage4.Padding = new System.Windows.Forms.Padding(3); - this.tabPage4.Size = new System.Drawing.Size(438, 370); + this.tabPage4.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPage4.Size = new System.Drawing.Size(587, 466); this.tabPage4.TabIndex = 3; this.tabPage4.Text = "その他"; this.tabPage4.UseVisualStyleBackColor = true; @@ -1349,18 +1571,20 @@ private void InitializeComponent() // checkBoxDebug // this.checkBoxDebug.AutoSize = true; - this.checkBoxDebug.Location = new System.Drawing.Point(10, 54); + this.checkBoxDebug.Location = new System.Drawing.Point(13, 68); + this.checkBoxDebug.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.checkBoxDebug.Name = "checkBoxDebug"; - this.checkBoxDebug.Size = new System.Drawing.Size(130, 16); + this.checkBoxDebug.Size = new System.Drawing.Size(194, 19); this.checkBoxDebug.TabIndex = 6; this.checkBoxDebug.Text = "デバッグログを出力する"; this.checkBoxDebug.UseVisualStyleBackColor = true; // // buttonRefernceEditor // - this.buttonRefernceEditor.Location = new System.Drawing.Point(394, 22); + this.buttonRefernceEditor.Location = new System.Drawing.Point(525, 28); + this.buttonRefernceEditor.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonRefernceEditor.Name = "buttonRefernceEditor"; - this.buttonRefernceEditor.Size = new System.Drawing.Size(23, 23); + this.buttonRefernceEditor.Size = new System.Drawing.Size(31, 29); this.buttonRefernceEditor.TabIndex = 5; this.buttonRefernceEditor.Text = "..."; this.buttonRefernceEditor.UseVisualStyleBackColor = true; @@ -1369,137 +1593,43 @@ private void InitializeComponent() // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(8, 27); + this.label8.Location = new System.Drawing.Point(11, 34); + this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(102, 12); + this.label8.Size = new System.Drawing.Size(172, 15); this.label8.TabIndex = 4; this.label8.Text = "エディタのファイルパス"; // // textBoxEditorFilePath // - this.textBoxEditorFilePath.Location = new System.Drawing.Point(116, 24); + this.textBoxEditorFilePath.Location = new System.Drawing.Point(155, 30); + this.textBoxEditorFilePath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBoxEditorFilePath.Name = "textBoxEditorFilePath"; - this.textBoxEditorFilePath.Size = new System.Drawing.Size(272, 19); + this.textBoxEditorFilePath.Size = new System.Drawing.Size(361, 25); this.textBoxEditorFilePath.TabIndex = 3; // - // 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 + // checkBoxEnableMoveBottomFromBookmarks // - 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.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}); - // - // label31 - // - 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 - // - this.buttonRunEditorAAMode.AutoSize = true; - this.buttonRunEditorAAMode.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.buttonRunEditorAAMode.EditorErrorMessage = "エディターが見つかりません。\\nその他タブで設定してください。"; - this.buttonRunEditorAAMode.Location = new System.Drawing.Point(344, 44); - this.buttonRunEditorAAMode.Name = "buttonRunEditorAAMode"; - this.buttonRunEditorAAMode.Size = new System.Drawing.Size(53, 30); - this.buttonRunEditorAAMode.TabIndex = 3; - this.buttonRunEditorAAMode.TextBox = this.textBoxAAModeConditions; - this.buttonRunEditorAAMode.GetEditorFilePath += new SpeechCast.Controls.GetEditorFilePathEventHandler(this.buttonRunEditor_GetEditorFilePath); - // - // buttonRunEditorNGWord - // - this.buttonRunEditorNGWord.AutoSize = true; - this.buttonRunEditorNGWord.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.buttonRunEditorNGWord.EditorErrorMessage = "エディターが見つかりません。\\nその他タブで設定してください。"; - this.buttonRunEditorNGWord.Location = new System.Drawing.Point(369, 26); - this.buttonRunEditorNGWord.Name = "buttonRunEditorNGWord"; - this.buttonRunEditorNGWord.Size = new System.Drawing.Size(53, 30); - this.buttonRunEditorNGWord.TabIndex = 1; - this.buttonRunEditorNGWord.TextBox = this.TextBoxNGWords; - this.buttonRunEditorNGWord.GetEditorFilePath += new SpeechCast.Controls.GetEditorFilePathEventHandler(this.buttonRunEditor_GetEditorFilePath); - // - // buttonRunEditorPronounciation - // - this.buttonRunEditorPronounciation.AutoSize = true; - this.buttonRunEditorPronounciation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.buttonRunEditorPronounciation.EditorErrorMessage = "エディターが見つかりません。\\nその他タブで設定してください。"; - this.buttonRunEditorPronounciation.Location = new System.Drawing.Point(369, 46); - this.buttonRunEditorPronounciation.Name = "buttonRunEditorPronounciation"; - this.buttonRunEditorPronounciation.Size = new System.Drawing.Size(53, 30); - this.buttonRunEditorPronounciation.TabIndex = 4; - 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; + this.checkBoxEnableMoveBottomFromBookmarks.AutoSize = true; + this.checkBoxEnableMoveBottomFromBookmarks.Location = new System.Drawing.Point(15, 140); + this.checkBoxEnableMoveBottomFromBookmarks.Margin = new System.Windows.Forms.Padding(4); + this.checkBoxEnableMoveBottomFromBookmarks.Name = "checkBoxEnableMoveBottomFromBookmarks"; + this.checkBoxEnableMoveBottomFromBookmarks.Size = new System.Drawing.Size(491, 19); + this.checkBoxEnableMoveBottomFromBookmarks.TabIndex = 18; + this.checkBoxEnableMoveBottomFromBookmarks.Text = "ブックマークからスレを開いたときに末尾までレス表示欄を移動する"; + this.checkBoxEnableMoveBottomFromBookmarks.UseVisualStyleBackColor = true; // // FormSettings // this.AcceptButton = this.buttonOK; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.buttonCancel; - this.ClientSize = new System.Drawing.Size(446, 436); + this.ClientSize = new System.Drawing.Size(595, 545); this.Controls.Add(this.tabControl1); this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormSettings"; @@ -1531,6 +1661,9 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.numericUpDownAAFontBorderSize)).EndInit(); this.tabPage3.ResumeLayout(false); this.tabPage3.PerformLayout(); + this.groupBox3.ResumeLayout(false); + this.groupBox3.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownAutoReloadAlertTime)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NumericUpDownAutoGettingWebInverval)).EndInit(); this.tabPage5.ResumeLayout(false); this.tabPage5.PerformLayout(); @@ -1547,9 +1680,6 @@ private void InitializeComponent() ((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); } @@ -1669,5 +1799,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox checkBoxAutoReloadAlertCaption; private System.Windows.Forms.CheckBox checkBoxAutoReloadAlertVoice; private System.Windows.Forms.TextBox textBoxAutoReloadAlertMessage; + public System.Windows.Forms.CheckBox checkBoxEnableMoveBottomFromBookmarks; } } \ No newline at end of file diff --git a/SpeechCast/FormSettings.cs b/SpeechCast/FormSettings.cs index a60d040..8f8aef5 100644 --- a/SpeechCast/FormSettings.cs +++ b/SpeechCast/FormSettings.cs @@ -125,6 +125,7 @@ public void SetUserConfig(UserConfig userConfig) this.checkBoxAutoReloadAlertVoice.Checked = userConfig.AutoReloadAlertVoice; this.numericUpDownAutoReloadAlertTime.Value = userConfig.AutoReloadAlertInvervalMinutes; this.textBoxAutoReloadAlertMessage.Text = userConfig.AutoReloadAlertMessage; + this.checkBoxEnableMoveBottomFromBookmarks.Checked = userConfig.enableMoveBottomFromBookmarks; numericUpDownViewerYoutubePlayerHeight.Value = userConfig.ViewerYoutubePlayerHeight; numericUpDownViewerYoutubePlayerWidth.Value = userConfig.ViewerYoutubePlayerWidth; UpdateUI(); @@ -208,6 +209,7 @@ public void GetUserConfig(UserConfig userConfig) userConfig.AutoReloadAlertVoice = this.checkBoxAutoReloadAlertVoice.Checked; userConfig.AutoReloadAlertInvervalMinutes = (int)this.numericUpDownAutoReloadAlertTime.Value; userConfig.AutoReloadAlertMessage = this.textBoxAutoReloadAlertMessage.Text; + userConfig.enableMoveBottomFromBookmarks = this.checkBoxEnableMoveBottomFromBookmarks.Checked; } diff --git a/SpeechCast/Properties/AssemblyInfo.cs b/SpeechCast/Properties/AssemblyInfo.cs index 9f0cbc6..337ed0a 100644 --- a/SpeechCast/Properties/AssemblyInfo.cs +++ b/SpeechCast/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を // 既定値にすることができます: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.1.18")] -[assembly: AssemblyFileVersion("2.0.1.18")] +[assembly: AssemblyVersion("2.0.1.19")] +[assembly: AssemblyFileVersion("2.0.1.19")] diff --git a/SpeechCast/Resources/move-bottom.png b/SpeechCast/Resources/move-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..64e9f943959eb41219fb37f6cfe682b34997873e GIT binary patch literal 432 zcmV;h0Z;ykP)gb)hdw(ZO1LLoc}Kt#{;dc9s7O$b>omrw1_0}yeu+4TGU9|gd1tJR9d%M^f! zK@bcEgDaiq`Sp6uXk-mQ#NBQuilQJ0zVEZU2qLooj$s%ck4H_@*e$OGywj%J?G`%y aZ+!zC-Npt%@E3Cc0000 public double magnification = 1.0; + /// + /// お気に入りからスレを開いたときにレス表示欄を末尾まで移動するかのフラグ + /// + public bool enableMoveBottomFromBookmarks = false; + /// /// 文字数制限 ///