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

Code refactoring

Browse source
This commit is contained in:
Jaex 2024-04-03 08:18:18 +03:00
parent 5e317dc5b2
commit 2dc5f2d7fc
2 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ShareX/QuickTaskInfo.cs
View file

@ -25,6 +25,7 @@
using ShareX.HelpersLib; using ShareX.HelpersLib;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing;
using System.Linq; using System.Linq;
namespace ShareX namespace ShareX
@ -43,6 +44,23 @@ public bool IsValid
} }
} }
public Image Icon
{
get
{
IEnumerable<AfterCaptureTasks> flags = AfterCaptureTasks.GetFlags();
if (flags.Count() > 0)
{
AfterCaptureTasks last = flags.Last();
return TaskHelpers.FindMenuIcon(last);
}
return null;
}
}
public static List<QuickTaskInfo> DefaultPresets => new List<QuickTaskInfo>() public static List<QuickTaskInfo> DefaultPresets => new List<QuickTaskInfo>()
{ {
new QuickTaskInfo("Save, Upload, Copy URL", AfterCaptureTasks.SaveImageToFile | AfterCaptureTasks.UploadImageToHost, AfterUploadTasks.CopyURLToClipboard), new QuickTaskInfo("Save, Upload, Copy URL", AfterCaptureTasks.SaveImageToFile | AfterCaptureTasks.UploadImageToHost, AfterUploadTasks.CopyURLToClipboard),

20
ShareX/QuickTaskMenu.cs
View file

@ -25,9 +25,7 @@
using ShareX.HelpersLib; using ShareX.HelpersLib;
using ShareX.Properties; using ShareX.Properties;
using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Linq;
using System.Windows.Forms; using System.Windows.Forms;
namespace ShareX namespace ShareX
@ -71,11 +69,11 @@ public void ShowMenu()
if (taskInfo.IsValid) if (taskInfo.IsValid)
{ {
ToolStripMenuItem tsmi = new ToolStripMenuItem { Text = taskInfo.ToString().Replace("&", "&&"), Tag = taskInfo }; ToolStripMenuItem tsmi = new ToolStripMenuItem { Text = taskInfo.ToString().Replace("&", "&&"), Tag = taskInfo };
tsmi.Image = FindSuitableIcon(taskInfo); tsmi.Image = taskInfo.Icon;
tsmi.Click += (sender, e) => tsmi.Click += (sender, e) =>
{ {
QuickTaskInfo selectedTaskInfo = ((ToolStripMenuItem)sender).Tag as QuickTaskInfo;
cms.Close(); cms.Close();
QuickTaskInfo selectedTaskInfo = ((ToolStripMenuItem)sender).Tag as QuickTaskInfo;
OnTaskInfoSelected(selectedTaskInfo); OnTaskInfoSelected(selectedTaskInfo);
}; };
cms.Items.Add(tsmi); cms.Items.Add(tsmi);
@ -122,19 +120,5 @@ protected void OnTaskInfoSelected(QuickTaskInfo taskInfo)
{ {
TaskInfoSelected?.Invoke(taskInfo); TaskInfoSelected?.Invoke(taskInfo);
} }
public Image FindSuitableIcon(QuickTaskInfo taskInfo)
{
IEnumerable<AfterCaptureTasks> afterCaptureTasks = taskInfo.AfterCaptureTasks.GetFlags();
if (afterCaptureTasks.Count() > 0)
{
AfterCaptureTasks last = afterCaptureTasks.Last();
return TaskHelpers.FindMenuIcon(last);
}
return null;
}
} }
} }