mirror of https://github.com/ShareX/ShareX.git
fixed #7305: Improve icon detection in quick task menu
This commit is contained in:
parent
8b96a53262
commit
5e317dc5b2
|
@ -114,6 +114,7 @@
|
|||
this.Controls.Add(this.btnAdd);
|
||||
this.Controls.Add(this.lvPresets);
|
||||
this.Name = "QuickTaskMenuEditorForm";
|
||||
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
|
||||
|
|
|
@ -142,7 +142,7 @@
|
|||
<value>lvPresets</value>
|
||||
</data>
|
||||
<data name=">>lvPresets.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=16.0.3.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>lvPresets.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
|
|
|
@ -25,7 +25,9 @@
|
|||
|
||||
using ShareX.HelpersLib;
|
||||
using ShareX.Properties;
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing;
|
||||
using System.Linq;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace ShareX
|
||||
|
@ -123,20 +125,16 @@ namespace ShareX
|
|||
|
||||
public Image FindSuitableIcon(QuickTaskInfo taskInfo)
|
||||
{
|
||||
if (taskInfo.AfterCaptureTasks.HasFlag(AfterCaptureTasks.UploadImageToHost))
|
||||
IEnumerable<AfterCaptureTasks> afterCaptureTasks = taskInfo.AfterCaptureTasks.GetFlags();
|
||||
|
||||
if (afterCaptureTasks.Count() > 0)
|
||||
{
|
||||
return Resources.upload_cloud;
|
||||
}
|
||||
else if (taskInfo.AfterCaptureTasks.HasFlag(AfterCaptureTasks.CopyImageToClipboard) || taskInfo.AfterCaptureTasks.HasFlag(AfterCaptureTasks.CopyFileToClipboard))
|
||||
{
|
||||
return Resources.clipboard;
|
||||
}
|
||||
else if (taskInfo.AfterCaptureTasks.HasFlag(AfterCaptureTasks.SaveImageToFile) || taskInfo.AfterCaptureTasks.HasFlag(AfterCaptureTasks.SaveImageToFileWithDialog))
|
||||
{
|
||||
return Resources.disk_black;
|
||||
AfterCaptureTasks last = afterCaptureTasks.Last();
|
||||
|
||||
return TaskHelpers.FindMenuIcon(last);
|
||||
}
|
||||
|
||||
return Resources.image;
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue