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

Merge pull request #2876 from Jaex/editor-mode-options-menu

Browse source 
Show options menu in editor mode and save options
This commit is contained in:
Jaex 2017-10-25 04:00:48 +03:00 committed by GitHub
commit 2967ef2643
3 changed files with 129 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -187,7 +187,7 @@ public void Prepare()
public void Prepare(Image img)
{
ShapeManager = new ShapeManager(this);
ShapeManager.WindowCaptureMode = Config.DetectWindows;
ShapeManager.WindowCaptureMode = !IsEditorMode && Config.DetectWindows;
ShapeManager.IncludeControls = Config.DetectControls;
InitBackground(img);
@ -235,7 +235,7 @@ internal void InitBackground(Image img)
CenterCanvas();
}
else if (Config.UseDimming)
else if (!IsEditorMode && Config.UseDimming)
{
using (Bitmap darkBackground = (Bitmap)Image.Clone())
using (Graphics g = Graphics.FromImage(darkBackground))
@ -604,7 +604,7 @@ private void Draw(Graphics g)
UpdateRegionPath();
// If background is dimmed then draw non dimmed background to region selections
if (Config.UseDimming)
if (!IsEditorMode && Config.UseDimming)
{
using (Region region = new Region(regionDrawPath))
{
@ -706,7 +706,7 @@ private void Draw(Graphics g)
DrawObjects(g);
// Draw F1 tips
if (Config.ShowHotkeys)
if (!IsEditorMode && Config.ShowHotkeys)
{
DrawTips(g);
}

6
ShareX.ScreenCaptureLib/RegionCaptureTasks.cs
View file

@ -162,13 +162,9 @@ public static Image AnnotateImage(Image img, string filePath, RegionCaptureOptio
using (RegionCaptureForm form = new RegionCaptureForm(mode))
{
form.Config = options;
form.ImageFilePath = filePath;
form.Config = GetRegionCaptureOptions(options);
form.Config.DetectWindows = false;
form.Config.ShowHotkeys = false;
form.Config.UseDimming = false;
form.Prepare(img);
form.ShowDialog();

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

@ -646,8 +646,6 @@ internal void CreateToolbar()
#endregion
}
if (!form.IsEditorMode)
{
tsMain.Items.Add(new ToolStripSeparator());
#region Capture
@ -717,6 +715,8 @@ internal void CreateToolbar()
tsddbOptions.Image = Resources.gear;
tsMain.Items.Add(tsddbOptions);
if (!form.IsEditorMode)
{
tsmiQuickCrop = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Multi_region_mode);
tsmiQuickCrop.Checked = !Config.QuickCrop;
tsmiQuickCrop.CheckOnClick = true;
@ -730,6 +730,7 @@ internal void CreateToolbar()
tsmiTips.ShortcutKeyDisplayString = "F1";
tsmiTips.Click += (sender, e) => Config.ShowHotkeys = tsmiTips.Checked;
tsddbOptions.DropDownItems.Add(tsmiTips);
}
ToolStripMenuItem tsmiShowInfo = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Show_position_and_size_info);
tsmiShowInfo.Checked = Config.ShowInfo;
@ -776,6 +777,8 @@ internal void CreateToolbar()
tsmiEnableAnimations.Click += (sender, e) => Config.EnableAnimations = tsmiEnableAnimations.Checked;
tsddbOptions.DropDownItems.Add(tsmiEnableAnimations);
if (!form.IsEditorMode)
{
ToolStripMenuItem tsmiFixedSize = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Fixed_size_region_mode);
tsmiFixedSize.Checked = Config.IsFixedSize;
tsmiFixedSize.CheckOnClick = true;
@ -791,6 +794,7 @@ internal void CreateToolbar()
tslnudFixedSize.Content.Value2 = Config.FixedSize.Height;
tslnudFixedSize.Content.ValueChanged = (sender, e) => Config.FixedSize = new Size((int)tslnudFixedSize.Content.Value, (int)tslnudFixedSize.Content.Value2);
tsddbOptions.DropDownItems.Add(tslnudFixedSize);
}
ToolStripMenuItem tsmiShowFPS = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Show_FPS);
tsmiShowFPS.Checked = Config.ShowFPS;
@ -805,7 +809,6 @@ internal void CreateToolbar()
tsddbOptions.DropDownItems.Add(tsmiRememberMenuState);
#endregion Options
}
ToolStripLabel tslDragRight = new ToolStripLabel()
{