From 6da958b00115b73ba999d8ff1365e08acf0fc5f7 Mon Sep 17 00:00:00 2001 From: Jaex Date: Sun, 12 Dec 2021 20:02:44 +0300 Subject: [PATCH] Added "Show stats" button to history form --- ShareX.HelpersLib/Forms/OutputBox.Designer.cs | 5 +- ShareX.HelpersLib/Forms/OutputBox.cs | 28 +- ShareX.HelpersLib/Forms/OutputBox.resx | 120 ++++ ShareX.HelpersLib/ShareX.HelpersLib.csproj | 3 + .../Forms/HistoryForm.Designer.cs | 18 +- ShareX.HistoryLib/Forms/HistoryForm.cs | 5 +- ShareX.HistoryLib/Forms/HistoryForm.resx | 567 ++++++------------ .../Properties/Resources.Designer.cs | 6 +- ShareX.HistoryLib/Properties/Resources.resx | 50 +- ShareX.HistoryLib/Resources/chart.png | Bin 0 -> 650 bytes .../Resources/clipboard-list.png | Bin 600 -> 0 bytes ShareX.HistoryLib/ShareX.HistoryLib.csproj | 6 +- ShareX.MediaLib/FFmpegCLIManager.cs | 5 +- 13 files changed, 386 insertions(+), 427 deletions(-) create mode 100644 ShareX.HelpersLib/Forms/OutputBox.resx create mode 100644 ShareX.HistoryLib/Resources/chart.png delete mode 100644 ShareX.HistoryLib/Resources/clipboard-list.png diff --git a/ShareX.HelpersLib/Forms/OutputBox.Designer.cs b/ShareX.HelpersLib/Forms/OutputBox.Designer.cs index 79bd95305b3..cd540a8f04f 100644 --- a/ShareX.HelpersLib/Forms/OutputBox.Designer.cs +++ b/ShareX.HelpersLib/Forms/OutputBox.Designer.cs @@ -43,7 +43,7 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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(); diff --git a/ShareX.HelpersLib/Forms/OutputBox.cs b/ShareX.HelpersLib/Forms/OutputBox.cs index 8ea5a6d7632..d984b855b0a 100644 --- a/ShareX.HelpersLib/Forms/OutputBox.cs +++ b/ShareX.HelpersLib/Forms/OutputBox.cs @@ -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(); } diff --git a/ShareX.HelpersLib/Forms/OutputBox.resx b/ShareX.HelpersLib/Forms/OutputBox.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/ShareX.HelpersLib/Forms/OutputBox.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ShareX.HelpersLib/ShareX.HelpersLib.csproj b/ShareX.HelpersLib/ShareX.HelpersLib.csproj index 949c2d4d312..f4916537816 100644 --- a/ShareX.HelpersLib/ShareX.HelpersLib.csproj +++ b/ShareX.HelpersLib/ShareX.HelpersLib.csproj @@ -1122,6 +1122,9 @@ ExportImportControl.cs + + OutputBox.cs + PrintForm.cs diff --git a/ShareX.HistoryLib/Forms/HistoryForm.Designer.cs b/ShareX.HistoryLib/Forms/HistoryForm.Designer.cs index e56a3ac4108..19ba5e6eabe 100644 --- a/ShareX.HistoryLib/Forms/HistoryForm.Designer.cs +++ b/ShareX.HistoryLib/Forms/HistoryForm.Designer.cs @@ -59,7 +59,7 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() this.tsbAdvancedSearch, this.tss1, this.tsbToggleMoreInfo, - this.tsbCopyStats, + this.tsbShowStats, this.tss2, this.tsbSettings}); this.tsHistory.Name = "tsHistory"; @@ -298,13 +298,13 @@ private void InitializeComponent() 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 void InitializeComponent() 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; } } \ No newline at end of file diff --git a/ShareX.HistoryLib/Forms/HistoryForm.cs b/ShareX.HistoryLib/Forms/HistoryForm.cs index 81f73c255c0..4367668fd6d 100644 --- a/ShareX.HistoryLib/Forms/HistoryForm.cs +++ b/ShareX.HistoryLib/Forms/HistoryForm.cs @@ -461,10 +461,11 @@ private void tsbToggleMoreInfo_Click(object sender, EventArgs e) 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) diff --git a/ShareX.HistoryLib/Forms/HistoryForm.resx b/ShareX.HistoryLib/Forms/HistoryForm.resx index 8d1178ff2a1..ae5607b462c 100644 --- a/ShareX.HistoryLib/Forms/HistoryForm.resx +++ b/ShareX.HistoryLib/Forms/HistoryForm.resx @@ -129,373 +129,14 @@ 4 - - btnAdvancedSearchReset - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbAdvancedSearch - - - 0 - - - btnAdvancedSearch - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbAdvancedSearch - - - 1 - - - lblURLFilter - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbAdvancedSearch - - - 2 - - - txtURLFilter - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbAdvancedSearch - - - 3 - - - lblFilenameFilter - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbAdvancedSearch - - - 4 - - - cbHostFilterSelection - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbAdvancedSearch - - - 5 - - - cbTypeFilterSelection - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbAdvancedSearch - - - 6 - - - cbHostFilter - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbAdvancedSearch - - - 7 - - - cbTypeFilter - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbAdvancedSearch - - - 8 - - - dtpFilterFrom - - - System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbAdvancedSearch - - - 9 - - - lblFilterFrom - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbAdvancedSearch - - - 10 - - - lblFilterTo - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbAdvancedSearch - - - 11 - - - cbDateFilter - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbAdvancedSearch - - - 12 - - - dtpFilterTo - - - System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbAdvancedSearch - - - 13 - - - txtFilenameFilter - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbAdvancedSearch - - - 14 - - - - 71, 3 - - - 409, 213 - - - - 4 - - - Advanced search - - - False - - - gbAdvancedSearch - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tscHistory.ContentPanel - - - 0 - - - - @Invariant - - - 24 - - - Date - - - 115 - - - Filename - - - 170 - - - URL - - - 230 - - - - Fill - - - 0, 0 - - - 550, 636 - - - 0 - - - lvHistory - - - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null - - - tscHistory.ContentPanel - - - 1 - - - 550, 636 - - - tscHistory.ContentPanel - - - System.Windows.Forms.ToolStripContentPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tscHistory - - - 0 - - - Fill - - - tscHistory.LeftToolStripPanel - - - System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tscHistory - - - 1 - - - 0, 0 - - - tscHistory.RightToolStripPanel - - - System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tscHistory - - - 2 - - - 550, 661 - - - 2 - - - 17, 17 - - - None - - - 3, 0 - - - 477, 25 - - - 0 - - - tsHistory - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tscHistory.TopToolStripPanel - - - 0 - - - tscHistory.TopToolStripPanel - - - System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tscHistory - - - 3 - - - tscHistory - - - System.Windows.Forms.ToolStripContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - scMain.Panel1 - - - 0 - + 272, 176 120, 24 + 22 @@ -514,6 +155,7 @@ 0 + NoControl @@ -877,6 +519,138 @@ 14 + + 71, 3 + + + 409, 213 + + + 4 + + + Advanced search + + + False + + + gbAdvancedSearch + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tscHistory.ContentPanel + + + 0 + + + + + + 24 + + + Date + + + 115 + + + Filename + + + 170 + + + URL + + + 230 + + + Fill + + + 0, 0 + + + 550, 636 + + + 0 + + + lvHistory + + + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null + + + tscHistory.ContentPanel + + + 1 + + + 550, 636 + + + tscHistory.ContentPanel + + + System.Windows.Forms.ToolStripContentPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tscHistory + + + 0 + + + Fill + + + tscHistory.LeftToolStripPanel + + + System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tscHistory + + + 1 + + + 0, 0 + + + tscHistory.RightToolStripPanel + + + System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tscHistory + + + 2 + + + 550, 661 + + + 2 + + + 17, 17 + + + None + 45, 22 @@ -919,14 +693,14 @@ Toggle more info - + Magenta - + 23, 22 - - Copy stats to clipboard + + Show stats... 6, 25 @@ -940,6 +714,51 @@ Settings... + + 3, 0 + + + 508, 25 + + + 0 + + + tsHistory + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tscHistory.TopToolStripPanel + + + 0 + + + tscHistory.TopToolStripPanel + + + System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tscHistory + + + 3 + + + tscHistory + + + System.Windows.Forms.ToolStripContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + scMain.Panel1 + + + 0 + Fill @@ -980,7 +799,7 @@ 0, 0 - 627, 454 + 627, 445 3 @@ -989,7 +808,7 @@ pbThumbnail - ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null scHistoryItemInfo.Panel1 @@ -1019,7 +838,7 @@ 0, 0 - 627, 200 + 627, 209 0 @@ -1052,7 +871,7 @@ 627, 661 - 454 + 445 7 @@ -1064,7 +883,7 @@ scHistoryItemInfo - ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null scMain.Panel2 @@ -1103,7 +922,7 @@ scMain - ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null $this @@ -1189,10 +1008,10 @@ System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsbCopyStats + + tsbShowStats - + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/ShareX.HistoryLib/Properties/Resources.Designer.cs b/ShareX.HistoryLib/Properties/Resources.Designer.cs index 544e82519bf..72676b9a0c6 100644 --- a/ShareX.HistoryLib/Properties/Resources.Designer.cs +++ b/ShareX.HistoryLib/Properties/Resources.Designer.cs @@ -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 @@ internal static System.Drawing.Bitmap application_block { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - 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)); } } diff --git a/ShareX.HistoryLib/Properties/Resources.resx b/ShareX.HistoryLib/Properties/Resources.resx index 07f6b9d8fbc..d7f57648870 100644 --- a/ShareX.HistoryLib/Properties/Resources.resx +++ b/ShareX.HistoryLib/Properties/Resources.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Filtered + History item counts: @@ -135,21 +138,21 @@ File - - Error occured while reading history file: - Filtered: {0} Markdown link - - File extensions: + + Error occured while reading history file: Folder + + Total + URL @@ -159,12 +162,18 @@ Copy + + Forum (BBCode) image + HTML image Markdown linked image + + File name, window title, process name, etc. + Total: {0} @@ -175,9 +184,6 @@ Yearly usages: - - ..\Resources\clipboard-list.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Open @@ -208,14 +214,17 @@ Total: - - Forum (BBCode) linked image + + ..\Resources\layout-header-3-mix.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Deletion URL - - Forum (BBCode) image + + Upload file + + + Forum (BBCode) linked image Text @@ -232,8 +241,8 @@ Shortened URL - - Upload file + + File extensions: File name @@ -247,16 +256,7 @@ Forum (BBCode) link - - ..\Resources\layout-header-3-mix.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - File name, window title, process name, etc. - - - Total - - - Filtered + + ..\Resources\chart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/ShareX.HistoryLib/Resources/chart.png b/ShareX.HistoryLib/Resources/chart.png new file mode 100644 index 0000000000000000000000000000000000000000..8e8273a659bc7c4b571f8c4b9bf7f94094021329 GIT binary patch literal 650 zcmV;50(Jd~P)(zs`djPKB-&V_!N-b}G`0`#z_E*Y`?PBxc`eR2*Wwo2T z5Mtio$q(Sy#53`&e2jOsa|Rg~T1y7fE>MCW3xr8+Tu9m`YFiEq8 kJ^dup9ZMtr&-x?404msyM~mthivR!s07*qoM6N<$g0dqaQ2+n{ literal 0 HcmV?d00001 diff --git a/ShareX.HistoryLib/Resources/clipboard-list.png b/ShareX.HistoryLib/Resources/clipboard-list.png deleted file mode 100644 index fa14de3fda5cf4bab5d08e9daede2a2bdebc677a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 600 zcmV-e0;m0nP)bcnQOyLpvGx`S}@md3hOFSy>sreErJs>ElNR zF}orLwa5sD?JKYu@RxxB zpxl2ZCa_u(m(j02Lm(aDn0S!-ovFU%q6x|NJ>v41_^yu)5&SKZp(c ze6KS60je<5)<&`Y4^$T;BO_QXrU8E;Ubt9Q&Y<1g#&GG*9bimwF#P!O15ASeCnqO^ zvZN$fEv5l~AO@&4wlMq#x7BCDz_%SF9 zfMOsFQiIh6zoA~J3VsV#ps%HcH4H#%e*eYg0-)sd?rv~spSgIE;qIeH3|DU61k)f4 z5(j$$n+tyaf<$9dVIkO=x@fTgO9vn|KYw8{;N52+2bgR*xw#qe0gxJyS_}ied}lZt m$IH$@3}9je=SDC92rvL^X9ena&iX_E0000 - - - + + + diff --git a/ShareX.MediaLib/FFmpegCLIManager.cs b/ShareX.MediaLib/FFmpegCLIManager.cs index 9d650c195ff..915e9ea6ffa 100644 --- a/ShareX.MediaLib/FFmpegCLIManager.cs +++ b/ShareX.MediaLib/FFmpegCLIManager.cs @@ -93,10 +93,7 @@ protected bool Run(string path, string args) 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; }