ShareX
/
ShareX
mirror of https://github.com/ShareX/ShareX.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added "Show stats" button to history form

This commit is contained in:
Jaex 2021-12-12 20:02:44 +03:00
parent 86b1d718b0
commit 6da958b001
13 changed files with 385 additions and 426 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ShareX.HelpersLib/Forms/OutputBox.Designer.cs generated
View File

@ -43,7 +43,7 @@
this.txtText.Name = "txtText";
this.txtText.ReadOnly = true;
this.txtText.ScrollBars = System.Windows.Forms.ScrollBars.Both;
this.txtText.Size = new System.Drawing.Size(784, 562);
this.txtText.Size = new System.Drawing.Size(984, 761);
this.txtText.TabIndex = 0;
this.txtText.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtText_KeyUp);
//
@ -52,12 +52,11 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.Color.Black;
this.ClientSize = new System.Drawing.Size(784, 562);
this.ClientSize = new System.Drawing.Size(984, 761);
this.Controls.Add(this.txtText);
this.Name = "OutputBox";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "OutputBox";
this.TopMost = true;
this.Shown += new System.EventHandler(this.OutputBox_Shown);
this.ResumeLayout(false);
this.PerformLayout();

28
ShareX.HelpersLib/Forms/OutputBox.cs
View File

@ -30,24 +30,44 @@ namespace ShareX.HelpersLib
{
public partial class OutputBox : Form
{
public OutputBox(string text, string title)
private bool scrollToEnd;
public OutputBox(string text, string title, bool scrollToEnd = false)
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
Text = "ShareX - " + title;
txtText.Text = text;
this.scrollToEnd = scrollToEnd;
}
public static void Show(string text, string title, bool scrollToEnd = false)
{
using (OutputBox outputBox = new OutputBox(text, title, scrollToEnd))
{
outputBox.ShowDialog();
}
}
private void OutputBox_Shown(object sender, EventArgs e)
{
txtText.SelectionStart = txtText.TextLength;
txtText.ScrollToCaret();
this.ForceActivate();
if (scrollToEnd)
{
txtText.SelectionStart = txtText.TextLength;
txtText.ScrollToCaret();
}
else
{
txtText.Select(0, 0);
}
}
private void txtText_KeyUp(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Enter || e.KeyCode == Keys.Escape)
if (e.KeyCode == Keys.Escape)
{
Close();
}

120
ShareX.HelpersLib/Forms/OutputBox.resx Normal file
View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

3
ShareX.HelpersLib/ShareX.HelpersLib.csproj
View File

@ -1122,6 +1122,9 @@
<EmbeddedResource Include="Controls\ExportImportControl.resx">
<DependentUpon>ExportImportControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\OutputBox.resx">
<DependentUpon>OutputBox.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\PrintForm.de.resx">
<DependentUpon>PrintForm.cs</DependentUpon>
</EmbeddedResource>

18
ShareX.HistoryLib/Forms/HistoryForm.Designer.cs generated
View File

@ -59,7 +59,7 @@
this.tsbAdvancedSearch = new System.Windows.Forms.ToolStripButton();
this.tss1 = new System.Windows.Forms.ToolStripSeparator();
this.tsbToggleMoreInfo = new System.Windows.Forms.ToolStripButton();
this.tsbCopyStats = new System.Windows.Forms.ToolStripButton();
this.tsbShowStats = new System.Windows.Forms.ToolStripButton();
this.tss2 = new System.Windows.Forms.ToolStripSeparator();
this.tsbSettings = new System.Windows.Forms.ToolStripButton();
this.scMain = new ShareX.HelpersLib.SplitContainerCustomSplitter();
@ -252,7 +252,7 @@
this.tsbAdvancedSearch,
this.tss1,
this.tsbToggleMoreInfo,
this.tsbCopyStats,
this.tsbShowStats,
this.tss2,
this.tsbSettings});
this.tsHistory.Name = "tsHistory";
@ -298,13 +298,13 @@
this.tsbToggleMoreInfo.Name = "tsbToggleMoreInfo";
this.tsbToggleMoreInfo.Click += new System.EventHandler(this.tsbToggleMoreInfo_Click);
//
// tsbCopyStats
// tsbShowStats
//
this.tsbCopyStats.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.tsbCopyStats.Image = global::ShareX.HistoryLib.Properties.Resources.clipboard_list;
resources.ApplyResources(this.tsbCopyStats, "tsbCopyStats");
this.tsbCopyStats.Name = "tsbCopyStats";
this.tsbCopyStats.Click += new System.EventHandler(this.tsbCopyStats_Click);
this.tsbShowStats.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.tsbShowStats.Image = global::ShareX.HistoryLib.Properties.Resources.chart;
resources.ApplyResources(this.tsbShowStats, "tsbShowStats");
this.tsbShowStats.Name = "tsbShowStats";
this.tsbShowStats.Click += new System.EventHandler(this.tsbShowStats_Click);
//
// tss2
//
@ -434,10 +434,10 @@
private System.Windows.Forms.ToolStripButton tsbAdvancedSearch;
private System.Windows.Forms.Button btnAdvancedSearch;
private System.Windows.Forms.Button btnAdvancedSearchReset;
private System.Windows.Forms.ToolStripButton tsbCopyStats;
private System.Windows.Forms.ToolStripSeparator tss2;
private System.Windows.Forms.PropertyGrid pgHistoryItemInfo;
private HelpersLib.SplitContainerCustomSplitter scHistoryItemInfo;
private System.Windows.Forms.ToolStripButton tsbToggleMoreInfo;
private System.Windows.Forms.ToolStripButton tsbShowStats;
}
}

5
ShareX.HistoryLib/Forms/HistoryForm.cs
View File

@ -461,10 +461,11 @@ namespace ShareX.HistoryLib
tsbToggleMoreInfo.Checked = !isPanelVisible;
}
private void tsbCopyStats_Click(object sender, EventArgs e)
private void tsbShowStats_Click(object sender, EventArgs e)
{
string stats = OutputStats(allHistoryItems);
ClipboardHelpers.CopyText(stats);
// TODO: Translate
OutputBox.Show(stats, "History stats");
}
private void tsbSettings_Click(object sender, EventArgs e)

565
ShareX.HistoryLib/Forms/HistoryForm.resx
View File

@ -129,373 +129,14 @@
<data name="&gt;&gt;tscHistory.BottomToolStripPanel.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="&gt;&gt;btnAdvancedSearchReset.Name" xml:space="preserve">
<value>btnAdvancedSearchReset</value>
</data>
<data name="&gt;&gt;btnAdvancedSearchReset.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;btnAdvancedSearchReset.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;btnAdvancedSearchReset.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;btnAdvancedSearch.Name" xml:space="preserve">
<value>btnAdvancedSearch</value>
</data>
<data name="&gt;&gt;btnAdvancedSearch.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;btnAdvancedSearch.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;btnAdvancedSearch.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="&gt;&gt;lblURLFilter.Name" xml:space="preserve">
<value>lblURLFilter</value>
</data>
<data name="&gt;&gt;lblURLFilter.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblURLFilter.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;lblURLFilter.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="&gt;&gt;txtURLFilter.Name" xml:space="preserve">
<value>txtURLFilter</value>
</data>
<data name="&gt;&gt;txtURLFilter.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;txtURLFilter.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;txtURLFilter.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="&gt;&gt;lblFilenameFilter.Name" xml:space="preserve">
<value>lblFilenameFilter</value>
</data>
<data name="&gt;&gt;lblFilenameFilter.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblFilenameFilter.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;lblFilenameFilter.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="&gt;&gt;cbHostFilterSelection.Name" xml:space="preserve">
<value>cbHostFilterSelection</value>
</data>
<data name="&gt;&gt;cbHostFilterSelection.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;cbHostFilterSelection.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;cbHostFilterSelection.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="&gt;&gt;cbTypeFilterSelection.Name" xml:space="preserve">
<value>cbTypeFilterSelection</value>
</data>
<data name="&gt;&gt;cbTypeFilterSelection.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;cbTypeFilterSelection.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;cbTypeFilterSelection.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="&gt;&gt;cbHostFilter.Name" xml:space="preserve">
<value>cbHostFilter</value>
</data>
<data name="&gt;&gt;cbHostFilter.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;cbHostFilter.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;cbHostFilter.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="&gt;&gt;cbTypeFilter.Name" xml:space="preserve">
<value>cbTypeFilter</value>
</data>
<data name="&gt;&gt;cbTypeFilter.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;cbTypeFilter.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;cbTypeFilter.ZOrder" xml:space="preserve">
<value>8</value>
</data>
<data name="&gt;&gt;dtpFilterFrom.Name" xml:space="preserve">
<value>dtpFilterFrom</value>
</data>
<data name="&gt;&gt;dtpFilterFrom.Type" xml:space="preserve">
<value>System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;dtpFilterFrom.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;dtpFilterFrom.ZOrder" xml:space="preserve">
<value>9</value>
</data>
<data name="&gt;&gt;lblFilterFrom.Name" xml:space="preserve">
<value>lblFilterFrom</value>
</data>
<data name="&gt;&gt;lblFilterFrom.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblFilterFrom.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;lblFilterFrom.ZOrder" xml:space="preserve">
<value>10</value>
</data>
<data name="&gt;&gt;lblFilterTo.Name" xml:space="preserve">
<value>lblFilterTo</value>
</data>
<data name="&gt;&gt;lblFilterTo.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblFilterTo.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;lblFilterTo.ZOrder" xml:space="preserve">
<value>11</value>
</data>
<data name="&gt;&gt;cbDateFilter.Name" xml:space="preserve">
<value>cbDateFilter</value>
</data>
<data name="&gt;&gt;cbDateFilter.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;cbDateFilter.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;cbDateFilter.ZOrder" xml:space="preserve">
<value>12</value>
</data>
<data name="&gt;&gt;dtpFilterTo.Name" xml:space="preserve">
<value>dtpFilterTo</value>
</data>
<data name="&gt;&gt;dtpFilterTo.Type" xml:space="preserve">
<value>System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;dtpFilterTo.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;dtpFilterTo.ZOrder" xml:space="preserve">
<value>13</value>
</data>
<data name="&gt;&gt;txtFilenameFilter.Name" xml:space="preserve">
<value>txtFilenameFilter</value>
</data>
<data name="&gt;&gt;txtFilenameFilter.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;txtFilenameFilter.Parent" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;txtFilenameFilter.ZOrder" xml:space="preserve">
<value>14</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="gbAdvancedSearch.Location" type="System.Drawing.Point, System.Drawing">
<value>71, 3</value>
</data>
<data name="gbAdvancedSearch.Size" type="System.Drawing.Size, System.Drawing">
<value>409, 213</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="gbAdvancedSearch.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="gbAdvancedSearch.Text" xml:space="preserve">
<value>Advanced search</value>
</data>
<data name="gbAdvancedSearch.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;gbAdvancedSearch.Name" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;gbAdvancedSearch.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;gbAdvancedSearch.Parent" xml:space="preserve">
<value>tscHistory.ContentPanel</value>
</data>
<data name="&gt;&gt;gbAdvancedSearch.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="chIcon.Text" xml:space="preserve">
<value />
<comment>@Invariant</comment>
</data>
<data name="chIcon.Width" type="System.Int32, mscorlib">
<value>24</value>
</data>
<data name="chDateTime.Text" xml:space="preserve">
<value>Date</value>
</data>
<data name="chDateTime.Width" type="System.Int32, mscorlib">
<value>115</value>
</data>
<data name="chFilename.Text" xml:space="preserve">
<value>Filename</value>
</data>
<data name="chFilename.Width" type="System.Int32, mscorlib">
<value>170</value>
</data>
<data name="chURL.Text" xml:space="preserve">
<value>URL</value>
</data>
<data name="chURL.Width" type="System.Int32, mscorlib">
<value>230</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="lvHistory.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="lvHistory.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="lvHistory.Size" type="System.Drawing.Size, System.Drawing">
<value>550, 636</value>
</data>
<data name="lvHistory.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;lvHistory.Name" xml:space="preserve">
<value>lvHistory</value>
</data>
<data name="&gt;&gt;lvHistory.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvHistory.Parent" xml:space="preserve">
<value>tscHistory.ContentPanel</value>
</data>
<data name="&gt;&gt;lvHistory.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="tscHistory.ContentPanel.Size" type="System.Drawing.Size, System.Drawing">
<value>550, 636</value>
</data>
<data name="&gt;&gt;tscHistory.ContentPanel.Name" xml:space="preserve">
<value>tscHistory.ContentPanel</value>
</data>
<data name="&gt;&gt;tscHistory.ContentPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripContentPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tscHistory.ContentPanel.Parent" xml:space="preserve">
<value>tscHistory</value>
</data>
<data name="&gt;&gt;tscHistory.ContentPanel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="tscHistory.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="&gt;&gt;tscHistory.LeftToolStripPanel.Name" xml:space="preserve">
<value>tscHistory.LeftToolStripPanel</value>
</data>
<data name="&gt;&gt;tscHistory.LeftToolStripPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tscHistory.LeftToolStripPanel.Parent" xml:space="preserve">
<value>tscHistory</value>
</data>
<data name="&gt;&gt;tscHistory.LeftToolStripPanel.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="tscHistory.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="&gt;&gt;tscHistory.RightToolStripPanel.Name" xml:space="preserve">
<value>tscHistory.RightToolStripPanel</value>
</data>
<data name="&gt;&gt;tscHistory.RightToolStripPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tscHistory.RightToolStripPanel.Parent" xml:space="preserve">
<value>tscHistory</value>
</data>
<data name="&gt;&gt;tscHistory.RightToolStripPanel.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="tscHistory.Size" type="System.Drawing.Size, System.Drawing">
<value>550, 661</value>
</data>
<data name="tscHistory.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<metadata name="tsHistory.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="tsHistory.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>None</value>
</data>
<data name="tsHistory.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 0</value>
</data>
<data name="tsHistory.Size" type="System.Drawing.Size, System.Drawing">
<value>477, 25</value>
</data>
<data name="tsHistory.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;tsHistory.Name" xml:space="preserve">
<value>tsHistory</value>
</data>
<data name="&gt;&gt;tsHistory.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsHistory.Parent" xml:space="preserve">
<value>tscHistory.TopToolStripPanel</value>
</data>
<data name="&gt;&gt;tsHistory.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;tscHistory.TopToolStripPanel.Name" xml:space="preserve">
<value>tscHistory.TopToolStripPanel</value>
</data>
<data name="&gt;&gt;tscHistory.TopToolStripPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tscHistory.TopToolStripPanel.Parent" xml:space="preserve">
<value>tscHistory</value>
</data>
<data name="&gt;&gt;tscHistory.TopToolStripPanel.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="&gt;&gt;tscHistory.Name" xml:space="preserve">
<value>tscHistory</value>
</data>
<data name="&gt;&gt;tscHistory.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tscHistory.Parent" xml:space="preserve">
<value>scMain.Panel1</value>
</data>
<data name="&gt;&gt;tscHistory.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="btnAdvancedSearchReset.Location" type="System.Drawing.Point, System.Drawing">
<value>272, 176</value>
</data>
<data name="btnAdvancedSearchReset.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 24</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="btnAdvancedSearchReset.TabIndex" type="System.Int32, mscorlib">
<value>22</value>
</data>
@ -514,6 +155,7 @@
<data name="&gt;&gt;btnAdvancedSearchReset.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="btnAdvancedSearch.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
@ -877,6 +519,138 @@
<data name="&gt;&gt;txtFilenameFilter.ZOrder" xml:space="preserve">
<value>14</value>
</data>
<data name="gbAdvancedSearch.Location" type="System.Drawing.Point, System.Drawing">
<value>71, 3</value>
</data>
<data name="gbAdvancedSearch.Size" type="System.Drawing.Size, System.Drawing">
<value>409, 213</value>
</data>
<data name="gbAdvancedSearch.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="gbAdvancedSearch.Text" xml:space="preserve">
<value>Advanced search</value>
</data>
<data name="gbAdvancedSearch.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;gbAdvancedSearch.Name" xml:space="preserve">
<value>gbAdvancedSearch</value>
</data>
<data name="&gt;&gt;gbAdvancedSearch.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;gbAdvancedSearch.Parent" xml:space="preserve">
<value>tscHistory.ContentPanel</value>
</data>
<data name="&gt;&gt;gbAdvancedSearch.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="chIcon.Text" xml:space="preserve">
<value />
</data>
<data name="chIcon.Width" type="System.Int32, mscorlib">
<value>24</value>
</data>
<data name="chDateTime.Text" xml:space="preserve">
<value>Date</value>
</data>
<data name="chDateTime.Width" type="System.Int32, mscorlib">
<value>115</value>
</data>
<data name="chFilename.Text" xml:space="preserve">
<value>Filename</value>
</data>
<data name="chFilename.Width" type="System.Int32, mscorlib">
<value>170</value>
</data>
<data name="chURL.Text" xml:space="preserve">
<value>URL</value>
</data>
<data name="chURL.Width" type="System.Int32, mscorlib">
<value>230</value>
</data>
<data name="lvHistory.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="lvHistory.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="lvHistory.Size" type="System.Drawing.Size, System.Drawing">
<value>550, 636</value>
</data>
<data name="lvHistory.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;lvHistory.Name" xml:space="preserve">
<value>lvHistory</value>
</data>
<data name="&gt;&gt;lvHistory.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvHistory.Parent" xml:space="preserve">
<value>tscHistory.ContentPanel</value>
</data>
<data name="&gt;&gt;lvHistory.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="tscHistory.ContentPanel.Size" type="System.Drawing.Size, System.Drawing">
<value>550, 636</value>
</data>
<data name="&gt;&gt;tscHistory.ContentPanel.Name" xml:space="preserve">
<value>tscHistory.ContentPanel</value>
</data>
<data name="&gt;&gt;tscHistory.ContentPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripContentPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tscHistory.ContentPanel.Parent" xml:space="preserve">
<value>tscHistory</value>
</data>
<data name="&gt;&gt;tscHistory.ContentPanel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="tscHistory.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="&gt;&gt;tscHistory.LeftToolStripPanel.Name" xml:space="preserve">
<value>tscHistory.LeftToolStripPanel</value>
</data>
<data name="&gt;&gt;tscHistory.LeftToolStripPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tscHistory.LeftToolStripPanel.Parent" xml:space="preserve">
<value>tscHistory</value>
</data>
<data name="&gt;&gt;tscHistory.LeftToolStripPanel.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="tscHistory.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="&gt;&gt;tscHistory.RightToolStripPanel.Name" xml:space="preserve">
<value>tscHistory.RightToolStripPanel</value>
</data>
<data name="&gt;&gt;tscHistory.RightToolStripPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tscHistory.RightToolStripPanel.Parent" xml:space="preserve">
<value>tscHistory</value>
</data>
<data name="&gt;&gt;tscHistory.RightToolStripPanel.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="tscHistory.Size" type="System.Drawing.Size, System.Drawing">
<value>550, 661</value>
</data>
<data name="tscHistory.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<metadata name="tsHistory.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="tsHistory.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>None</value>
</data>
<data name="tslSearch.Size" type="System.Drawing.Size, System.Drawing">
<value>45, 22</value>
</data>
@ -919,14 +693,14 @@
<data name="tsbToggleMoreInfo.Text" xml:space="preserve">
<value>Toggle more info</value>
</data>
<data name="tsbCopyStats.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<data name="tsbShowStats.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsbCopyStats.Size" type="System.Drawing.Size, System.Drawing">
<data name="tsbShowStats.Size" type="System.Drawing.Size, System.Drawing">
<value>23, 22</value>
</data>
<data name="tsbCopyStats.Text" xml:space="preserve">
<value>Copy stats to clipboard</value>
<data name="tsbShowStats.Text" xml:space="preserve">
<value>Show stats...</value>
</data>
<data name="tss2.Size" type="System.Drawing.Size, System.Drawing">
<value>6, 25</value>
@ -940,6 +714,51 @@
<data name="tsbSettings.Text" xml:space="preserve">
<value>Settings...</value>
</data>
<data name="tsHistory.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 0</value>
</data>
<data name="tsHistory.Size" type="System.Drawing.Size, System.Drawing">
<value>508, 25</value>
</data>
<data name="tsHistory.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;tsHistory.Name" xml:space="preserve">
<value>tsHistory</value>
</data>
<data name="&gt;&gt;tsHistory.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsHistory.Parent" xml:space="preserve">
<value>tscHistory.TopToolStripPanel</value>
</data>
<data name="&gt;&gt;tsHistory.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;tscHistory.TopToolStripPanel.Name" xml:space="preserve">
<value>tscHistory.TopToolStripPanel</value>
</data>
<data name="&gt;&gt;tscHistory.TopToolStripPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tscHistory.TopToolStripPanel.Parent" xml:space="preserve">
<value>tscHistory</value>
</data>
<data name="&gt;&gt;tscHistory.TopToolStripPanel.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="&gt;&gt;tscHistory.Name" xml:space="preserve">
<value>tscHistory</value>
</data>
<data name="&gt;&gt;tscHistory.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tscHistory.Parent" xml:space="preserve">
<value>scMain.Panel1</value>
</data>
<data name="&gt;&gt;tscHistory.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="scMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
@ -980,7 +799,7 @@
<value>0, 0</value>
</data>
<data name="pbThumbnail.Size" type="System.Drawing.Size, System.Drawing">
<value>627, 454</value>
<value>627, 445</value>
</data>
<data name="pbThumbnail.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@ -989,7 +808,7 @@
<value>pbThumbnail</value>
</data>
<data name="&gt;&gt;pbThumbnail.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;pbThumbnail.Parent" xml:space="preserve">
<value>scHistoryItemInfo.Panel1</value>
@ -1019,7 +838,7 @@
<value>0, 0</value>
</data>
<data name="pgHistoryItemInfo.Size" type="System.Drawing.Size, System.Drawing">
<value>627, 200</value>
<value>627, 209</value>
</data>
<data name="pgHistoryItemInfo.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -1052,7 +871,7 @@
<value>627, 661</value>
</data>
<data name="scHistoryItemInfo.SplitterDistance" type="System.Int32, mscorlib">
<value>454</value>
<value>445</value>
</data>
<data name="scHistoryItemInfo.SplitterWidth" type="System.Int32, mscorlib">
<value>7</value>
@ -1064,7 +883,7 @@
<value>scHistoryItemInfo</value>
</data>
<data name="&gt;&gt;scHistoryItemInfo.Type" xml:space="preserve">
<value>ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;scHistoryItemInfo.Parent" xml:space="preserve">
<value>scMain.Panel2</value>
@ -1103,7 +922,7 @@
<value>scMain</value>
</data>
<data name="&gt;&gt;scMain.Type" xml:space="preserve">
<value>ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;scMain.Parent" xml:space="preserve">
<value>$this</value>
@ -1189,10 +1008,10 @@
<data name="&gt;&gt;tsbToggleMoreInfo.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsbCopyStats.Name" xml:space="preserve">
<value>tsbCopyStats</value>
<data name="&gt;&gt;tsbShowStats.Name" xml:space="preserve">
<value>tsbShowStats</value>
</data>
<data name="&gt;&gt;tsbCopyStats.Type" xml:space="preserve">
<data name="&gt;&gt;tsbShowStats.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tss2.Name" xml:space="preserve">

6
ShareX.HistoryLib/Properties/Resources.Designer.cs generated
View File

@ -19,7 +19,7 @@ namespace ShareX.HistoryLib.Properties {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@ -73,9 +73,9 @@ namespace ShareX.HistoryLib.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap clipboard_list {
internal static System.Drawing.Bitmap chart {
get {
object obj = ResourceManager.GetObject("clipboard-list", resourceCulture);
object obj = ResourceManager.GetObject("chart", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}

50
ShareX.HistoryLib/Properties/Resources.resx
View File

@ -117,6 +117,9 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Filtered" xml:space="preserve">
<value>Filtered</value>
</data>
<data name="HistoryItemCounts" xml:space="preserve">
<value>History item counts:</value>
</data>
@ -135,21 +138,21 @@
<data name="HistoryItemManager_InitializeComponent_File" xml:space="preserve">
<value>File</value>
</data>
<data name="ErrorOccuredWhileReadingHistoryFile" xml:space="preserve">
<value>Error occured while reading history file:</value>
</data>
<data name="HistoryForm_UpdateItemCount___Filtered___0_" xml:space="preserve">
<value>Filtered: {0}</value>
</data>
<data name="HistoryItemManager_InitializeComponent_Markdown__link" xml:space="preserve">
<value>Markdown link</value>
</data>
<data name="HistoryStats_FileExtensions" xml:space="preserve">
<value>File extensions:</value>
<data name="ErrorOccuredWhileReadingHistoryFile" xml:space="preserve">
<value>Error occured while reading history file:</value>
</data>
<data name="HistoryItemManager_InitializeComponent_Folder" xml:space="preserve">
<value>Folder</value>
</data>
<data name="Total" xml:space="preserve">
<value>Total</value>
</data>
<data name="HistoryItemManager_InitializeComponent_URL" xml:space="preserve">
<value>URL</value>
</data>
@ -159,12 +162,18 @@
<data name="HistoryItemManager_InitializeComponent_Copy" xml:space="preserve">
<value>Copy</value>
</data>
<data name="HistoryItemManager_InitializeComponent_Forum__BBCode__image" xml:space="preserve">
<value>Forum (BBCode) image</value>
</data>
<data name="HistoryItemManager_InitializeComponent_HTML_image" xml:space="preserve">
<value>HTML image</value>
</data>
<data name="HistoryItemManager_InitializeComponent_Markdown__linked_image" xml:space="preserve">
<value>Markdown linked image</value>
</data>
<data name="HistoryForm_Search_Watermark" xml:space="preserve">
<value>File name, window title, process name, etc.</value>
</data>
<data name="HistoryForm_UpdateItemCount_Total___0_" xml:space="preserve">
<value>Total: {0}</value>
</data>
@ -175,9 +184,6 @@
<data name="HistoryStats_YearlyUsages" xml:space="preserve">
<value>Yearly usages:</value>
</data>
<data name="clipboard-list" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clipboard-list.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="HistoryItemManager_InitializeComponent_Open" xml:space="preserve">
<value>Open</value>
</data>
@ -208,14 +214,17 @@
<data name="HistoryStats_Total" xml:space="preserve">
<value>Total:</value>
</data>
<data name="HistoryItemManager_InitializeComponent_Forum__BBCode__linked_image" xml:space="preserve">
<value>Forum (BBCode) linked image</value>
<data name="layout-header-3-mix" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layout-header-3-mix.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="HistoryItemManager_InitializeComponent_Deletion_URL" xml:space="preserve">
<value>Deletion URL</value>
</data>
<data name="HistoryItemManager_InitializeComponent_Forum__BBCode__image" xml:space="preserve">
<value>Forum (BBCode) image</value>
<data name="HistoryItemManager_InitializeComponent_UploadFile" xml:space="preserve">
<value>Upload file</value>
</data>
<data name="HistoryItemManager_InitializeComponent_Forum__BBCode__linked_image" xml:space="preserve">
<value>Forum (BBCode) linked image</value>
</data>
<data name="HistoryItemManager_InitializeComponent_Text" xml:space="preserve">
<value>Text</value>
@ -232,8 +241,8 @@
<data name="HistoryItemManager_InitializeComponent_Shortened_URL" xml:space="preserve">
<value>Shortened URL</value>
</data>
<data name="HistoryItemManager_InitializeComponent_UploadFile" xml:space="preserve">
<value>Upload file</value>
<data name="HistoryStats_FileExtensions" xml:space="preserve">
<value>File extensions:</value>
</data>
<data name="HistoryItemManager_InitializeComponent_File_name" xml:space="preserve">
<value>File name</value>
@ -247,16 +256,7 @@
<data name="HistoryItemManager_InitializeComponent_Forum__BBCode__link" xml:space="preserve">
<value>Forum (BBCode) link</value>
</data>
<data name="layout-header-3-mix" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layout-header-3-mix.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="HistoryForm_Search_Watermark" xml:space="preserve">
<value>File name, window title, process name, etc.</value>
</data>
<data name="Total" xml:space="preserve">
<value>Total</value>
</data>
<data name="Filtered" xml:space="preserve">
<value>Filtered</value>
<data name="chart" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\chart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
ShareX.HistoryLib/Resources/chart.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 650 B

BIN
ShareX.HistoryLib/Resources/clipboard-list.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 600 B

6
ShareX.HistoryLib/ShareX.HistoryLib.csproj
View File

@ -403,15 +403,15 @@
<ItemGroup>
<None Include="Resources\magnifier--plus.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\clipboard-list.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\gear.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\layout-header-3-mix.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\chart.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>

5
ShareX.MediaLib/FFmpegCLIManager.cs
View File

@ -93,10 +93,7 @@ namespace ShareX.MediaLib
bool result = errorCode == 0;
if (!result && ShowError)
{
using (OutputBox outputBox = new OutputBox(Output.ToString(), Resources.FFmpegError))
{
outputBox.ShowDialog();
}
OutputBox.Show(Output.ToString(), Resources.FFmpegError, true);
}
return result;
}