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

Reset show tips and click action settings to new default values

Browse source
This commit is contained in:
Jaex 2016-10-31 13:53:45 +03:00
parent 4dd247c1fc
commit 9880f87fc8
7 changed files with 29 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ShareX.ScreenCaptureLib/Enums.cs
View file

@ -166,7 +166,6 @@ public enum RegionCaptureAction // Localized
CancelCapture,
RemoveShapeCancelCapture,
RemoveShape,
OpenOptionsMenu,
SwapToolType,
CaptureFullscreen,
CaptureActiveMonitor

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

@ -226,7 +226,7 @@ private void RegionCaptureForm_KeyDown(object sender, KeyEventArgs e)
switch (e.KeyData)
{
case Keys.F1:
Config.ShowTips = !Config.ShowTips;
Config.ShowHotkeys = !Config.ShowHotkeys;
break;
case Keys.Control | Keys.C:
CopyAreaInfo();
@ -529,7 +529,7 @@ private void Draw(Graphics g)
DrawObjects(g);
// Draw F1 tips
if (Config.ShowTips)
if (Config.ShowHotkeys)
{
DrawTips(g);
}

10
ShareX.ScreenCaptureLib/RegionCaptureOptions.cs
View file

@ -39,10 +39,10 @@ public class RegionCaptureOptions
public const int MoveSpeedMaximum = 10;
public bool QuickCrop = true;
public RegionCaptureAction MouseRightClickAction = RegionCaptureAction.RemoveShapeCancelCapture;
public RegionCaptureAction MouseMiddleClickAction = RegionCaptureAction.SwapToolType;
public RegionCaptureAction Mouse4ClickAction = RegionCaptureAction.CaptureFullscreen;
public RegionCaptureAction Mouse5ClickAction = RegionCaptureAction.CaptureActiveMonitor;
public RegionCaptureAction RegionCaptureActionRightClick = RegionCaptureAction.RemoveShapeCancelCapture;
public RegionCaptureAction RegionCaptureActionMiddleClick = RegionCaptureAction.SwapToolType;
public RegionCaptureAction RegionCaptureActionX1Click = RegionCaptureAction.CaptureFullscreen;
public RegionCaptureAction RegionCaptureActionX2Click = RegionCaptureAction.CaptureActiveMonitor;
public bool DetectWindows = true;
public bool DetectControls = true;
public bool UseDimming = true;
@ -56,7 +56,7 @@ public class RegionCaptureOptions
new SnapSize(1280, 720), // 720p
new SnapSize(1920, 1080) // 1080p
};
public bool ShowTips = false;
public bool ShowHotkeys = false;
public bool ShowInfo = true;
public bool ShowMagnifier = true;
public bool UseSquareMagnifier = false;

12
ShareX.ScreenCaptureLib/RegionCaptureTasks.cs
View file

@ -39,7 +39,7 @@ public static Image GetRegionImage(RegionCaptureOptions options)
using (RegionCaptureForm form = new RegionCaptureForm(RegionCaptureMode.Default))
{
form.Config = GetRegionCaptureOptions(options);
form.Config.ShowTips = false;
form.Config.ShowHotkeys = false;
form.Prepare();
form.ShowDialog();
@ -53,7 +53,7 @@ public static bool GetRectangleRegion(out Rectangle rect, RegionCaptureOptions o
using (RegionCaptureForm form = new RegionCaptureForm(RegionCaptureMode.Default))
{
form.Config = GetRegionCaptureOptions(options);
form.Config.ShowTips = false;
form.Config.ShowHotkeys = false;
form.Prepare();
form.ShowDialog();
@ -99,7 +99,7 @@ public static PointInfo GetPointInfo(RegionCaptureOptions options)
{
form.Config = GetRegionCaptureOptions(options);
form.Config.DetectWindows = false;
form.Config.ShowTips = false;
form.Config.ShowHotkeys = false;
form.Config.UseDimming = false;
form.Prepare();
@ -124,7 +124,7 @@ public static SimpleWindowInfo GetWindowInfo(RegionCaptureOptions options)
form.Config = GetRegionCaptureOptions(options);
form.Config.UseDimming = false;
form.Config.ShowMagnifier = false;
form.Config.ShowTips = false;
form.Config.ShowHotkeys = false;
form.Prepare();
form.ShowDialog();
@ -144,7 +144,7 @@ public static void ShowScreenRuler(RegionCaptureOptions options)
{
form.Config = GetRegionCaptureOptions(options);
form.Config.QuickCrop = false;
form.Config.ShowTips = false;
form.Config.ShowHotkeys = false;
form.Prepare();
form.ShowDialog();
@ -165,7 +165,7 @@ public static void AnnotateImage(Image img, string filePath, RegionCaptureOption
form.Config = GetRegionCaptureOptions(options);
form.Config.DetectWindows = false;
form.Config.ShowTips = false;
form.Config.ShowHotkeys = false;
form.Config.UseDimming = false;
form.Prepare(img);

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

@ -264,7 +264,7 @@ private void form_MouseUp(object sender, MouseEventArgs e)
}
else if (form.IsAnnotationMode)
{
RunAction(Config.MouseRightClickAction);
RunAction(Config.RegionCaptureActionRightClick);
}
else if (IsShapeIntersect())
{
@ -277,15 +277,15 @@ private void form_MouseUp(object sender, MouseEventArgs e)
}
else if (e.Button == MouseButtons.Middle)
{
RunAction(Config.MouseMiddleClickAction);
RunAction(Config.RegionCaptureActionMiddleClick);
}
else if (e.Button == MouseButtons.XButton1)
{
RunAction(Config.Mouse4ClickAction);
RunAction(Config.RegionCaptureActionX1Click);
}
else if (e.Button == MouseButtons.XButton2)
{
RunAction(Config.Mouse5ClickAction);
RunAction(Config.RegionCaptureActionX2Click);
}
}
@ -552,7 +552,6 @@ private void RunAction(RegionCaptureAction action)
form.Close();
break;
case RegionCaptureAction.RemoveShapeCancelCapture:
case RegionCaptureAction.OpenOptionsMenu:
if (IsShapeIntersect())
{
DeleteIntersectShape();

4
ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs
View file

@ -532,9 +532,9 @@ private void CreateMenu()
tsddbOptions.DropDownItems.Add(tsmiQuickCrop);
ToolStripMenuItem tsmiTips = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Show_tips);
tsmiTips.Checked = Config.ShowTips;
tsmiTips.Checked = Config.ShowHotkeys;
tsmiTips.CheckOnClick = true;
tsmiTips.Click += (sender, e) => Config.ShowTips = tsmiTips.Checked;
tsmiTips.Click += (sender, e) => Config.ShowHotkeys = tsmiTips.Checked;
tsddbOptions.DropDownItems.Add(tsmiTips);
ToolStripMenuItem tsmiShowInfo = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Show_position_and_size_info);

20
ShareX/Forms/TaskSettingsForm.cs
View file

@ -235,13 +235,13 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false)
cbRegionCaptureMultiRegionMode.Checked = !TaskSettings.CaptureSettings.SurfaceOptions.QuickCrop;
cbRegionCaptureMouseRightClickAction.Items.AddRange(Helpers.GetLocalizedEnumDescriptions<RegionCaptureAction>());
cbRegionCaptureMouseRightClickAction.SelectedIndex = (int)TaskSettings.CaptureSettings.SurfaceOptions.MouseRightClickAction;
cbRegionCaptureMouseRightClickAction.SelectedIndex = (int)TaskSettings.CaptureSettings.SurfaceOptions.RegionCaptureActionRightClick;
cbRegionCaptureMouseMiddleClickAction.Items.AddRange(Helpers.GetLocalizedEnumDescriptions<RegionCaptureAction>());
cbRegionCaptureMouseMiddleClickAction.SelectedIndex = (int)TaskSettings.CaptureSettings.SurfaceOptions.MouseMiddleClickAction;
cbRegionCaptureMouseMiddleClickAction.SelectedIndex = (int)TaskSettings.CaptureSettings.SurfaceOptions.RegionCaptureActionMiddleClick;
cbRegionCaptureMouse4ClickAction.Items.AddRange(Helpers.GetLocalizedEnumDescriptions<RegionCaptureAction>());
cbRegionCaptureMouse4ClickAction.SelectedIndex = (int)TaskSettings.CaptureSettings.SurfaceOptions.Mouse4ClickAction;
cbRegionCaptureMouse4ClickAction.SelectedIndex = (int)TaskSettings.CaptureSettings.SurfaceOptions.RegionCaptureActionX1Click;
cbRegionCaptureMouse5ClickAction.Items.AddRange(Helpers.GetLocalizedEnumDescriptions<RegionCaptureAction>());
cbRegionCaptureMouse5ClickAction.SelectedIndex = (int)TaskSettings.CaptureSettings.SurfaceOptions.Mouse5ClickAction;
cbRegionCaptureMouse5ClickAction.SelectedIndex = (int)TaskSettings.CaptureSettings.SurfaceOptions.RegionCaptureActionX2Click;
cbRegionCaptureDetectWindows.Checked = TaskSettings.CaptureSettings.SurfaceOptions.DetectWindows;
cbRegionCaptureDetectControls.Enabled = TaskSettings.CaptureSettings.SurfaceOptions.DetectWindows;
cbRegionCaptureDetectControls.Checked = TaskSettings.CaptureSettings.SurfaceOptions.DetectControls;
@ -252,7 +252,7 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false)
CodeMenu.Create<CodeMenuEntryPixelInfo>(txtRegionCaptureCustomInfoText);
txtRegionCaptureCustomInfoText.Text = TaskSettings.CaptureSettings.SurfaceOptions.CustomInfoText;
cbRegionCaptureSnapSizes.Items.AddRange(TaskSettings.CaptureSettings.SurfaceOptions.SnapSizes.ToArray());
cbRegionCaptureShowTips.Checked = TaskSettings.CaptureSettings.SurfaceOptions.ShowTips;
cbRegionCaptureShowTips.Checked = TaskSettings.CaptureSettings.SurfaceOptions.ShowHotkeys;
cbRegionCaptureShowInfo.Checked = TaskSettings.CaptureSettings.SurfaceOptions.ShowInfo;
cbRegionCaptureShowMagnifier.Checked = TaskSettings.CaptureSettings.SurfaceOptions.ShowMagnifier;
cbRegionCaptureUseSquareMagnifier.Enabled = nudRegionCaptureMagnifierPixelCount.Enabled = nudRegionCaptureMagnifierPixelSize.Enabled = TaskSettings.CaptureSettings.SurfaceOptions.ShowMagnifier;
@ -879,22 +879,22 @@ private void cbRegionCaptureMultiRegionMode_CheckedChanged(object sender, EventA
private void cbRegionCaptureMouseRightClickAction_SelectedIndexChanged(object sender, EventArgs e)
{
TaskSettings.CaptureSettings.SurfaceOptions.MouseRightClickAction = (RegionCaptureAction)cbRegionCaptureMouseRightClickAction.SelectedIndex;
TaskSettings.CaptureSettings.SurfaceOptions.RegionCaptureActionRightClick = (RegionCaptureAction)cbRegionCaptureMouseRightClickAction.SelectedIndex;
}
private void cbRegionCaptureMouseMiddleClickAction_SelectedIndexChanged(object sender, EventArgs e)
{
TaskSettings.CaptureSettings.SurfaceOptions.MouseMiddleClickAction = (RegionCaptureAction)cbRegionCaptureMouseMiddleClickAction.SelectedIndex;
TaskSettings.CaptureSettings.SurfaceOptions.RegionCaptureActionMiddleClick = (RegionCaptureAction)cbRegionCaptureMouseMiddleClickAction.SelectedIndex;
}
private void cbRegionCaptureMouse4ClickAction_SelectedIndexChanged(object sender, EventArgs e)
{
TaskSettings.CaptureSettings.SurfaceOptions.Mouse4ClickAction = (RegionCaptureAction)cbRegionCaptureMouse4ClickAction.SelectedIndex;
TaskSettings.CaptureSettings.SurfaceOptions.RegionCaptureActionX1Click = (RegionCaptureAction)cbRegionCaptureMouse4ClickAction.SelectedIndex;
}
private void cbRegionCaptureMouse5ClickAction_SelectedIndexChanged(object sender, EventArgs e)
{
TaskSettings.CaptureSettings.SurfaceOptions.Mouse5ClickAction = (RegionCaptureAction)cbRegionCaptureMouse5ClickAction.SelectedIndex;
TaskSettings.CaptureSettings.SurfaceOptions.RegionCaptureActionX2Click = (RegionCaptureAction)cbRegionCaptureMouse5ClickAction.SelectedIndex;
}
private void cbRegionCaptureDetectWindows_CheckedChanged(object sender, EventArgs e)
@ -957,7 +957,7 @@ private void btnRegionCaptureSnapSizesDialogCancel_Click(object sender, EventArg
private void cbRegionCaptureShowTips_CheckedChanged(object sender, EventArgs e)
{
TaskSettings.CaptureSettings.SurfaceOptions.ShowTips = cbRegionCaptureShowTips.Checked;
TaskSettings.CaptureSettings.SurfaceOptions.ShowHotkeys = cbRegionCaptureShowTips.Checked;
}
private void cbRegionCaptureShowInfo_CheckedChanged(object sender, EventArgs e)