diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 529adea37..34d303629 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -453,6 +453,7 @@ private void AddMultiEnumItems(Action selectedEnum, params ToolStripDropDo for (int i = 0; i < enums.Length; i++) { ToolStripMenuItem tsmi = new ToolStripMenuItem(enums[i]); + tsmi.Image = FindMenuIcon(i + 1); int index = i; @@ -611,6 +612,56 @@ private void UpdateContextMenu() Refresh(); } + private Image FindMenuIcon(int index) + { + T e = Helpers.GetEnumFromIndex(index); + + if (e is AfterCaptureTasks) + { + AfterCaptureTasks afterCaptureTask = (AfterCaptureTasks)(object)e; + + switch (afterCaptureTask) + { + case AfterCaptureTasks.ShowQuickTaskMenu: + return Resources.ui_menu_blue; + case AfterCaptureTasks.ShowAfterCaptureWindow: + return Resources.application_text_image; + case AfterCaptureTasks.AddImageEffects: + return Resources.image_saturation; + case AfterCaptureTasks.AnnotateImage: + return Resources.image_pencil; + case AfterCaptureTasks.CopyImageToClipboard: + return Resources.clipboard_paste_image; + case AfterCaptureTasks.SendImageToPrinter: + return Resources.printer; + case AfterCaptureTasks.SaveImageToFile: + return Resources.disk; + case AfterCaptureTasks.SaveImageToFileWithDialog: + return Resources.disk_rename; + case AfterCaptureTasks.SaveThumbnailImageToFile: + return Resources.disk_small; + case AfterCaptureTasks.PerformActions: + return Resources.application_terminal; + case AfterCaptureTasks.CopyFileToClipboard: + return Resources.clipboard_block; + case AfterCaptureTasks.CopyFilePathToClipboard: + return Resources.clipboard_list; + case AfterCaptureTasks.ShowInExplorer: + return Resources.folder_stand; + case AfterCaptureTasks.DoOCR: + return Resources.edit_drop_cap; + case AfterCaptureTasks.ShowBeforeUploadWindow: + return Resources.application__arrow; + case AfterCaptureTasks.UploadImageToHost: + return Resources.upload_cloud; + case AfterCaptureTasks.DeleteFile: + return Resources.bin; + } + } + + return null; + } + private void CleanCustomClipboardFormats() { tssCopy5.Visible = false; diff --git a/ShareX/Properties/Resources.Designer.cs b/ShareX/Properties/Resources.Designer.cs index cc195e113..7c9bfabfd 100644 --- a/ShareX/Properties/Resources.Designer.cs +++ b/ShareX/Properties/Resources.Designer.cs @@ -141,6 +141,16 @@ public static string ActionsForm_btnOK_Click_Name_can_t_be_empty_ { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap application__arrow { + get { + object obj = ResourceManager.GetObject("application__arrow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -221,6 +231,26 @@ public static System.Drawing.Bitmap application_task { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap application_terminal { + get { + object obj = ResourceManager.GetObject("application_terminal", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap application_text_image { + get { + object obj = ResourceManager.GetObject("application_text_image", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized string similar to Choose screenshots folder path. /// @@ -492,6 +522,16 @@ public static System.Drawing.Bitmap clipboard { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap clipboard_block { + get { + object obj = ResourceManager.GetObject("clipboard_block", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -502,6 +542,16 @@ public static System.Drawing.Bitmap clipboard_list { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap clipboard_paste_image { + get { + object obj = ResourceManager.GetObject("clipboard_paste_image", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized string similar to Supported variables: {0} and other variables such as {1} etc.. /// @@ -612,6 +662,16 @@ public static System.Drawing.Bitmap de { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap disk { + get { + object obj = ResourceManager.GetObject("disk", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -622,6 +682,26 @@ public static System.Drawing.Bitmap disk_black { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap disk_rename { + get { + object obj = ResourceManager.GetObject("disk_rename", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap disk_small { + get { + object obj = ResourceManager.GetObject("disk_small", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -687,7 +767,7 @@ public static string DropForm_DrawDropImage_Drop_here { /// public static System.Drawing.Bitmap edit_drop_cap { get { - object obj = ResourceManager.GetObject("edit-drop-cap", resourceCulture); + object obj = ResourceManager.GetObject("edit_drop_cap", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -817,6 +897,16 @@ public static System.Drawing.Bitmap folder_open_image { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap folder_stand { + get { + object obj = ResourceManager.GetObject("folder_stand", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -1363,6 +1453,16 @@ public static System.Drawing.Bitmap pipette { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap printer { + get { + object obj = ResourceManager.GetObject("printer", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized string similar to Error. /// @@ -1911,6 +2011,16 @@ public static System.Drawing.Bitmap Twitter { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ui_menu_blue { + get { + object obj = ResourceManager.GetObject("ui_menu_blue", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/ShareX/Properties/Resources.resx b/ShareX/Properties/Resources.resx index f2264a385..54edb2b90 100644 --- a/ShareX/Properties/Resources.resx +++ b/ShareX/Properties/Resources.resx @@ -793,7 +793,40 @@ Would you like to restart ShareX? Start screen color picker - + ..\Resources\edit-drop-cap.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\application-terminal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\application-text-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\application--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\clipboard-block.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\clipboard-paste-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\disk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\disk-rename.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\disk-small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\folder-stand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\printer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ui-menu-blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/ShareX/Resources/application--arrow.png b/ShareX/Resources/application--arrow.png new file mode 100644 index 000000000..c961043d8 Binary files /dev/null and b/ShareX/Resources/application--arrow.png differ diff --git a/ShareX/Resources/application-terminal.png b/ShareX/Resources/application-terminal.png new file mode 100644 index 000000000..e773d064e Binary files /dev/null and b/ShareX/Resources/application-terminal.png differ diff --git a/ShareX/Resources/application-text-image.png b/ShareX/Resources/application-text-image.png new file mode 100644 index 000000000..c9abaef6d Binary files /dev/null and b/ShareX/Resources/application-text-image.png differ diff --git a/ShareX/Resources/clipboard-block.png b/ShareX/Resources/clipboard-block.png new file mode 100644 index 000000000..f70e63259 Binary files /dev/null and b/ShareX/Resources/clipboard-block.png differ diff --git a/ShareX/Resources/clipboard-paste-image.png b/ShareX/Resources/clipboard-paste-image.png new file mode 100644 index 000000000..b80481bff Binary files /dev/null and b/ShareX/Resources/clipboard-paste-image.png differ diff --git a/ShareX/Resources/disk-rename.png b/ShareX/Resources/disk-rename.png new file mode 100644 index 000000000..d97dd1eb1 Binary files /dev/null and b/ShareX/Resources/disk-rename.png differ diff --git a/ShareX/Resources/disk-small.png b/ShareX/Resources/disk-small.png new file mode 100644 index 000000000..2f1003048 Binary files /dev/null and b/ShareX/Resources/disk-small.png differ diff --git a/ShareX/Resources/disk.png b/ShareX/Resources/disk.png new file mode 100644 index 000000000..9a89d64ff Binary files /dev/null and b/ShareX/Resources/disk.png differ diff --git a/ShareX/Resources/folder-stand.png b/ShareX/Resources/folder-stand.png new file mode 100644 index 000000000..8d2fe3be8 Binary files /dev/null and b/ShareX/Resources/folder-stand.png differ diff --git a/ShareX/Resources/printer.png b/ShareX/Resources/printer.png new file mode 100644 index 000000000..50ac1f4c2 Binary files /dev/null and b/ShareX/Resources/printer.png differ diff --git a/ShareX/Resources/ui-menu-blue.png b/ShareX/Resources/ui-menu-blue.png new file mode 100644 index 000000000..283b6afba Binary files /dev/null and b/ShareX/Resources/ui-menu-blue.png differ diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj index 0966bec97..3fb954971 100644 --- a/ShareX/ShareX.csproj +++ b/ShareX/ShareX.csproj @@ -1245,6 +1245,17 @@ + + + + + + + + + + +