Added "Insert image" button to editor image menu

ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs

@@ -484,6 +484,16 @@ internal static System.Drawing.Bitmap image_crop {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap image_empty {
+            get {
+                object obj = ResourceManager.GetObject("image_empty", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

ShareX.ScreenCaptureLib/Properties/Resources.resx

@@ -693,4 +693,7 @@ Distance: {6:0.00} px / Angle: {7:0.00}°</value>
   <data name="image__plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\image--plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="image_empty" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\image-empty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs

@@ -1540,6 +1540,28 @@ private void LoadImageFile(string filePath)
             }
         }
 
+        private void InsertImage()
+        {
+            string filePath = ImageHelpers.OpenImageFileDialog();
+
+            if (!string.IsNullOrEmpty(filePath))
+            {
+                Image img = ImageHelpers.LoadImage(filePath);
+
+                if (img != null)
+                {
+                    CurrentTool = ShapeType.DrawingImage;
+                    ImageDrawingShape shape = (ImageDrawingShape)CreateShape(ShapeType.DrawingImage);
+                    Point pos = Form.ClientArea.Center();
+                    shape.Rectangle = new Rectangle(pos.X, pos.Y, 1, 1);
+                    shape.SetImage(img, true);
+                    shape.OnCreated();
+                    AddShape(shape);
+                    SelectCurrentShape();
+                }
+            }
+        }
+
         private void ChangeImageSize()
         {
             Size oldSize = Form.Canvas.Size;

ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs

@@ -621,7 +621,7 @@ internal void CreateToolbar()
                 tsMain.Items.Add(tsddbImage);
 
                 ToolStripMenuItem tsmiNewImage = new ToolStripMenuItem("New image...");
-                tsmiNewImage.Image = Resources.image__plus;
+                tsmiNewImage.Image = Resources.image_empty;
                 tsmiNewImage.Click += (sender, e) =>
                 {
                     Form.Pause();
@@ -635,6 +635,11 @@ internal void CreateToolbar()
                 tsmiOpenImage.Click += (sender, e) => OpenImage();
                 tsddbImage.DropDownItems.Add(tsmiOpenImage);
 
+                ToolStripMenuItem tsmiInsertImage = new ToolStripMenuItem("Insert image...");
+                tsmiInsertImage.Image = Resources.image__plus;
+                tsmiInsertImage.Click += (sender, e) => InsertImage();
+                tsddbImage.DropDownItems.Add(tsmiInsertImage);
+
                 tsddbImage.DropDownItems.Add(new ToolStripSeparator());
 
                 ToolStripMenuItem tsmiImageSize = new ToolStripMenuItem(Resources.ShapeManager_CreateToolbar_ImageSize);

ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj

@@ -209,6 +209,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\image-empty.png" />
     <None Include="Resources\image--plus.png" />
     <None Include="Resources\image-resize.png" />
     <None Include="Resources\layer-flip.png" />