CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 09:47:22 +13:00
Code Issues Projects Releases Packages Wiki Activity

Use rich textbox for response text too

Browse source
This commit is contained in:
Jaex 2019-02-12 03:03:12 +03:00
parent 8d684fd286
commit b1edac7b79
3 changed files with 75 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.Designer.cs generated
View file

@ -29,7 +29,6 @@ protected override void Dispose(bool disposing)
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CustomUploaderSettingsForm));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
@ -38,8 +37,8 @@ private void InitializeComponent()
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CustomUploaderSettingsForm));
this.tscResponseText = new System.Windows.Forms.ToolStripContainer(); this.tscResponseText = new System.Windows.Forms.ToolStripContainer();
this.txtResponseText = new System.Windows.Forms.TextBox();
this.tsResponseText = new System.Windows.Forms.ToolStrip(); this.tsResponseText = new System.Windows.Forms.ToolStrip();
this.tsbResponseTextJSONFormat = new System.Windows.Forms.ToolStripButton(); this.tsbResponseTextJSONFormat = new System.Windows.Forms.ToolStripButton();
this.tsbResponseTextXMLFormat = new System.Windows.Forms.ToolStripButton(); this.tsbResponseTextXMLFormat = new System.Windows.Forms.ToolStripButton();
@ -121,6 +120,7 @@ private void InitializeComponent()
this.lblXPath = new System.Windows.Forms.Label(); this.lblXPath = new System.Windows.Forms.Label();
this.txtXPath = new System.Windows.Forms.TextBox(); this.txtXPath = new System.Windows.Forms.TextBox();
this.tpRegexParse = new System.Windows.Forms.TabPage(); this.tpRegexParse = new System.Windows.Forms.TabPage();
this.lblRegex = new System.Windows.Forms.Label();
this.dgvRegex = new System.Windows.Forms.DataGridView(); this.dgvRegex = new System.Windows.Forms.DataGridView();
this.cRegex = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.cRegex = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.btnRegexAddSyntax = new System.Windows.Forms.Button(); this.btnRegexAddSyntax = new System.Windows.Forms.Button();
@ -139,7 +139,8 @@ private void InitializeComponent()
this.cbURLSharingService = new System.Windows.Forms.ComboBox(); this.cbURLSharingService = new System.Windows.Forms.ComboBox();
this.btnURLSharingServiceTest = new System.Windows.Forms.Button(); this.btnURLSharingServiceTest = new System.Windows.Forms.Button();
this.ttHelpTip = new System.Windows.Forms.ToolTip(this.components); this.ttHelpTip = new System.Windows.Forms.ToolTip(this.components);
this.lblRegex = new System.Windows.Forms.Label(); this.pResponseText = new System.Windows.Forms.Panel();
this.rtbResponseText = new System.Windows.Forms.RichTextBox();
this.tscResponseText.ContentPanel.SuspendLayout(); this.tscResponseText.ContentPanel.SuspendLayout();
this.tscResponseText.TopToolStripPanel.SuspendLayout(); this.tscResponseText.TopToolStripPanel.SuspendLayout();
this.tscResponseText.SuspendLayout(); this.tscResponseText.SuspendLayout();
@ -169,6 +170,7 @@ private void InitializeComponent()
this.tpResult.SuspendLayout(); this.tpResult.SuspendLayout();
this.pResult.SuspendLayout(); this.pResult.SuspendLayout();
this.tpResponseText.SuspendLayout(); this.tpResponseText.SuspendLayout();
this.pResponseText.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// tscResponseText // tscResponseText
@ -176,7 +178,7 @@ private void InitializeComponent()
// //
// tscResponseText.ContentPanel // tscResponseText.ContentPanel
// //
this.tscResponseText.ContentPanel.Controls.Add(this.txtResponseText); this.tscResponseText.ContentPanel.Controls.Add(this.pResponseText);
resources.ApplyResources(this.tscResponseText.ContentPanel, "tscResponseText.ContentPanel"); resources.ApplyResources(this.tscResponseText.ContentPanel, "tscResponseText.ContentPanel");
resources.ApplyResources(this.tscResponseText, "tscResponseText"); resources.ApplyResources(this.tscResponseText, "tscResponseText");
this.tscResponseText.Name = "tscResponseText"; this.tscResponseText.Name = "tscResponseText";
@ -186,11 +188,6 @@ private void InitializeComponent()
this.tscResponseText.TopToolStripPanel.Controls.Add(this.tsResponseText); this.tscResponseText.TopToolStripPanel.Controls.Add(this.tsResponseText);
this.tscResponseText.TopToolStripPanel.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; this.tscResponseText.TopToolStripPanel.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
// //
// txtResponseText
//
resources.ApplyResources(this.txtResponseText, "txtResponseText");
this.txtResponseText.Name = "txtResponseText";
//
// tsResponseText // tsResponseText
// //
resources.ApplyResources(this.tsResponseText, "tsResponseText"); resources.ApplyResources(this.tsResponseText, "tsResponseText");
@ -870,6 +867,11 @@ private void InitializeComponent()
this.tpRegexParse.Name = "tpRegexParse"; this.tpRegexParse.Name = "tpRegexParse";
this.tpRegexParse.UseVisualStyleBackColor = true; this.tpRegexParse.UseVisualStyleBackColor = true;
// //
// lblRegex
//
resources.ApplyResources(this.lblRegex, "lblRegex");
this.lblRegex.Name = "lblRegex";
//
// dgvRegex // dgvRegex
// //
this.dgvRegex.AllowUserToResizeRows = false; this.dgvRegex.AllowUserToResizeRows = false;
@ -1026,10 +1028,19 @@ private void InitializeComponent()
this.ttHelpTip.UseAnimation = false; this.ttHelpTip.UseAnimation = false;
this.ttHelpTip.UseFading = false; this.ttHelpTip.UseFading = false;
// //
// lblRegex // pResponseText
// //
resources.ApplyResources(this.lblRegex, "lblRegex"); this.pResponseText.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblRegex.Name = "lblRegex"; this.pResponseText.Controls.Add(this.rtbResponseText);
resources.ApplyResources(this.pResponseText, "pResponseText");
this.pResponseText.Name = "pResponseText";
//
// rtbResponseText
//
this.rtbResponseText.BorderStyle = System.Windows.Forms.BorderStyle.None;
resources.ApplyResources(this.rtbResponseText, "rtbResponseText");
this.rtbResponseText.Name = "rtbResponseText";
this.rtbResponseText.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.txtCustomUploaderLog_LinkClicked);
// //
// CustomUploaderSettingsForm // CustomUploaderSettingsForm
// //
@ -1063,7 +1074,6 @@ private void InitializeComponent()
this.DragDrop += new System.Windows.Forms.DragEventHandler(this.CustomUploaderSettingsForm_DragDrop); this.DragDrop += new System.Windows.Forms.DragEventHandler(this.CustomUploaderSettingsForm_DragDrop);
this.DragEnter += new System.Windows.Forms.DragEventHandler(this.CustomUploaderSettingsForm_DragEnter); this.DragEnter += new System.Windows.Forms.DragEventHandler(this.CustomUploaderSettingsForm_DragEnter);
this.tscResponseText.ContentPanel.ResumeLayout(false); this.tscResponseText.ContentPanel.ResumeLayout(false);
this.tscResponseText.ContentPanel.PerformLayout();
this.tscResponseText.TopToolStripPanel.ResumeLayout(false); this.tscResponseText.TopToolStripPanel.ResumeLayout(false);
this.tscResponseText.TopToolStripPanel.PerformLayout(); this.tscResponseText.TopToolStripPanel.PerformLayout();
this.tscResponseText.ResumeLayout(false); this.tscResponseText.ResumeLayout(false);
@ -1101,6 +1111,7 @@ private void InitializeComponent()
this.tpResult.ResumeLayout(false); this.tpResult.ResumeLayout(false);
this.pResult.ResumeLayout(false); this.pResult.ResumeLayout(false);
this.tpResponseText.ResumeLayout(false); this.tpResponseText.ResumeLayout(false);
this.pResponseText.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
@ -1179,7 +1190,6 @@ private void InitializeComponent()
private System.Windows.Forms.RichTextBox rtbResult; private System.Windows.Forms.RichTextBox rtbResult;
private System.Windows.Forms.TabPage tpResponseText; private System.Windows.Forms.TabPage tpResponseText;
private System.Windows.Forms.ToolStripContainer tscResponseText; private System.Windows.Forms.ToolStripContainer tscResponseText;
private System.Windows.Forms.TextBox txtResponseText;
private System.Windows.Forms.ToolStrip tsResponseText; private System.Windows.Forms.ToolStrip tsResponseText;
private System.Windows.Forms.ToolStripButton tsbResponseTextJSONFormat; private System.Windows.Forms.ToolStripButton tsbResponseTextJSONFormat;
private System.Windows.Forms.ToolStripButton tsbResponseTextXMLFormat; private System.Windows.Forms.ToolStripButton tsbResponseTextXMLFormat;
@ -1210,5 +1220,7 @@ private void InitializeComponent()
private System.Windows.Forms.DataGridView dgvRegex; private System.Windows.Forms.DataGridView dgvRegex;
private System.Windows.Forms.DataGridViewTextBoxColumn cRegex; private System.Windows.Forms.DataGridViewTextBoxColumn cRegex;
private System.Windows.Forms.Label lblRegex; private System.Windows.Forms.Label lblRegex;
private System.Windows.Forms.Panel pResponseText;
private System.Windows.Forms.RichTextBox rtbResponseText;
} }
} }

15
ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.cs
View file

@ -98,6 +98,7 @@ public CustomUploaderSettingsForm(UploadersConfig config)
rtbResultThumbnailURL.AddContextMenu(); rtbResultThumbnailURL.AddContextMenu();
rtbResultDeletionURL.AddContextMenu(); rtbResultDeletionURL.AddContextMenu();
rtbResult.AddContextMenu(); rtbResult.AddContextMenu();
rtbResponseText.AddContextMenu();
eiCustomUploaders.ObjectType = typeof(CustomUploaderItem); eiCustomUploaders.ObjectType = typeof(CustomUploaderItem);
CustomUploaderAddDestinationTypes(); CustomUploaderAddDestinationTypes();
cbRequestMethod.Items.AddRange(Enum.GetNames(typeof(HttpMethod))); cbRequestMethod.Items.AddRange(Enum.GetNames(typeof(HttpMethod)));
@ -626,7 +627,7 @@ private async Task TestCustomUploader(CustomUploaderDestinationType type, int in
btnImageUploaderTest.Enabled = btnTextUploaderTest.Enabled = btnFileUploaderTest.Enabled = btnImageUploaderTest.Enabled = btnTextUploaderTest.Enabled = btnFileUploaderTest.Enabled =
btnURLShortenerTest.Enabled = btnURLSharingServiceTest.Enabled = false; btnURLShortenerTest.Enabled = btnURLSharingServiceTest.Enabled = false;
rtbResult.ResetText(); rtbResult.ResetText();
txtResponseText.ResetText(); rtbResponseText.ResetText();
lbCustomUploaderList.SelectedIndex = index; lbCustomUploaderList.SelectedIndex = index;
CustomUploaderItem item = Config.CustomUploadersList[index]; CustomUploaderItem item = Config.CustomUploadersList[index];
@ -719,7 +720,7 @@ await Task.Run(() =>
} }
rtbResult.Text = sbResult.ToString(); rtbResult.Text = sbResult.ToString();
txtResponseText.Text = result.ResponseInfo?.ResponseText; rtbResponseText.Text = result.ResponseInfo?.ResponseText;
tcCustomUploader.SelectedTab = tpTest; tcCustomUploader.SelectedTab = tpTest;
} }
@ -1217,13 +1218,13 @@ private void txtCustomUploaderLog_LinkClicked(object sender, LinkClickedEventArg
private void tsbCustomUploaderJSONFormat_Click(object sender, EventArgs e) private void tsbCustomUploaderJSONFormat_Click(object sender, EventArgs e)
{ {
string response = txtResponseText.Text; string response = rtbResponseText.Text;
if (!string.IsNullOrEmpty(response)) if (!string.IsNullOrEmpty(response))
{ {
try try
{ {
response = Helpers.JSONFormat(response, Formatting.Indented); response = Helpers.JSONFormat(response, Formatting.Indented);
txtResponseText.Text = response; rtbResponseText.Text = response;
} }
catch catch
{ {
@ -1234,13 +1235,13 @@ private void tsbCustomUploaderJSONFormat_Click(object sender, EventArgs e)
private void tsbCustomUploaderXMLFormat_Click(object sender, EventArgs e) private void tsbCustomUploaderXMLFormat_Click(object sender, EventArgs e)
{ {
string response = txtResponseText.Text; string response = rtbResponseText.Text;
if (!string.IsNullOrEmpty(response)) if (!string.IsNullOrEmpty(response))
{ {
try try
{ {
response = Helpers.XMLFormat(response); response = Helpers.XMLFormat(response);
txtResponseText.Text = response; rtbResponseText.Text = response;
} }
catch catch
{ {
@ -1251,7 +1252,7 @@ private void tsbCustomUploaderXMLFormat_Click(object sender, EventArgs e)
private void tsbCustomUploaderCopyResponseText_Click(object sender, EventArgs e) private void tsbCustomUploaderCopyResponseText_Click(object sender, EventArgs e)
{ {
string response = txtResponseText.Text; string response = rtbResponseText.Text;
if (!string.IsNullOrEmpty(response)) if (!string.IsNullOrEmpty(response))
{ {
ClipboardHelpers.CopyText(response); ClipboardHelpers.CopyText(response);

55
ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.resx
View file

@ -130,33 +130,60 @@
<value>4</value> <value>4</value>
</data> </data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="txtResponseText.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="rtbResponseText.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
</data> </data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="txtResponseText.Location" type="System.Drawing.Point, System.Drawing"> <data name="rtbResponseText.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>2, 2</value>
</data>
<data name="rtbResponseText.Size" type="System.Drawing.Size, System.Drawing">
<value>486, 409</value>
</data> </data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="txtResponseText.Multiline" type="System.Boolean, mscorlib"> <data name="rtbResponseText.TabIndex" type="System.Int32, mscorlib">
<value>True</value> <value>0</value>
</data> </data>
<data name="txtResponseText.Size" type="System.Drawing.Size, System.Drawing"> <data name="rtbResponseText.Text" xml:space="preserve">
<value />
</data>
<data name="&gt;&gt;rtbResponseText.Name" xml:space="preserve">
<value>rtbResponseText</value>
</data>
<data name="&gt;&gt;rtbResponseText.Type" xml:space="preserve">
<value>System.Windows.Forms.RichTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;rtbResponseText.Parent" xml:space="preserve">
<value>pResponseText</value>
</data>
<data name="&gt;&gt;rtbResponseText.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="pResponseText.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="pResponseText.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="pResponseText.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>2, 2, 2, 2</value>
</data>
<data name="pResponseText.Size" type="System.Drawing.Size, System.Drawing">
<value>492, 415</value> <value>492, 415</value>
</data> </data>
<data name="txtResponseText.TabIndex" type="System.Int32, mscorlib"> <data name="pResponseText.TabIndex" type="System.Int32, mscorlib">
<value>43</value> <value>42</value>
</data> </data>
<data name="&gt;&gt;txtResponseText.Name" xml:space="preserve"> <data name="&gt;&gt;pResponseText.Name" xml:space="preserve">
<value>txtResponseText</value> <value>pResponseText</value>
</data> </data>
<data name="&gt;&gt;txtResponseText.Type" xml:space="preserve"> <data name="&gt;&gt;pResponseText.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="&gt;&gt;txtResponseText.Parent" xml:space="preserve"> <data name="&gt;&gt;pResponseText.Parent" xml:space="preserve">
<value>tscResponseText.ContentPanel</value> <value>tscResponseText.ContentPanel</value>
</data> </data>
<data name="&gt;&gt;txtResponseText.ZOrder" xml:space="preserve"> <data name="&gt;&gt;pResponseText.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </data>
<data name="tscResponseText.ContentPanel.Size" type="System.Drawing.Size, System.Drawing"> <data name="tscResponseText.ContentPanel.Size" type="System.Drawing.Size, System.Drawing">