diff --git a/Greenshot/Forms/ImageEditorForm.Designer.cs b/Greenshot/Forms/ImageEditorForm.Designer.cs index eacda6514..20ed7d996 100644 --- a/Greenshot/Forms/ImageEditorForm.Designer.cs +++ b/Greenshot/Forms/ImageEditorForm.Designer.cs @@ -73,7 +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.btnResize = new GreenshotPlugin.Controls.GreenshotToolStripButton(); this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator(); this.btnCrop = new GreenshotPlugin.Controls.GreenshotToolStripButton(); this.rotateCwToolstripButton = new GreenshotPlugin.Controls.GreenshotToolStripButton(); @@ -312,7 +312,8 @@ namespace Greenshot { this.toolStripSeparator13, this.btnCrop, this.rotateCwToolstripButton, - this.rotateCcwToolstripButton}); + this.rotateCcwToolstripButton, + this.btnResize}); this.toolStrip2.Location = new System.Drawing.Point(0, 0); this.toolStrip2.Name = "toolStrip2"; this.toolStrip2.Size = new System.Drawing.Size(24, 385); @@ -457,8 +458,7 @@ namespace Greenshot { this.addDropshadowToolStripMenuItem, this.tornEdgesToolStripMenuItem, this.grayscaleToolStripMenuItem, - this.invertToolStripMenuItem, - this.resizeToolStripMenuItem}); + this.invertToolStripMenuItem}); this.toolStripSplitButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripSplitButton1.Image"))); this.toolStripSplitButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripSplitButton1.LanguageKey = "editor_effects"; @@ -502,12 +502,16 @@ namespace Greenshot { this.invertToolStripMenuItem.Size = new System.Drawing.Size(67, 22); this.invertToolStripMenuItem.Click += new System.EventHandler(this.InvertToolStripMenuItemClick); // - // resizeToolStripMenuItem + // btnResize // - 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); + this.btnResize.Text = "Resize"; + this.btnResize.Name = "btnResize"; + this.btnResize.Size = new System.Drawing.Size(22, 20); + this.btnResize.Click += new System.EventHandler(this.BtnResizeClick); + this.btnResize.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btnResize.Image = ((System.Drawing.Image)(resources.GetObject("btnResize.Image"))); + this.btnResize.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btnResize.LanguageKey = "editor_resize"; // // toolStripSeparator13 // @@ -1747,7 +1751,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.GreenshotToolStripButton btnResize; 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 f63100af3..b2b106f5b 100644 --- a/Greenshot/Forms/ImageEditorForm.cs +++ b/Greenshot/Forms/ImageEditorForm.cs @@ -175,7 +175,7 @@ namespace Greenshot { obfuscateModeButton.DropDownItemClicked += FilterPresetDropDownItemClicked; highlightModeButton.DropDownItemClicked += FilterPresetDropDownItemClicked; - + toolbarButtons = new[] { btnCursor, btnRect, btnEllipse, btnText, btnLine, btnArrow, btnFreehand, btnHighlight, btnObfuscate, btnCrop, btnStepLabel, btnSpeechBubble }; //toolbarDropDownButtons = new ToolStripDropDownButton[]{btnBlur, btnPixeliate, btnTextHighlighter, btnAreaHighlighter, btnMagnifier}; @@ -1229,11 +1229,11 @@ namespace Greenshot { } /// - /// Currently unused + /// Open the resize settings from, and resize if ok was pressed /// /// /// - void ResizeToolStripMenuItemClick(object sender, EventArgs e) { + void BtnResizeClick(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); diff --git a/Greenshot/Forms/ImageEditorForm.resx b/Greenshot/Forms/ImageEditorForm.resx index 960e81a2d..88fd73b87 100644 --- a/Greenshot/Forms/ImageEditorForm.resx +++ b/Greenshot/Forms/ImageEditorForm.resx @@ -1005,6 +1005,9 @@ ..\icons\balloon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\icons\resize.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + 551, 17 diff --git a/Greenshot/icons/resize.png b/Greenshot/icons/resize.png new file mode 100644 index 000000000..4a6bc017d Binary files /dev/null and b/Greenshot/icons/resize.png differ