From e3a419c8b8f720d582f805900f0d180a2e400921 Mon Sep 17 00:00:00 2001 From: Jaex Date: Mon, 22 Jul 2019 03:17:18 +0300 Subject: [PATCH 01/10] Store minimum size in options --- ShareX.ScreenCaptureLib/RegionCaptureOptions.cs | 2 ++ ShareX.ScreenCaptureLib/Shapes/BaseShape.cs | 4 +--- .../Shapes/Drawing/LineDrawingShape.cs | 2 +- ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs | 15 +++++++-------- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/ShareX.ScreenCaptureLib/RegionCaptureOptions.cs b/ShareX.ScreenCaptureLib/RegionCaptureOptions.cs index fc00b8b71..f1f7a822e 100644 --- a/ShareX.ScreenCaptureLib/RegionCaptureOptions.cs +++ b/ShareX.ScreenCaptureLib/RegionCaptureOptions.cs @@ -32,6 +32,7 @@ namespace ShareX.ScreenCaptureLib { public class RegionCaptureOptions { + public const int DefaultMinimumSize = 5; public const int MagnifierPixelCountMinimum = 3; public const int MagnifierPixelCountMaximum = 35; public const int MagnifierPixelSizeMinimum = 3; @@ -41,6 +42,7 @@ public class RegionCaptureOptions public const int MoveSpeedMaximum = 10; public bool QuickCrop = true; + public int MinimumSize = DefaultMinimumSize; public RegionCaptureAction RegionCaptureActionRightClick = RegionCaptureAction.RemoveShapeCancelCapture; public RegionCaptureAction RegionCaptureActionMiddleClick = RegionCaptureAction.SwapToolType; public RegionCaptureAction RegionCaptureActionX1Click = RegionCaptureAction.CaptureFullscreen; diff --git a/ShareX.ScreenCaptureLib/Shapes/BaseShape.cs b/ShareX.ScreenCaptureLib/Shapes/BaseShape.cs index 4b99cbf19..918f42e04 100644 --- a/ShareX.ScreenCaptureLib/Shapes/BaseShape.cs +++ b/ShareX.ScreenCaptureLib/Shapes/BaseShape.cs @@ -33,8 +33,6 @@ namespace ShareX.ScreenCaptureLib { public abstract class BaseShape : IDisposable { - protected const int MinimumSize = 3; - public abstract ShapeCategory ShapeCategory { get; } public abstract ShapeType ShapeType { get; } @@ -93,7 +91,7 @@ private set public Size InitialSize { get; set; } - public virtual bool IsValidShape => !Rectangle.IsEmpty && Rectangle.Width >= MinimumSize && Rectangle.Height >= MinimumSize; + public virtual bool IsValidShape => !Rectangle.IsEmpty && Rectangle.Width >= Options.MinimumSize && Rectangle.Height >= Options.MinimumSize; public virtual bool IsSelectable => Manager.CurrentTool == ShapeType || Manager.CurrentTool == ShapeType.ToolSelect; diff --git a/ShareX.ScreenCaptureLib/Shapes/Drawing/LineDrawingShape.cs b/ShareX.ScreenCaptureLib/Shapes/Drawing/LineDrawingShape.cs index 2dcd9b48a..9de4bcd94 100644 --- a/ShareX.ScreenCaptureLib/Shapes/Drawing/LineDrawingShape.cs +++ b/ShareX.ScreenCaptureLib/Shapes/Drawing/LineDrawingShape.cs @@ -40,7 +40,7 @@ public class LineDrawingShape : BaseDrawingShape public bool CenterNodeActive { get; private set; } public int CenterPointCount { get; private set; } - public override bool IsValidShape => Rectangle.Width > 1 || Rectangle.Height > 1; + public override bool IsValidShape => Rectangle.Width >= Options.MinimumSize || Rectangle.Height >= Options.MinimumSize; protected override void UseLightResizeNodes() { diff --git a/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs b/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs index ccebcee87..f70b1228c 100644 --- a/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs +++ b/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs @@ -1179,10 +1179,10 @@ private BaseShape CheckHover() { Point location = InputManager.ClientMousePosition; - return new RectangleRegionShape() - { - Rectangle = new Rectangle(new Point(location.X - (Options.FixedSize.Width / 2), location.Y - (Options.FixedSize.Height / 2)), Options.FixedSize) - }; + BaseShape rectangleRegionShape = CreateShape(ShapeType.RegionRectangle); + rectangleRegionShape.Rectangle = new Rectangle(new Point(location.X - (Options.FixedSize.Width / 2), + location.Y - (Options.FixedSize.Height / 2)), Options.FixedSize); + return rectangleRegionShape; } else { @@ -1192,10 +1192,9 @@ private BaseShape CheckHover() { Rectangle hoverArea = CaptureHelpers.ScreenToClient(window.Rectangle); - return new RectangleRegionShape() - { - Rectangle = Rectangle.Intersect(Form.ClientArea, hoverArea) - }; + BaseShape rectangleRegionShape = CreateShape(ShapeType.RegionRectangle); + rectangleRegionShape.Rectangle = Rectangle.Intersect(Form.ClientArea, hoverArea); + return rectangleRegionShape; } } } From 76f7e24f87832e80d7745cad7fab1bf6267187b2 Mon Sep 17 00:00:00 2001 From: Jaex Date: Tue, 23 Jul 2019 12:50:07 +0300 Subject: [PATCH 02/10] Support Imgur video uploads --- ShareX.UploadersLib/ImageUploaders/Imgur.cs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ShareX.UploadersLib/ImageUploaders/Imgur.cs b/ShareX.UploadersLib/ImageUploaders/Imgur.cs index 6826c49f3..e5856ace1 100644 --- a/ShareX.UploadersLib/ImageUploaders/Imgur.cs +++ b/ShareX.UploadersLib/ImageUploaders/Imgur.cs @@ -296,7 +296,18 @@ private UploadResult InternalUpload(Stream stream, string fileName, bool refresh ReturnResponseOnError = true; - UploadResult result = SendRequestFile("https://api.imgur.com/3/image", stream, fileName, "image", args, headers); + string fileFormName; + + if (Helpers.IsVideoFile(fileName)) + { + fileFormName = "video"; + } + else + { + fileFormName = "image"; + } + + UploadResult result = SendRequestFile("https://api.imgur.com/3/upload", stream, fileName, fileFormName, args, headers); if (!string.IsNullOrEmpty(result.Response)) { From 092b93efc86b608b503862423fa0de207e2bfb86 Mon Sep 17 00:00:00 2001 From: Jaex Date: Wed, 24 Jul 2019 14:03:54 +0300 Subject: [PATCH 03/10] Fix unfocused text color --- ShareX.HistoryLib/Forms/ImageHistoryForm.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/ShareX.HistoryLib/Forms/ImageHistoryForm.cs b/ShareX.HistoryLib/Forms/ImageHistoryForm.cs index fe221f624..089522d63 100644 --- a/ShareX.HistoryLib/Forms/ImageHistoryForm.cs +++ b/ShareX.HistoryLib/Forms/ImageHistoryForm.cs @@ -63,6 +63,7 @@ public ImageHistoryForm(string historyPath, ImageHistorySettings settings, Actio ilvImages.Colors.BorderColor = ShareXResources.DarkBorderColor; ilvImages.Colors.ForeColor = ShareXResources.DarkTextColor; ilvImages.Colors.SelectedForeColor = ShareXResources.DarkTextColor; + ilvImages.Colors.UnFocusedForeColor = ShareXResources.DarkTextColor; } him = new HistoryItemManager(uploadFile, editImage); From 86e20a74e404e1224f4aced4384b77c9f535fe7d Mon Sep 17 00:00:00 2001 From: Jaex Date: Wed, 24 Jul 2019 14:47:13 +0300 Subject: [PATCH 04/10] Clicking on task panel title will open URL or file path --- .../Controls/TaskThumbnailPanel.Designer.cs | 1 + ShareX/Controls/TaskThumbnailPanel.cs | 36 +++++++++++++++++++ ShareX/TaskManager.cs | 7 +--- 3 files changed, 38 insertions(+), 6 deletions(-) diff --git a/ShareX/Controls/TaskThumbnailPanel.Designer.cs b/ShareX/Controls/TaskThumbnailPanel.Designer.cs index d1bca6dc9..a70d799da 100644 --- a/ShareX/Controls/TaskThumbnailPanel.Designer.cs +++ b/ShareX/Controls/TaskThumbnailPanel.Designer.cs @@ -94,6 +94,7 @@ private void InitializeComponent() this.lblTitle.TabIndex = 1; this.lblTitle.Text = "Test.png"; this.lblTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.lblTitle.MouseClick += new System.Windows.Forms.MouseEventHandler(this.LblTitle_MouseClick); // // TaskThumbnailPanel // diff --git a/ShareX/Controls/TaskThumbnailPanel.cs b/ShareX/Controls/TaskThumbnailPanel.cs index d229c321e..2c377e8f7 100644 --- a/ShareX/Controls/TaskThumbnailPanel.cs +++ b/ShareX/Controls/TaskThumbnailPanel.cs @@ -303,6 +303,20 @@ public void UpdateStatus() { pThumbnail.UpdateStatusColor(Task.Status); } + + UpdateTitleCursor(); + } + + private void UpdateTitleCursor() + { + if (Task.Info != null && !string.IsNullOrEmpty(Task.Info.ToString())) + { + lblTitle.Cursor = Cursors.Hand; + } + else + { + lblTitle.Cursor = Cursors.Default; + } } public void ClearThumbnail() @@ -321,6 +335,28 @@ public void ClearThumbnail() ThumbnailExists = false; } + private void LblTitle_MouseClick(object sender, MouseEventArgs e) + { + if (e.Button == MouseButtons.Left && Task.Info != null) + { + if (Task.Info.Result != null) + { + string url = Task.Info.Result.ToString(); + + if (!string.IsNullOrEmpty(url)) + { + URLHelpers.OpenURL(url); + return; + } + } + + if (!string.IsNullOrEmpty(Task.Info.FilePath)) + { + Helpers.OpenFile(Task.Info.FilePath); + } + } + } + private void PbThumbnail_MouseDown(object sender, MouseEventArgs e) { if (e.Button == MouseButtons.Left) diff --git a/ShareX/TaskManager.cs b/ShareX/TaskManager.cs index efd1ae8be..41729b5ab 100644 --- a/ShareX/TaskManager.cs +++ b/ShareX/TaskManager.cs @@ -333,12 +333,7 @@ private static void Task_TaskCompleted(WorkerTask task) { DebugHelper.WriteLine($"Task completed. Filename: {info.FileName}, Duration: {(long)info.TaskDuration.TotalMilliseconds} ms"); - string result = info.Result.ToString(); - - if (string.IsNullOrEmpty(result) && !string.IsNullOrEmpty(info.FilePath)) - { - result = info.FilePath; - } + string result = info.ToString(); if (lvi != null) { From 6e7e2d10e5eebb4478f10f078ffa4834001efd86 Mon Sep 17 00:00:00 2001 From: Jaex Date: Wed, 24 Jul 2019 15:49:53 +0300 Subject: [PATCH 05/10] Added dark themed tooltip to title label which shows URL or file path --- .../CustomUploaderSettingsForm.Designer.cs | 8 ++-- .../Forms/CustomUploaderSettingsForm.resx | 6 +-- .../Controls/TaskThumbnailPanel.Designer.cs | 41 +++++++++++------- ShareX/Controls/TaskThumbnailPanel.cs | 42 ++++++++++++------- ShareX/Controls/TaskThumbnailPanel.resx | 3 ++ ShareX/Forms/MainForm.cs | 2 +- ShareX/Forms/NotificationForm.cs | 2 +- ShareX/TaskManager.cs | 2 +- 8 files changed, 65 insertions(+), 41 deletions(-) diff --git a/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.Designer.cs b/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.Designer.cs index 3cb238397..921b6a812 100644 --- a/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.Designer.cs +++ b/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.Designer.cs @@ -460,7 +460,7 @@ private void InitializeComponent() dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(0, 2, 0, 2); dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; @@ -509,7 +509,7 @@ private void InitializeComponent() dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control; dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; dataGridViewCellStyle3.Padding = new System.Windows.Forms.Padding(0, 2, 0, 2); dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; @@ -623,7 +623,7 @@ private void InitializeComponent() dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; dataGridViewCellStyle5.Padding = new System.Windows.Forms.Padding(0, 2, 0, 2); dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; @@ -907,7 +907,7 @@ private void InitializeComponent() dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText; dataGridViewCellStyle7.Padding = new System.Windows.Forms.Padding(0, 2, 0, 2); dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; diff --git a/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.resx b/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.resx index 27c8d1b9f..2e2eedc4b 100644 --- a/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.resx +++ b/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.resx @@ -544,7 +544,7 @@ mbHelp - ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null gbCustomUploaders @@ -646,7 +646,7 @@ eiCustomUploaders - ShareX.HelpersLib.ExportImportControl, ShareX.HelpersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.ExportImportControl, ShareX.HelpersLib, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null gbCustomUploaders @@ -2596,7 +2596,7 @@ store.book[0].title mbDestinationType - ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null $this diff --git a/ShareX/Controls/TaskThumbnailPanel.Designer.cs b/ShareX/Controls/TaskThumbnailPanel.Designer.cs index a70d799da..49b3b5be9 100644 --- a/ShareX/Controls/TaskThumbnailPanel.Designer.cs +++ b/ShareX/Controls/TaskThumbnailPanel.Designer.cs @@ -31,14 +31,38 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); + this.lblTitle = new ShareX.HelpersLib.BlackStyleLabel(); + this.ttMain = new System.Windows.Forms.ToolTip(this.components); this.pThumbnail = new ShareX.TaskRoundedCornerPanel(); this.pbProgress = new ShareX.HelpersLib.BlackStyleProgressBar(); this.pbThumbnail = new System.Windows.Forms.PictureBox(); - this.lblTitle = new ShareX.HelpersLib.BlackStyleLabel(); this.pThumbnail.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbThumbnail)).BeginInit(); this.SuspendLayout(); // + // lblTitle + // + this.lblTitle.AutoEllipsis = true; + this.lblTitle.BackColor = System.Drawing.Color.Transparent; + this.lblTitle.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblTitle.ForeColor = System.Drawing.Color.White; + this.lblTitle.Location = new System.Drawing.Point(0, 0); + this.lblTitle.Name = "lblTitle"; + this.lblTitle.Size = new System.Drawing.Size(256, 22); + this.lblTitle.TabIndex = 1; + this.lblTitle.Text = "Test.png"; + this.lblTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.lblTitle.MouseClick += new System.Windows.Forms.MouseEventHandler(this.LblTitle_MouseClick); + // + // ttMain + // + this.ttMain.AutoPopDelay = 5000; + this.ttMain.InitialDelay = 200; + this.ttMain.OwnerDraw = true; + this.ttMain.ReshowDelay = 100; + this.ttMain.Draw += new System.Windows.Forms.DrawToolTipEventHandler(this.TtMain_Draw); + // // pThumbnail // this.pThumbnail.BackColor = System.Drawing.Color.Transparent; @@ -82,20 +106,6 @@ private void InitializeComponent() this.pbThumbnail.MouseMove += new System.Windows.Forms.MouseEventHandler(this.PbThumbnail_MouseMove); this.pbThumbnail.MouseUp += new System.Windows.Forms.MouseEventHandler(this.PbThumbnail_MouseUp); // - // lblTitle - // - this.lblTitle.AutoEllipsis = true; - this.lblTitle.BackColor = System.Drawing.Color.Transparent; - this.lblTitle.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblTitle.ForeColor = System.Drawing.Color.White; - this.lblTitle.Location = new System.Drawing.Point(0, 0); - this.lblTitle.Name = "lblTitle"; - this.lblTitle.Size = new System.Drawing.Size(256, 22); - this.lblTitle.TabIndex = 1; - this.lblTitle.Text = "Test.png"; - this.lblTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.lblTitle.MouseClick += new System.Windows.Forms.MouseEventHandler(this.LblTitle_MouseClick); - // // TaskThumbnailPanel // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -117,5 +127,6 @@ private void InitializeComponent() private HelpersLib.BlackStyleLabel lblTitle; private HelpersLib.BlackStyleProgressBar pbProgress; private System.Windows.Forms.PictureBox pbThumbnail; + private System.Windows.Forms.ToolTip ttMain; } } diff --git a/ShareX/Controls/TaskThumbnailPanel.cs b/ShareX/Controls/TaskThumbnailPanel.cs index 2c377e8f7..76d2bfce2 100644 --- a/ShareX/Controls/TaskThumbnailPanel.cs +++ b/ShareX/Controls/TaskThumbnailPanel.cs @@ -190,7 +190,7 @@ public TaskThumbnailPanel(WorkerTask task) InitializeComponent(); UpdateTheme(); - UpdateFilename(); + UpdateTitle(); } public void UpdateTheme() @@ -200,18 +200,33 @@ public void UpdateTheme() lblTitle.ForeColor = ShareXResources.DarkTextColor; lblTitle.TextShadowColor = ShareXResources.DarkBorderColor; pThumbnail.PanelColor = ShareXResources.DarkBorderColor; + ttMain.BackColor = ShareXResources.DarkBackgroundColor; + ttMain.ForeColor = ShareXResources.DarkTextColor; } else { - lblTitle.ForeColor = SystemColors.WindowText; + lblTitle.ForeColor = SystemColors.ControlText; lblTitle.TextShadowColor = Color.Transparent; pThumbnail.PanelColor = SystemColors.ControlLight; + ttMain.BackColor = SystemColors.Window; + ttMain.ForeColor = SystemColors.ControlText; } } - public void UpdateFilename() + public void UpdateTitle() { Title = Task.Info?.FileName; + + if (Task.Info != null && !string.IsNullOrEmpty(Task.Info.ToString())) + { + lblTitle.Cursor = Cursors.Hand; + ttMain.SetToolTip(lblTitle, Task.Info.ToString()); + } + else + { + lblTitle.Cursor = Cursors.Default; + ttMain.SetToolTip(lblTitle, null); + } } private void UpdateSize() @@ -304,19 +319,7 @@ public void UpdateStatus() pThumbnail.UpdateStatusColor(Task.Status); } - UpdateTitleCursor(); - } - - private void UpdateTitleCursor() - { - if (Task.Info != null && !string.IsNullOrEmpty(Task.Info.ToString())) - { - lblTitle.Cursor = Cursors.Hand; - } - else - { - lblTitle.Cursor = Cursors.Default; - } + UpdateTitle(); } public void ClearThumbnail() @@ -423,5 +426,12 @@ private void PbThumbnail_MouseMove(object sender, MouseEventArgs e) } } } + + private void TtMain_Draw(object sender, DrawToolTipEventArgs e) + { + e.DrawBackground(); + e.DrawBorder(); + e.DrawText(); + } } } \ No newline at end of file diff --git a/ShareX/Controls/TaskThumbnailPanel.resx b/ShareX/Controls/TaskThumbnailPanel.resx index 1af7de150..50af4c04f 100644 --- a/ShareX/Controls/TaskThumbnailPanel.resx +++ b/ShareX/Controls/TaskThumbnailPanel.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 2a16221a3..ae0df90f2 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -789,7 +789,7 @@ private void UpdateTheme() cmsTray.Renderer = new ToolStripCustomRenderer(); cmsTaskInfo.Renderer = new ToolStripCustomRenderer(); lvUploads.BackColor = SystemColors.Window; - lvUploads.ForeColor = SystemColors.WindowText; + lvUploads.ForeColor = SystemColors.ControlText; lblListViewTip.ForeColor = Color.Silver; scMain.SplitterColor = Color.White; scMain.SplitterLineColor = ProfessionalColors.SeparatorDark; diff --git a/ShareX/Forms/NotificationForm.cs b/ShareX/Forms/NotificationForm.cs index 74b1c303f..cbb4a2c59 100644 --- a/ShareX/Forms/NotificationForm.cs +++ b/ShareX/Forms/NotificationForm.cs @@ -177,7 +177,7 @@ protected override void OnPaint(PaintEventArgs e) TextRenderer.DrawText(g, ToastConfig.Text, textFont, textRect.LocationOffset(1), Color.White, TextFormatFlags.Left | TextFormatFlags.EndEllipsis); } - Color borderColor = ShareXResources.UseDarkTheme ? ShareXResources.DarkBorderColor : SystemColors.WindowText; + Color borderColor = ShareXResources.UseDarkTheme ? ShareXResources.DarkBorderColor : SystemColors.ControlText; using (Pen borderPen = new Pen(borderColor)) { g.DrawRectangleProper(borderPen, rect); diff --git a/ShareX/TaskManager.cs b/ShareX/TaskManager.cs index 41729b5ab..3cc590301 100644 --- a/ShareX/TaskManager.cs +++ b/ShareX/TaskManager.cs @@ -158,7 +158,7 @@ private static void Task_ImageReady(WorkerTask task) if (panel != null) { - panel.UpdateFilename(); + panel.UpdateTitle(); if (Program.Settings.TaskViewMode == TaskViewMode.ThumbnailView) { From c02cdced076f87378cdf79ce71ad7075cc0002ac Mon Sep 17 00:00:00 2001 From: Jaex Date: Thu, 25 Jul 2019 11:57:34 +0300 Subject: [PATCH 06/10] fixed #4236: Make sure screen record options preserved when imported --- ShareX/Forms/TaskSettingsForm.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ShareX/Forms/TaskSettingsForm.cs b/ShareX/Forms/TaskSettingsForm.cs index 2e8281d38..6ec0fc97f 100644 --- a/ShareX/Forms/TaskSettingsForm.cs +++ b/ShareX/Forms/TaskSettingsForm.cs @@ -1058,6 +1058,8 @@ private void btnScreenRecorderFFmpegOptions_Click(object sender, EventArgs e) { form.DefaultToolsFolder = Program.ToolsFolder; form.ShowDialog(); + + TaskSettings.CaptureSettings.FFmpegOptions = form.Options.FFmpeg; } } From 9e0f4d98c63ef255a7921c19c792beb8b69a940c Mon Sep 17 00:00:00 2001 From: Jaex Date: Wed, 31 Jul 2019 12:50:57 +0300 Subject: [PATCH 07/10] Added note label for actions tab --- ShareX/Forms/TaskSettingsForm.Designer.cs | 11 + ShareX/Forms/TaskSettingsForm.resx | 4049 ++++++++++++++++----- 2 files changed, 3057 insertions(+), 1003 deletions(-) diff --git a/ShareX/Forms/TaskSettingsForm.Designer.cs b/ShareX/Forms/TaskSettingsForm.Designer.cs index c70fe0b66..bb2eb7fe0 100644 --- a/ShareX/Forms/TaskSettingsForm.Designer.cs +++ b/ShareX/Forms/TaskSettingsForm.Designer.cs @@ -247,6 +247,7 @@ private void InitializeComponent() this.pgTaskSettings = new System.Windows.Forms.PropertyGrid(); this.chkOverrideAdvancedSettings = new System.Windows.Forms.CheckBox(); this.tttvMain = new ShareX.HelpersLib.TabToTreeView(); + this.lblActionsNote = new System.Windows.Forms.Label(); this.tcTaskSettings.SuspendLayout(); this.tpTask.SuspendLayout(); this.cmsDestinations.SuspendLayout(); @@ -1895,6 +1896,7 @@ private void InitializeComponent() // // pActions // + this.pActions.Controls.Add(this.lblActionsNote); this.pActions.Controls.Add(this.btnActionsDuplicate); this.pActions.Controls.Add(this.btnActionsAdd); this.pActions.Controls.Add(this.lvActions); @@ -1930,6 +1932,7 @@ private void InitializeComponent() this.chActionsArgs, this.chActionsExtensions}); this.lvActions.FullRowSelect = true; + this.lvActions.HideSelection = false; this.lvActions.MultiSelect = false; this.lvActions.Name = "lvActions"; this.lvActions.UseCompatibleStateImageBehavior = false; @@ -2010,6 +2013,7 @@ private void InitializeComponent() this.chWatchFolderFilter, this.chWatchFolderIncludeSubdirectories}); this.lvWatchFolderList.FullRowSelect = true; + this.lvWatchFolderList.HideSelection = false; this.lvWatchFolderList.Name = "lvWatchFolderList"; this.lvWatchFolderList.UseCompatibleStateImageBehavior = false; this.lvWatchFolderList.View = System.Windows.Forms.View.Details; @@ -2110,6 +2114,11 @@ private void InitializeComponent() this.tttvMain.TreeViewSize = 190; this.tttvMain.TabChanged += new ShareX.HelpersLib.TabToTreeView.TabChangedEventHandler(this.tttvMain_TabChanged); // + // lblActionsNote + // + resources.ApplyResources(this.lblActionsNote, "lblActionsNote"); + this.lblActionsNote.Name = "lblActionsNote"; + // // TaskSettingsForm // resources.ApplyResources(this, "$this"); @@ -2188,6 +2197,7 @@ private void InitializeComponent() this.tpActions.ResumeLayout(false); this.tpActions.PerformLayout(); this.pActions.ResumeLayout(false); + this.pActions.PerformLayout(); this.tpWatchFolders.ResumeLayout(false); this.tpWatchFolders.PerformLayout(); this.tpTools.ResumeLayout(false); @@ -2419,5 +2429,6 @@ private void InitializeComponent() private System.Windows.Forms.Label lblAutoIncrementNumber; private System.Windows.Forms.NumericUpDown nudAutoIncrementNumber; private System.Windows.Forms.Button btnAutoIncrementNumber; + private System.Windows.Forms.Label lblActionsNote; } } \ No newline at end of file diff --git a/ShareX/Forms/TaskSettingsForm.resx b/ShareX/Forms/TaskSettingsForm.resx index 62121b722..2fd83b537 100644 --- a/ShareX/Forms/TaskSettingsForm.resx +++ b/ShareX/Forms/TaskSettingsForm.resx @@ -297,6 +297,1086 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + cbOverrideCustomUploader + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpTask + + + 0 + + + chkOverrideCustomUploader + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpTask + + + 1 + + + chkOverrideFTP + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpTask + + + 2 + + + cboFTPaccounts + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpTask + + + 3 + + + btnAfterCapture + + + ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null + + + tpTask + + + 5 + + + btnAfterUpload + + + ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null + + + tpTask + + + 6 + + + btnDestinations + + + ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null + + + tpTask + + + 7 + + + btnTask + + + ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null + + + tpTask + + + 9 + + + 4, 22 + + + 3, 3, 3, 3 + + + 571, 479 + + + 0 + + + Task + + + tpTask + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcTaskSettings + + + 0 + + + pGeneral + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpGeneral + + + 0 + + + chkOverrideGeneralSettings + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpGeneral + + + 1 + + + 4, 22 + + + 571, 479 + + + 7 + + + General + + + tpGeneral + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcTaskSettings + + + 1 + + + pImage + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpQuality + + + 0 + + + chkOverrideImageSettings + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpQuality + + + 1 + + + 4, 22 + + + 557, 447 + + + 0 + + + tpQuality + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcImage + + + 0 + + + True + + + NoControl + + + 5, 8 + + + 443, 13 + + + 0 + + + Note: You can enable/disable image effects from "After capture tasks -> Add image effects". + + + lblImageEffectsNote + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpEffects + + + 0 + + + True + + + NoControl + + + 11, 64 + + + 221, 17 + + + 2 + + + Show image effects window after capture + + + chkShowImageEffectsWindowAfterCapture + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpEffects + + + 1 + + + True + + + NoControl + + + 11, 88 + + + 193, 17 + + + 3 + + + Only apply effects to region capture + + + cbImageEffectOnlyRegionCapture + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpEffects + + + 2 + + + NoControl + + + 8, 32 + + + 208, 23 + + + 1 + + + Image effects configuration... + + + btnImageEffects + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpEffects + + + 3 + + + 4, 22 + + + 3, 3, 3, 3 + + + 557, 447 + + + 2 + + + Effects + + + tpEffects + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcImage + + + 1 + + + cbThumbnailIfSmaller + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpThumbnail + + + 0 + + + lblThumbnailNamePreview + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpThumbnail + + + 1 + + + lblThumbnailName + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpThumbnail + + + 2 + + + txtThumbnailName + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpThumbnail + + + 3 + + + lblThumbnailHeight + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpThumbnail + + + 4 + + + lblThumbnailWidth + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpThumbnail + + + 5 + + + nudThumbnailHeight + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpThumbnail + + + 6 + + + nudThumbnailWidth + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpThumbnail + + + 7 + + + 4, 22 + + + 3, 3, 3, 3 + + + 557, 447 + + + 3 + + + Thumbnail + + + tpThumbnail + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcImage + + + 2 + + + Fill + + + 3, 3 + + + 565, 473 + + + 0 + + + tcImage + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpImage + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 571, 479 + + + 1 + + + Image + + + tpImage + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcTaskSettings + + + 2 + + + tcCapture + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 571, 479 + + + 2 + + + Capture + + + tpCapture + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcTaskSettings + + + 3 + + + tcUpload + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUpload + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 571, 479 + + + 4 + + + Upload + + + tpUpload + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcTaskSettings + + + 4 + + + True + + + 5, 8 + + + 402, 13 + + + 5 + + + Note: You can enable/disable actions from "After capture tasks -> Perform actions". + + + lblActionsNote + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pActions + + + 0 + + + False + + + NoControl + + + 200, 32 + + + 88, 23 + + + 2 + + + Duplicate + + + btnActionsDuplicate + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pActions + + + 1 + + + NoControl + + + 8, 32 + + + 88, 23 + + + 0 + + + Add + + + btnActionsAdd + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pActions + + + 2 + + + Top, Bottom, Left, Right + + + 8, 64 + + + 558, 383 + + + 4 + + + lvActions + + + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null + + + pActions + + + 3 + + + False + + + NoControl + + + 104, 32 + + + 88, 23 + + + 1 + + + Edit + + + btnActionsEdit + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pActions + + + 4 + + + False + + + NoControl + + + 296, 32 + + + 88, 23 + + + 3 + + + Remove + + + btnActionsRemove + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pActions + + + 5 + + + Fill + + + 0, 25 + + + 0, 0, 0, 0 + + + 571, 454 + + + 1 + + + pActions + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpActions + + + 0 + + + True + + + Top + + + NoControl + + + 0, 0 + + + 8, 8, 8, 0 + + + 571, 25 + + + 0 + + + Override actions + + + chkOverrideActions + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpActions + + + 1 + + + 4, 22 + + + 571, 479 + + + 3 + + + Actions + + + tpActions + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcTaskSettings + + + 5 + + + btnWatchFolderEdit + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpWatchFolders + + + 0 + + + cbWatchFolderEnabled + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpWatchFolders + + + 1 + + + lvWatchFolderList + + + System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpWatchFolders + + + 2 + + + btnWatchFolderRemove + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpWatchFolders + + + 3 + + + btnWatchFolderAdd + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpWatchFolders + + + 4 + + + 4, 22 + + + 3, 3, 3, 3 + + + 571, 479 + + + 5 + + + Watch folders + + + tpWatchFolders + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcTaskSettings + + + 6 + + + pTools + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpTools + + + 0 + + + chkOverrideToolsSettings + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpTools + + + 1 + + + 4, 22 + + + 571, 479 + + + 8 + + + Tools + + + tpTools + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcTaskSettings + + + 7 + + + pgTaskSettings + + + System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpAdvanced + + + 0 + + + chkOverrideAdvancedSettings + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpAdvanced + + + 1 + + + 4, 22 + + + 3, 3, 3, 3 + + + 571, 479 + + + 6 + + + Advanced + + + tpAdvanced + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcTaskSettings + + + 8 + + + Right + + + 202, 3 + + + 579, 505 + + + 1 + + + False + + + tcTaskSettings + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + 8, 328 @@ -421,7 +1501,7 @@ btnAfterCapture - ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=12.4.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null tpTask @@ -451,7 +1531,7 @@ btnAfterUpload - ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=12.4.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null tpTask @@ -468,6 +1548,39 @@ 396, 17 + + 182, 114 + + + cmsDestinations + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 504, 23 + + + 8 + + + Destinations... + + + MiddleLeft + + + btnDestinations + + + ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null + + + tpTask + + + 7 + 181, 22 @@ -498,39 +1611,6 @@ URL sharing services - - 182, 114 - - - cmsDestinations - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 504, 23 - - - 8 - - - Destinations... - - - MiddleLeft - - - btnDestinations - - - ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=12.4.0.0, Culture=neutral, PublicKeyToken=null - - - tpTask - - - 7 - NoControl @@ -553,7 +1633,7 @@ btnTask - ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=12.4.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null tpTask @@ -561,31 +1641,76 @@ 9 - - 4, 22 + + lblAfterTaskNotification - - 3, 3, 3, 3 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 571, 479 + + pGeneral - + 0 - - Task + + cboPopUpNotification - - tpTask + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + pGeneral - - tcTaskSettings + + 1 - + + cbPlaySoundAfterUpload + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pGeneral + + + 2 + + + cbPlaySoundAfterCapture + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pGeneral + + + 3 + + + Fill + + + 0, 25 + + + 571, 454 + + + 1 + + + pGeneral + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpGeneral + + 0 @@ -699,30 +1824,6 @@ 3 - - Fill - - - 0, 25 - - - 571, 454 - - - 1 - - - pGeneral - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGeneral - - - 0 - True @@ -759,30 +1860,198 @@ 1 - - 4, 22 + + cbImagePNGBitDepth - - 571, 479 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + pImage + + + 0 + + + lblImagePNGBitDepth + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 1 + + + cbImageAutoUseJPEG + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 2 + + + lblImageFormat + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 3 + + + cbImageFileExist + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 4 + + + lblImageFileExist + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 5 + + + nudImageAutoUseJPEGSize + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 6 + + + lblImageSizeLimitHint + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + 7 - - General + + nudImageJPEGQuality - - tpGeneral + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + pImage - - tcTaskSettings + + 8 - + + cbImageFormat + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 9 + + + lblImageJPEGQualityHint + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 10 + + + lblImageGIFQuality + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 11 + + + lblImageJPEGQuality + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 12 + + + cbImageGIFQuality + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 13 + + + Fill + + + 0, 25 + + + 557, 422 + + 1 + + pImage + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpQuality + + + 0 + 8, 72 @@ -1149,30 +2418,6 @@ 13 - - Fill - - - 0, 25 - - - 557, 422 - - - 1 - - - pImage - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpQuality - - - 0 - True @@ -1209,171 +2454,6 @@ 1 - - 4, 22 - - - 557, 447 - - - 0 - - - tpQuality - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcImage - - - 0 - - - True - - - NoControl - - - 8, 8 - - - 415, 13 - - - 0 - - - You can enable/disable Image effects from "After capture tasks -> Add image effects". - - - lblImageEffectsNote - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpEffects - - - 0 - - - True - - - NoControl - - - 11, 64 - - - 221, 17 - - - 2 - - - Show image effects window after capture - - - chkShowImageEffectsWindowAfterCapture - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpEffects - - - 1 - - - True - - - NoControl - - - 11, 88 - - - 193, 17 - - - 3 - - - Only apply effects to region capture - - - cbImageEffectOnlyRegionCapture - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpEffects - - - 2 - - - NoControl - - - 11, 32 - - - 208, 23 - - - 1 - - - Image effects configuration... - - - btnImageEffects - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpEffects - - - 3 - - - 4, 22 - - - 3, 3, 3, 3 - - - 557, 447 - - - 2 - - - Effects - - - tpEffects - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcImage - - - 1 - True @@ -1593,84 +2673,387 @@ 7 - - 4, 22 + + tpCaptureGeneral - - 3, 3, 3, 3 - - - 557, 447 - - - 3 - - - Thumbnail - - - tpThumbnail - - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tcImage + + tcCapture - - 2 - - - Fill - - - 3, 3 - - - 565, 473 - - + 0 - - tcImage + + tpRegionCapture - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tpImage + + tcCapture - - 0 - - - 4, 22 - - - 3, 3, 3, 3 - - - 571, 479 - - + 1 - - Image + + tpScreenRecorder - - tpImage - - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tcTaskSettings + + tcCapture - + 2 + + tpOCR + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcCapture + + + 3 + + + Fill + + + 3, 3 + + + 565, 473 + + + 0 + + + tcCapture + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 0 + + + pCapture + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCaptureGeneral + + + 0 + + + chkOverrideCaptureSettings + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCaptureGeneral + + + 1 + + + 4, 22 + + + 557, 447 + + + 0 + + + tpCaptureGeneral + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcCapture + + + 0 + + + lblScreenshotDelay + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 0 + + + btnCaptureCustomRegionSelectRectangle + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 1 + + + lblCaptureCustomRegion + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 2 + + + lblCaptureCustomRegionWidth + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 3 + + + lblCaptureCustomRegionHeight + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 4 + + + lblCaptureCustomRegionY + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 5 + + + lblCaptureCustomRegionX + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 6 + + + nudCaptureCustomRegionHeight + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 7 + + + nudCaptureCustomRegionWidth + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 8 + + + nudCaptureCustomRegionY + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 9 + + + nudCaptureCustomRegionX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 10 + + + cbShowCursor + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 11 + + + lblCaptureShadowOffset + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 12 + + + cbCaptureTransparent + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 13 + + + cbCaptureAutoHideTaskbar + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 14 + + + cbCaptureShadow + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 15 + + + lblScreenshotDelayInfo + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 16 + + + cbCaptureClientArea + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 17 + + + nudScreenshotDelay + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 18 + + + nudCaptureShadowOffset + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 19 + + + Fill + + + 0, 25 + + + 557, 422 + + + 1 + + + pCapture + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCaptureGeneral + + + 0 + True @@ -2211,30 +3594,6 @@ 19 - - Fill - - - 0, 25 - - - 557, 422 - - - 1 - - - pCapture - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCaptureGeneral - - - 0 - True @@ -2271,26 +3630,392 @@ 1 - + + cbRegionCaptureShowFPS + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 0 + + + flpRegionCaptureFixedSize + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 1 + + + cbRegionCaptureIsFixedSize + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 2 + + + cbRegionCaptureShowCrosshair + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 3 + + + lblRegionCaptureMagnifierPixelSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 4 + + + lblRegionCaptureMagnifierPixelCount + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 5 + + + cbRegionCaptureUseSquareMagnifier + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 6 + + + cbRegionCaptureShowMagnifier + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 7 + + + cbRegionCaptureShowInfo + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 8 + + + btnRegionCaptureSnapSizesRemove + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 9 + + + btnRegionCaptureSnapSizesAdd + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 10 + + + cbRegionCaptureSnapSizes + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 11 + + + lblRegionCaptureSnapSizes + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 12 + + + cbRegionCaptureUseCustomInfoText + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 13 + + + cbRegionCaptureDetectControls + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 14 + + + cbRegionCaptureDetectWindows + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 15 + + + cbRegionCaptureMouse5ClickAction + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 16 + + + lblRegionCaptureMouse5ClickAction + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 17 + + + cbRegionCaptureMouse4ClickAction + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 18 + + + lblRegionCaptureMouse4ClickAction + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 19 + + + cbRegionCaptureMouseMiddleClickAction + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 20 + + + lblRegionCaptureMouseMiddleClickAction + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 21 + + + cbRegionCaptureMouseRightClickAction + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 22 + + + lblRegionCaptureMouseRightClickAction + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 23 + + + cbRegionCaptureMultiRegionMode + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 24 + + + pRegionCaptureSnapSizes + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 25 + + + cbRegionCaptureUseDimming + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 26 + + + txtRegionCaptureCustomInfoText + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 27 + + + nudRegionCaptureMagnifierPixelCount + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 28 + + + nudRegionCaptureMagnifierPixelSize + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 29 + + 4, 22 - + + 3, 3, 3, 3 + + 557, 447 - - 0 + + 1 - - tpCaptureGeneral + + Region capture - + + tpRegionCapture + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcCapture - - 0 + + 1 True @@ -2325,6 +4050,78 @@ GrowAndShrink + + lblRegionCaptureFixedSizeWidth + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flpRegionCaptureFixedSize + + + 0 + + + nudRegionCaptureFixedSizeWidth + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flpRegionCaptureFixedSize + + + 1 + + + lblRegionCaptureFixedSizeHeight + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flpRegionCaptureFixedSize + + + 2 + + + nudRegionCaptureFixedSizeHeight + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flpRegionCaptureFixedSize + + + 3 + + + 312, 387 + + + 222, 26 + + + 29 + + + False + + + flpRegionCaptureFixedSize + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 1 + Left @@ -2439,30 +4236,6 @@ 3 - - 312, 387 - - - 222, 26 - - - 29 - - - False - - - flpRegionCaptureFixedSize - - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpRegionCapture - - - 1 - True @@ -3060,6 +4833,102 @@ 24 + + btnRegionCaptureSnapSizesDialogCancel + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pRegionCaptureSnapSizes + + + 0 + + + btnRegionCaptureSnapSizesDialogAdd + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pRegionCaptureSnapSizes + + + 1 + + + nudRegionCaptureSnapSizesHeight + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pRegionCaptureSnapSizes + + + 2 + + + RegionCaptureSnapSizesHeight + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pRegionCaptureSnapSizes + + + 3 + + + nudRegionCaptureSnapSizesWidth + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pRegionCaptureSnapSizes + + + 4 + + + lblRegionCaptureSnapSizesWidth + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pRegionCaptureSnapSizes + + + 5 + + + 304, 208 + + + 232, 112 + + + 18 + + + False + + + pRegionCaptureSnapSizes + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 25 + 120, 80 @@ -3213,30 +5082,6 @@ 5 - - 304, 208 - - - 232, 112 - - - 18 - - - False - - - pRegionCaptureSnapSizes - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpRegionCapture - - - 25 - True @@ -3333,32 +5178,200 @@ 29 - + + cbScreenRecordTwoPassEncoding + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 0 + + + cbScreenRecordConfirmAbort + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 1 + + + cbScreenRecorderShowCursor + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 2 + + + btnScreenRecorderFFmpegOptions + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 3 + + + lblScreenRecorderStartDelay + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 4 + + + chkScreenRecordAutoStart + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 5 + + + lblScreenRecorderFixedDuration + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 6 + + + nudScreenRecordFPS + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 7 + + + lblScreenRecordFPS + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 8 + + + nudScreenRecorderDuration + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 9 + + + nudScreenRecorderStartDelay + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 10 + + + cbScreenRecorderFixedDuration + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 11 + + + nudGIFFPS + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 12 + + + lblGIFFPS + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 13 + + 4, 22 - + 3, 3, 3, 3 - + 557, 447 - - 1 + + 2 - - Region capture + + Screen recorder - - tpRegionCapture + + tpScreenRecorder - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcCapture - - 1 + + 2 True @@ -3750,32 +5763,92 @@ 13 - + + cbCaptureOCRAutoCopy + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOCR + + + 0 + + + cbCaptureOCRProcessOnLoad + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOCR + + + 1 + + + cbCaptureOCRSilent + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOCR + + + 2 + + + lblOCRDefaultLanguage + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOCR + + + 3 + + + cbCaptureOCRDefaultLanguage + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOCR + + + 4 + + 4, 22 - + 3, 3, 3, 3 - + 557, 447 - - 2 + + 3 - - Screen recorder + + OCR - - tpScreenRecorder + + tpOCR - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcCapture - - 2 + + 3 True @@ -3915,84 +5988,111 @@ 4 - - 4, 22 + + tpUploadMain - - 3, 3, 3, 3 - - - 557, 447 - - - 3 - - - OCR - - - tpOCR - - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tcCapture + + tcUpload - - 3 - - - Fill - - - 3, 3 - - - 565, 473 - - + 0 - - tcCapture + + tpFileNaming - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tpCapture + + tcUpload - - 0 + + 1 - - 4, 22 + + tpUploadClipboard - - 3, 3, 3, 3 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 571, 479 + + tcUpload - + 2 - - Capture + + tpUploaderFilters - - tpCapture - - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tcTaskSettings + + tcUpload - + 3 + + Fill + + + 3, 3 + + + 565, 473 + + + 0 + + + tcUpload + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUpload + + + 0 + + + chkOverrideUploadSettings + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUploadMain + + + 0 + + + 4, 22 + + + 557, 447 + + + 0 + + + tpUploadMain + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcUpload + + + 0 + True @@ -4029,26 +6129,200 @@ 0 - + + btnAutoIncrementNumber + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 0 + + + lblAutoIncrementNumber + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 1 + + + nudAutoIncrementNumber + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 2 + + + cbFileUploadReplaceProblematicCharacters + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 3 + + + cbRegionCaptureUseWindowPattern + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 4 + + + cbNameFormatCustomTimeZone + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 5 + + + lblNameFormatPatternPreview + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 6 + + + lblNameFormatPatternActiveWindow + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 7 + + + lblNameFormatPatternPreviewActiveWindow + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 8 + + + cbNameFormatTimeZone + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 9 + + + txtNameFormatPatternActiveWindow + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 10 + + + cbFileUploadUseNamePattern + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 11 + + + lblNameFormatPattern + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 12 + + + txtNameFormatPattern + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 13 + + 4, 22 - + + 3, 3, 3, 3 + + 557, 447 - - 0 + + 2 - - tpUploadMain + + File naming - + + tpFileNaming + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcUpload - - 0 + + 1 104, 224 @@ -4422,32 +6696,80 @@ 13 - - 4, 22 + + cbClipboardUploadShareURL - - 3, 3, 3, 3 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 557, 447 + + tpUploadClipboard - + + 0 + + + cbClipboardUploadURLContents + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUploadClipboard + + + 1 + + + cbClipboardUploadAutoIndexFolder + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUploadClipboard + + 2 - - File naming + + cbClipboardUploadShortenURL - - tpFileNaming + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + tpUploadClipboard + + + 3 + + + 4, 22 + + + 3, 3, 3, 3 + + + 557, 447 + + + 1 + + + Clipboard upload + + + tpUploadClipboard + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcUpload - - 1 + + 2 True @@ -4569,48 +6891,144 @@ 3 - - 4, 22 + + lvUploaderFiltersList - - 3, 3, 3, 3 + + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null - - 557, 447 + + tpUploaderFilters - + + 0 + + + btnUploaderFiltersRemove + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUploaderFilters + + 1 - - Clipboard upload + + btnUploaderFiltersUpdate - - tpUploadClipboard + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + tpUploaderFilters + + + 2 + + + btnUploaderFiltersAdd + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUploaderFilters + + + 3 + + + lblUploaderFiltersDestination + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUploaderFilters + + + 4 + + + cbUploaderFiltersDestination + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUploaderFilters + + + 5 + + + lblUploaderFiltersExtensionsExample + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUploaderFilters + + + 6 + + + lblUploaderFiltersExtensions + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUploaderFilters + + + 7 + + + txtUploaderFiltersExtensions + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUploaderFilters + + + 8 + + + 4, 22 + + + 3, 3, 3, 3 + + + 557, 447 + + + 3 + + + Uploader filters + + + tpUploaderFilters + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcUpload - - 2 + + 3 Top, Bottom, Left, Right - - Uploader - - - 128 - - - Extension - - - 98 - 8, 136 @@ -4624,7 +7042,7 @@ lvUploaderFiltersList - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.4.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null tpUploaderFilters @@ -4632,6 +7050,18 @@ 0 + + Uploader + + + 128 + + + Extension + + + 98 + 280, 104 @@ -4827,144 +7257,6 @@ 8 - - 4, 22 - - - 3, 3, 3, 3 - - - 557, 447 - - - 3 - - - Uploader filters - - - tpUploaderFilters - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcUpload - - - 3 - - - Fill - - - 3, 3 - - - 565, 473 - - - 0 - - - tcUpload - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpUpload - - - 0 - - - 4, 22 - - - 3, 3, 3, 3 - - - 571, 479 - - - 4 - - - Upload - - - tpUpload - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcTaskSettings - - - 4 - - - False - - - NoControl - - - 200, 8 - - - 88, 23 - - - 2 - - - Duplicate - - - btnActionsDuplicate - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pActions - - - 0 - - - NoControl - - - 8, 8 - - - 88, 23 - - - 0 - - - Add - - - btnActionsAdd - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pActions - - - 1 - - - Top, Bottom, Left, Right - Name @@ -4989,174 +7281,6 @@ 75 - - 8, 40 - - - 558, 407 - - - 4 - - - lvActions - - - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.4.0.0, Culture=neutral, PublicKeyToken=null - - - pActions - - - 2 - - - False - - - NoControl - - - 104, 8 - - - 88, 23 - - - 1 - - - Edit - - - btnActionsEdit - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pActions - - - 3 - - - False - - - NoControl - - - 296, 8 - - - 88, 23 - - - 3 - - - Remove - - - btnActionsRemove - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pActions - - - 4 - - - Fill - - - 0, 25 - - - 0, 0, 0, 0 - - - 571, 454 - - - 1 - - - pActions - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpActions - - - 0 - - - True - - - Top - - - NoControl - - - 0, 0 - - - 8, 8, 8, 0 - - - 571, 25 - - - 0 - - - Override actions - - - chkOverrideActions - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpActions - - - 1 - - - 4, 22 - - - 571, 479 - - - 3 - - - Actions - - - tpActions - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcTaskSettings - - - 5 - 104, 32 @@ -5214,24 +7338,6 @@ Top, Bottom, Left, Right - - Folder path - - - 323 - - - Filter - - - 43 - - - Include subdirectories - - - 124 - 8, 64 @@ -5253,6 +7359,24 @@ 2 + + Folder path + + + 323 + + + Filter + + + 43 + + + Include subdirectories + + + 124 + NoControl @@ -5307,32 +7431,53 @@ 4 - - 4, 22 + + txtToolsScreenColorPickerFormat - - 3, 3, 3, 3 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 571, 479 + + pTools - - 5 + + 0 - - Watch folders + + lblToolsScreenColorPickerFormat - - tpWatchFolders + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + pTools - - tcTaskSettings + + 1 - - 6 + + Fill + + + 0, 25 + + + 571, 454 + + + 1 + + + pTools + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpTools + + + 0 8, 24 @@ -5382,30 +7527,6 @@ 1 - - Fill - - - 0, 25 - - - 571, 454 - - - 1 - - - pTools - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTools - - - 0 - True @@ -5442,30 +7563,6 @@ 1 - - 4, 22 - - - 571, 479 - - - 8 - - - Tools - - - tpTools - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcTaskSettings - - - 7 - Fill @@ -5526,60 +7623,6 @@ 1 - - 4, 22 - - - 3, 3, 3, 3 - - - 571, 479 - - - 6 - - - Advanced - - - tpAdvanced - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcTaskSettings - - - 8 - - - Right - - - 202, 3 - - - 579, 505 - - - 1 - - - False - - - tcTaskSettings - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 4 - Fill @@ -5599,7 +7642,7 @@ tttvMain - ShareX.HelpersLib.TabToTreeView, ShareX.HelpersLib, Version=12.4.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.TabToTreeView, ShareX.HelpersLib, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null $this From eb491e8532846502d9426a7c789477464ee338bf Mon Sep 17 00:00:00 2001 From: Jaex Date: Tue, 6 Aug 2019 23:52:40 +0300 Subject: [PATCH 08/10] Encode GIF without creating temp palette file --- .../Screencast/FFmpegHelper.cs | 38 +++---------------- .../Screencast/ScreenRecorder.cs | 11 ++---- ShareX/ScreenRecordManager.cs | 2 +- 3 files changed, 11 insertions(+), 40 deletions(-) diff --git a/ShareX.ScreenCaptureLib/Screencast/FFmpegHelper.cs b/ShareX.ScreenCaptureLib/Screencast/FFmpegHelper.cs index 0013af29a..b16cca28f 100644 --- a/ShareX.ScreenCaptureLib/Screencast/FFmpegHelper.cs +++ b/ShareX.ScreenCaptureLib/Screencast/FFmpegHelper.cs @@ -101,39 +101,13 @@ public bool EncodeVideo(string input, string output) return Run(Options.FFmpeg.FFmpegPath, Options.GetFFmpegCommands()); } - public bool EncodeGIF(string input, string output, string tempFolder) + public bool EncodeGIF(string input, string output) { - bool result; - - string palettePath = Path.Combine(tempFolder, "FFmpeg-palette.png"); - - try - { - // https://ffmpeg.org/ffmpeg-filters.html#palettegen-1 - result = Run(Options.FFmpeg.FFmpegPath, string.Format("-y -i \"{0}\" -vf \"palettegen=stats_mode={2}\" \"{1}\"", input, palettePath, Options.FFmpeg.GIFStatsMode)); - - if (result) - { - if (File.Exists(palettePath)) - { - // https://ffmpeg.org/ffmpeg-filters.html#paletteuse - result = Run(Options.FFmpeg.FFmpegPath, string.Format("-y -i \"{0}\" -i \"{1}\" -lavfi \"paletteuse=dither={3}\" \"{2}\"", input, palettePath, output, Options.FFmpeg.GIFDither)); - } - else - { - result = false; - } - } - } - finally - { - if (File.Exists(palettePath)) - { - File.Delete(palettePath); - } - } - - return result; + // https://ffmpeg.org/ffmpeg-filters.html#palettegen-1 + // https://ffmpeg.org/ffmpeg-filters.html#paletteuse + return Run(Options.FFmpeg.FFmpegPath, + $"-y -i \"{input}\" -lavfi \"palettegen=stats_mode={Options.FFmpeg.GIFStatsMode}[palette]," + + $"[0:v][palette]paletteuse=dither={Options.FFmpeg.GIFDither}\" \"{output}\""); } private bool Run(string path, string args = null) diff --git a/ShareX.ScreenCaptureLib/Screencast/ScreenRecorder.cs b/ShareX.ScreenCaptureLib/Screencast/ScreenRecorder.cs index 1452d87d1..883fd0db0 100644 --- a/ShareX.ScreenCaptureLib/Screencast/ScreenRecorder.cs +++ b/ShareX.ScreenCaptureLib/Screencast/ScreenRecorder.cs @@ -233,16 +233,13 @@ public void SaveAsGIF(string path, GIFQuality quality) public bool FFmpegEncodeVideo(string input, string output) { Helpers.CreateDirectoryFromFilePath(output); - bool result = ffmpegCli.EncodeVideo(input, output); - //DebugHelper.WriteLine("Video encoding result:\nInput file size: {0}\nOutput file size: {1}", new FileInfo(input).Length.ToSizeString(), new FileInfo(output).Length.ToSizeString()); - return result; + return ffmpegCli.EncodeVideo(input, output); } - public bool FFmpegEncodeAsGIF(string sourceFilePath, string targetFilePath, string tempFolder) + public bool FFmpegEncodeAsGIF(string input, string output) { - Helpers.CreateDirectoryFromFilePath(targetFilePath); - Helpers.CreateDirectoryFromDirectoryPath(tempFolder); - return ffmpegCli.EncodeGIF(sourceFilePath, targetFilePath, tempFolder); + Helpers.CreateDirectoryFromFilePath(output); + return ffmpegCli.EncodeGIF(input, output); } protected void OnRecordingStarted() diff --git a/ShareX/ScreenRecordManager.cs b/ShareX/ScreenRecordManager.cs index 47e0dc723..38ddc575e 100644 --- a/ShareX/ScreenRecordManager.cs +++ b/ShareX/ScreenRecordManager.cs @@ -303,7 +303,7 @@ private static string ProcessTwoPassEncoding(string input, TaskSettings taskSett { if (taskSettings.CaptureSettings.FFmpegOptions.VideoCodec == FFmpegVideoCodec.gif) { - screenRecorder.FFmpegEncodeAsGIF(input, output, Program.ToolsFolder); + screenRecorder.FFmpegEncodeAsGIF(input, output); } else { From 857298909b256e156de918cc3769d294608a618f Mon Sep 17 00:00:00 2001 From: Jaex Date: Fri, 9 Aug 2019 11:30:06 +0300 Subject: [PATCH 09/10] fixed #4256: Q hotkey should work only in region capture mode --- ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs b/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs index f70b1228c..ed988ee97 100644 --- a/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs +++ b/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs @@ -591,10 +591,6 @@ private void form_KeyDown(object sender, KeyEventArgs e) case Keys.PageDown: MoveCurrentShapeDown(); break; - case Keys.Q: - Options.QuickCrop = !Options.QuickCrop; - tsmiQuickCrop.Checked = !Options.QuickCrop; - break; case Keys.M: CurrentTool = ShapeType.ToolSelect; break; @@ -625,6 +621,16 @@ private void form_KeyDown(object sender, KeyEventArgs e) break; } } + else + { + switch (e.KeyData) + { + case Keys.Q: + Options.QuickCrop = !Options.QuickCrop; + tsmiQuickCrop.Checked = !Options.QuickCrop; + break; + } + } } int speed; From afca1de5bc743159a597243fdc8978274a14d613 Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 9 Aug 2019 23:45:54 +1000 Subject: [PATCH 10/10] Update BackblazeB2.cs Fixes #4187 --- ShareX.UploadersLib/FileUploaders/BackblazeB2.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ShareX.UploadersLib/FileUploaders/BackblazeB2.cs b/ShareX.UploadersLib/FileUploaders/BackblazeB2.cs index fc6e3f78f..9dfc9100a 100644 --- a/ShareX.UploadersLib/FileUploaders/BackblazeB2.cs +++ b/ShareX.UploadersLib/FileUploaders/BackblazeB2.cs @@ -213,6 +213,12 @@ public override UploadResult Upload(Stream stream, string fileName) DebugHelper.WriteLine("B2 uploader: Too Many Requests, trying with same URL."); continue; } + else if (uploadResult.RC == 503) + { + DebugHelper.WriteLine("B2 uploader: Service Unavailable, trying with new URL."); + url = null; + continue; + } else if (uploadResult.RC != 200) { // something else happened that wasn't a success, so bail out @@ -678,4 +684,4 @@ public B2Upload(string fileId, string fileName, string accountId, string bucketI #endregion JSON responses } -} \ No newline at end of file +}