From 74e5075aebb199a4bd8deca1f03ea42453a22ca5 Mon Sep 17 00:00:00 2001 From: Jaex Date: Sun, 6 Dec 2015 04:43:15 +0200 Subject: [PATCH] Enable/disable add syntax button depending on input --- .../Forms/UploadersConfigForm.Designer.cs | 2 ++ .../Forms/UploadersConfigForm.cs | 15 +++++++++++- .../Forms/UploadersConfigForm.resx | 23 +++++++++++++------ 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs index 93dfb6fd3..cc666a371 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs @@ -880,6 +880,7 @@ private void InitializeComponent() // resources.ApplyResources(this.txtCustomUploaderJsonPath, "txtCustomUploaderJsonPath"); this.txtCustomUploaderJsonPath.Name = "txtCustomUploaderJsonPath"; + this.txtCustomUploaderJsonPath.TextChanged += new System.EventHandler(this.txtCustomUploaderJsonPath_TextChanged); // // tpCustomUploaderXmlParse // @@ -920,6 +921,7 @@ private void InitializeComponent() // resources.ApplyResources(this.txtCustomUploaderXPath, "txtCustomUploaderXPath"); this.txtCustomUploaderXPath.Name = "txtCustomUploaderXPath"; + this.txtCustomUploaderXPath.TextChanged += new System.EventHandler(this.txtCustomUploaderXPath_TextChanged); // // tcCustomUploaderArguments // diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs index 7499bd4ff..4d3e3498f 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs @@ -39,7 +39,7 @@ You should have received a copy of the GNU General Public License namespace ShareX.UploadersLib { - public partial class UploadersConfigForm : BaseForm + public partial class UploadersConfigForm : Form { public UploadersConfig Config { get; private set; } @@ -49,6 +49,7 @@ public UploadersConfigForm(UploadersConfig uploadersConfig) { Config = uploadersConfig; InitializeComponent(); + Icon = ShareXResources.Icon; if (!string.IsNullOrEmpty(Config.FilePath)) { @@ -2696,6 +2697,8 @@ private void lvCustomUploaderRegexps_SelectedIndexChanged(object sender, EventAr } txtCustomUploaderRegexp.Text = regex; + + btnCustomUploaderRegexAddSyntax.Enabled = lvCustomUploaderRegexps.SelectedItems.Count > 0; } private void btnCustomUploaderRegexAddSyntax_Click(object sender, EventArgs e) @@ -2731,6 +2734,11 @@ private void btnCustomUploaderRegexAddSyntax_Click(object sender, EventArgs e) } } + private void txtCustomUploaderJsonPath_TextChanged(object sender, EventArgs e) + { + btnCustomUploaderJsonAddSyntax.Enabled = !string.IsNullOrEmpty(txtCustomUploaderJsonPath.Text); + } + private void btnCustomUploadJsonPathHelp_Click(object sender, EventArgs e) { URLHelpers.OpenURL("http://goessner.net/articles/JsonPath/"); @@ -2753,6 +2761,11 @@ private void btnCustomUploaderJsonAddSyntax_Click(object sender, EventArgs e) } } + private void txtCustomUploaderXPath_TextChanged(object sender, EventArgs e) + { + btnCustomUploaderXmlSyntaxAdd.Enabled = !string.IsNullOrEmpty(txtCustomUploaderXPath.Text); + } + private void btnCustomUploaderXPathHelp_Click(object sender, EventArgs e) { URLHelpers.OpenURL("http://www.w3schools.com/xsl/xpath_syntax.asp"); diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.resx index 656dd334e..cd724497d 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.resx @@ -526,6 +526,9 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 0 + + False + NoControl @@ -706,6 +709,9 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 0 + + False + NoControl @@ -871,6 +877,9 @@ store.book[0].title 1 + + False + NoControl @@ -1646,7 +1655,7 @@ store.book[0].title 536, 344 - 248, 20 + 256, 20 16 @@ -1724,7 +1733,7 @@ store.book[0].title 624, 376 - 160, 23 + 168, 23 33 @@ -2132,7 +2141,7 @@ store.book[0].title 536, 304 - 248, 20 + 256, 20 14 @@ -2183,7 +2192,7 @@ store.book[0].title 536, 24 - 248, 21 + 256, 21 9 @@ -2231,7 +2240,7 @@ store.book[0].title 536, 264 - 248, 20 + 256, 20 12 @@ -2294,7 +2303,7 @@ store.book[0].title 272, 408 - 512, 72 + 520, 72 30 @@ -12875,6 +12884,6 @@ Using an encrypted library disables sharing. UploadersConfigForm - ShareX.HelpersLib.BaseForm, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file