diff --git a/Greenshot/Forms/ImageEditorForm.Designer.cs b/Greenshot/Forms/ImageEditorForm.Designer.cs index 256b449ce..2e3c745c3 100644 --- a/Greenshot/Forms/ImageEditorForm.Designer.cs +++ b/Greenshot/Forms/ImageEditorForm.Designer.cs @@ -73,6 +73,7 @@ namespace Greenshot { this.tornEdgesToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem(); this.grayscaleToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem(); this.invertToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem(); + this.resizeToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem(); this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator(); this.btnCrop = new GreenshotPlugin.Controls.GreenshotToolStripButton(); this.rotateCwToolstripButton = new GreenshotPlugin.Controls.GreenshotToolStripButton(); @@ -456,7 +457,8 @@ namespace Greenshot { this.addDropshadowToolStripMenuItem, this.tornEdgesToolStripMenuItem, this.grayscaleToolStripMenuItem, - this.invertToolStripMenuItem}); + this.invertToolStripMenuItem, + this.resizeToolStripMenuItem}); this.toolStripSplitButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripSplitButton1.Image"))); this.toolStripSplitButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripSplitButton1.LanguageKey = "editor_effects"; @@ -500,6 +502,13 @@ namespace Greenshot { this.invertToolStripMenuItem.Size = new System.Drawing.Size(67, 22); this.invertToolStripMenuItem.Click += new System.EventHandler(this.InvertToolStripMenuItemClick); // + // resizeToolStripMenuItem + // + this.resizeToolStripMenuItem.Text = "Resize"; + this.resizeToolStripMenuItem.Name = "resizeToolStripMenuItem"; + this.resizeToolStripMenuItem.Size = new System.Drawing.Size(67, 22); + this.resizeToolStripMenuItem.Click += new System.EventHandler(this.ResizeToolStripMenuItemClick); + // // toolStripSeparator13 // this.toolStripSeparator13.Name = "toolStripSeparator13"; @@ -1738,6 +1747,7 @@ namespace Greenshot { private GreenshotPlugin.Controls.GreenshotToolStripMenuItem alignTopToolStripMenuItem; private Greenshot.Controls.BindableToolStripDropDownButton textVerticalAlignmentButton; private GreenshotPlugin.Controls.GreenshotToolStripMenuItem invertToolStripMenuItem; + private GreenshotPlugin.Controls.GreenshotToolStripMenuItem resizeToolStripMenuItem; private GreenshotPlugin.Controls.GreenshotToolStripMenuItem grayscaleToolStripMenuItem; private GreenshotPlugin.Controls.GreenshotToolStripButton rotateCcwToolstripButton; private GreenshotPlugin.Controls.GreenshotToolStripButton rotateCwToolstripButton; diff --git a/Greenshot/Forms/ImageEditorForm.cs b/Greenshot/Forms/ImageEditorForm.cs index 7e7d42ec9..bbe86a537 100644 --- a/Greenshot/Forms/ImageEditorForm.cs +++ b/Greenshot/Forms/ImageEditorForm.cs @@ -41,6 +41,7 @@ using Greenshot.IniFile; using System.Threading; using Greenshot.Core; using log4net; +using Greenshot.Forms; namespace Greenshot { /// @@ -1214,11 +1215,11 @@ namespace Greenshot { void AddDropshadowToolStripMenuItemClick(object sender, EventArgs e) { DropShadowEffect dropShadowEffect= new DropShadowEffect(); // TODO: Use the dropshadow settings form to make it possible to change the default values - //DialogResult result = new DropShadowSettingsForm(dropShadowEffect).ShowDialog(this); - //if (result == DialogResult.OK) { + DialogResult result = new DropShadowSettingsForm(dropShadowEffect).ShowDialog(this); + if (result == DialogResult.OK) { surface.ApplyBitmapEffect(dropShadowEffect); updateUndoRedoSurfaceDependencies(); - //} + } } /// @@ -1229,11 +1230,11 @@ namespace Greenshot { void ResizeToolStripMenuItemClick(object sender, EventArgs e) { ResizeEffect resizeEffect = new ResizeEffect(surface.Image.Width, surface.Image.Height, true); // TODO: Use the Resize SettingsForm to make it possible to change the default values - // DialogResult result = new ResizeSettingsForm(resizeEffect).ShowDialog(this); - // if (result == DialogResult.OK) { + DialogResult result = new ResizeSettingsForm(resizeEffect).ShowDialog(this); + if (result == DialogResult.OK) { surface.ApplyBitmapEffect(resizeEffect); updateUndoRedoSurfaceDependencies(); - //} + } } /// @@ -1244,11 +1245,11 @@ namespace Greenshot { void TornEdgesToolStripMenuItemClick(object sender, EventArgs e) { TornEdgeEffect tornEdgeEffect = new TornEdgeEffect(); // TODO: Use the dropshadow settings form to make it possible to change the default values - //DialogResult result = new TornEdgeSettingsForm(tornEdgeEffect).ShowDialog(this); - //if (result == DialogResult.OK) { + DialogResult result = new TornEdgeSettingsForm(tornEdgeEffect).ShowDialog(this); + if (result == DialogResult.OK) { surface.ApplyBitmapEffect(tornEdgeEffect); updateUndoRedoSurfaceDependencies(); - //} + } } void GrayscaleToolStripMenuItemClick(object sender, EventArgs e) { diff --git a/Greenshot/Greenshot.csproj b/Greenshot/Greenshot.csproj index 21d162026..8af94865c 100644 --- a/Greenshot/Greenshot.csproj +++ b/Greenshot/Greenshot.csproj @@ -136,12 +136,12 @@ CaptureForm.cs - + Form - - + + DropShadowSettingsForm.cs - + Form @@ -151,18 +151,18 @@ Form - + Form - - + + ResizeSettingsForm.cs - - + + Form - - + + TornEdgeSettingsForm.cs - + Form