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

Added create thumbnail to after capture tasks

Browse source
This commit is contained in:
Jaex 2014-04-22 23:44:58 +03:00
parent abf441dae5
commit d21c038791
8 changed files with 222 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
HelpersLib/Extensions/Extensions.cs
View file

@ -279,6 +279,14 @@ public static void SaveJPG(this Image img, Stream stream, int quality)
img.Save(stream, ImageFormat.Jpeg.GetCodecInfo(), encoderParameters);
}
public static void SaveJPG(this Image img, string filepath, int quality)
{
quality = quality.Between(0, 100);
EncoderParameters encoderParameters = new EncoderParameters(1);
encoderParameters.Param[0] = new EncoderParameter(Encoder.Quality, quality);
img.Save(filepath, ImageFormat.Jpeg.GetCodecInfo(), encoderParameters);
}
public static void SaveGIF(this Image img, Stream stream, GIFQuality quality)
{
if (quality == GIFQuality.Default)

2
ImageEffectsLib/Manipulations/Resize.cs
View file

@ -29,7 +29,7 @@
namespace ImageEffectsLib
{
internal class Resize : ImageEffect
public class Resize : ImageEffect
{
[DefaultValue(250), Description("Use width as 0 to automatically adjust width to maintain aspect ratio.")]
public int Width { get; set; }

10
ShareX/Enums.cs
View file

@ -69,14 +69,16 @@ public enum AfterCaptureTasks
SaveImageToFile = 1 << 5,
[Description("Save image to file as...")]
SaveImageToFileWithDialog = 1 << 6,
[Description("Save thumbnail image to file")]
SaveThumbnailImageToFile = 1 << 7,
[Description("Copy file to clipboard")]
CopyFileToClipboard = 1 << 7,
CopyFileToClipboard = 1 << 8,
[Description("Copy file path to clipboard")]
CopyFilePathToClipboard = 1 << 8,
CopyFilePathToClipboard = 1 << 9,
[Description("Perform actions")]
PerformActions = 1 << 9,
PerformActions = 1 << 10,
[Description("Upload image to host")]
UploadImageToHost = 1 << 10
UploadImageToHost = 1 << 11
}
[Flags]

127
ShareX/Forms/TaskSettingsForm.Designer.cs generated
View file

@ -84,6 +84,14 @@ private void InitializeComponent()
this.cbImageEffectOnlyRegionCapture = new System.Windows.Forms.CheckBox();
this.btnImageEffects = new System.Windows.Forms.Button();
this.btnWatermarkSettings = new System.Windows.Forms.Button();
this.tpThumbnail = new System.Windows.Forms.TabPage();
this.lblThumbnailNamePreview = new System.Windows.Forms.Label();
this.lblThumbnailName = new System.Windows.Forms.Label();
this.txtThumbnailName = new System.Windows.Forms.TextBox();
this.lblThumbnailHeight = new System.Windows.Forms.Label();
this.lblThumbnailWidth = new System.Windows.Forms.Label();
this.nudThumbnailHeight = new System.Windows.Forms.NumericUpDown();
this.nudThumbnailWidth = new System.Windows.Forms.NumericUpDown();
this.chkUseDefaultImageSettings = new System.Windows.Forms.CheckBox();
this.tpCapture = new System.Windows.Forms.TabPage();
this.tcCapture = new System.Windows.Forms.TabControl();
@ -149,6 +157,7 @@ private void InitializeComponent()
this.tpAdvanced = new System.Windows.Forms.TabPage();
this.pgTaskSettings = new System.Windows.Forms.PropertyGrid();
this.chkUseDefaultAdvancedSettings = new System.Windows.Forms.CheckBox();
this.cbThumbnailIfSmaller = new System.Windows.Forms.CheckBox();
this.tcHotkeySettings.SuspendLayout();
this.tpTask.SuspendLayout();
this.cmsDestinations.SuspendLayout();
@ -161,6 +170,9 @@ private void InitializeComponent()
((System.ComponentModel.ISupportInitialize)(this.nudUseImageFormat2After)).BeginInit();
this.tpEffects.SuspendLayout();
this.gbImageEffects.SuspendLayout();
this.tpThumbnail.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.nudThumbnailHeight)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nudThumbnailWidth)).BeginInit();
this.tpCapture.SuspendLayout();
this.tcCapture.SuspendLayout();
this.tpCaptureGeneral.SuspendLayout();
@ -536,6 +548,7 @@ private void InitializeComponent()
//
this.tcImage.Controls.Add(this.tpQuality);
this.tcImage.Controls.Add(this.tpEffects);
this.tcImage.Controls.Add(this.tpThumbnail);
this.tcImage.Dock = System.Windows.Forms.DockStyle.Fill;
this.tcImage.Location = new System.Drawing.Point(3, 30);
this.tcImage.Name = "tcImage";
@ -795,6 +808,96 @@ private void InitializeComponent()
this.btnWatermarkSettings.UseVisualStyleBackColor = true;
this.btnWatermarkSettings.Click += new System.EventHandler(this.btnWatermarkSettings_Click);
//
// tpThumbnail
//
this.tpThumbnail.Controls.Add(this.cbThumbnailIfSmaller);
this.tpThumbnail.Controls.Add(this.lblThumbnailNamePreview);
this.tpThumbnail.Controls.Add(this.lblThumbnailName);
this.tpThumbnail.Controls.Add(this.txtThumbnailName);
this.tpThumbnail.Controls.Add(this.lblThumbnailHeight);
this.tpThumbnail.Controls.Add(this.lblThumbnailWidth);
this.tpThumbnail.Controls.Add(this.nudThumbnailHeight);
this.tpThumbnail.Controls.Add(this.nudThumbnailWidth);
this.tpThumbnail.Location = new System.Drawing.Point(4, 22);
this.tpThumbnail.Name = "tpThumbnail";
this.tpThumbnail.Padding = new System.Windows.Forms.Padding(3);
this.tpThumbnail.Size = new System.Drawing.Size(536, 301);
this.tpThumbnail.TabIndex = 3;
this.tpThumbnail.Text = "Thumbnail";
this.tpThumbnail.UseVisualStyleBackColor = true;
//
// lblThumbnailNamePreview
//
this.lblThumbnailNamePreview.AutoSize = true;
this.lblThumbnailNamePreview.Location = new System.Drawing.Point(248, 76);
this.lblThumbnailNamePreview.Name = "lblThumbnailNamePreview";
this.lblThumbnailNamePreview.Size = new System.Drawing.Size(45, 13);
this.lblThumbnailNamePreview.TabIndex = 6;
this.lblThumbnailNamePreview.Text = "Preview";
//
// lblThumbnailName
//
this.lblThumbnailName.AutoSize = true;
this.lblThumbnailName.Location = new System.Drawing.Point(16, 76);
this.lblThumbnailName.Name = "lblThumbnailName";
this.lblThumbnailName.Size = new System.Drawing.Size(88, 13);
this.lblThumbnailName.TabIndex = 5;
this.lblThumbnailName.Text = "Thumbnail name:";
//
// txtThumbnailName
//
this.txtThumbnailName.Location = new System.Drawing.Point(112, 72);
this.txtThumbnailName.Name = "txtThumbnailName";
this.txtThumbnailName.Size = new System.Drawing.Size(128, 20);
this.txtThumbnailName.TabIndex = 4;
this.txtThumbnailName.TextChanged += new System.EventHandler(this.txtThumbnailName_TextChanged);
//
// lblThumbnailHeight
//
this.lblThumbnailHeight.AutoSize = true;
this.lblThumbnailHeight.Location = new System.Drawing.Point(16, 44);
this.lblThumbnailHeight.Name = "lblThumbnailHeight";
this.lblThumbnailHeight.Size = new System.Drawing.Size(41, 13);
this.lblThumbnailHeight.TabIndex = 3;
this.lblThumbnailHeight.Text = "Height:";
//
// lblThumbnailWidth
//
this.lblThumbnailWidth.AutoSize = true;
this.lblThumbnailWidth.Location = new System.Drawing.Point(16, 16);
this.lblThumbnailWidth.Name = "lblThumbnailWidth";
this.lblThumbnailWidth.Size = new System.Drawing.Size(38, 13);
this.lblThumbnailWidth.TabIndex = 2;
this.lblThumbnailWidth.Text = "Width:";
//
// nudThumbnailHeight
//
this.nudThumbnailHeight.Location = new System.Drawing.Point(64, 40);
this.nudThumbnailHeight.Maximum = new decimal(new int[] {
2000,
0,
0,
0});
this.nudThumbnailHeight.Name = "nudThumbnailHeight";
this.nudThumbnailHeight.Size = new System.Drawing.Size(64, 20);
this.nudThumbnailHeight.TabIndex = 1;
this.nudThumbnailHeight.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.nudThumbnailHeight.ValueChanged += new System.EventHandler(this.nudThumbnailHeight_ValueChanged);
//
// nudThumbnailWidth
//
this.nudThumbnailWidth.Location = new System.Drawing.Point(64, 12);
this.nudThumbnailWidth.Maximum = new decimal(new int[] {
2000,
0,
0,
0});
this.nudThumbnailWidth.Name = "nudThumbnailWidth";
this.nudThumbnailWidth.Size = new System.Drawing.Size(64, 20);
this.nudThumbnailWidth.TabIndex = 0;
this.nudThumbnailWidth.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.nudThumbnailWidth.ValueChanged += new System.EventHandler(this.nudThumbnailWidth_ValueChanged);
//
// chkUseDefaultImageSettings
//
this.chkUseDefaultImageSettings.AutoSize = true;
@ -1571,6 +1674,17 @@ private void InitializeComponent()
this.chkUseDefaultAdvancedSettings.UseVisualStyleBackColor = true;
this.chkUseDefaultAdvancedSettings.CheckedChanged += new System.EventHandler(this.chkUseDefaultAdvancedSettings_CheckedChanged);
//
// cbThumbnailIfSmaller
//
this.cbThumbnailIfSmaller.AutoSize = true;
this.cbThumbnailIfSmaller.Location = new System.Drawing.Point(20, 104);
this.cbThumbnailIfSmaller.Name = "cbThumbnailIfSmaller";
this.cbThumbnailIfSmaller.Size = new System.Drawing.Size(322, 17);
this.cbThumbnailIfSmaller.TabIndex = 7;
this.cbThumbnailIfSmaller.Text = "Create thumbnail only if image size is bigger than thumbnail size";
this.cbThumbnailIfSmaller.UseVisualStyleBackColor = true;
this.cbThumbnailIfSmaller.CheckedChanged += new System.EventHandler(this.cbThumbnailIfSmaller_CheckedChanged);
//
// TaskSettingsForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -1604,6 +1718,10 @@ private void InitializeComponent()
this.tpEffects.ResumeLayout(false);
this.gbImageEffects.ResumeLayout(false);
this.gbImageEffects.PerformLayout();
this.tpThumbnail.ResumeLayout(false);
this.tpThumbnail.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.nudThumbnailHeight)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nudThumbnailWidth)).EndInit();
this.tpCapture.ResumeLayout(false);
this.tpCapture.PerformLayout();
this.tcCapture.ResumeLayout(false);
@ -1759,6 +1877,15 @@ private void InitializeComponent()
private System.Windows.Forms.Label lblImageFileExist;
private System.Windows.Forms.ComboBox cboEncoder;
private System.Windows.Forms.Button btnEncoderConfig;
private System.Windows.Forms.TabPage tpThumbnail;
private System.Windows.Forms.Label lblThumbnailHeight;
private System.Windows.Forms.Label lblThumbnailWidth;
private System.Windows.Forms.NumericUpDown nudThumbnailHeight;
private System.Windows.Forms.NumericUpDown nudThumbnailWidth;
private System.Windows.Forms.Label lblThumbnailName;
private System.Windows.Forms.TextBox txtThumbnailName;
private System.Windows.Forms.Label lblThumbnailNamePreview;
private System.Windows.Forms.CheckBox cbThumbnailIfSmaller;

28
ShareX/Forms/TaskSettingsForm.cs
View file

@ -136,6 +136,13 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false)
chkShowImageEffectsWindowAfterCapture.Checked = TaskSettings.ImageSettings.ShowImageEffectsWindowAfterCapture;
cbImageEffectOnlyRegionCapture.Checked = TaskSettings.ImageSettings.ImageEffectOnlyRegionCapture;
// Image - Thumbnail
nudThumbnailWidth.Value = TaskSettings.ImageSettings.ThumbnailWidth;
nudThumbnailHeight.Value = TaskSettings.ImageSettings.ThumbnailHeight;
txtThumbnailName.Text = TaskSettings.ImageSettings.ThumbnailName;
lblThumbnailNamePreview.Text = "ImageName" + TaskSettings.ImageSettings.ThumbnailName + ".jpg";
cbThumbnailIfSmaller.Checked = TaskSettings.ImageSettings.ThumbnailCheckSize;
// Capture
cbShowCursor.Checked = TaskSettings.CaptureSettings.ShowCursor;
cbCaptureTransparent.Checked = TaskSettings.CaptureSettings.CaptureTransparent;
@ -557,6 +564,27 @@ private void btnImageEffects_Click(object sender, EventArgs e)
}
}
private void nudThumbnailWidth_ValueChanged(object sender, EventArgs e)
{
TaskSettings.ImageSettings.ThumbnailWidth = (int)nudThumbnailWidth.Value;
}
private void nudThumbnailHeight_ValueChanged(object sender, EventArgs e)
{
TaskSettings.ImageSettings.ThumbnailHeight = (int)nudThumbnailHeight.Value;
}
private void txtThumbnailName_TextChanged(object sender, EventArgs e)
{
TaskSettings.ImageSettings.ThumbnailName = txtThumbnailName.Text;
lblThumbnailNamePreview.Text = "ImageName" + TaskSettings.ImageSettings.ThumbnailName + ".jpg";
}
private void cbThumbnailIfSmaller_CheckedChanged(object sender, EventArgs e)
{
TaskSettings.ImageSettings.ThumbnailCheckSize = cbThumbnailIfSmaller.Checked;
}
#endregion Image
#region Capture

40
ShareX/TaskHelpers.cs
View file

@ -52,8 +52,6 @@ public static ImageData PrepareImage(Image img, TaskSettings taskSettings)
img = ImageHelpers.FillBackground(img, Color.White);
}
ImageHelpers.AddMetadata(img, PropertyTagSoftwareUsed, Program.ApplicationName);
imageData.ImageStream = SaveImage(img, taskSettings.ImageSettings.ImageFormat, taskSettings);
int sizeLimit = taskSettings.ImageSettings.ImageSizeLimit * 1000;
@ -72,6 +70,44 @@ public static ImageData PrepareImage(Image img, TaskSettings taskSettings)
return imageData;
}
public static bool CreateThumbnail(Image img, string filename, TaskSettings taskSettings)
{
if ((taskSettings.ImageSettings.ThumbnailWidth > 0 || taskSettings.ImageSettings.ThumbnailHeight > 0) && (!taskSettings.ImageSettings.ThumbnailCheckSize ||
(img.Width > taskSettings.ImageSettings.ThumbnailWidth && img.Height > taskSettings.ImageSettings.ThumbnailHeight)))
{
string thumbnailFileName = Path.GetFileNameWithoutExtension(filename) + taskSettings.ImageSettings.ThumbnailName + ".jpg";
string thumbnailFilePath = TaskHelpers.CheckFilePath(taskSettings.CaptureFolder, thumbnailFileName, taskSettings);
if (!string.IsNullOrEmpty(thumbnailFilePath))
{
Image thumbImage = null;
try
{
thumbImage = (Image)img.Clone();
thumbImage = new Resize
{
Width = taskSettings.ImageSettings.ThumbnailWidth,
Height = taskSettings.ImageSettings.ThumbnailHeight
}.Apply(thumbImage);
thumbImage = ImageHelpers.FillBackground(thumbImage, Color.White);
thumbImage.SaveJPG(thumbnailFilePath, 90);
DebugHelper.WriteLine("SaveThumbnailImageToFile: " + thumbnailFilePath);
return true;
}
finally
{
if (thumbImage != null)
{
thumbImage.Dispose();
}
}
}
}
return false;
}
public static MemoryStream SaveImage(Image img, EImageFormat imageFormat, TaskSettings taskSettings)
{
MemoryStream stream = new MemoryStream();

9
ShareX/TaskSettings.cs
View file

@ -243,6 +243,15 @@ public class TaskSettingsImage
public WatermarkConfig WatermarkConfig = new WatermarkConfig();
#endregion Image / Effects
#region Image / Thumbnail
public int ThumbnailWidth = 200;
public int ThumbnailHeight = 0;
public string ThumbnailName = "-thumbnail";
public bool ThumbnailCheckSize = false;
#endregion Image / Thumbnail
}
public class TaskSettingsCapture

5
ShareX/UploadTask.cs
View file

@ -450,6 +450,11 @@ private void DoAfterCaptureJobs()
}
}
if (Info.TaskSettings.AfterCaptureJob.HasFlag(AfterCaptureTasks.SaveThumbnailImageToFile))
{
TaskHelpers.CreateThumbnail(tempImage, Info.FileName, Info.TaskSettings);
}
if (Info.TaskSettings.AfterCaptureJob.HasFlag(AfterCaptureTasks.CopyFileToClipboard) && !string.IsNullOrEmpty(Info.FilePath) &&
File.Exists(Info.FilePath))
{