Switch configuration enable button (shadowsocks#2460)

Stzx · celeron533 · commit ecd59c8f5729 · 2019-07-14T19:46:44.000+08:00
Fix shadowsocks/shadowsocks-windows/shadowsocks#2458
diff --git a/shadowsocks-csharp/View/ConfigForm.cs b/shadowsocks-csharp/View/ConfigForm.cs
@@ -15,6 +15,8 @@ public partial class ConfigForm : Form
         private Configuration _modifiedConfiguration;
         private int _lastSelectedIndex = -1;
 
+        private bool isChange = false;
+
         public ConfigForm(ShadowsocksController controller)
         {
             Font = SystemFonts.MessageBoxFont;
@@ -85,6 +87,7 @@ private void Controller_ConfigChanged(object sender, EventArgs e)
 
         private void ConfigValueChanged(object sender, EventArgs e)
         {
+            isChange = true;
             ApplyButton.Enabled = true;
         }
 
@@ -178,7 +181,7 @@ private bool GetServerDetailsFromUI(out Server server, bool isSave = false, bool
                     if (result == DialogResult.OK)
                         return null;
                 }
-                else if (ApplyButton.Enabled && !isSave && !isCopy)
+                else if (isChange && !isSave && !isCopy)
                 {
                     var result = MessageBox.Show(I18N.GetString("Invalid server address, Cannot automatically save or discard changes"), I18N.GetString("Auto save failed"), MessageBoxButtons.OKCancel);
 
@@ -216,7 +219,7 @@ private bool GetServerDetailsFromUI(out Server server, bool isSave = false, bool
                     if (result == DialogResult.OK)
                         return null;
                 }
-                else if (!isSave && !isCopy)
+                else if (isChange && !isSave && !isCopy)
                 {
                     var result = MessageBox.Show(I18N.GetString("Illegal port number format, Cannot automatically save or discard changes"), I18N.GetString("Auto save failed"), MessageBoxButtons.OKCancel);
 
@@ -255,7 +258,7 @@ private bool GetServerDetailsFromUI(out Server server, bool isSave = false, bool
                     if (result == DialogResult.OK)
                         return null;
                 }
-                else if (ApplyButton.Enabled && !isSave && !isCopy)
+                else if (isChange && !isSave && !isCopy)
                 {
                     var result = MessageBox.Show(I18N.GetString("Password can not be blank, Cannot automatically save or discard changes"), I18N.GetString("Auto save failed"), MessageBoxButtons.OKCancel);
 
@@ -293,7 +296,7 @@ private bool GetServerDetailsFromUI(out Server server, bool isSave = false, bool
                     if (result == DialogResult.OK)
                         return null;
                 }
-                else if (ApplyButton.Enabled && !isSave && !isCopy)
+                else if (isChange && !isSave && !isCopy)
                 {
                     var result = MessageBox.Show(I18N.GetString("Illegal timeout format, Cannot automatically save or discard changes"), I18N.GetString("Auto save failed"), MessageBoxButtons.OKCancel);
 
@@ -347,7 +350,7 @@ private void SetServerDetailsToUI(Server server)
             RemarksTextBox.Text = server.remarks;
             TimeoutTextBox.Text = server.timeout.ToString();
 
-            ApplyButton.Enabled = false;
+            isChange = false;
         }
 
         private void ShowHidePluginArgInput(bool show)

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ public partial class ConfigForm : Form`
`15`	`15`	`private Configuration _modifiedConfiguration;`
`16`	`16`	`private int _lastSelectedIndex = -1;`
`17`	`17`
	`18`	`+ private bool isChange = false;`
	`19`	`+`
`18`	`20`	`public ConfigForm(ShadowsocksController controller)`
`19`	`21`	`{`
`20`	`22`	`Font = SystemFonts.MessageBoxFont;`
`@@ -85,6 +87,7 @@ private void Controller_ConfigChanged(object sender, EventArgs e)`
`85`	`87`
`86`	`88`	`private void ConfigValueChanged(object sender, EventArgs e)`
`87`	`89`	`{`
	`90`	`+ isChange = true;`
`88`	`91`	`ApplyButton.Enabled = true;`
`89`	`92`	`}`
`90`	`93`
`@@ -178,7 +181,7 @@ private bool GetServerDetailsFromUI(out Server server, bool isSave = false, bool`
`178`	`181`	`if (result == DialogResult.OK)`
`179`	`182`	`return null;`
`180`	`183`	`}`
`181`		`- else if (ApplyButton.Enabled && !isSave && !isCopy)`
	`184`	`+ else if (isChange && !isSave && !isCopy)`
`182`	`185`	`{`
`183`	`186`	`var result = MessageBox.Show(I18N.GetString("Invalid server address, Cannot automatically save or discard changes"), I18N.GetString("Auto save failed"), MessageBoxButtons.OKCancel);`
`184`	`187`
`@@ -216,7 +219,7 @@ private bool GetServerDetailsFromUI(out Server server, bool isSave = false, bool`
`216`	`219`	`if (result == DialogResult.OK)`
`217`	`220`	`return null;`
`218`	`221`	`}`
`219`		`- else if (!isSave && !isCopy)`
	`222`	`+ else if (isChange && !isSave && !isCopy)`
`220`	`223`	`{`
`221`	`224`	`var result = MessageBox.Show(I18N.GetString("Illegal port number format, Cannot automatically save or discard changes"), I18N.GetString("Auto save failed"), MessageBoxButtons.OKCancel);`
`222`	`225`
`@@ -255,7 +258,7 @@ private bool GetServerDetailsFromUI(out Server server, bool isSave = false, bool`
`255`	`258`	`if (result == DialogResult.OK)`
`256`	`259`	`return null;`
`257`	`260`	`}`
`258`		`- else if (ApplyButton.Enabled && !isSave && !isCopy)`
	`261`	`+ else if (isChange && !isSave && !isCopy)`
`259`	`262`	`{`
`260`	`263`	`var result = MessageBox.Show(I18N.GetString("Password can not be blank, Cannot automatically save or discard changes"), I18N.GetString("Auto save failed"), MessageBoxButtons.OKCancel);`
`261`	`264`
`@@ -293,7 +296,7 @@ private bool GetServerDetailsFromUI(out Server server, bool isSave = false, bool`
`293`	`296`	`if (result == DialogResult.OK)`
`294`	`297`	`return null;`
`295`	`298`	`}`
`296`		`- else if (ApplyButton.Enabled && !isSave && !isCopy)`
	`299`	`+ else if (isChange && !isSave && !isCopy)`
`297`	`300`	`{`
`298`	`301`	`var result = MessageBox.Show(I18N.GetString("Illegal timeout format, Cannot automatically save or discard changes"), I18N.GetString("Auto save failed"), MessageBoxButtons.OKCancel);`
`299`	`302`
`@@ -347,7 +350,7 @@ private void SetServerDetailsToUI(Server server)`
`347`	`350`	`RemarksTextBox.Text = server.remarks;`
`348`	`351`	`TimeoutTextBox.Text = server.timeout.ToString();`
`349`	`352`
`350`		`- ApplyButton.Enabled = false;`
	`353`	`+ isChange = false;`
`351`	`354`	`}`
`352`	`355`
`353`	`356`	`private void ShowHidePluginArgInput(bool show)`