CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 09:47:22 +13:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3237 from sylveon/master

Browse source 
Add greenshot-like shortcuts to the region capture mode and image editor
This commit is contained in:
Jaex 2018-03-26 07:02:54 +03:00 committed by GitHub
commit 8ff0461eea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 61 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs
View file

@ -816,7 +816,7 @@ private void Draw(Graphics g)
ShapeManager.DrawObjects(g);
// Draw F1 tips
if (!IsEditorMode && Options.ShowHotkeys)
if (Options.ShowHotkeys)
{
DrawTips(g);
}
@ -1077,7 +1077,7 @@ private void WriteTips(StringBuilder sb)
sb.AppendLine(Resources.RectangleRegion_WriteTips__1__2__3_____0__Monitor_capture);
sb.AppendLine(Resources.RectangleRegion_WriteTips_____Active_monitor_capture);
if (Mode == RegionCaptureMode.Annotation && !ShapeManager.IsCreating)
if (IsAnnotationMode && !ShapeManager.IsCreating)
{
sb.AppendLine();
@ -1090,37 +1090,38 @@ private void WriteTips(StringBuilder sb)
sb.AppendLine(Resources.RectangleRegionForm_WriteTips__Tab___Mouse_4_click__Select_last_region_tool);
}
void AddToolShortcut(ShapeType type, string shortcut)
{
if (ShapeManager.CurrentTool == type)
{
sb.Append("-> ");
}
string description = string.Format("[{0}] {1}", shortcut, type.GetLocalizedDescription());
sb.AppendLine(description);
}
sb.AppendLine(Resources.RectangleRegionForm_WriteTips__Ctrl___Mouse_wheel__Change_magnifier_size);
if (ShapeManager.CurrentTool == ShapeType.RegionRectangle) sb.Append("-> ");
sb.AppendLine(string.Format("[{0}] {1}", "Numpad 0", ShapeType.RegionRectangle.GetLocalizedDescription()));
if (ShapeManager.CurrentTool == ShapeType.RegionEllipse) sb.Append("-> ");
sb.AppendLine(ShapeType.RegionEllipse.GetLocalizedDescription());
if (ShapeManager.CurrentTool == ShapeType.RegionFreehand) sb.Append("-> ");
sb.AppendLine(ShapeType.RegionFreehand.GetLocalizedDescription());
if (ShapeManager.CurrentTool == ShapeType.DrawingRectangle) sb.Append("-> ");
sb.AppendLine(string.Format("[{0}] {1}", "Numpad 1", ShapeType.DrawingRectangle.GetLocalizedDescription()));
if (ShapeManager.CurrentTool == ShapeType.DrawingEllipse) sb.Append("-> ");
sb.AppendLine(string.Format("[{0}] {1}", "Numpad 2", ShapeType.DrawingEllipse.GetLocalizedDescription()));
if (ShapeManager.CurrentTool == ShapeType.DrawingFreehand) sb.Append("-> ");
sb.AppendLine(string.Format("[{0}] {1}", "Numpad 3", ShapeType.DrawingFreehand.GetLocalizedDescription()));
if (ShapeManager.CurrentTool == ShapeType.DrawingLine) sb.Append("-> ");
sb.AppendLine(string.Format("[{0}] {1}", "Numpad 4", ShapeType.DrawingLine.GetLocalizedDescription()));
if (ShapeManager.CurrentTool == ShapeType.DrawingArrow) sb.Append("-> ");
sb.AppendLine(string.Format("[{0}] {1}", "Numpad 5", ShapeType.DrawingArrow.GetLocalizedDescription()));
if (ShapeManager.CurrentTool == ShapeType.DrawingTextOutline) sb.Append("-> ");
sb.AppendLine(string.Format("[{0}] {1}", "Numpad 6", ShapeType.DrawingTextOutline.GetLocalizedDescription()));
if (ShapeManager.CurrentTool == ShapeType.DrawingSpeechBalloon) sb.Append("-> ");
sb.AppendLine(ShapeType.DrawingSpeechBalloon.GetLocalizedDescription());
if (ShapeManager.CurrentTool == ShapeType.DrawingStep) sb.Append("-> ");
sb.AppendLine(string.Format("[{0}] {1}", "Numpad 7", ShapeType.DrawingStep.GetLocalizedDescription()));
if (ShapeManager.CurrentTool == ShapeType.DrawingImage) sb.Append("-> ");
sb.AppendLine(ShapeType.DrawingImage.GetLocalizedDescription());
if (ShapeManager.CurrentTool == ShapeType.EffectBlur) sb.Append("-> ");
sb.AppendLine(string.Format("[{0}] {1}", "Numpad 8", ShapeType.EffectBlur.GetLocalizedDescription()));
if (ShapeManager.CurrentTool == ShapeType.EffectPixelate) sb.Append("-> ");
sb.AppendLine(string.Format("[{0}] {1}", "Numpad 9", ShapeType.EffectPixelate.GetLocalizedDescription()));
if (ShapeManager.CurrentTool == ShapeType.EffectHighlight) sb.Append("-> ");
sb.AppendLine(ShapeType.EffectHighlight.GetLocalizedDescription());
if (Mode == RegionCaptureMode.Annotation)
{
AddToolShortcut(ShapeType.RegionRectangle, "Numpad 0");
}
AddToolShortcut(ShapeType.DrawingRectangle, "Numpad 1 / R");
AddToolShortcut(ShapeType.DrawingEllipse, "Numpad 2 / E");
AddToolShortcut(ShapeType.DrawingFreehand, "Numpad 3 / F");
AddToolShortcut(ShapeType.DrawingLine, "Numpad 4 / L");
AddToolShortcut(ShapeType.DrawingArrow, "Numpad 5 / A");
AddToolShortcut(ShapeType.DrawingTextOutline, "Numpad 6 / O");
AddToolShortcut(ShapeType.DrawingStep, "Numpad 7 / I");
AddToolShortcut(ShapeType.EffectBlur, "Numpad 8 / B");
AddToolShortcut(ShapeType.EffectPixelate, "Numpad 9 / P");
AddToolShortcut(ShapeType.EffectHighlight, "H");
AddToolShortcut(ShapeType.DrawingTextBackground, "T");
AddToolShortcut(ShapeType.DrawingSpeechBalloon, "S");
if (IsEditorMode)
{
AddToolShortcut(ShapeType.ToolCrop, "C");
}
}
sb.AppendLine();

28
ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
View file

@ -481,33 +481,51 @@ private void form_KeyDown(object sender, KeyEventArgs e)
{
switch (e.KeyData)
{
case Keys.R:
case Keys.NumPad1:
CurrentTool = ShapeType.DrawingRectangle;
break;
case Keys.E:
case Keys.NumPad2:
CurrentTool = ShapeType.DrawingEllipse;
break;
case Keys.F:
case Keys.NumPad3:
CurrentTool = ShapeType.DrawingFreehand;
break;
case Keys.L:
case Keys.NumPad4:
CurrentTool = ShapeType.DrawingLine;
break;
case Keys.A:
case Keys.NumPad5:
CurrentTool = ShapeType.DrawingArrow;
break;
case Keys.O:
case Keys.NumPad6:
CurrentTool = ShapeType.DrawingTextOutline;
break;
case Keys.I:
case Keys.NumPad7:
CurrentTool = ShapeType.DrawingStep;
break;
case Keys.B:
case Keys.NumPad8:
CurrentTool = ShapeType.EffectBlur;
break;
case Keys.P:
case Keys.NumPad9:
CurrentTool = ShapeType.EffectPixelate;
break;
case Keys.H:
CurrentTool = ShapeType.EffectHighlight;
break;
case Keys.T:
CurrentTool = ShapeType.DrawingTextBackground;
break;
case Keys.S:
CurrentTool = ShapeType.DrawingSpeechBalloon;
break;
case Keys.Control | Keys.V:
PasteFromClipboard(true);
break;
@ -532,6 +550,16 @@ private void form_KeyDown(object sender, KeyEventArgs e)
break;
}
}
if (Form.IsEditorMode)
{
switch (e.KeyData)
{
case Keys.C:
CurrentTool = ShapeType.ToolCrop;
break;
}
}
}
int speed;