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

Merge pull request #3644 from sylveon/master

Browse source 
Add button in debug form to upload log
This commit is contained in:
Jaex 2018-10-01 23:39:38 +03:00 committed by GitHub
commit d026beb0e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 71 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ShareX.HelpersLib/Forms/DebugForm.Designer.cs generated
View file

@ -36,6 +36,7 @@ private void InitializeComponent()
this.llRunningFrom = new System.Windows.Forms.LinkLabel();
this.flpRunningFrom = new System.Windows.Forms.FlowLayoutPanel();
this.lblRunningFrom = new System.Windows.Forms.Label();
this.btnUploadLog = new System.Windows.Forms.Button();
this.flpRunningFrom.SuspendLayout();
this.SuspendLayout();
//
@ -87,11 +88,19 @@ private void InitializeComponent()
resources.ApplyResources(this.lblRunningFrom, "lblRunningFrom");
this.lblRunningFrom.Name = "lblRunningFrom";
//
// btnUploadLog
//
resources.ApplyResources(this.btnUploadLog, "btnUploadLog");
this.btnUploadLog.Name = "btnUploadLog";
this.btnUploadLog.UseVisualStyleBackColor = true;
this.btnUploadLog.Click += new System.EventHandler(this.btnUploadLog_Click);
//
// DebugForm
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Window;
this.Controls.Add(this.btnUploadLog);
this.Controls.Add(this.flpRunningFrom);
this.Controls.Add(this.btnOpenLogFile);
this.Controls.Add(this.rtbDebug);
@ -113,5 +122,6 @@ private void InitializeComponent()
private System.Windows.Forms.LinkLabel llRunningFrom;
private System.Windows.Forms.FlowLayoutPanel flpRunningFrom;
private System.Windows.Forms.Label lblRunningFrom;
private System.Windows.Forms.Button btnUploadLog;
}
}

14
ShareX.HelpersLib/Forms/DebugForm.cs
View file

@ -35,8 +35,13 @@ public partial class DebugForm : Form
{
private static DebugForm instance;
public delegate void EventHandler(string log);
public event EventHandler UploadRequested;
public Logger Logger { get; private set; }
public bool HasUploadRequested => UploadRequested != null;
private DebugForm(Logger logger)
{
InitializeComponent();
@ -53,6 +58,7 @@ private DebugForm(Logger logger)
llRunningFrom.LinkClicked += (sender, e) => Helpers.OpenFolder(startupPath);
Logger.MessageAdded += logger_MessageAdded;
Activated += (sender, e) => btnUploadLog.Visible = HasUploadRequested;
FormClosing += (sender, e) => Logger.MessageAdded -= logger_MessageAdded;
}
@ -112,6 +118,14 @@ private void btnLoadedAssemblies_Click(object sender, EventArgs e)
DebugHelper.WriteLine($"Loaded assemblies:\r\n{assemblies}");
}
private void btnUploadLog_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(rtbDebug.Text))
{
UploadRequested?.Invoke(rtbDebug.Text);
}
}
private void rtbDebug_LinkClicked(object sender, LinkClickedEventArgs e)
{
URLHelpers.OpenURL(e.LinkText);

37
ShareX.HelpersLib/Forms/DebugForm.resx
View file

@ -145,7 +145,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnLoadedAssemblies.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="btnCopyAll.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value>
@ -172,7 +172,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnCopyAll.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="rtbDebug.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
@ -186,6 +186,9 @@
<data name="rtbDebug.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="rtbDebug.Text" xml:space="preserve">
<value />
</data>
<data name="rtbDebug.WordWrap" type="System.Boolean, mscorlib">
<value>False</value>
</data>
@ -199,7 +202,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;rtbDebug.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="btnOpenLogFile.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value>
@ -229,7 +232,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnOpenLogFile.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="llRunningFrom.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -295,7 +298,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;flpRunningFrom.ZOrder" xml:space="preserve">
<value>0</value>
<value>1</value>
</data>
<data name="lblRunningFrom.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -327,6 +330,30 @@
<data name="&gt;&gt;lblRunningFrom.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="btnUploadLog.Location" type="System.Drawing.Point, System.Drawing">
<value>486, 512</value>
</data>
<data name="btnUploadLog.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 23</value>
</data>
<data name="btnUploadLog.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="btnUploadLog.Text" xml:space="preserve">
<value>Upload log</value>
</data>
<data name="&gt;&gt;btnUploadLog.Name" xml:space="preserve">
<value>btnUploadLog</value>
</data>
<data name="&gt;&gt;btnUploadLog.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnUploadLog.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnUploadLog.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>

18
ShareX.HelpersLib/ShareX.HelpersLib.csproj
View file

@ -131,6 +131,12 @@
<Compile Include="Controls\ToolStripNumericUpDown.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Forms\DebugForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\DebugForm.Designer.cs">
<DependentUpon>DebugForm.cs</DependentUpon>
</Compile>
<Compile Include="Helpers\JsonHelpers.cs" />
<Compile Include="PointInfo.cs" />
<Compile Include="SevenZipManager.cs" />
@ -276,12 +282,6 @@
<Compile Include="UITypeEditors\CssFileNameEditor.cs" />
<Compile Include="CursorData.cs" />
<Compile Include="UITypeEditors\ExeFileNameEditor.cs" />
<Compile Include="Forms\DebugForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\DebugForm.Designer.cs">
<DependentUpon>DebugForm.cs</DependentUpon>
</Compile>
<Compile Include="DebugTimer.cs" />
<Compile Include="Extensions\ObjectExtensions.cs" />
<Compile Include="Forms\HashCheckForm.cs">
@ -769,6 +769,9 @@
<EmbeddedResource Include="Forms\ClipboardContentViewer.zh-TW.resx">
<DependentUpon>ClipboardContentViewer.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\ClipboardContentViewer.resx">
<DependentUpon>ClipboardContentViewer.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\DebugForm.de.resx">
<DependentUpon>DebugForm.cs</DependentUpon>
</EmbeddedResource>
@ -802,9 +805,6 @@
<EmbeddedResource Include="Forms\DebugForm.resx">
<DependentUpon>DebugForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\ClipboardContentViewer.resx">
<DependentUpon>ClipboardContentViewer.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\DebugForm.ru.resx">
<DependentUpon>DebugForm.cs</DependentUpon>
</EmbeddedResource>

7
ShareX/Forms/MainForm.cs
View file

@ -1602,7 +1602,12 @@ private void tsbImageHistory_Click(object sender, EventArgs e)
private void tsmiShowDebugLog_Click(object sender, EventArgs e)
{
DebugForm.GetFormInstance(DebugHelper.Logger).ForceActivate();
var form = DebugForm.GetFormInstance(DebugHelper.Logger);
if (!form.HasUploadRequested)
{
form.UploadRequested += text => UploadManager.UploadText(text);
}
form.ForceActivate();
}
private void tsmiTestImageUpload_Click(object sender, EventArgs e)