diff --git a/ISCamRecorder/MainForm.Designer.cs b/ISCamRecorder/MainForm.Designer.cs index ae42866..5414c4f 100644 --- a/ISCamRecorder/MainForm.Designer.cs +++ b/ISCamRecorder/MainForm.Designer.cs @@ -88,7 +88,7 @@ // // BtnSetProperty // - this.BtnSetProperty.Location = new System.Drawing.Point(295, 12); + this.BtnSetProperty.Location = new System.Drawing.Point(821, 14); this.BtnSetProperty.Name = "BtnSetProperty"; this.BtnSetProperty.Size = new System.Drawing.Size(75, 34); this.BtnSetProperty.TabIndex = 5; @@ -388,7 +388,7 @@ this.BtnRecodeMovie.Name = "BtnRecodeMovie"; this.BtnRecodeMovie.Size = new System.Drawing.Size(75, 34); this.BtnRecodeMovie.TabIndex = 15; - this.BtnRecodeMovie.Text = "動画撮影"; + this.BtnRecodeMovie.Text = "録画"; this.BtnRecodeMovie.UseVisualStyleBackColor = true; this.BtnRecodeMovie.Click += new System.EventHandler(this.BtnRecodeMovie_Click); // @@ -398,14 +398,14 @@ this.BtnSnapImage.Name = "BtnSnapImage"; this.BtnSnapImage.Size = new System.Drawing.Size(75, 34); this.BtnSnapImage.TabIndex = 18; - this.BtnSnapImage.Text = "静止画撮影"; + this.BtnSnapImage.Text = "撮影"; this.BtnSnapImage.UseVisualStyleBackColor = true; this.BtnSnapImage.Click += new System.EventHandler(this.BtnSnapImage_Click); // // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(837, 12); + this.label8.Location = new System.Drawing.Point(319, 23); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(53, 12); this.label8.TabIndex = 23; @@ -413,15 +413,16 @@ // // TxtSubjectName // - this.TxtSubjectName.Location = new System.Drawing.Point(836, 34); + this.TxtSubjectName.Font = new System.Drawing.Font("MS UI Gothic", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128))); + this.TxtSubjectName.Location = new System.Drawing.Point(464, 14); this.TxtSubjectName.Name = "TxtSubjectName"; - this.TxtSubjectName.Size = new System.Drawing.Size(123, 19); + this.TxtSubjectName.Size = new System.Drawing.Size(281, 31); this.TxtSubjectName.TabIndex = 24; this.TxtSubjectName.Text = "テスト"; // // BtnOpenSubjList // - this.BtnOpenSubjList.Location = new System.Drawing.Point(896, 5); + this.BtnOpenSubjList.Location = new System.Drawing.Point(945, 14); this.BtnOpenSubjList.Name = "BtnOpenSubjList"; this.BtnOpenSubjList.Size = new System.Drawing.Size(40, 27); this.BtnOpenSubjList.TabIndex = 25; @@ -431,9 +432,9 @@ // // BtnNextSubject // - this.BtnNextSubject.Location = new System.Drawing.Point(942, 5); + this.BtnNextSubject.Location = new System.Drawing.Point(378, 12); this.BtnNextSubject.Name = "BtnNextSubject"; - this.BtnNextSubject.Size = new System.Drawing.Size(34, 27); + this.BtnNextSubject.Size = new System.Drawing.Size(37, 34); this.BtnNextSubject.TabIndex = 26; this.BtnNextSubject.Text = "次"; this.BtnNextSubject.UseVisualStyleBackColor = true; @@ -441,9 +442,9 @@ // // BtnPrevSubject // - this.BtnPrevSubject.Location = new System.Drawing.Point(982, 5); + this.BtnPrevSubject.Location = new System.Drawing.Point(421, 12); this.BtnPrevSubject.Name = "BtnPrevSubject"; - this.BtnPrevSubject.Size = new System.Drawing.Size(22, 27); + this.BtnPrevSubject.Size = new System.Drawing.Size(37, 34); this.BtnPrevSubject.TabIndex = 27; this.BtnPrevSubject.Text = "前"; this.BtnPrevSubject.UseVisualStyleBackColor = true; @@ -451,9 +452,10 @@ // // TxtCounter // - this.TxtCounter.Location = new System.Drawing.Point(965, 34); + this.TxtCounter.Font = new System.Drawing.Font("MS UI Gothic", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128))); + this.TxtCounter.Location = new System.Drawing.Point(751, 14); this.TxtCounter.Name = "TxtCounter"; - this.TxtCounter.Size = new System.Drawing.Size(23, 19); + this.TxtCounter.Size = new System.Drawing.Size(29, 31); this.TxtCounter.TabIndex = 28; this.TxtCounter.Text = "1"; this.TxtCounter.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -462,11 +464,11 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(987, 37); + this.label9.Location = new System.Drawing.Point(786, 25); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(17, 12); + this.label9.Size = new System.Drawing.Size(29, 12); this.label9.TabIndex = 29; - this.label9.Text = "回"; + this.label9.Text = "回目"; // // LblState // diff --git a/ISCamRecorder/MainForm.cs b/ISCamRecorder/MainForm.cs index 72c930a..7603c10 100644 --- a/ISCamRecorder/MainForm.cs +++ b/ISCamRecorder/MainForm.cs @@ -168,18 +168,50 @@ case STATE.Init: LblState.Text = "初期化中"; PnlState.BackColor = Color.LightBlue; + BtnRecodeMovie.Text = "録画"; + BtnRecodeMovie.Enabled = false; + BtnSnapImage.Enabled = false; + BtnSetProperty.Enabled = true; + BtnNextSubject.Enabled = true; + BtnPrevSubject.Enabled = true; + TxtSubjectName.ReadOnly = false; + TxtCounter.ReadOnly = false; break; case STATE.Idle: LblState.Text = "待機中"; PnlState.BackColor = Color.MediumSpringGreen; + BtnRecodeMovie.Text = "録画"; + BtnRecodeMovie.Enabled = true; + BtnSnapImage.Enabled = true; + BtnSetProperty.Enabled = true; + BtnNextSubject.Enabled = true; + BtnPrevSubject.Enabled = true; + TxtSubjectName.ReadOnly = false; + TxtCounter.ReadOnly = false; break; case STATE.Recoding: LblState.Text = "録画中"; PnlState.BackColor = Color.OrangeRed; + BtnRecodeMovie.Text = "停止"; + BtnRecodeMovie.Enabled = true; + BtnSnapImage.Enabled = false; + BtnSetProperty.Enabled = false; + BtnNextSubject.Enabled = false; + BtnPrevSubject.Enabled = false; + TxtSubjectName.ReadOnly = true; + TxtCounter.ReadOnly = true; break; case STATE.Saving: LblState.Text = "保存中"; PnlState.BackColor = Color.Goldenrod; + BtnRecodeMovie.Text = "停止"; + BtnRecodeMovie.Enabled = false; + BtnSnapImage.Enabled = false; + BtnSetProperty.Enabled = false; + BtnNextSubject.Enabled = false; + BtnPrevSubject.Enabled = false; + TxtSubjectName.ReadOnly = true; + TxtCounter.ReadOnly = true; break; } } @@ -266,9 +298,6 @@ // 録画モードへ変更 this.Invoke((MethodInvoker)delegate { _Cameras.ForEach(c => c.ChangeSink(true)); - - BtnSetProperty.Enabled = false; - BtnRecodeMovie.Text = "停止"; State = STATE.Recoding; this.UpdateStateLabel(); }); @@ -286,11 +315,10 @@ Task.WaitAll(tasks); // 保存準備 - State = STATE.Saving; player = new SoundPlayer(@"end.wav"); player.Play(); this.Invoke((MethodInvoker)delegate { - BtnRecodeMovie.Enabled = false; + State = STATE.Saving; this.UpdateStateLabel(); }); @@ -306,9 +334,6 @@ // プレビューモードへ変更 this.Invoke((MethodInvoker)delegate { _Cameras.ForEach(c => c.ChangeSink(false)); - BtnRecodeMovie.Text = "動画撮影"; - BtnRecodeMovie.Enabled = true; - BtnSetProperty.Enabled = true; TxtCounter.Text = (int.Parse(TxtCounter.Text) + 1).ToString(); State = STATE.Idle; this.UpdateStateLabel();