CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-28 03:00:22 +12:00
Code Issues Packages Projects Releases Wiki Activity

Added toggle more info button to history form

Browse source
This commit is contained in:
Jaex 2021-08-07 20:23:34 +03:00
parent c5ef30e910
commit b61a9918fe
8 changed files with 159 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
ShareX.HistoryLib/Forms/HistoryForm.Designer.cs generated
View file

@ -61,10 +61,11 @@ private void InitializeComponent()
this.tsbCopyStats = new System.Windows.Forms.ToolStripButton();
this.tss2 = new System.Windows.Forms.ToolStripSeparator();
this.tsbSettings = new System.Windows.Forms.ToolStripButton();
this.tsbToggleMoreInfo = new System.Windows.Forms.ToolStripButton();
this.scMain = new ShareX.HelpersLib.SplitContainerCustomSplitter();
this.scHistoryItemInfo = new ShareX.HelpersLib.SplitContainerCustomSplitter();
this.pbThumbnail = new ShareX.HelpersLib.MyPictureBox();
this.pgHistoryItemInfo = new System.Windows.Forms.PropertyGrid();
this.scHistoryItemInfo = new ShareX.HelpersLib.SplitContainerCustomSplitter();
this.tscHistory.ContentPanel.SuspendLayout();
this.tscHistory.TopToolStripPanel.SuspendLayout();
this.tscHistory.SuspendLayout();
@ -250,6 +251,7 @@ private void InitializeComponent()
this.tsbSearch,
this.tsbAdvancedSearch,
this.tss1,
this.tsbToggleMoreInfo,
this.tsbCopyStats,
this.tss2,
this.tsbSettings});
@ -309,6 +311,14 @@ private void InitializeComponent()
this.tsbSettings.Name = "tsbSettings";
this.tsbSettings.Click += new System.EventHandler(this.tsbSettings_Click);
//
// tsbToggleMoreInfo
//
this.tsbToggleMoreInfo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.tsbToggleMoreInfo.Image = global::ShareX.HistoryLib.Properties.Resources.layout_header_3_mix;
resources.ApplyResources(this.tsbToggleMoreInfo, "tsbToggleMoreInfo");
this.tsbToggleMoreInfo.Name = "tsbToggleMoreInfo";
this.tsbToggleMoreInfo.Click += new System.EventHandler(this.tsbToggleMoreInfo_Click);
//
// scMain
//
resources.ApplyResources(this.scMain, "scMain");
@ -325,6 +335,22 @@ private void InitializeComponent()
this.scMain.SplitterColor = System.Drawing.Color.White;
this.scMain.SplitterLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(189)))), ((int)(((byte)(189)))), ((int)(((byte)(189)))));
//
// scHistoryItemInfo
//
resources.ApplyResources(this.scHistoryItemInfo, "scHistoryItemInfo");
this.scHistoryItemInfo.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
this.scHistoryItemInfo.Name = "scHistoryItemInfo";
//
// scHistoryItemInfo.Panel1
//
this.scHistoryItemInfo.Panel1.Controls.Add(this.pbThumbnail);
//
// scHistoryItemInfo.Panel2
//
this.scHistoryItemInfo.Panel2.Controls.Add(this.pgHistoryItemInfo);
this.scHistoryItemInfo.SplitterColor = System.Drawing.Color.White;
this.scHistoryItemInfo.SplitterLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(189)))), ((int)(((byte)(189)))), ((int)(((byte)(189)))));
//
// pbThumbnail
//
this.pbThumbnail.BackColor = System.Drawing.SystemColors.Window;
@ -342,22 +368,6 @@ private void InitializeComponent()
this.pgHistoryItemInfo.PropertySort = System.Windows.Forms.PropertySort.NoSort;
this.pgHistoryItemInfo.ToolbarVisible = false;
//
// scHistoryItemInfo
//
resources.ApplyResources(this.scHistoryItemInfo, "scHistoryItemInfo");
this.scHistoryItemInfo.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
this.scHistoryItemInfo.Name = "scHistoryItemInfo";
//
// scHistoryItemInfo.Panel1
//
this.scHistoryItemInfo.Panel1.Controls.Add(this.pbThumbnail);
//
// scHistoryItemInfo.Panel2
//
this.scHistoryItemInfo.Panel2.Controls.Add(this.pgHistoryItemInfo);
this.scHistoryItemInfo.SplitterColor = System.Drawing.Color.White;
this.scHistoryItemInfo.SplitterLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(189)))), ((int)(((byte)(189)))), ((int)(((byte)(189)))));
//
// HistoryForm
//
resources.ApplyResources(this, "$this");
@ -428,5 +438,6 @@ private void InitializeComponent()
private System.Windows.Forms.ToolStripSeparator tss2;
private System.Windows.Forms.PropertyGrid pgHistoryItemInfo;
private HelpersLib.SplitContainerCustomSplitter scHistoryItemInfo;
private System.Windows.Forms.ToolStripButton tsbToggleMoreInfo;
}
}

12
ShareX.HistoryLib/Forms/HistoryForm.cs
View file

@ -65,7 +65,7 @@ public HistoryForm(string historyPath, HistorySettings settings, Action<string>
il.Images.Add(Resources.globe);
lvHistory.SmallImageList = il;
him = new HistoryItemManager(uploadFile, editImage, ShowMoreInfo);
him = new HistoryItemManager(uploadFile, editImage, true);
him.GetHistoryItems += him_GetHistoryItems;
lvHistory.ContextMenuStrip = him.cmsHistory;
@ -354,11 +354,6 @@ private string OutputStats(HistoryItem[] historyItems)
return sb.ToString();
}
private void ShowMoreInfo(HistoryItem historyItem)
{
scHistoryItemInfo.Panel2Collapsed = !scHistoryItemInfo.Panel2Collapsed;
}
#region Form events
private void HistoryForm_Shown(object sender, EventArgs e)
@ -431,6 +426,11 @@ private void tsbAdvancedSearch_Click(object sender, EventArgs e)
gbAdvancedSearch.Visible = !gbAdvancedSearch.Visible;
}
private void tsbToggleMoreInfo_Click(object sender, EventArgs e)
{
scHistoryItemInfo.Panel2Collapsed = !scHistoryItemInfo.Panel2Collapsed;
}
private void tsbCopyStats_Click(object sender, EventArgs e)
{
string stats = OutputStats(allHistoryItems);

131
ShareX.HistoryLib/Forms/HistoryForm.resx
View file

@ -423,11 +423,74 @@
<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>
<data name="tslSearch.Text" xml:space="preserve">
<value>Search:</value>
</data>
<data name="tstbSearch.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="tstbSearch.Size" type="System.Drawing.Size, System.Drawing">
<value>300, 25</value>
</data>
<data name="tsbSearch.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsbSearch.Size" type="System.Drawing.Size, System.Drawing">
<value>23, 22</value>
</data>
<data name="tsbSearch.Text" xml:space="preserve">
<value>Search</value>
</data>
<data name="tsbAdvancedSearch.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsbAdvancedSearch.Size" type="System.Drawing.Size, System.Drawing">
<value>23, 22</value>
</data>
<data name="tsbAdvancedSearch.Text" xml:space="preserve">
<value>Advanced search...</value>
</data>
<data name="tss1.Size" type="System.Drawing.Size, System.Drawing">
<value>6, 25</value>
</data>
<data name="tsbToggleMoreInfo.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsbToggleMoreInfo.Size" type="System.Drawing.Size, System.Drawing">
<value>23, 22</value>
</data>
<data name="tsbToggleMoreInfo.Text" xml:space="preserve">
<value>Toggle more info</value>
</data>
<data name="tsbCopyStats.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsbCopyStats.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>
<data name="tss2.Size" type="System.Drawing.Size, System.Drawing">
<value>6, 25</value>
</data>
<data name="tsbSettings.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsbSettings.Size" type="System.Drawing.Size, System.Drawing">
<value>23, 22</value>
</data>
<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>454, 25</value>
<value>508, 25</value>
</data>
<data name="tsHistory.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -879,60 +942,6 @@
<data name="chURL.Width" type="System.Int32, mscorlib">
<value>230</value>
</data>
<data name="tslSearch.Size" type="System.Drawing.Size, System.Drawing">
<value>45, 22</value>
</data>
<data name="tslSearch.Text" xml:space="preserve">
<value>Search:</value>
</data>
<data name="tstbSearch.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="tstbSearch.Size" type="System.Drawing.Size, System.Drawing">
<value>300, 25</value>
</data>
<data name="tsbSearch.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsbSearch.Size" type="System.Drawing.Size, System.Drawing">
<value>23, 22</value>
</data>
<data name="tsbSearch.Text" xml:space="preserve">
<value>Search</value>
</data>
<data name="tsbAdvancedSearch.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsbAdvancedSearch.Size" type="System.Drawing.Size, System.Drawing">
<value>23, 22</value>
</data>
<data name="tsbAdvancedSearch.Text" xml:space="preserve">
<value>Advanced search...</value>
</data>
<data name="tss1.Size" type="System.Drawing.Size, System.Drawing">
<value>6, 25</value>
</data>
<data name="tsbCopyStats.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsbCopyStats.Size" type="System.Drawing.Size, System.Drawing">
<value>23, 22</value>
</data>
<data name="tsbCopyStats.Text" xml:space="preserve">
<value>Copy stats</value>
</data>
<data name="tss2.Size" type="System.Drawing.Size, System.Drawing">
<value>6, 25</value>
</data>
<data name="tsbSettings.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsbSettings.Size" type="System.Drawing.Size, System.Drawing">
<value>23, 22</value>
</data>
<data name="tsbSettings.Text" xml:space="preserve">
<value>Settings...</value>
</data>
<data name="scMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
@ -973,7 +982,7 @@
<value>0, 0</value>
</data>
<data name="pbThumbnail.Size" type="System.Drawing.Size, System.Drawing">
<value>627, 475</value>
<value>627, 466</value>
</data>
<data name="pbThumbnail.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@ -1012,7 +1021,7 @@
<value>0, 0</value>
</data>
<data name="pgHistoryItemInfo.Size" type="System.Drawing.Size, System.Drawing">
<value>627, 179</value>
<value>627, 188</value>
</data>
<data name="pgHistoryItemInfo.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -1045,7 +1054,7 @@
<value>627, 661</value>
</data>
<data name="scHistoryItemInfo.SplitterDistance" type="System.Int32, mscorlib">
<value>475</value>
<value>466</value>
</data>
<data name="scHistoryItemInfo.SplitterWidth" type="System.Int32, mscorlib">
<value>7</value>
@ -1194,6 +1203,12 @@
<data name="&gt;&gt;tsbSettings.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;tsbToggleMoreInfo.Name" xml:space="preserve">
<value>tsbToggleMoreInfo</value>
</data>
<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;$this.Name" xml:space="preserve">
<value>HistoryForm</value>
</data>

15
ShareX.HistoryLib/HistoryItemManager.cs
View file

@ -50,15 +50,15 @@ public partial class HistoryItemManager
public bool IsTextFile { get; private set; }
private Action<string> uploadFile, editImage;
private Action<HistoryItem> showMoreInfo;
public HistoryItemManager(Action<string> uploadFile, Action<string> editImage, Action<HistoryItem> showMoreInfo = null)
public HistoryItemManager(Action<string> uploadFile, Action<string> editImage, bool hideShowMoreInfoButton = false)
{
this.uploadFile = uploadFile;
this.editImage = editImage;
this.showMoreInfo = showMoreInfo;
InitializeComponent();
tsmiShowMoreInfo.Visible = !hideShowMoreInfoButton;
}
public HistoryItem UpdateSelectedHistoryItem()
@ -520,14 +520,7 @@ public void EditImage()
public void ShowMoreInfo()
{
if (showMoreInfo != null)
{
showMoreInfo(HistoryItem);
}
else
{
new HistoryItemInfoForm(HistoryItem).Show();
}
new HistoryItemInfoForm(HistoryItem).Show();
}
}
}

10
ShareX.HistoryLib/Properties/Resources.Designer.cs generated
View file

@ -425,6 +425,16 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap layout_header_3_mix {
get {
object obj = ResourceManager.GetObject("layout-header-3-mix", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

67
ShareX.HistoryLib/Properties/Resources.resx
View file

@ -117,21 +117,17 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="magnifier" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\magnifier.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="HistoryItemCounts" xml:space="preserve">
<value>History item counts:</value>
</data>
<data name="HistoryItemManager_InitializeComponent_Thumbnail_URL" xml:space="preserve">
<value>Thumbnail URL</value>
</data>
<data name="HistoryItemManager_InitializeComponent_File_path" xml:space="preserve">
<value>File path</value>
<data name="HistoryManager_GetHistoryItems_Error" xml:space="preserve">
<value>Error</value>
</data>
<data name="HistoryStats_Hosts" xml:space="preserve">
<value>Hosts:</value>
</data>
<data name="HistoryItemCounts" xml:space="preserve">
<value>History item counts:</value>
<data name="HistoryItemManager_InitializeComponent_More_info" xml:space="preserve">
<value>More info...</value>
</data>
<data name="HistoryItemManager_InitializeComponent_Image_preview" xml:space="preserve">
<value>Image preview...</value>
@ -139,12 +135,12 @@
<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_Shortened_URL" xml:space="preserve">
<value>Shortened URL</value>
</data>
<data name="HistoryItemManager_InitializeComponent_Markdown__link" xml:space="preserve">
<value>Markdown link</value>
</data>
@ -154,8 +150,8 @@
<data name="HistoryItemManager_InitializeComponent_Folder" xml:space="preserve">
<value>Folder</value>
</data>
<data name="HistoryItemManager_InitializeComponent_File_name" xml:space="preserve">
<value>File name</value>
<data name="HistoryItemManager_InitializeComponent_URL" xml:space="preserve">
<value>URL</value>
</data>
<data name="HistoryItemManager_InitializeComponent_File_name_with_extension" xml:space="preserve">
<value>File name with extension</value>
@ -163,9 +159,6 @@
<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>
@ -175,17 +168,21 @@
<data name="HistoryForm_UpdateItemCount_Total___0_" xml:space="preserve">
<value>Total: {0}</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="globe" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\globe.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<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>
<data name="HistoryItemManager_InitializeComponent_More_info" xml:space="preserve">
<value>More info...</value>
<data name="HistoryItemManager_InitializeComponent_Thumbnail_URL" xml:space="preserve">
<value>Thumbnail URL</value>
</data>
<data name="magnifier--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\magnifier--plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -205,8 +202,8 @@
<data name="HistoryItemManager_InitializeComponent_EditImage" xml:space="preserve">
<value>Edit image...</value>
</data>
<data name="HistoryManager_GetHistoryItems_Error" xml:space="preserve">
<value>Error</value>
<data name="magnifier" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\magnifier.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="HistoryStats_Total" xml:space="preserve">
<value>Total:</value>
@ -217,8 +214,8 @@
<data name="HistoryItemManager_InitializeComponent_Deletion_URL" xml:space="preserve">
<value>Deletion URL</value>
</data>
<data name="HistoryItemManager_InitializeComponent_UploadFile" xml:space="preserve">
<value>Upload file</value>
<data name="HistoryItemManager_InitializeComponent_Forum__BBCode__image" xml:space="preserve">
<value>Forum (BBCode) image</value>
</data>
<data name="HistoryItemManager_InitializeComponent_Text" xml:space="preserve">
<value>Text</value>
@ -232,19 +229,25 @@
<data name="application_block" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-block.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ErrorOccuredWhileReadingHistoryFile" xml:space="preserve">
<value>Error occured while reading history file:</value>
<data name="HistoryItemManager_InitializeComponent_Shortened_URL" xml:space="preserve">
<value>Shortened URL</value>
</data>
<data name="HistoryStats_YearlyUsages" xml:space="preserve">
<value>Yearly usages:</value>
<data name="HistoryItemManager_InitializeComponent_UploadFile" xml:space="preserve">
<value>Upload file</value>
</data>
<data name="HistoryItemManager_InitializeComponent_URL" xml:space="preserve">
<value>URL</value>
<data name="HistoryItemManager_InitializeComponent_File_name" xml:space="preserve">
<value>File name</value>
</data>
<data name="HistoryItemManager_InitializeComponent_Forum__BBCode__link" xml:space="preserve">
<value>Forum (BBCode) link</value>
<data name="HistoryItemManager_InitializeComponent_File_path" xml:space="preserve">
<value>File path</value>
</data>
<data name="gear" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\gear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<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>
</root>

BIN
ShareX.HistoryLib/Resources/layout-header-3-mix.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 366 B

3
ShareX.HistoryLib/ShareX.HistoryLib.csproj
View file

@ -399,6 +399,9 @@
<ItemGroup>
<None Include="Resources\gear.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\layout-header-3-mix.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>