github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-14 00:53:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added the resize "effect" to the editor and activated the different "settings forms" for the DropShadow, Resize and TornEdge effects.

Browse source
This commit is contained in:
RKrom 2014-05-27 17:41:52 +02:00
parent 9c72521738
commit 48187fcdba
3 changed files with 33 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Greenshot/Forms/ImageEditorForm.Designer.cs generated
View file

@ -73,6 +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.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();
@ -456,7 +457,8 @@ 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";
@ -500,6 +502,13 @@ 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
//
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 // toolStripSeparator13
// //
this.toolStripSeparator13.Name = "toolStripSeparator13"; this.toolStripSeparator13.Name = "toolStripSeparator13";
@ -1738,6 +1747,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.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;

19
Greenshot/Forms/ImageEditorForm.cs
View file

@ -41,6 +41,7 @@ using Greenshot.IniFile;
using System.Threading; using System.Threading;
using Greenshot.Core; using Greenshot.Core;
using log4net; using log4net;
using Greenshot.Forms;
namespace Greenshot { namespace Greenshot {
/// <summary> /// <summary>
@ -1214,11 +1215,11 @@ namespace Greenshot {
void AddDropshadowToolStripMenuItemClick(object sender, EventArgs e) { void AddDropshadowToolStripMenuItemClick(object sender, EventArgs e) {
DropShadowEffect dropShadowEffect= new DropShadowEffect(); DropShadowEffect dropShadowEffect= new DropShadowEffect();
// TODO: Use the dropshadow settings form to make it possible to change the default values // TODO: Use the dropshadow settings form to make it possible to change the default values
//DialogResult result = new DropShadowSettingsForm(dropShadowEffect).ShowDialog(this); DialogResult result = new DropShadowSettingsForm(dropShadowEffect).ShowDialog(this);
//if (result == DialogResult.OK) { if (result == DialogResult.OK) {
surface.ApplyBitmapEffect(dropShadowEffect); surface.ApplyBitmapEffect(dropShadowEffect);
updateUndoRedoSurfaceDependencies(); updateUndoRedoSurfaceDependencies();
//} }
} }
/// <summary> /// <summary>
@ -1229,11 +1230,11 @@ namespace Greenshot {
void ResizeToolStripMenuItemClick(object sender, EventArgs e) { void ResizeToolStripMenuItemClick(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);
// if (result == DialogResult.OK) { if (result == DialogResult.OK) {
surface.ApplyBitmapEffect(resizeEffect); surface.ApplyBitmapEffect(resizeEffect);
updateUndoRedoSurfaceDependencies(); updateUndoRedoSurfaceDependencies();
//} }
} }
/// <summary> /// <summary>
@ -1244,11 +1245,11 @@ namespace Greenshot {
void TornEdgesToolStripMenuItemClick(object sender, EventArgs e) { void TornEdgesToolStripMenuItemClick(object sender, EventArgs e) {
TornEdgeEffect tornEdgeEffect = new TornEdgeEffect(); TornEdgeEffect tornEdgeEffect = new TornEdgeEffect();
// TODO: Use the dropshadow settings form to make it possible to change the default values // TODO: Use the dropshadow settings form to make it possible to change the default values
//DialogResult result = new TornEdgeSettingsForm(tornEdgeEffect).ShowDialog(this); DialogResult result = new TornEdgeSettingsForm(tornEdgeEffect).ShowDialog(this);
//if (result == DialogResult.OK) { if (result == DialogResult.OK) {
surface.ApplyBitmapEffect(tornEdgeEffect); surface.ApplyBitmapEffect(tornEdgeEffect);
updateUndoRedoSurfaceDependencies(); updateUndoRedoSurfaceDependencies();
//} }
} }
void GrayscaleToolStripMenuItemClick(object sender, EventArgs e) { void GrayscaleToolStripMenuItemClick(object sender, EventArgs e) {

24
Greenshot/Greenshot.csproj
View file

@ -136,12 +136,12 @@
<Compile Include="Forms\CaptureForm.Designer.cs"> <Compile Include="Forms\CaptureForm.Designer.cs">
<DependentUpon>CaptureForm.cs</DependentUpon> <DependentUpon>CaptureForm.cs</DependentUpon>
</Compile> </Compile>
<None Include="Forms\DropShadowSettingsForm.cs"> <Compile Include="Forms\DropShadowSettingsForm.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</None> </Compile>
<None Include="Forms\DropShadowSettingsForm.Designer.cs"> <Compile Include="Forms\DropShadowSettingsForm.Designer.cs">
<DependentUpon>DropShadowSettingsForm.cs</DependentUpon> <DependentUpon>DropShadowSettingsForm.cs</DependentUpon>
</None> </Compile>
<Compile Include="Forms\ImageEditorForm.cs"> <Compile Include="Forms\ImageEditorForm.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
@ -151,18 +151,18 @@
<Compile Include="Forms\AnimatingBaseForm.cs"> <Compile Include="Forms\AnimatingBaseForm.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<None Include="Forms\ResizeSettingsForm.cs"> <Compile Include="Forms\ResizeSettingsForm.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</None> </Compile>
<None Include="Forms\ResizeSettingsForm.Designer.cs"> <Compile Include="Forms\ResizeSettingsForm.Designer.cs">
<DependentUpon>ResizeSettingsForm.cs</DependentUpon> <DependentUpon>ResizeSettingsForm.cs</DependentUpon>
</None> </Compile>
<None Include="Forms\TornEdgeSettingsForm.cs"> <Compile Include="Forms\TornEdgeSettingsForm.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</None> </Compile>
<None Include="Forms\TornEdgeSettingsForm.Designer.cs"> <Compile Include="Forms\TornEdgeSettingsForm.Designer.cs">
<DependentUpon>TornEdgeSettingsForm.cs</DependentUpon> <DependentUpon>TornEdgeSettingsForm.cs</DependentUpon>
</None> </Compile>
<Compile Include="Forms\LanguageDialog.cs"> <Compile Include="Forms\LanguageDialog.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>