cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-10-04 19:37:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add PageUp/PageDown key binds for FViewer to scroll through pages

Browse Source
This commit is contained in:
Ben Olden-Cooligan 2015-08-14 01:28:00 -04:00
parent 6db0d73a84
commit 6de0393f53
5 changed files with 54 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
NAPS2.Core/WinForms/FViewer.cs
View File

@ -156,6 +156,7 @@ namespace NAPS2.WinForms
resources.ApplyResources(this.tiffViewer1, "tiffViewer1");
this.tiffViewer1.Image = null;
this.tiffViewer1.Name = "tiffViewer1";
this.tiffViewer1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tiffViewer1_KeyDown);
//
// toolStrip1
//
@ -177,6 +178,7 @@ namespace NAPS2.WinForms
//
this.tbPageCurrent.Name = "tbPageCurrent";
resources.ApplyResources(this.tbPageCurrent, "tbPageCurrent");
this.tbPageCurrent.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbPageCurrent_KeyDown);
this.tbPageCurrent.TextChanged += new System.EventHandler(this.tbPageCurrent_TextChanged);
//
// lblPageTotal
@ -402,5 +404,34 @@ namespace NAPS2.WinForms
}
}
}
private void tiffViewer1_KeyDown(object sender, KeyEventArgs e)
{
switch (e.KeyCode)
{
case Keys.Escape:
Close();
break;
case Keys.PageDown:
GoTo(ImageIndex + 1);
break;
case Keys.PageUp:
GoTo(ImageIndex - 1);
break;
}
}
private void tbPageCurrent_KeyDown(object sender, KeyEventArgs e)
{
switch (e.KeyCode)
{
case Keys.PageDown:
GoTo(ImageIndex + 1);
break;
case Keys.PageUp:
GoTo(ImageIndex - 1);
break;
}
}
}
}

4
NAPS2.Core/WinForms/FViewer.resx
View File

@ -148,7 +148,7 @@
<value>tiffViewer1</value>
</data>
<data name="&gt;&gt;tiffViewer1.Type" xml:space="preserve">
<value>NAPS2.WinForms.TiffViewerCtl, NAPS2.Core, Version=4.1.1.42801, Culture=neutral, PublicKeyToken=null</value>
<value>NAPS2.WinForms.TiffViewerCtl, NAPS2.Core, Version=4.1.1.632, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;tiffViewer1.Parent" xml:space="preserve">
<value>toolStripContainer1.ContentPanel</value>
@ -484,6 +484,6 @@
<value>FViewer</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.1.1.42801, Culture=neutral, PublicKeyToken=null</value>
<value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.1.1.632, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

7
NAPS2.Core/WinForms/TiffViewer.cs
View File

@ -144,6 +144,7 @@ namespace NAPS2.WinForms
protected override void OnKeyDown(KeyEventArgs e)
{
base.OnKeyDown(e);
isControlKeyDown = e.Control;
switch (e.KeyCode)
{
@ -159,12 +160,6 @@ namespace NAPS2.WinForms
StepZoom(1);
}
break;
case Keys.Escape:
if (ParentForm != null)
{
ParentForm.Close();
}
break;
}
}

31
NAPS2.Core/WinForms/TiffViewerCtl.cs
View File

@ -120,6 +120,12 @@ namespace NAPS2.WinForms
tiffviewer1.Zoom = 100;
}
private void tiffviewer1_KeyDown(object sender, KeyEventArgs e)
{
// Pass through events to the parent form in case it listens for them
OnKeyDown(e);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
@ -129,6 +135,7 @@ namespace NAPS2.WinForms
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TiffViewerCtl));
this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer();
this.tiffviewer1 = new NAPS2.WinForms.TiffViewer();
this.tStrip = new System.Windows.Forms.ToolStrip();
this.tsStretch = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
@ -137,7 +144,6 @@ namespace NAPS2.WinForms
this.tsZoomOut = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.tsZoom = new System.Windows.Forms.ToolStripLabel();
this.tiffviewer1 = new NAPS2.WinForms.TiffViewer();
this.toolStripContainer1.ContentPanel.SuspendLayout();
this.toolStripContainer1.TopToolStripPanel.SuspendLayout();
this.toolStripContainer1.SuspendLayout();
@ -158,6 +164,14 @@ namespace NAPS2.WinForms
//
this.toolStripContainer1.TopToolStripPanel.Controls.Add(this.tStrip);
//
// tiffviewer1
//
resources.ApplyResources(this.tiffviewer1, "tiffviewer1");
this.tiffviewer1.BackColor = System.Drawing.Color.White;
this.tiffviewer1.Name = "tiffviewer1";
this.tiffviewer1.Zoom = 0;
this.tiffviewer1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tiffviewer1_KeyDown);
//
// tStrip
//
resources.ApplyResources(this.tStrip, "tStrip");
@ -174,7 +188,7 @@ namespace NAPS2.WinForms
// tsStretch
//
this.tsStretch.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.tsStretch.Image = Icons.arrow_out;
this.tsStretch.Image = global::NAPS2.Icons.arrow_out;
resources.ApplyResources(this.tsStretch, "tsStretch");
this.tsStretch.Name = "tsStretch";
this.tsStretch.CheckedChanged += new System.EventHandler(this.tsStretch_CheckedChanged);
@ -188,7 +202,7 @@ namespace NAPS2.WinForms
// tsZoomActual
//
this.tsZoomActual.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.tsZoomActual.Image = Icons.zoom_actual;
this.tsZoomActual.Image = global::NAPS2.Icons.zoom_actual;
resources.ApplyResources(this.tsZoomActual, "tsZoomActual");
this.tsZoomActual.Name = "tsZoomActual";
this.tsZoomActual.Click += new System.EventHandler(this.tsZoomActual_Click);
@ -196,7 +210,7 @@ namespace NAPS2.WinForms
// tsZoomPlus
//
this.tsZoomPlus.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.tsZoomPlus.Image = Icons.zoom_in;
this.tsZoomPlus.Image = global::NAPS2.Icons.zoom_in;
resources.ApplyResources(this.tsZoomPlus, "tsZoomPlus");
this.tsZoomPlus.Name = "tsZoomPlus";
this.tsZoomPlus.Click += new System.EventHandler(this.tsZoomPlus_Click);
@ -204,7 +218,7 @@ namespace NAPS2.WinForms
// tsZoomOut
//
this.tsZoomOut.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.tsZoomOut.Image = Icons.zoom_out;
this.tsZoomOut.Image = global::NAPS2.Icons.zoom_out;
resources.ApplyResources(this.tsZoomOut, "tsZoomOut");
this.tsZoomOut.Name = "tsZoomOut";
this.tsZoomOut.Click += new System.EventHandler(this.tsZoomOut_Click);
@ -219,13 +233,6 @@ namespace NAPS2.WinForms
this.tsZoom.Name = "tsZoom";
resources.ApplyResources(this.tsZoom, "tsZoom");
//
// tiffviewer1
//
resources.ApplyResources(this.tiffviewer1, "tiffviewer1");
this.tiffviewer1.BackColor = System.Drawing.Color.White;
this.tiffviewer1.Name = "tiffviewer1";
this.tiffviewer1.Zoom = 0;
//
// TiffViewerCtl
//
this.Controls.Add(this.toolStripContainer1);

2
NAPS2.Core/WinForms/TiffViewerCtl.resx
View File

@ -154,7 +154,7 @@
<value>tiffviewer1</value>
</data>
<data name="&gt;&gt;tiffviewer1.Type" xml:space="preserve">
<value>NAPS2.WinForms.TiffViewer, NAPS2.Core, Version=3.3.5.29101, Culture=neutral, PublicKeyToken=null</value>
<value>NAPS2.WinForms.TiffViewer, NAPS2.Core, Version=4.1.1.264, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;tiffviewer1.Parent" xml:space="preserve">
<value>toolStripContainer1.ContentPanel</value>