mirror of
https://github.com/cyanfish/naps2.git
synced 2024-10-04 19:37:15 +03:00
Add new image adjustment buttons to FViewer
This commit is contained in:
Ben Olden-Cooligan
parent
2acf9829e2
commit
2d967805af
@ -41,6 +41,9 @@ namespace NAPS2.WinForms
|
||||
private readonly IOperationFactory operationFactory;
|
||||
private readonly WinFormsExportHelper exportHelper;
|
||||
private readonly AppConfigManager appConfigManager;
|
||||
private ToolStripButton tsHueSaturation;
|
||||
private ToolStripButton tsBlackWhite;
|
||||
private ToolStripButton tsSharpen;
|
||||
private readonly ScannedImageRenderer scannedImageRenderer;
|
||||
|
||||
public FViewer(ChangeTracker changeTracker, IOperationFactory operationFactory, WinFormsExportHelper exportHelper, AppConfigManager appConfigManager, ScannedImageRenderer scannedImageRenderer)
|
||||
@ -133,6 +136,9 @@ namespace NAPS2.WinForms
|
||||
this.tsSaveImage = new System.Windows.Forms.ToolStripButton();
|
||||
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.tsDelete = new System.Windows.Forms.ToolStripButton();
|
||||
this.tsSharpen = new System.Windows.Forms.ToolStripButton();
|
||||
this.tsBlackWhite = new System.Windows.Forms.ToolStripButton();
|
||||
this.tsHueSaturation = new System.Windows.Forms.ToolStripButton();
|
||||
this.toolStripContainer1.ContentPanel.SuspendLayout();
|
||||
this.toolStripContainer1.TopToolStripPanel.SuspendLayout();
|
||||
this.toolStripContainer1.SuspendLayout();
|
||||
@ -172,6 +178,9 @@ namespace NAPS2.WinForms
|
||||
this.tsdRotate,
|
||||
this.tsCrop,
|
||||
this.tsBrightnessContrast,
|
||||
this.tsHueSaturation,
|
||||
this.tsBlackWhite,
|
||||
this.tsSharpen,
|
||||
this.toolStripSeparator3,
|
||||
this.tsSavePDF,
|
||||
this.tsSaveImage,
|
||||
@ -309,6 +318,30 @@ namespace NAPS2.WinForms
|
||||
this.tsDelete.Name = "tsDelete";
|
||||
this.tsDelete.Click += new System.EventHandler(this.tsDelete_Click);
|
||||
//
|
||||
// tsSharpen
|
||||
//
|
||||
this.tsSharpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
|
||||
this.tsSharpen.Image = global::NAPS2.Icons.sharpen;
|
||||
resources.ApplyResources(this.tsSharpen, "tsSharpen");
|
||||
this.tsSharpen.Name = "tsSharpen";
|
||||
this.tsSharpen.Click += new System.EventHandler(this.tsSharpen_Click);
|
||||
//
|
||||
// tsBlackWhite
|
||||
//
|
||||
this.tsBlackWhite.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
|
||||
this.tsBlackWhite.Image = global::NAPS2.Icons.contrast_high;
|
||||
resources.ApplyResources(this.tsBlackWhite, "tsBlackWhite");
|
||||
this.tsBlackWhite.Name = "tsBlackWhite";
|
||||
this.tsBlackWhite.Click += new System.EventHandler(this.tsBlackWhite_Click);
|
||||
//
|
||||
// tsHueSaturation
|
||||
//
|
||||
this.tsHueSaturation.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
|
||||
this.tsHueSaturation.Image = global::NAPS2.Icons.color_management;
|
||||
resources.ApplyResources(this.tsHueSaturation, "tsHueSaturation");
|
||||
this.tsHueSaturation.Name = "tsHueSaturation";
|
||||
this.tsHueSaturation.Click += new System.EventHandler(this.tsHueSaturation_Click);
|
||||
//
|
||||
// FViewer
|
||||
//
|
||||
resources.ApplyResources(this, "$this");
|
||||
@ -408,6 +441,33 @@ namespace NAPS2.WinForms
|
||||
UpdateCallback(Enumerable.Range(ImageIndex, 1));
|
||||
}
|
||||
|
||||
private void tsHueSaturation_Click(object sender, EventArgs e)
|
||||
{
|
||||
var form = FormFactory.Create<FHueSaturation>();
|
||||
form.Image = ImageList.Images[ImageIndex];
|
||||
form.ShowDialog();
|
||||
UpdateImage();
|
||||
UpdateCallback(Enumerable.Range(ImageIndex, 1));
|
||||
}
|
||||
|
||||
private void tsBlackWhite_Click(object sender, EventArgs e)
|
||||
{
|
||||
var form = FormFactory.Create<FBlackWhite>();
|
||||
form.Image = ImageList.Images[ImageIndex];
|
||||
form.ShowDialog();
|
||||
UpdateImage();
|
||||
UpdateCallback(Enumerable.Range(ImageIndex, 1));
|
||||
}
|
||||
|
||||
private void tsSharpen_Click(object sender, EventArgs e)
|
||||
{
|
||||
var form = FormFactory.Create<FSharpen>();
|
||||
form.Image = ImageList.Images[ImageIndex];
|
||||
form.ShowDialog();
|
||||
UpdateImage();
|
||||
UpdateCallback(Enumerable.Range(ImageIndex, 1));
|
||||
}
|
||||
|
||||
private void tsDelete_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (MessageBox.Show(string.Format(MiscResources.ConfirmDeleteItems, 1), MiscResources.Delete, MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
|
||||
|
||||
@ -148,7 +148,7 @@
|
||||
<value>tiffViewer1</value>
|
||||
</data>
|
||||
<data name=">>tiffViewer1.Type" xml:space="preserve">
|
||||
<value>NAPS2.WinForms.TiffViewerCtl, NAPS2.Core, Version=5.5.0.35980, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>NAPS2.WinForms.TiffViewerCtl, NAPS2.Core, Version=5.5.0.42778, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>tiffViewer1.Parent" xml:space="preserve">
|
||||
<value>toolStripContainer1.ContentPanel</value>
|
||||
@ -243,36 +243,6 @@
|
||||
<data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>6, 25</value>
|
||||
</data>
|
||||
<data name="tsRotateLeft.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>164, 22</value>
|
||||
</data>
|
||||
<data name="tsRotateLeft.Text" xml:space="preserve">
|
||||
<value>Rotate Left</value>
|
||||
</data>
|
||||
<data name="tsRotateRight.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>164, 22</value>
|
||||
</data>
|
||||
<data name="tsRotateRight.Text" xml:space="preserve">
|
||||
<value>Rotate Right</value>
|
||||
</data>
|
||||
<data name="tsFlip.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>164, 22</value>
|
||||
</data>
|
||||
<data name="tsFlip.Text" xml:space="preserve">
|
||||
<value>Flip</value>
|
||||
</data>
|
||||
<data name="tsDeskew.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>164, 22</value>
|
||||
</data>
|
||||
<data name="tsDeskew.Text" xml:space="preserve">
|
||||
<value>Deskew</value>
|
||||
</data>
|
||||
<data name="tsCustomRotation.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>164, 22</value>
|
||||
</data>
|
||||
<data name="tsCustomRotation.Text" xml:space="preserve">
|
||||
<value>Custom Rotation</value>
|
||||
</data>
|
||||
<data name="tsdRotate.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
|
||||
<value>Magenta</value>
|
||||
</data>
|
||||
@ -300,6 +270,33 @@
|
||||
<data name="tsBrightnessContrast.Text" xml:space="preserve">
|
||||
<value>Brightness / Contrast</value>
|
||||
</data>
|
||||
<data name="tsHueSaturation.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
|
||||
<value>Magenta</value>
|
||||
</data>
|
||||
<data name="tsHueSaturation.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>23, 22</value>
|
||||
</data>
|
||||
<data name="tsHueSaturation.Text" xml:space="preserve">
|
||||
<value>Hue / Saturation</value>
|
||||
</data>
|
||||
<data name="tsBlackWhite.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
|
||||
<value>Magenta</value>
|
||||
</data>
|
||||
<data name="tsBlackWhite.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>23, 22</value>
|
||||
</data>
|
||||
<data name="tsBlackWhite.Text" xml:space="preserve">
|
||||
<value>Black and White</value>
|
||||
</data>
|
||||
<data name="tsSharpen.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
|
||||
<value>Magenta</value>
|
||||
</data>
|
||||
<data name="tsSharpen.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>23, 22</value>
|
||||
</data>
|
||||
<data name="tsSharpen.Text" xml:space="preserve">
|
||||
<value>Sharpen</value>
|
||||
</data>
|
||||
<data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>6, 25</value>
|
||||
</data>
|
||||
@ -337,7 +334,7 @@
|
||||
<value>3, 0</value>
|
||||
</data>
|
||||
<data name="toolStrip1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>304, 25</value>
|
||||
<value>373, 25</value>
|
||||
</data>
|
||||
<data name="toolStrip1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
@ -378,6 +375,36 @@
|
||||
<data name=">>toolStripContainer1.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="tsRotateLeft.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>164, 22</value>
|
||||
</data>
|
||||
<data name="tsRotateLeft.Text" xml:space="preserve">
|
||||
<value>Rotate Left</value>
|
||||
</data>
|
||||
<data name="tsRotateRight.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>164, 22</value>
|
||||
</data>
|
||||
<data name="tsRotateRight.Text" xml:space="preserve">
|
||||
<value>Rotate Right</value>
|
||||
</data>
|
||||
<data name="tsFlip.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>164, 22</value>
|
||||
</data>
|
||||
<data name="tsFlip.Text" xml:space="preserve">
|
||||
<value>Flip</value>
|
||||
</data>
|
||||
<data name="tsDeskew.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>164, 22</value>
|
||||
</data>
|
||||
<data name="tsDeskew.Text" xml:space="preserve">
|
||||
<value>Deskew</value>
|
||||
</data>
|
||||
<data name="tsCustomRotation.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>164, 22</value>
|
||||
</data>
|
||||
<data name="tsCustomRotation.Text" xml:space="preserve">
|
||||
<value>Custom Rotation</value>
|
||||
</data>
|
||||
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
@ -525,10 +552,28 @@
|
||||
<data name=">>tsDelete.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>tsSharpen.Name" xml:space="preserve">
|
||||
<value>tsSharpen</value>
|
||||
</data>
|
||||
<data name=">>tsSharpen.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>tsBlackWhite.Name" xml:space="preserve">
|
||||
<value>tsBlackWhite</value>
|
||||
</data>
|
||||
<data name=">>tsBlackWhite.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>tsHueSaturation.Name" xml:space="preserve">
|
||||
<value>tsHueSaturation</value>
|
||||
</data>
|
||||
<data name=">>tsHueSaturation.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>$this.Name" xml:space="preserve">
|
||||
<value>FViewer</value>
|
||||
</data>
|
||||
<data name=">>$this.Type" xml:space="preserve">
|
||||
<value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=5.5.0.35980, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=5.5.0.42778, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
</root>
|
||||
Loading…
Reference in New Issue
Block a user