mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-04 12:14:45 +13:00
Added hotkey string to remaining menu items
This commit is contained in:
parent
3c21c208b4
commit
f8cbf0da94
3 changed files with 35 additions and 44 deletions
|
@ -225,9 +225,6 @@ private void RegionCaptureForm_KeyDown(object sender, KeyEventArgs e)
|
||||||
{
|
{
|
||||||
switch (e.KeyData)
|
switch (e.KeyData)
|
||||||
{
|
{
|
||||||
case Keys.F1:
|
|
||||||
Config.ShowHotkeys = !Config.ShowHotkeys;
|
|
||||||
break;
|
|
||||||
case Keys.Control | Keys.C:
|
case Keys.Control | Keys.C:
|
||||||
CopyAreaInfo();
|
CopyAreaInfo();
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -373,6 +373,18 @@ private void form_KeyDown(object sender, KeyEventArgs e)
|
||||||
StartRegionSelection();
|
StartRegionSelection();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case Keys.Delete:
|
||||||
|
DeleteCurrentShape();
|
||||||
|
|
||||||
|
if (IsCreating)
|
||||||
|
{
|
||||||
|
EndRegionSelection();
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case Keys.F1:
|
||||||
|
Config.ShowHotkeys = !Config.ShowHotkeys;
|
||||||
|
tsmiTips.Checked = Config.ShowHotkeys;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!IsCreating)
|
if (!IsCreating)
|
||||||
|
@ -439,6 +451,10 @@ private void form_KeyDown(object sender, KeyEventArgs e)
|
||||||
case Keys.PageDown:
|
case Keys.PageDown:
|
||||||
MoveCurrentShapeDown();
|
MoveCurrentShapeDown();
|
||||||
break;
|
break;
|
||||||
|
case Keys.Q:
|
||||||
|
Config.QuickCrop = !Config.QuickCrop;
|
||||||
|
tsmiQuickCrop.Checked = !Config.QuickCrop;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -530,29 +546,6 @@ private void form_KeyUp(object sender, KeyEventArgs e)
|
||||||
isDownPressed = false;
|
isDownPressed = false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (e.KeyData)
|
|
||||||
{
|
|
||||||
case Keys.Delete:
|
|
||||||
DeleteCurrentShape();
|
|
||||||
|
|
||||||
if (IsCreating)
|
|
||||||
{
|
|
||||||
EndRegionSelection();
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (form.IsAnnotationMode)
|
|
||||||
{
|
|
||||||
switch (e.KeyData)
|
|
||||||
{
|
|
||||||
case Keys.Q:
|
|
||||||
Config.QuickCrop = !Config.QuickCrop;
|
|
||||||
tsmiQuickCrop.Checked = !Config.QuickCrop;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void RunAction(RegionCaptureAction action)
|
private void RunAction(RegionCaptureAction action)
|
||||||
|
|
|
@ -42,7 +42,7 @@ internal partial class ShapeManager
|
||||||
private ToolStripEx tsMain;
|
private ToolStripEx tsMain;
|
||||||
private ToolStripButton tsbBorderColor, tsbFillColor, tsbHighlightColor;
|
private ToolStripButton tsbBorderColor, tsbFillColor, tsbHighlightColor;
|
||||||
private ToolStripDropDownButton tsddbShapeOptions;
|
private ToolStripDropDownButton tsddbShapeOptions;
|
||||||
private ToolStripMenuItem tsmiShadow, tsmiUndo, tsmiDelete, tsmiDeleteAll, tsmiMoveTop, tsmiMoveUp, tsmiMoveDown, tsmiMoveBottom, tsmiQuickCrop, tsmiRegionCapture;
|
private ToolStripMenuItem tsmiShadow, tsmiUndo, tsmiDelete, tsmiDeleteAll, tsmiMoveTop, tsmiMoveUp, tsmiMoveDown, tsmiMoveBottom, tsmiRegionCapture, tsmiQuickCrop, tsmiTips;
|
||||||
private ToolStripLabeledNumericUpDown tslnudBorderSize, tslnudCornerRadius, tslnudBlurRadius, tslnudPixelateSize;
|
private ToolStripLabeledNumericUpDown tslnudBorderSize, tslnudCornerRadius, tslnudBlurRadius, tslnudPixelateSize;
|
||||||
private ToolStripLabel tslDragLeft;
|
private ToolStripLabel tslDragLeft;
|
||||||
|
|
||||||
|
@ -112,10 +112,10 @@ private void CreateToolbar()
|
||||||
|
|
||||||
tsMain.Items.Add(tslDragLeft);
|
tsMain.Items.Add(tslDragLeft);
|
||||||
|
|
||||||
#region Editor mode
|
|
||||||
|
|
||||||
if (form.Mode == RegionCaptureMode.Editor)
|
if (form.Mode == RegionCaptureMode.Editor)
|
||||||
{
|
{
|
||||||
|
#region Editor mode
|
||||||
|
|
||||||
ToolStripButton tsbCompleteEdit = new ToolStripButton("Run after capture tasks");
|
ToolStripButton tsbCompleteEdit = new ToolStripButton("Run after capture tasks");
|
||||||
tsbCompleteEdit.DisplayStyle = ToolStripItemDisplayStyle.Image;
|
tsbCompleteEdit.DisplayStyle = ToolStripItemDisplayStyle.Image;
|
||||||
tsbCompleteEdit.Image = Resources.tick;
|
tsbCompleteEdit.Image = Resources.tick;
|
||||||
|
@ -154,9 +154,9 @@ private void CreateToolbar()
|
||||||
tsMain.Items.Add(tsbPrintImage);
|
tsMain.Items.Add(tsbPrintImage);
|
||||||
|
|
||||||
tsMain.Items.Add(new ToolStripSeparator());
|
tsMain.Items.Add(new ToolStripSeparator());
|
||||||
}
|
|
||||||
|
|
||||||
#endregion Editor mode
|
#endregion Editor mode
|
||||||
|
}
|
||||||
|
|
||||||
#region Tools
|
#region Tools
|
||||||
|
|
||||||
|
@ -507,12 +507,12 @@ private void CreateToolbar()
|
||||||
|
|
||||||
#endregion Edit
|
#endregion Edit
|
||||||
|
|
||||||
#region Capture
|
|
||||||
|
|
||||||
if (form.Mode != RegionCaptureMode.Editor)
|
if (form.Mode != RegionCaptureMode.Editor)
|
||||||
{
|
{
|
||||||
tsMain.Items.Add(new ToolStripSeparator());
|
tsMain.Items.Add(new ToolStripSeparator());
|
||||||
|
|
||||||
|
#region Capture
|
||||||
|
|
||||||
ToolStripDropDownButton tsddbCapture = new ToolStripDropDownButton("Capture");
|
ToolStripDropDownButton tsddbCapture = new ToolStripDropDownButton("Capture");
|
||||||
tsddbCapture.DisplayStyle = ToolStripItemDisplayStyle.Image;
|
tsddbCapture.DisplayStyle = ToolStripItemDisplayStyle.Image;
|
||||||
tsddbCapture.Image = Resources.camera;
|
tsddbCapture.Image = Resources.camera;
|
||||||
|
@ -520,6 +520,7 @@ private void CreateToolbar()
|
||||||
|
|
||||||
tsmiRegionCapture = new ToolStripMenuItem("Capture regions");
|
tsmiRegionCapture = new ToolStripMenuItem("Capture regions");
|
||||||
tsmiRegionCapture.Image = Resources.layer;
|
tsmiRegionCapture.Image = Resources.layer;
|
||||||
|
tsmiRegionCapture.ShortcutKeyDisplayString = "Enter";
|
||||||
tsmiRegionCapture.MouseDown += (sender, e) =>
|
tsmiRegionCapture.MouseDown += (sender, e) =>
|
||||||
{
|
{
|
||||||
form.UpdateRegionPath();
|
form.UpdateRegionPath();
|
||||||
|
@ -537,11 +538,13 @@ private void CreateToolbar()
|
||||||
|
|
||||||
ToolStripMenuItem tsmiFullscreenCapture = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Capture_fullscreen);
|
ToolStripMenuItem tsmiFullscreenCapture = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Capture_fullscreen);
|
||||||
tsmiFullscreenCapture.Image = Resources.layer_fullscreen;
|
tsmiFullscreenCapture.Image = Resources.layer_fullscreen;
|
||||||
|
tsmiFullscreenCapture.ShortcutKeyDisplayString = "Space";
|
||||||
tsmiFullscreenCapture.MouseDown += (sender, e) => form.Close(RegionResult.Fullscreen);
|
tsmiFullscreenCapture.MouseDown += (sender, e) => form.Close(RegionResult.Fullscreen);
|
||||||
tsddbCapture.DropDownItems.Add(tsmiFullscreenCapture);
|
tsddbCapture.DropDownItems.Add(tsmiFullscreenCapture);
|
||||||
|
|
||||||
ToolStripMenuItem tsmiActiveMonitorCapture = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Capture_active_monitor);
|
ToolStripMenuItem tsmiActiveMonitorCapture = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Capture_active_monitor);
|
||||||
tsmiActiveMonitorCapture.Image = Resources.monitor;
|
tsmiActiveMonitorCapture.Image = Resources.monitor;
|
||||||
|
tsmiActiveMonitorCapture.ShortcutKeyDisplayString = "~";
|
||||||
tsmiActiveMonitorCapture.MouseDown += (sender, e) => form.Close(RegionResult.ActiveMonitor);
|
tsmiActiveMonitorCapture.MouseDown += (sender, e) => form.Close(RegionResult.ActiveMonitor);
|
||||||
tsddbCapture.DropDownItems.Add(tsmiActiveMonitorCapture);
|
tsddbCapture.DropDownItems.Add(tsmiActiveMonitorCapture);
|
||||||
|
|
||||||
|
@ -555,7 +558,8 @@ private void CreateToolbar()
|
||||||
for (int i = 0; i < screens.Length; i++)
|
for (int i = 0; i < screens.Length; i++)
|
||||||
{
|
{
|
||||||
Screen screen = screens[i];
|
Screen screen = screens[i];
|
||||||
ToolStripMenuItem tsmi = new ToolStripMenuItem(string.Format("{0}. {1}x{2}", i + 1, screen.Bounds.Width, screen.Bounds.Height));
|
ToolStripMenuItem tsmi = new ToolStripMenuItem($"{screen.Bounds.Width}x{screen.Bounds.Height}");
|
||||||
|
tsmi.ShortcutKeyDisplayString = (i + 1).ToString();
|
||||||
int index = i;
|
int index = i;
|
||||||
tsmi.MouseDown += (sender, e) =>
|
tsmi.MouseDown += (sender, e) =>
|
||||||
{
|
{
|
||||||
|
@ -564,16 +568,11 @@ private void CreateToolbar()
|
||||||
};
|
};
|
||||||
tsmiMonitorCapture.DropDownItems.Add(tsmi);
|
tsmiMonitorCapture.DropDownItems.Add(tsmi);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
#endregion Capture
|
#endregion Capture
|
||||||
|
|
||||||
#region Options
|
#region Options
|
||||||
|
|
||||||
if (form.Mode != RegionCaptureMode.Editor)
|
|
||||||
{
|
|
||||||
tsMain.Items.Add(new ToolStripSeparator());
|
|
||||||
|
|
||||||
ToolStripDropDownButton tsddbOptions = new ToolStripDropDownButton(Resources.ShapeManager_CreateContextMenu_Options);
|
ToolStripDropDownButton tsddbOptions = new ToolStripDropDownButton(Resources.ShapeManager_CreateContextMenu_Options);
|
||||||
tsddbOptions.DisplayStyle = ToolStripItemDisplayStyle.Image;
|
tsddbOptions.DisplayStyle = ToolStripItemDisplayStyle.Image;
|
||||||
tsddbOptions.Image = Resources.gear;
|
tsddbOptions.Image = Resources.gear;
|
||||||
|
@ -582,12 +581,14 @@ private void CreateToolbar()
|
||||||
tsmiQuickCrop = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Multi_region_mode);
|
tsmiQuickCrop = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Multi_region_mode);
|
||||||
tsmiQuickCrop.Checked = !Config.QuickCrop;
|
tsmiQuickCrop.Checked = !Config.QuickCrop;
|
||||||
tsmiQuickCrop.CheckOnClick = true;
|
tsmiQuickCrop.CheckOnClick = true;
|
||||||
|
tsmiQuickCrop.ShortcutKeyDisplayString = "Q";
|
||||||
tsmiQuickCrop.Click += (sender, e) => Config.QuickCrop = !tsmiQuickCrop.Checked;
|
tsmiQuickCrop.Click += (sender, e) => Config.QuickCrop = !tsmiQuickCrop.Checked;
|
||||||
tsddbOptions.DropDownItems.Add(tsmiQuickCrop);
|
tsddbOptions.DropDownItems.Add(tsmiQuickCrop);
|
||||||
|
|
||||||
ToolStripMenuItem tsmiTips = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Show_tips);
|
tsmiTips = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Show_tips);
|
||||||
tsmiTips.Checked = Config.ShowHotkeys;
|
tsmiTips.Checked = Config.ShowHotkeys;
|
||||||
tsmiTips.CheckOnClick = true;
|
tsmiTips.CheckOnClick = true;
|
||||||
|
tsmiTips.ShortcutKeyDisplayString = "F1";
|
||||||
tsmiTips.Click += (sender, e) => Config.ShowHotkeys = tsmiTips.Checked;
|
tsmiTips.Click += (sender, e) => Config.ShowHotkeys = tsmiTips.Checked;
|
||||||
tsddbOptions.DropDownItems.Add(tsmiTips);
|
tsddbOptions.DropDownItems.Add(tsmiTips);
|
||||||
|
|
||||||
|
@ -657,9 +658,9 @@ private void CreateToolbar()
|
||||||
tsmiRememberMenuState.CheckOnClick = true;
|
tsmiRememberMenuState.CheckOnClick = true;
|
||||||
tsmiRememberMenuState.Click += (sender, e) => Config.RememberMenuState = tsmiRememberMenuState.Checked;
|
tsmiRememberMenuState.Click += (sender, e) => Config.RememberMenuState = tsmiRememberMenuState.Checked;
|
||||||
tsddbOptions.DropDownItems.Add(tsmiRememberMenuState);
|
tsddbOptions.DropDownItems.Add(tsmiRememberMenuState);
|
||||||
}
|
|
||||||
|
|
||||||
#endregion Options
|
#endregion Options
|
||||||
|
}
|
||||||
|
|
||||||
ToolStripLabel tslDragRight = new ToolStripLabel()
|
ToolStripLabel tslDragRight = new ToolStripLabel()
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue