CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-29 03:30:43 +12:00
Code Issues Packages Projects Releases Wiki Activity

Refactor CodeMenu, show CodeMenu at bottom in screenshots folder textbox

Browse source
This commit is contained in:
Jaex 2020-04-28 04:44:37 +03:00
parent 377752fe13
commit b6a138b663
3 changed files with 116 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

205
ShareX.HelpersLib/NameParser/CodeMenu.cs
View file

@ -31,14 +31,115 @@
namespace ShareX.HelpersLib
{
public static class CodeMenu
public class CodeMenu : ContextMenuStrip
{
public static ContextMenuStrip Create<TEntry>(TextBoxBase tb, params TEntry[] ignoreList) where TEntry : CodeMenuEntry
public Point MenuLocation
{
return Create(tb, ignoreList, (CodeMenuItem[])null);
get
{
if (MenuLocationBottom)
{
return new Point(0, textBoxBase.Height + 1);
}
return new Point(textBoxBase.Width + 1, 0);
}
}
public static ContextMenuStrip Create<TEntry>(TextBoxBase tb, TEntry[] ignoreList, CodeMenuItem[] extraItems) where TEntry : CodeMenuEntry
public bool MenuLocationBottom { get; set; }
private TextBoxBase textBoxBase;
public CodeMenu(TextBoxBase tbb, CodeMenuItem[] items)
{
textBoxBase = tbb;
Font = new Font("Lucida Console", 8);
AutoClose = textBoxBase == null;
ShowImageMargin = false;
if (ShareXResources.ExperimentalCustomTheme)
{
Opacity = ShareXResources.Theme.ContextMenuOpacityDouble;
Renderer = new ToolStripDarkRenderer();
}
foreach (CodeMenuItem item in items)
{
ToolStripMenuItem tsmi = new ToolStripMenuItem { Text = $"{item.Name} - {item.Description}", Tag = item.Name };
tsmi.MouseUp += (sender, e) =>
{
if (textBoxBase != null && e.Button == MouseButtons.Left)
{
string text = ((ToolStripMenuItem)sender).Tag.ToString();
textBoxBase.AppendTextToSelection(text);
}
else
{
Close();
}
};
if (string.IsNullOrWhiteSpace(item.Category))
{
Items.Add(tsmi);
}
else
{
ToolStripMenuItem tsmiParent;
int index = Items.IndexOfKey(item.Category);
if (index < 0)
{
tsmiParent = new ToolStripMenuItem { Text = item.Category, Tag = item.Category, Name = item.Category };
tsmiParent.HideImageMargin();
Items.Add(tsmiParent);
}
else
{
tsmiParent = Items[index] as ToolStripMenuItem;
}
tsmiParent.DropDownItems.Add(tsmi);
}
}
Items.Add(new ToolStripSeparator());
ToolStripMenuItem tsmiClose = new ToolStripMenuItem(Resources.CodeMenu_Create_Close);
tsmiClose.Click += (sender, e) => Close();
Items.Add(tsmiClose);
if (textBoxBase != null)
{
textBoxBase.MouseDown += (sender, e) =>
{
if (Items.Count > 0) Show(textBoxBase, MenuLocation);
};
textBoxBase.GotFocus += (sender, e) =>
{
if (Items.Count > 0) Show(textBoxBase, MenuLocation);
};
textBoxBase.LostFocus += (sender, e) =>
{
if (Visible) Close();
};
textBoxBase.KeyDown += (sender, e) =>
{
if ((e.KeyCode == Keys.Enter || e.KeyCode == Keys.Escape) && Visible)
{
Close();
e.SuppressKeyPress = true;
}
};
textBoxBase.Disposed += (sender, e) => Dispose();
}
}
public static CodeMenu Create<TEntry>(TextBoxBase tb, TEntry[] ignoreList, CodeMenuItem[] extraItems) where TEntry : CodeMenuEntry
{
List<CodeMenuItem> items = new List<CodeMenuItem>();
@ -47,103 +148,17 @@ public static class CodeMenu
items.AddRange(extraItems);
}
IEnumerable<CodeMenuItem> variables = Helpers.GetValueFields<TEntry>().Where(x => !ignoreList.Contains(x)).
IEnumerable<CodeMenuItem> codeMenuItems = Helpers.GetValueFields<TEntry>().Where(x => !ignoreList.Contains(x)).
Select(x => new CodeMenuItem(x.ToPrefixString(), x.Description, x.Category));
items.AddRange(variables);
items.AddRange(codeMenuItems);
return Create(tb, items.ToArray());
return new CodeMenu(tb, items.ToArray());
}
public static ContextMenuStrip Create(TextBoxBase tb, CodeMenuItem[] items)
public static CodeMenu Create<TEntry>(TextBoxBase tb, params TEntry[] ignoreList) where TEntry : CodeMenuEntry
{
ContextMenuStrip cms = new ContextMenuStrip
{
Font = new Font("Lucida Console", 8),
AutoClose = tb == null,
Opacity = ShareXResources.Theme.ContextMenuOpacityDouble,
ShowImageMargin = false
};
if (ShareXResources.ExperimentalCustomTheme)
{
cms.Renderer = new ToolStripDarkRenderer();
}
foreach (CodeMenuItem item in items)
{
ToolStripMenuItem tsmi = new ToolStripMenuItem { Text = $"{item.Name} - {item.Description}", Tag = item.Name };
tsmi.MouseUp += (sender, e) =>
{
if (tb != null && e.Button == MouseButtons.Left)
{
string text = ((ToolStripMenuItem)sender).Tag.ToString();
tb.AppendTextToSelection(text);
}
else
{
cms.Close();
}
};
if (string.IsNullOrWhiteSpace(item.Category))
{
cms.Items.Add(tsmi);
}
else
{
ToolStripMenuItem tsmiParent;
int index = cms.Items.IndexOfKey(item.Category);
if (index < 0)
{
tsmiParent = new ToolStripMenuItem { Text = item.Category, Tag = item.Category, Name = item.Category };
tsmiParent.HideImageMargin();
cms.Items.Add(tsmiParent);
}
else
{
tsmiParent = cms.Items[index] as ToolStripMenuItem;
}
tsmiParent.DropDownItems.Add(tsmi);
}
}
cms.Items.Add(new ToolStripSeparator());
ToolStripMenuItem tsmiClose = new ToolStripMenuItem(Resources.CodeMenu_Create_Close);
tsmiClose.Click += (sender, e) => cms.Close();
cms.Items.Add(tsmiClose);
if (tb != null)
{
tb.MouseDown += (sender, e) =>
{
if (cms.Items.Count > 0) cms.Show(tb, new Point(tb.Width + 1, 0));
};
tb.GotFocus += (sender, e) =>
{
if (cms.Items.Count > 0) cms.Show(tb, new Point(tb.Width + 1, 0));
};
tb.LostFocus += (sender, e) =>
{
if (cms.Visible) cms.Close();
};
tb.KeyDown += (sender, e) =>
{
if ((e.KeyCode == Keys.Enter || e.KeyCode == Keys.Escape) && cms.Visible)
{
cms.Close();
e.SuppressKeyPress = true;
}
};
tb.Disposed += (sender, e) => cms.Dispose();
}
return cms;
return Create(tb, ignoreList, (CodeMenuItem[])null);
}
}
}

6
ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.cs
View file

@ -87,9 +87,9 @@ public CustomUploaderSettingsForm(UploadersConfig config)
new CodeMenuItem("$base64:input$", "Base64 encode input")
};
CodeMenu.Create(rtbResultURL, outputCodeMenuItems);
CodeMenu.Create(rtbResultThumbnailURL, outputCodeMenuItems);
CodeMenu.Create(rtbResultDeletionURL, outputCodeMenuItems);
new CodeMenu(rtbResultURL, outputCodeMenuItems);
new CodeMenu(rtbResultThumbnailURL, outputCodeMenuItems);
new CodeMenu(rtbResultDeletionURL, outputCodeMenuItems);
rtbRequestURL.AddContextMenu();
rtbData.AddContextMenu();

4
ShareX/Forms/TaskSettingsForm.cs
View file

@ -164,7 +164,9 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false)
}
cbOverrideScreenshotsFolder.Checked = TaskSettings.OverrideScreenshotsFolder;
CodeMenu.Create<CodeMenuEntryFilename>(txtScreenshotsFolder, CodeMenuEntryFilename.t, CodeMenuEntryFilename.pn, CodeMenuEntryFilename.i, CodeMenuEntryFilename.width, CodeMenuEntryFilename.height, CodeMenuEntryFilename.n);
CodeMenu screenshotsFolderMenu = CodeMenu.Create<CodeMenuEntryFilename>(txtScreenshotsFolder, CodeMenuEntryFilename.t, CodeMenuEntryFilename.pn,
CodeMenuEntryFilename.i, CodeMenuEntryFilename.width, CodeMenuEntryFilename.height, CodeMenuEntryFilename.n);
screenshotsFolderMenu.MenuLocationBottom = true;
txtScreenshotsFolder.Text = TaskSettings.ScreenshotsFolder;
txtScreenshotsFolder.Enabled = btnScreenshotsFolderBrowse.Enabled = TaskSettings.OverrideScreenshotsFolder;