From bcbaa0e767f9dd6d2220ae3692c2923b7246b14c Mon Sep 17 00:00:00 2001 From: Jaex Date: Fri, 22 Jul 2016 10:22:18 +0300 Subject: [PATCH] Added auto use JPEG image format option instead of previous image format 2 option for UI to be more user friendly --- ShareX/Forms/TaskSettingsForm.Designer.cs | 76 +- ShareX/Forms/TaskSettingsForm.cs | 32 +- ShareX/Forms/TaskSettingsForm.resx | 4196 +++++++++++++++------ ShareX/TaskHelpers.cs | 23 +- ShareX/TaskSettings.cs | 4 +- 5 files changed, 3045 insertions(+), 1286 deletions(-) diff --git a/ShareX/Forms/TaskSettingsForm.Designer.cs b/ShareX/Forms/TaskSettingsForm.Designer.cs index 782fb2e01..0a17f281e 100644 --- a/ShareX/Forms/TaskSettingsForm.Designer.cs +++ b/ShareX/Forms/TaskSettingsForm.Designer.cs @@ -65,16 +65,14 @@ private void InitializeComponent() this.tcImage = new System.Windows.Forms.TabControl(); this.tpQuality = new System.Windows.Forms.TabPage(); this.pImage = new System.Windows.Forms.Panel(); + this.cbImageAutoUseJPEG = new System.Windows.Forms.CheckBox(); this.lblImageFormat = new System.Windows.Forms.Label(); this.cbImageFileExist = new System.Windows.Forms.ComboBox(); - this.lblUseImageFormat2After = new System.Windows.Forms.Label(); this.lblImageFileExist = new System.Windows.Forms.Label(); - this.nudUseImageFormat2After = new System.Windows.Forms.NumericUpDown(); - this.lblImageFormat2 = new System.Windows.Forms.Label(); - this.lblUseImageFormat2AfterHint = new System.Windows.Forms.Label(); + this.nudImageAutoUseJPEGSize = new System.Windows.Forms.NumericUpDown(); + this.lblImageSizeLimitHint = new System.Windows.Forms.Label(); this.nudImageJPEGQuality = new System.Windows.Forms.NumericUpDown(); this.cbImageFormat = new System.Windows.Forms.ComboBox(); - this.cbImageFormat2 = new System.Windows.Forms.ComboBox(); this.lblImageJPEGQualityHint = new System.Windows.Forms.Label(); this.lblImageGIFQuality = new System.Windows.Forms.Label(); this.lblImageJPEGQuality = new System.Windows.Forms.Label(); @@ -244,7 +242,7 @@ private void InitializeComponent() this.tcImage.SuspendLayout(); this.tpQuality.SuspendLayout(); this.pImage.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.nudUseImageFormat2After)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudImageAutoUseJPEGSize)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudImageJPEGQuality)).BeginInit(); this.tpEffects.SuspendLayout(); this.tpThumbnail.SuspendLayout(); @@ -554,16 +552,14 @@ private void InitializeComponent() // // pImage // + this.pImage.Controls.Add(this.cbImageAutoUseJPEG); this.pImage.Controls.Add(this.lblImageFormat); this.pImage.Controls.Add(this.cbImageFileExist); - this.pImage.Controls.Add(this.lblUseImageFormat2After); this.pImage.Controls.Add(this.lblImageFileExist); - this.pImage.Controls.Add(this.nudUseImageFormat2After); - this.pImage.Controls.Add(this.lblImageFormat2); - this.pImage.Controls.Add(this.lblUseImageFormat2AfterHint); + this.pImage.Controls.Add(this.nudImageAutoUseJPEGSize); + this.pImage.Controls.Add(this.lblImageSizeLimitHint); this.pImage.Controls.Add(this.nudImageJPEGQuality); this.pImage.Controls.Add(this.cbImageFormat); - this.pImage.Controls.Add(this.cbImageFormat2); this.pImage.Controls.Add(this.lblImageJPEGQualityHint); this.pImage.Controls.Add(this.lblImageGIFQuality); this.pImage.Controls.Add(this.lblImageJPEGQuality); @@ -571,6 +567,13 @@ private void InitializeComponent() resources.ApplyResources(this.pImage, "pImage"); this.pImage.Name = "pImage"; // + // cbImageAutoUseJPEG + // + resources.ApplyResources(this.cbImageAutoUseJPEG, "cbImageAutoUseJPEG"); + this.cbImageAutoUseJPEG.Name = "cbImageAutoUseJPEG"; + this.cbImageAutoUseJPEG.UseVisualStyleBackColor = true; + this.cbImageAutoUseJPEG.CheckedChanged += new System.EventHandler(this.cbImageAutoUseJPEG_CheckedChanged); + // // lblImageFormat // resources.ApplyResources(this.lblImageFormat, "lblImageFormat"); @@ -584,41 +587,36 @@ private void InitializeComponent() this.cbImageFileExist.Name = "cbImageFileExist"; this.cbImageFileExist.SelectedIndexChanged += new System.EventHandler(this.cbImageFileExist_SelectedIndexChanged); // - // lblUseImageFormat2After - // - resources.ApplyResources(this.lblUseImageFormat2After, "lblUseImageFormat2After"); - this.lblUseImageFormat2After.Name = "lblUseImageFormat2After"; - // // lblImageFileExist // resources.ApplyResources(this.lblImageFileExist, "lblImageFileExist"); this.lblImageFileExist.Name = "lblImageFileExist"; // - // nudUseImageFormat2After + // nudImageAutoUseJPEGSize // - resources.ApplyResources(this.nudUseImageFormat2After, "nudUseImageFormat2After"); - this.nudUseImageFormat2After.Maximum = new decimal(new int[] { + resources.ApplyResources(this.nudImageAutoUseJPEGSize, "nudImageAutoUseJPEGSize"); + this.nudImageAutoUseJPEGSize.Maximum = new decimal(new int[] { 10000, 0, 0, 0}); - this.nudUseImageFormat2After.Name = "nudUseImageFormat2After"; - this.nudUseImageFormat2After.Value = new decimal(new int[] { + this.nudImageAutoUseJPEGSize.Minimum = new decimal(new int[] { + 100, + 0, + 0, + 0}); + this.nudImageAutoUseJPEGSize.Name = "nudImageAutoUseJPEGSize"; + this.nudImageAutoUseJPEGSize.Value = new decimal(new int[] { 2048, 0, 0, 0}); - this.nudUseImageFormat2After.ValueChanged += new System.EventHandler(this.nudUseImageFormat2After_ValueChanged); + this.nudImageAutoUseJPEGSize.ValueChanged += new System.EventHandler(this.nudImageAutoUseJPEGSize_ValueChanged); // - // lblImageFormat2 + // lblImageSizeLimitHint // - resources.ApplyResources(this.lblImageFormat2, "lblImageFormat2"); - this.lblImageFormat2.Name = "lblImageFormat2"; - // - // lblUseImageFormat2AfterHint - // - resources.ApplyResources(this.lblUseImageFormat2AfterHint, "lblUseImageFormat2AfterHint"); - this.lblUseImageFormat2AfterHint.Name = "lblUseImageFormat2AfterHint"; + resources.ApplyResources(this.lblImageSizeLimitHint, "lblImageSizeLimitHint"); + this.lblImageSizeLimitHint.Name = "lblImageSizeLimitHint"; // // nudImageJPEGQuality // @@ -639,14 +637,6 @@ private void InitializeComponent() this.cbImageFormat.Name = "cbImageFormat"; this.cbImageFormat.SelectedIndexChanged += new System.EventHandler(this.cbImageFormat_SelectedIndexChanged); // - // cbImageFormat2 - // - this.cbImageFormat2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cbImageFormat2.FormattingEnabled = true; - resources.ApplyResources(this.cbImageFormat2, "cbImageFormat2"); - this.cbImageFormat2.Name = "cbImageFormat2"; - this.cbImageFormat2.SelectedIndexChanged += new System.EventHandler(this.cbImageFormat2_SelectedIndexChanged); - // // lblImageJPEGQualityHint // resources.ApplyResources(this.lblImageJPEGQualityHint, "lblImageJPEGQualityHint"); @@ -2074,7 +2064,7 @@ private void InitializeComponent() this.tpQuality.PerformLayout(); this.pImage.ResumeLayout(false); this.pImage.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.nudUseImageFormat2After)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudImageAutoUseJPEGSize)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudImageJPEGQuality)).EndInit(); this.tpEffects.ResumeLayout(false); this.tpEffects.PerformLayout(); @@ -2158,17 +2148,14 @@ private void InitializeComponent() private System.Windows.Forms.TabControl tcImage; private System.Windows.Forms.TabPage tpQuality; private System.Windows.Forms.Label lblImageFormat; - private System.Windows.Forms.Label lblUseImageFormat2AfterHint; + private System.Windows.Forms.Label lblImageSizeLimitHint; private System.Windows.Forms.ComboBox cbImageFormat; private System.Windows.Forms.Label lblImageJPEGQualityHint; private System.Windows.Forms.Label lblImageJPEGQuality; private System.Windows.Forms.ComboBox cbImageGIFQuality; private System.Windows.Forms.Label lblImageGIFQuality; - private System.Windows.Forms.ComboBox cbImageFormat2; private System.Windows.Forms.NumericUpDown nudImageJPEGQuality; - private System.Windows.Forms.Label lblImageFormat2; - private System.Windows.Forms.NumericUpDown nudUseImageFormat2After; - private System.Windows.Forms.Label lblUseImageFormat2After; + private System.Windows.Forms.NumericUpDown nudImageAutoUseJPEGSize; private System.Windows.Forms.TabPage tpEffects; private System.Windows.Forms.TabControl tcCapture; private System.Windows.Forms.TabPage tpCaptureGeneral; @@ -2345,5 +2332,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox cbRegionCaptureIsFixedSize; private System.Windows.Forms.NumericUpDown nudRegionCaptureFixedSizeHeight; private System.Windows.Forms.CheckBox cbRegionCaptureShowFPS; + private System.Windows.Forms.CheckBox cbImageAutoUseJPEG; } } \ No newline at end of file diff --git a/ShareX/Forms/TaskSettingsForm.cs b/ShareX/Forms/TaskSettingsForm.cs index 5b060d7fc..28fa61d07 100644 --- a/ShareX/Forms/TaskSettingsForm.cs +++ b/ShareX/Forms/TaskSettingsForm.cs @@ -183,9 +183,9 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false) nudImageJPEGQuality.SetValue(TaskSettings.ImageSettings.ImageJPEGQuality); cbImageGIFQuality.Items.AddRange(Helpers.GetLocalizedEnumDescriptions()); cbImageGIFQuality.SelectedIndex = (int)TaskSettings.ImageSettings.ImageGIFQuality; - nudUseImageFormat2After.SetValue(TaskSettings.ImageSettings.ImageSizeLimit); - cbImageFormat2.Items.AddRange(Enum.GetNames(typeof(EImageFormat))); - cbImageFormat2.SelectedIndex = (int)TaskSettings.ImageSettings.ImageFormat2; + cbImageAutoUseJPEG.Checked = TaskSettings.ImageSettings.ImageAutoUseJPEG; + nudImageAutoUseJPEGSize.Enabled = TaskSettings.ImageSettings.ImageAutoUseJPEG; + nudImageAutoUseJPEGSize.SetValue(TaskSettings.ImageSettings.ImageAutoUseJPEGSize); cbImageFileExist.Items.Clear(); cbImageFileExist.Items.AddRange(Helpers.GetLocalizedEnumDescriptions()); cbImageFileExist.SelectedIndex = (int)TaskSettings.ImageSettings.FileExistAction; @@ -713,25 +713,25 @@ private void cbImageFormat_SelectedIndexChanged(object sender, EventArgs e) TaskSettings.ImageSettings.ImageFormat = (EImageFormat)cbImageFormat.SelectedIndex; } - private void cbImageGIFQuality_SelectedIndexChanged(object sender, EventArgs e) - { - TaskSettings.ImageSettings.ImageGIFQuality = (GIFQuality)cbImageGIFQuality.SelectedIndex; - } - - private void cbImageFormat2_SelectedIndexChanged(object sender, EventArgs e) - { - TaskSettings.ImageSettings.ImageFormat2 = (EImageFormat)cbImageFormat2.SelectedIndex; - } - private void nudImageJPEGQuality_ValueChanged(object sender, EventArgs e) { TaskSettings.ImageSettings.ImageJPEGQuality = (int)nudImageJPEGQuality.Value; } - private void nudUseImageFormat2After_ValueChanged(object sender, EventArgs e) + private void cbImageGIFQuality_SelectedIndexChanged(object sender, EventArgs e) { - TaskSettings.ImageSettings.ImageSizeLimit = (int)nudUseImageFormat2After.Value; - cbImageFormat2.Enabled = TaskSettings.ImageSettings.ImageSizeLimit > 0; + TaskSettings.ImageSettings.ImageGIFQuality = (GIFQuality)cbImageGIFQuality.SelectedIndex; + } + + private void cbImageAutoUseJPEG_CheckedChanged(object sender, EventArgs e) + { + TaskSettings.ImageSettings.ImageAutoUseJPEG = cbImageAutoUseJPEG.Checked; + nudImageAutoUseJPEGSize.Enabled = TaskSettings.ImageSettings.ImageAutoUseJPEG; + } + + private void nudImageAutoUseJPEGSize_ValueChanged(object sender, EventArgs e) + { + TaskSettings.ImageSettings.ImageAutoUseJPEGSize = (int)nudImageAutoUseJPEGSize.Value; } private void cbImageFileExist_SelectedIndexChanged(object sender, EventArgs e) diff --git a/ShareX/Forms/TaskSettingsForm.resx b/ShareX/Forms/TaskSettingsForm.resx index 7fd7b1109..c742fa01c 100644 --- a/ShareX/Forms/TaskSettingsForm.resx +++ b/ShareX/Forms/TaskSettingsForm.resx @@ -297,6 +297,1143 @@ 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=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + tpTask + + + 5 + + + btnAfterUpload + + + ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + tpTask + + + 6 + + + btnDestinations + + + ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + tpTask + + + 7 + + + btnTask + + + ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=1.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 + + + panelGeneral + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpGeneral + + + 0 + + + chkUseDefaultGeneralSettings + + + 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 + + + True + + + 8, 104 + + + 360, 17 + + + 14 + + + If image size bigger than specified size then use JPEG as image format: + + + cbImageAutoUseJPEG + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 0 + + + True + + + NoControl + + + 5, 8 + + + 71, 13 + + + 0 + + + Image format: + + + lblImageFormat + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 1 + + + 8, 176 + + + 253, 21 + + + 13 + + + cbImageFileExist + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 2 + + + True + + + NoControl + + + 5, 160 + + + 56, 13 + + + 12 + + + If file exist: + + + lblImageFileExist + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 3 + + + 8, 128 + + + 61, 20 + + + 8 + + + Center + + + nudImageAutoUseJPEGSize + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 4 + + + True + + + NoControl + + + 75, 132 + + + 20, 13 + + + 9 + + + kB + + + lblImageSizeLimitHint + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 5 + + + 8, 72 + + + 48, 20 + + + 4 + + + Center + + + nudImageJPEGQuality + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 6 + + + 8, 24 + + + 64, 21 + + + 1 + + + cbImageFormat + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 7 + + + True + + + NoControl + + + 64, 76 + + + 40, 13 + + + 5 + + + 0 - 100 + + + lblImageJPEGQualityHint + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 8 + + + True + + + NoControl + + + 109, 56 + + + 60, 13 + + + 3 + + + GIF quality: + + + lblImageGIFQuality + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 9 + + + True + + + NoControl + + + 5, 56 + + + 70, 13 + + + 2 + + + JPEG quality: + + + lblImageJPEGQuality + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 10 + + + 112, 72 + + + 360, 21 + + + 6 + + + cbImageGIFQuality + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 11 + + + 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 + + + Top + + + NoControl + + + 0, 0 + + + 8, 8, 8, 0 + + + 557, 25 + + + 0 + + + Use image settings in main window task settings + + + chkUseDefaultImageSettings + + + 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 + + + lblImageEffectsNote + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpEffects + + + 0 + + + chkShowImageEffectsWindowAfterCapture + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpEffects + + + 1 + + + cbImageEffectOnlyRegionCapture + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpEffects + + + 2 + + + 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 + + + pActions + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpActions + + + 0 + + + chkUseDefaultActions + + + 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 + + + cbWatchFolderEnabled + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpWatchFolders + + + 0 + + + lvWatchFolderList + + + System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpWatchFolders + + + 1 + + + btnWatchFolderRemove + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpWatchFolders + + + 2 + + + btnWatchFolderAdd + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpWatchFolders + + + 3 + + + 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 + + + tcTools + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpTools + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 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 + + + chkUseDefaultAdvancedSettings + + + 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 + False @@ -474,36 +1611,6 @@ 396, 17 - - 181, 22 - - - Image uploaders - - - 181, 22 - - - Text uploaders - - - 181, 22 - - - File uploaders - - - 181, 22 - - - URL shorteners - - - 181, 22 - - - URL sharing services - 182, 114 @@ -537,6 +1644,36 @@ 7 + + 181, 22 + + + Image uploaders + + + 181, 22 + + + Text uploaders + + + 181, 22 + + + File uploaders + + + 181, 22 + + + URL shorteners + + + 181, 22 + + + URL sharing services + NoControl @@ -567,31 +1704,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 + + panelGeneral - + 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 + + panelGeneral - - tcTaskSettings + + 1 - + + cbPlaySoundAfterUpload + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panelGeneral + + + 2 + + + cbPlaySoundAfterCapture + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panelGeneral + + + 3 + + + Fill + + + 0, 25 + + + 571, 454 + + + 1 + + + panelGeneral + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpGeneral + + 0 @@ -705,30 +1887,6 @@ 3 - - Fill - - - 0, 25 - - - 571, 454 - - - 1 - - - panelGeneral - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGeneral - - - 0 - True @@ -765,483 +1923,6 @@ 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 - - - True - - - NoControl - - - 8, 8 - - - 71, 13 - - - 0 - - - Image format: - - - lblImageFormat - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pImage - - - 0 - - - 11, 216 - - - 253, 21 - - - 13 - - - cbImageFileExist - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pImage - - - 1 - - - True - - - NoControl - - - 8, 104 - - - 198, 13 - - - 7 - - - Image size limit for use "Image format 2": - - - lblUseImageFormat2After - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pImage - - - 2 - - - True - - - NoControl - - - 8, 200 - - - 56, 13 - - - 12 - - - If file exist: - - - lblImageFileExist - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pImage - - - 3 - - - 11, 120 - - - 61, 20 - - - 8 - - - Center - - - nudUseImageFormat2After - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pImage - - - 4 - - - True - - - NoControl - - - 8, 152 - - - 80, 13 - - - 10 - - - Image format 2: - - - lblImageFormat2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pImage - - - 5 - - - True - - - NoControl - - - 80, 124 - - - 76, 13 - - - 9 - - - kB (0 disables) - - - lblUseImageFormat2AfterHint - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pImage - - - 6 - - - 11, 72 - - - 56, 20 - - - 4 - - - Center - - - nudImageJPEGQuality - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pImage - - - 7 - - - 11, 24 - - - 72, 21 - - - 1 - - - cbImageFormat - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pImage - - - 8 - - - 11, 168 - - - 72, 21 - - - 11 - - - cbImageFormat2 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pImage - - - 9 - - - True - - - NoControl - - - 75, 76 - - - 40, 13 - - - 5 - - - 0 - 100 - @Invariant - - lblImageJPEGQualityHint - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pImage - - - 10 - - - True - - - NoControl - - - 127, 56 - - - 60, 13 - - - 3 - - - GIF quality: - - - lblImageGIFQuality - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pImage - - - 11 - - - True - - - NoControl - - - 8, 56 - - - 70, 13 - - - 2 - - - JPEG quality: - - - lblImageJPEGQuality - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pImage - - - 12 - - - 131, 72 - - - 360, 21 - - - 6 - - - 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 - - - True - - - Top - - - NoControl - - - 0, 0 - - - 8, 8, 8, 0 - - - 557, 25 - - - 0 - - - Use image settings in main window task settings - - - chkUseDefaultImageSettings - - - 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 @@ -1359,33 +2040,6 @@ 3 - - 4, 22 - - - 3, 3, 3, 3 - - - 557, 328 - - - 2 - - - Effects - - - tpEffects - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcImage - - - 1 - True @@ -1605,84 +2259,387 @@ 7 - - 4, 22 + + tpCaptureGeneral - - 3, 3, 3, 3 - - - 557, 328 - - - 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 + + tpScrollingCapture + + + 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 + + + chkUseDefaultCaptureSettings + + + 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 + + + btnCaptureCustomRegionSelectRectangle + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 0 + + + lblCaptureCustomRegion + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 1 + + + lblCaptureCustomRegionWidth + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 2 + + + lblCaptureCustomRegionHeight + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 3 + + + lblCaptureCustomRegionY + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 4 + + + lblCaptureCustomRegionX + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 5 + + + nudCaptureCustomRegionHeight + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 6 + + + nudCaptureCustomRegionWidth + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 7 + + + nudCaptureCustomRegionY + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 8 + + + nudCaptureCustomRegionX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 9 + + + cbShowCursor + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 10 + + + lblCaptureShadowOffset + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 11 + + + cbCaptureTransparent + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 12 + + + cbCaptureAutoHideTaskbar + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 13 + + + cbCaptureShadow + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 14 + + + lblScreenshotDelayInfo + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 15 + + + cbCaptureClientArea + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 16 + + + nudScreenshotDelay + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 17 + + + nudCaptureShadowOffset + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 18 + + + cbScreenshotDelay + + + System.Windows.Forms.CheckBox, 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 + 232, 263 @@ -1811,7 +2768,7 @@ Y - @Invariant + lblCaptureCustomRegionY @@ -1841,7 +2798,7 @@ X - @Invariant + lblCaptureCustomRegionX @@ -2226,30 +3183,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 @@ -2286,26 +3219,404 @@ 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 + + + nudRegionCaptureMagnifierPixelSize + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 4 + + + lblRegionCaptureMagnifierPixelSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 5 + + + nudRegionCaptureMagnifierPixelCount + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 6 + + + lblRegionCaptureMagnifierPixelCount + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 7 + + + cbRegionCaptureUseSquareMagnifier + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 8 + + + cbRegionCaptureShowMagnifier + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 9 + + + cbRegionCaptureShowInfo + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 10 + + + cbRegionCaptureShowTips + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 11 + + + btnRegionCaptureSnapSizesRemove + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 12 + + + btnRegionCaptureSnapSizesAdd + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 13 + + + cbRegionCaptureSnapSizes + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 14 + + + lblRegionCaptureSnapSizes + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 15 + + + cbRegionCaptureUseCustomInfoText + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 16 + + + cbRegionCaptureDetectControls + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 17 + + + cbRegionCaptureDetectWindows + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 18 + + + cbRegionCaptureMouse5ClickAction + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 19 + + + lblRegionCaptureMouse5ClickAction + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 20 + + + cbRegionCaptureMouse4ClickAction + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 21 + + + lblRegionCaptureMouse4ClickAction + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 22 + + + cbRegionCaptureMouseMiddleClickAction + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 23 + + + lblRegionCaptureMouseMiddleClickAction + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 24 + + + cbRegionCaptureMouseRightClickAction + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 25 + + + lblRegionCaptureMouseRightClickAction + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 26 + + + cbRegionCaptureMultiRegionMode + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 27 + + + pRegionCaptureSnapSizes + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 28 + + + cbRegionCaptureUseDimming + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 29 + + + txtRegionCaptureCustomInfoText + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 30 + + 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 @@ -2340,6 +3651,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, 411 + + + 222, 26 + + + 29 + + + False + + + flpRegionCaptureFixedSize + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 1 + Left @@ -2454,30 +3837,6 @@ 3 - - 312, 411 - - - 222, 26 - - - 29 - - - False - - - flpRegionCaptureFixedSize - - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpRegionCapture - - - 1 - True @@ -2756,7 +4115,7 @@ - - @Invariant + btnRegionCaptureSnapSizesRemove @@ -2780,7 +4139,7 @@ + - @Invariant + btnRegionCaptureSnapSizesAdd @@ -3150,6 +4509,102 @@ 27 + + 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 + + + 28 + 120, 80 @@ -3303,30 +4758,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 - - - 28 - True @@ -3375,32 +4806,236 @@ 30 - + + cbScreenRecorderShowCursor + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 0 + + + cbGIFEncoding + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 1 + + + lblGIFEncoding + + + System.Windows.Forms.Label, 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 + + + chkRunScreencastCLI + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 9 + + + btnEncoderConfig + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 10 + + + cboEncoder + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 11 + + + nudScreenRecorderDuration + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 12 + + + nudScreenRecorderStartDelay + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 13 + + + cbScreenRecorderFixedDuration + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 14 + + + nudGIFFPS + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 15 + + + lblGIFFPS + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 16 + + 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 @@ -3864,45 +5499,6 @@ 16 - - 4, 22 - - - 3, 3, 3, 3 - - - 557, 447 - - - 2 - - - Screen recorder - - - tpScreenRecorder - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcCapture - - - 2 - - - Fill - - - 3, 3 - - - 551, 441 - - - 0 - pgScrollingCapture @@ -3942,56 +5538,122 @@ 3 - + Fill - + 3, 3 - - 565, 473 + + 551, 441 - + 0 - - tcCapture + + pgScrollingCapture - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tpCapture + + tpScrollingCapture - + 0 - - 4, 22 + + tpUploadMain - - 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 + + tcUpload - - 3 + + 0 + + + tpFileNaming + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcUpload + + + 1 + + + tpUploadClipboard + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcUpload + + + 2 + + + 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 + + + chkUseDefaultUploadSettings + + + 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 +5691,176 @@ 0 - + + lblAutoIncrementNumber + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 0 + + + cbRegionCaptureUseWindowPattern + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 1 + + + cbNameFormatCustomTimeZone + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 2 + + + lblNameFormatPatternPreview + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 3 + + + lblNameFormatPatternActiveWindow + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 4 + + + lblNameFormatPatternPreviewActiveWindow + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 5 + + + cbNameFormatTimeZone + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 6 + + + txtNameFormatPatternActiveWindow + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 7 + + + btnResetAutoIncrementNumber + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 8 + + + cbFileUploadUseNamePattern + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 9 + + + lblNameFormatPattern + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 10 + + + txtNameFormatPattern + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 11 + + 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 True @@ -4064,7 +5876,7 @@ 0 - @Invariant + lblAutoIncrementNumber @@ -4374,32 +6186,80 @@ 11 - - 4, 22 + + cbClipboardUploadShareURL - - 3, 3, 3, 3 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 557, 328 + + tpUploadClipboard - + + 0 + + + chkClipboardUploadURLContents + + + 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 @@ -4521,84 +6381,93 @@ 3 - - 4, 22 + + btnActionsDuplicate - - 3, 3, 3, 3 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 557, 328 + + pActions - + + 0 + + + btnActionsAdd + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pActions + + 1 - - Clipboard upload + + lvActions - - tpUploadClipboard + + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + pActions - - tcUpload - - + 2 - + + btnActionsEdit + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pActions + + + 3 + + + btnActionsRemove + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pActions + + + 4 + + Fill - - 3, 3 + + 0, 25 - - 565, 473 + + 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 - - 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 - NoControl @@ -4656,6 +6525,27 @@ Top, Bottom, Left, Right + + 8, 40 + + + 558, 407 + + + 4 + + + lvActions + + + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + pActions + + + 2 + Name @@ -4680,27 +6570,6 @@ 75 - - 8, 40 - - - 558, 407 - - - 4 - - - lvActions - - - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - pActions - - - 2 - NoControl @@ -4755,33 +6624,6 @@ 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 @@ -4818,30 +6660,6 @@ 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 - True @@ -4875,24 +6693,6 @@ Top, Bottom, Left, Right - - Folder path - - - 323 - - - Filter - - - 43 - - - Include subdirectories - - - 124 - 8, 64 @@ -4914,6 +6714,24 @@ 1 + + Folder path + + + 323 + + + Filter + + + 43 + + + Include subdirectories + + + 124 + NoControl @@ -4968,78 +6786,6 @@ 3 - - 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 - - - True - - - Top - - - NoControl - - - 0, 0 - - - 8, 8, 8, 0 - - - 557, 25 - - - 0 - - - Use tools settings in main window task settings - - - chkUseDefaultToolsSettings - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpToolsMain - - - 0 - - - 4, 22 - - - 557, 447 - - - 0 - tpToolsMain @@ -5052,45 +6798,6 @@ 0 - - Fill - - - 3, 3 - - - 551, 322 - - - 0 - - - pgIndexer - - - System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpIndexer - - - 0 - - - 4, 22 - - - 3, 3, 3, 3 - - - 557, 328 - - - 1 - - - Indexer - tpIndexer @@ -5103,45 +6810,6 @@ 1 - - Fill - - - 3, 3 - - - 551, 322 - - - 0 - - - pgVideoThumbnailer - - - System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpVideoThumbnailer - - - 0 - - - 4, 22 - - - 3, 3, 3, 3 - - - 557, 328 - - - 2 - - - Video thumbnailer - tpVideoThumbnailer @@ -5178,32 +6846,200 @@ 0 - + + chkUseDefaultToolsSettings + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpToolsMain + + + 0 + + 4, 22 - - 3, 3, 3, 3 + + 557, 447 - - 571, 479 + + 0 - - 8 + + tpToolsMain - - Tools - - - tpTools - - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tcTaskSettings + + tcTools - - 7 + + 0 + + + True + + + Top + + + NoControl + + + 0, 0 + + + 8, 8, 8, 0 + + + 557, 25 + + + 0 + + + Use tools settings in main window task settings + + + chkUseDefaultToolsSettings + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpToolsMain + + + 0 + + + pgIndexer + + + System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpIndexer + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 557, 447 + + + 1 + + + Indexer + + + tpIndexer + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcTools + + + 1 + + + Fill + + + 3, 3 + + + 551, 441 + + + 0 + + + pgIndexer + + + System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpIndexer + + + 0 + + + pgVideoThumbnailer + + + System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpVideoThumbnailer + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 557, 447 + + + 2 + + + Video thumbnailer + + + tpVideoThumbnailer + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcTools + + + 2 + + + Fill + + + 3, 3 + + + 551, 441 + + + 0 + + + pgVideoThumbnailer + + + System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpVideoThumbnailer + + + 0 Fill @@ -5265,60 +7101,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 diff --git a/ShareX/TaskHelpers.cs b/ShareX/TaskHelpers.cs index d2b9b3088..b1d85cb81 100644 --- a/ShareX/TaskHelpers.cs +++ b/ShareX/TaskHelpers.cs @@ -49,26 +49,14 @@ public static class TaskHelpers public static ImageData PrepareImage(Image img, TaskSettings taskSettings) { ImageData imageData = new ImageData(); + imageData.ImageStream = SaveImage(img, taskSettings.ImageSettings.ImageFormat, taskSettings); imageData.ImageFormat = taskSettings.ImageSettings.ImageFormat; - if (taskSettings.ImageSettings.ImageFormat == EImageFormat.JPEG) + if (taskSettings.ImageSettings.ImageAutoUseJPEG && taskSettings.ImageSettings.ImageFormat != EImageFormat.JPEG && + imageData.ImageStream.Length > taskSettings.ImageSettings.ImageAutoUseJPEGSize * 1000) { - img = ImageHelpers.FillBackground(img, Color.White); - } - - imageData.ImageStream = SaveImage(img, taskSettings.ImageSettings.ImageFormat, taskSettings); - - int sizeLimit = taskSettings.ImageSettings.ImageSizeLimit * 1000; - - if (taskSettings.ImageSettings.ImageFormat != taskSettings.ImageSettings.ImageFormat2 && sizeLimit > 0 && imageData.ImageStream.Length > sizeLimit) - { - if (taskSettings.ImageSettings.ImageFormat2 == EImageFormat.JPEG) - { - img = ImageHelpers.FillBackground(img, Color.White); - } - - imageData.ImageStream = SaveImage(img, taskSettings.ImageSettings.ImageFormat2, taskSettings); - imageData.ImageFormat = taskSettings.ImageSettings.ImageFormat2; + imageData.ImageStream = SaveImage(img, EImageFormat.JPEG, taskSettings); + imageData.ImageFormat = EImageFormat.JPEG; } return imageData; @@ -130,6 +118,7 @@ public static MemoryStream SaveImage(Image img, EImageFormat imageFormat, int jp img.Save(stream, ImageFormat.Png); break; case EImageFormat.JPEG: + img = ImageHelpers.FillBackground(img, Color.White); img.SaveJPG(stream, jpegQuality); break; case EImageFormat.GIF: diff --git a/ShareX/TaskSettings.cs b/ShareX/TaskSettings.cs index 86221b53a..78b0130b4 100644 --- a/ShareX/TaskSettings.cs +++ b/ShareX/TaskSettings.cs @@ -274,8 +274,8 @@ public class TaskSettingsImage public EImageFormat ImageFormat = EImageFormat.PNG; public int ImageJPEGQuality = 90; public GIFQuality ImageGIFQuality = GIFQuality.Default; - public int ImageSizeLimit = 2048; - public EImageFormat ImageFormat2 = EImageFormat.JPEG; + public bool ImageAutoUseJPEG = true; + public int ImageAutoUseJPEGSize = 2048; public FileExistAction FileExistAction = FileExistAction.Ask; #endregion Image / General