mirror of
https://github.com/greenshot/greenshot
synced 2025-07-14 00:53:51 -07:00
Moved the resize function to its own button, directly under the rotate effects.
This commit is contained in:
parent
aced477cef
commit
d0f934aa58
4 changed files with 20 additions and 13 deletions
24
Greenshot/Forms/ImageEditorForm.Designer.cs
generated
24
Greenshot/Forms/ImageEditorForm.Designer.cs
generated
|
@ -73,7 +73,7 @@ namespace Greenshot {
|
||||||
this.tornEdgesToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem();
|
this.tornEdgesToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem();
|
||||||
this.grayscaleToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem();
|
this.grayscaleToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem();
|
||||||
this.invertToolStripMenuItem = 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.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
|
||||||
this.btnCrop = new GreenshotPlugin.Controls.GreenshotToolStripButton();
|
this.btnCrop = new GreenshotPlugin.Controls.GreenshotToolStripButton();
|
||||||
this.rotateCwToolstripButton = new GreenshotPlugin.Controls.GreenshotToolStripButton();
|
this.rotateCwToolstripButton = new GreenshotPlugin.Controls.GreenshotToolStripButton();
|
||||||
|
@ -312,7 +312,8 @@ namespace Greenshot {
|
||||||
this.toolStripSeparator13,
|
this.toolStripSeparator13,
|
||||||
this.btnCrop,
|
this.btnCrop,
|
||||||
this.rotateCwToolstripButton,
|
this.rotateCwToolstripButton,
|
||||||
this.rotateCcwToolstripButton});
|
this.rotateCcwToolstripButton,
|
||||||
|
this.btnResize});
|
||||||
this.toolStrip2.Location = new System.Drawing.Point(0, 0);
|
this.toolStrip2.Location = new System.Drawing.Point(0, 0);
|
||||||
this.toolStrip2.Name = "toolStrip2";
|
this.toolStrip2.Name = "toolStrip2";
|
||||||
this.toolStrip2.Size = new System.Drawing.Size(24, 385);
|
this.toolStrip2.Size = new System.Drawing.Size(24, 385);
|
||||||
|
@ -457,8 +458,7 @@ namespace Greenshot {
|
||||||
this.addDropshadowToolStripMenuItem,
|
this.addDropshadowToolStripMenuItem,
|
||||||
this.tornEdgesToolStripMenuItem,
|
this.tornEdgesToolStripMenuItem,
|
||||||
this.grayscaleToolStripMenuItem,
|
this.grayscaleToolStripMenuItem,
|
||||||
this.invertToolStripMenuItem,
|
this.invertToolStripMenuItem});
|
||||||
this.resizeToolStripMenuItem});
|
|
||||||
this.toolStripSplitButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripSplitButton1.Image")));
|
this.toolStripSplitButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripSplitButton1.Image")));
|
||||||
this.toolStripSplitButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
|
this.toolStripSplitButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||||
this.toolStripSplitButton1.LanguageKey = "editor_effects";
|
this.toolStripSplitButton1.LanguageKey = "editor_effects";
|
||||||
|
@ -502,12 +502,16 @@ namespace Greenshot {
|
||||||
this.invertToolStripMenuItem.Size = new System.Drawing.Size(67, 22);
|
this.invertToolStripMenuItem.Size = new System.Drawing.Size(67, 22);
|
||||||
this.invertToolStripMenuItem.Click += new System.EventHandler(this.InvertToolStripMenuItemClick);
|
this.invertToolStripMenuItem.Click += new System.EventHandler(this.InvertToolStripMenuItemClick);
|
||||||
//
|
//
|
||||||
// resizeToolStripMenuItem
|
// btnResize
|
||||||
//
|
//
|
||||||
this.resizeToolStripMenuItem.Text = "Resize";
|
this.btnResize.Text = "Resize";
|
||||||
this.resizeToolStripMenuItem.Name = "resizeToolStripMenuItem";
|
this.btnResize.Name = "btnResize";
|
||||||
this.resizeToolStripMenuItem.Size = new System.Drawing.Size(67, 22);
|
this.btnResize.Size = new System.Drawing.Size(22, 20);
|
||||||
this.resizeToolStripMenuItem.Click += new System.EventHandler(this.ResizeToolStripMenuItemClick);
|
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
|
// toolStripSeparator13
|
||||||
//
|
//
|
||||||
|
@ -1747,7 +1751,7 @@ namespace Greenshot {
|
||||||
private GreenshotPlugin.Controls.GreenshotToolStripMenuItem alignTopToolStripMenuItem;
|
private GreenshotPlugin.Controls.GreenshotToolStripMenuItem alignTopToolStripMenuItem;
|
||||||
private Greenshot.Controls.BindableToolStripDropDownButton textVerticalAlignmentButton;
|
private Greenshot.Controls.BindableToolStripDropDownButton textVerticalAlignmentButton;
|
||||||
private GreenshotPlugin.Controls.GreenshotToolStripMenuItem invertToolStripMenuItem;
|
private GreenshotPlugin.Controls.GreenshotToolStripMenuItem invertToolStripMenuItem;
|
||||||
private GreenshotPlugin.Controls.GreenshotToolStripMenuItem resizeToolStripMenuItem;
|
private GreenshotPlugin.Controls.GreenshotToolStripButton btnResize;
|
||||||
private GreenshotPlugin.Controls.GreenshotToolStripMenuItem grayscaleToolStripMenuItem;
|
private GreenshotPlugin.Controls.GreenshotToolStripMenuItem grayscaleToolStripMenuItem;
|
||||||
private GreenshotPlugin.Controls.GreenshotToolStripButton rotateCcwToolstripButton;
|
private GreenshotPlugin.Controls.GreenshotToolStripButton rotateCcwToolstripButton;
|
||||||
private GreenshotPlugin.Controls.GreenshotToolStripButton rotateCwToolstripButton;
|
private GreenshotPlugin.Controls.GreenshotToolStripButton rotateCwToolstripButton;
|
||||||
|
|
|
@ -175,7 +175,7 @@ namespace Greenshot {
|
||||||
|
|
||||||
obfuscateModeButton.DropDownItemClicked += FilterPresetDropDownItemClicked;
|
obfuscateModeButton.DropDownItemClicked += FilterPresetDropDownItemClicked;
|
||||||
highlightModeButton.DropDownItemClicked += FilterPresetDropDownItemClicked;
|
highlightModeButton.DropDownItemClicked += FilterPresetDropDownItemClicked;
|
||||||
|
|
||||||
toolbarButtons = new[] { btnCursor, btnRect, btnEllipse, btnText, btnLine, btnArrow, btnFreehand, btnHighlight, btnObfuscate, btnCrop, btnStepLabel, btnSpeechBubble };
|
toolbarButtons = new[] { btnCursor, btnRect, btnEllipse, btnText, btnLine, btnArrow, btnFreehand, btnHighlight, btnObfuscate, btnCrop, btnStepLabel, btnSpeechBubble };
|
||||||
//toolbarDropDownButtons = new ToolStripDropDownButton[]{btnBlur, btnPixeliate, btnTextHighlighter, btnAreaHighlighter, btnMagnifier};
|
//toolbarDropDownButtons = new ToolStripDropDownButton[]{btnBlur, btnPixeliate, btnTextHighlighter, btnAreaHighlighter, btnMagnifier};
|
||||||
|
|
||||||
|
@ -1229,11 +1229,11 @@ namespace Greenshot {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Currently unused
|
/// Open the resize settings from, and resize if ok was pressed
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="sender"></param>
|
/// <param name="sender"></param>
|
||||||
/// <param name="e"></param>
|
/// <param name="e"></param>
|
||||||
void ResizeToolStripMenuItemClick(object sender, EventArgs e) {
|
void BtnResizeClick(object sender, EventArgs e) {
|
||||||
ResizeEffect resizeEffect = new ResizeEffect(surface.Image.Width, surface.Image.Height, true);
|
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
|
// TODO: Use the Resize SettingsForm to make it possible to change the default values
|
||||||
DialogResult result = new ResizeSettingsForm(resizeEffect).ShowDialog(this);
|
DialogResult result = new ResizeSettingsForm(resizeEffect).ShowDialog(this);
|
||||||
|
|
|
@ -1005,6 +1005,9 @@
|
||||||
<data name="btnSpeechBubble.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="btnSpeechBubble.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\icons\balloon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\icons\balloon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="btnResize.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\icons\resize.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||||
<value>551, 17</value>
|
<value>551, 17</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
|
BIN
Greenshot/icons/resize.png
Normal file
BIN
Greenshot/icons/resize.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 594 B |
Loading…
Add table
Add a link
Reference in a new issue