usingの順序を揃える (SA1208, SA1210)

[opentween/open-tween.git] / OpenTween / Setting / Panel / ActionPanel.cs

diff --git a/OpenTween/Setting/Panel/ActionPanel.cs b/OpenTween/Setting/Panel/ActionPanel.cs
index 5121f11..361c4b3 100644 (file)
--- a/OpenTween/Setting/Panel/ActionPanel.cs
+++ b/OpenTween/Setting/Panel/ActionPanel.cs
@@ -24,11 +24,13 @@
 // the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
 // Boston, MA 02110-1301, USA.
 
+#nullable enable
+
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
 using System.Data;
+using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
@@ -38,14 +40,11 @@ namespace OpenTween.Setting.Panel
     public partial class ActionPanel : SettingPanelBase
     {
         public ActionPanel()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         public void LoadConfig(SettingCommon settingCommon, SettingLocal settingLocal)
         {
             this.UReadMng.Checked = settingCommon.UnreadManage;
-            this.PlaySnd.Checked = settingCommon.PlaySound;
             this.BrowserPathText.Text = settingLocal.BrowserPath;
             this.CheckCloseToExit.Checked = settingCommon.CloseToExit;
             this.CheckMinimizeToTray.Checked = settingCommon.MinimizeToTray;
@@ -54,10 +53,10 @@ namespace OpenTween.Setting.Panel
             this.CheckReadOldPosts.Checked = settingCommon.ReadOldPosts;
 
             this.HotkeyCheck.Checked = settingCommon.HotkeyEnabled;
-            this.HotkeyAlt.Checked = ((settingCommon.HotkeyModifier & Keys.Alt) == Keys.Alt);
-            this.HotkeyCtrl.Checked = ((settingCommon.HotkeyModifier & Keys.Control) == Keys.Control);
-            this.HotkeyShift.Checked = ((settingCommon.HotkeyModifier & Keys.Shift) == Keys.Shift);
-            this.HotkeyWin.Checked = ((settingCommon.HotkeyModifier & Keys.LWin) == Keys.LWin);
+            this.HotkeyAlt.Checked = (settingCommon.HotkeyModifier & Keys.Alt) == Keys.Alt;
+            this.HotkeyCtrl.Checked = (settingCommon.HotkeyModifier & Keys.Control) == Keys.Control;
+            this.HotkeyShift.Checked = (settingCommon.HotkeyModifier & Keys.Shift) == Keys.Shift;
+            this.HotkeyWin.Checked = (settingCommon.HotkeyModifier & Keys.LWin) == Keys.LWin;
             this.HotkeyCode.Text = settingCommon.HotkeyValue.ToString();
             this.HotkeyText.Text = settingCommon.HotkeyKey.ToString();
             this.HotkeyText.Tag = settingCommon.HotkeyKey;
@@ -75,7 +74,6 @@ namespace OpenTween.Setting.Panel
 
         public void SaveConfig(SettingCommon settingCommon, SettingLocal settingLocal)
         {
-            settingCommon.PlaySound = this.PlaySnd.Checked;
             settingCommon.UnreadManage = this.UReadMng.Checked;
             settingLocal.BrowserPath = this.BrowserPathText.Text.Trim();
             settingCommon.CloseToExit = this.CheckCloseToExit.Checked;
@@ -104,39 +102,38 @@ namespace OpenTween.Setting.Panel
 
         private void Button3_Click(object sender, EventArgs e)
         {
-            using (OpenFileDialog filedlg = new OpenFileDialog())
-            {
-                filedlg.Filter = Properties.Resources.Button3_ClickText1;
-                filedlg.FilterIndex = 1;
-                filedlg.Title = Properties.Resources.Button3_ClickText2;
-                filedlg.RestoreDirectory = true;
+            using var filedlg = new OpenFileDialog();
 
-                if (filedlg.ShowDialog() == DialogResult.OK)
-                {
-                    BrowserPathText.Text = filedlg.FileName;
-                }
+            filedlg.Filter = Properties.Resources.Button3_ClickText1;
+            filedlg.FilterIndex = 1;
+            filedlg.Title = Properties.Resources.Button3_ClickText2;
+            filedlg.RestoreDirectory = true;
+
+            if (filedlg.ShowDialog() == DialogResult.OK)
+            {
+                this.BrowserPathText.Text = filedlg.FileName;
             }
         }
 
         private void HotkeyText_KeyDown(object sender, KeyEventArgs e)
         {
-            //KeyValueで判定する。
-            //表示文字とのテーブルを用意すること
-            HotkeyText.Text = e.KeyCode.ToString();
-            HotkeyCode.Text = e.KeyValue.ToString();
-            HotkeyText.Tag = e.KeyCode;
+            // KeyValueで判定する。
+            // 表示文字とのテーブルを用意すること
+            this.HotkeyText.Text = e.KeyCode.ToString();
+            this.HotkeyCode.Text = e.KeyValue.ToString();
+            this.HotkeyText.Tag = e.KeyCode;
             e.Handled = true;
             e.SuppressKeyPress = true;
         }
 
         private void HotkeyCheck_CheckedChanged(object sender, EventArgs e)
         {
-            HotkeyCtrl.Enabled = HotkeyCheck.Checked;
-            HotkeyAlt.Enabled = HotkeyCheck.Checked;
-            HotkeyShift.Enabled = HotkeyCheck.Checked;
-            HotkeyWin.Enabled = HotkeyCheck.Checked;
-            HotkeyText.Enabled = HotkeyCheck.Checked;
-            HotkeyCode.Enabled = HotkeyCheck.Checked;
+            this.HotkeyCtrl.Enabled = this.HotkeyCheck.Checked;
+            this.HotkeyAlt.Enabled = this.HotkeyCheck.Checked;
+            this.HotkeyShift.Enabled = this.HotkeyCheck.Checked;
+            this.HotkeyWin.Enabled = this.HotkeyCheck.Checked;
+            this.HotkeyText.Enabled = this.HotkeyCheck.Checked;
+            this.HotkeyCode.Enabled = this.HotkeyCheck.Checked;
         }
     }
 }