From a87d6397fa13f4ced18e9db0c0f0327f846b0c65 Mon Sep 17 00:00:00 2001 From: Terry MacDonald Date: Fri, 4 Dec 2020 23:09:08 +1300 Subject: [PATCH] WIP] Audio volume UI --- .../UIForms/ShortcutForm.Designer.cs | 7 +++---- DisplayMagician/UIForms/ShortcutForm.cs | 19 ++----------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/DisplayMagician/UIForms/ShortcutForm.Designer.cs b/DisplayMagician/UIForms/ShortcutForm.Designer.cs index 4251b1f..a85a093 100644 --- a/DisplayMagician/UIForms/ShortcutForm.Designer.cs +++ b/DisplayMagician/UIForms/ShortcutForm.Designer.cs @@ -1220,11 +1220,11 @@ namespace DisplayMagician.UIForms this.gb_audio_volume.Size = new System.Drawing.Size(506, 147); this.gb_audio_volume.TabIndex = 10; this.gb_audio_volume.TabStop = false; + this.gb_audio_volume.Visible = false; // // rb_set_audio_volume // this.rb_set_audio_volume.AutoSize = true; - this.rb_set_audio_volume.Enabled = false; this.rb_set_audio_volume.ForeColor = System.Drawing.Color.White; this.rb_set_audio_volume.Location = new System.Drawing.Point(38, 84); this.rb_set_audio_volume.Name = "rb_set_audio_volume"; @@ -1236,19 +1236,19 @@ namespace DisplayMagician.UIForms // rb_keep_audio_volume // this.rb_keep_audio_volume.AutoSize = true; - this.rb_keep_audio_volume.Enabled = false; + this.rb_keep_audio_volume.Checked = true; this.rb_keep_audio_volume.ForeColor = System.Drawing.Color.White; this.rb_keep_audio_volume.Location = new System.Drawing.Point(38, 36); this.rb_keep_audio_volume.Name = "rb_keep_audio_volume"; this.rb_keep_audio_volume.Size = new System.Drawing.Size(203, 24); this.rb_keep_audio_volume.TabIndex = 12; + this.rb_keep_audio_volume.TabStop = true; this.rb_keep_audio_volume.Text = "Leave audio volume as is"; this.rb_keep_audio_volume.UseVisualStyleBackColor = true; // // lbl_audio_volume // this.lbl_audio_volume.AutoSize = true; - this.lbl_audio_volume.Enabled = false; this.lbl_audio_volume.ForeColor = System.Drawing.Color.White; this.lbl_audio_volume.Location = new System.Drawing.Point(275, 86); this.lbl_audio_volume.Name = "lbl_audio_volume"; @@ -1258,7 +1258,6 @@ namespace DisplayMagician.UIForms // // nud_audio_volume // - this.nud_audio_volume.Enabled = false; this.nud_audio_volume.Location = new System.Drawing.Point(209, 84); this.nud_audio_volume.Name = "nud_audio_volume"; this.nud_audio_volume.Size = new System.Drawing.Size(60, 26); diff --git a/DisplayMagician/UIForms/ShortcutForm.cs b/DisplayMagician/UIForms/ShortcutForm.cs index 325cca7..66503de 100644 --- a/DisplayMagician/UIForms/ShortcutForm.cs +++ b/DisplayMagician/UIForms/ShortcutForm.cs @@ -1515,15 +1515,7 @@ namespace DisplayMagician.UIForms _isUnsaved = true; cb_audio_device.Enabled = false; btn_rescan_audio.Enabled = false; - rb_set_audio_volume.Visible = false; - rb_keep_audio_volume.Visible = false; - nud_audio_volume.Visible = false; - lbl_audio_volume.Visible = false; - rb_set_audio_volume.Enabled = false; - rb_keep_audio_volume.Enabled = false; - nud_audio_volume.Enabled = false; - lbl_audio_volume.Enabled = false; - + gb_audio_volume.Visible = false; } } @@ -1535,14 +1527,7 @@ namespace DisplayMagician.UIForms _isUnsaved = true; cb_audio_device.Enabled = true; btn_rescan_audio.Enabled = true; - rb_set_audio_volume.Visible = true; - rb_keep_audio_volume.Visible = true; - nud_audio_volume.Visible = true; - lbl_audio_volume.Visible = true; - rb_set_audio_volume.Enabled = true; - rb_keep_audio_volume.Enabled = true; - nud_audio_volume.Enabled = false; - lbl_audio_volume.Enabled = true; + gb_audio_volume.Visible = true; } }