Improved image load/save dialog

MrGongqi · Nov 20, 2013 · d3c110b · d3c110b
1 parent 4c3cdcc
commit d3c110b
Show file tree

Hide file tree

Showing 6 changed files with 99 additions and 39 deletions.
diff --git a/HelpersLib/Helpers/Helpers.cs b/HelpersLib/Helpers/Helpers.cs
@@ -311,6 +311,22 @@ public static string GetProperName(string name)
             return sb.ToString();
         }
 
+        public static string GetProperExtension(string filePath)
+        {
+            if (!string.IsNullOrEmpty(filePath))
+            {
+                int dot = filePath.LastIndexOf('.');
+
+                if (dot >= 0)
+                {
+                    string ext = filePath.Substring(dot + 1);
+                    return ext.ToLowerInvariant();
+                }
+            }
+
+            return null;
+        }
+
         public static string Encode(string text, string unreservedCharacters)
         {
             StringBuilder result = new StringBuilder();

diff --git a/HelpersLib/Helpers/ImageHelpers.cs b/HelpersLib/Helpers/ImageHelpers.cs
@@ -59,6 +59,7 @@ You should have received a copy of the GNU General Public License
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
+using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -950,5 +951,68 @@ public static Bitmap Sharpen(Image image, double strength)
             }
             return null;
         }
+
+        public static string OpenImageFileDialog()
+        {
+            using (OpenFileDialog ofd = new OpenFileDialog())
+            {
+                ofd.Filter = "Image files (*.png, *.jpg, *.jpeg, *.jpe, *.jfif, *.gif, *.bmp, *.tif, *.tiff)|*.png;*.jpg;*.jpeg;*.jpe;*.jfif;*.gif;*.bmp;*.tif;*.tiff|" +
+                    "PNG (*.png)|*.png|JPEG (*.jpg, *.jpeg, *.jpe, *.jfif)|*.jpg;*.jpeg;*.jpe;*.jfif|GIF (*.gif)|*.gif|BMP (*.bmp)|*.bmp|TIFF (*.tif, *.tiff)|*.tif;*.tiff|" +
+                    "All files (*.*)|*.*";
+
+                if (ofd.ShowDialog() == DialogResult.OK)
+                {
+                    return ofd.FileName;
+                }
+            }
+
+            return null;
+        }
+
+        public static void SaveImageFileDialog(Image img)
+        {
+            using (SaveFileDialog sfd = new SaveFileDialog())
+            {
+                sfd.DefaultExt = ".png";
+                sfd.Filter = "PNG (*.png)|*.png|JPEG (*.jpg, *.jpeg, *.jpe, *.jfif)|*.jpg;*.jpeg;*.jpe;*.jfif|GIF (*.gif)|*.gif|BMP (*.bmp)|*.bmp|TIFF (*.tif, *.tiff)|*.tif;*.tiff";
+
+                if (sfd.ShowDialog() == DialogResult.OK)
+                {
+                    string filePath = sfd.FileName;
+                    string ext = Helpers.GetProperExtension(filePath);
+
+                    if (!string.IsNullOrEmpty(ext))
+                    {
+                        ImageFormat imageFormat;
+
+                        switch (ext)
+                        {
+                            default:
+                            case "png":
+                                imageFormat = ImageFormat.Png;
+                                break;
+                            case "jpg":
+                            case "jpeg":
+                            case "jpe":
+                            case "jfif":
+                                imageFormat = ImageFormat.Jpeg;
+                                break;
+                            case "gif":
+                                imageFormat = ImageFormat.Gif;
+                                break;
+                            case "bmp":
+                                imageFormat = ImageFormat.Bmp;
+                                break;
+                            case "tif":
+                            case "tiff":
+                                imageFormat = ImageFormat.Tiff;
+                                break;
+                        }
+
+                        img.Save(filePath, imageFormat);
+                    }
+                }
+            }
+        }
     }
 }
diff --git a/HelpersLib/Helpers/SSLBypassHelper.cs b/HelpersLib/Helpers/SSLBypassHelper.cs
@@ -24,13 +24,12 @@ You should have received a copy of the GNU General Public License
 #endregion License Information (GPL v3)
 
 using System;
+using System.Net;
+using System.Net.Security;
+using System.Security.Cryptography.X509Certificates;
 
 namespace HelpersLib
 {
-    using System.Net;
-    using System.Net.Security;
-    using System.Security.Cryptography.X509Certificates;
-
     public class SSLBypassHelper : IDisposable
     {
         public SSLBypassHelper()

diff --git a/HelpersLib/UITypeEditors/ImageFileNameEditor.cs b/HelpersLib/UITypeEditors/ImageFileNameEditor.cs
@@ -39,14 +39,11 @@ public override object EditValue(ITypeDescriptorContext context, IServiceProvide
                 return base.EditValue(context, provider, value);
             }
 
-            using (OpenFileDialog ofd = new OpenFileDialog())
-            {
-                ofd.Filter = "All image types (*.jpg, *.jpeg, *.png, *.gif, *.bmp, *.tif, *.tiff)|*.jpg;*.jpeg;*.png;*.gif;*.bmp;*.tif;*.tiff";
+            string filePath = ImageHelpers.OpenImageFileDialog();
 
-                if (ofd.ShowDialog() == DialogResult.OK)
-                {
-                    value = ofd.FileName;
-                }
+            if (!string.IsNullOrEmpty(filePath))
+            {
+                value = filePath;
             }
 
             return value;

diff --git a/ImageEffectsLib/ImageEffectsForm.cs b/ImageEffectsLib/ImageEffectsForm.cs
@@ -340,34 +340,21 @@ private void btnSettingsImport_Click(object sender, EventArgs e)
 
         private void btnLoadImage_Click(object sender, EventArgs e)
         {
-            using (OpenFileDialog ofd = new OpenFileDialog())
-            {
-                ofd.Title = "Browse for images...";
-                ofd.Filter = "Image files (*.jpg, *.jpeg, *.png, *.gif, *.bmp)|*.jpg;*.jpeg;*.png;*.gif;*.bmp";
+            string filePath = ImageHelpers.OpenImageFileDialog();
 
-                if (ofd.ShowDialog() == DialogResult.OK)
-                {
-                    if (DefaultImage != null) DefaultImage.Dispose();
-                    DefaultImage = Helpers.GetImageFromFile(ofd.FileName);
-                    UpdatePreview();
-                }
+            if (!string.IsNullOrEmpty(filePath))
+            {
+                if (DefaultImage != null) DefaultImage.Dispose();
+                DefaultImage = Helpers.GetImageFromFile(filePath);
+                UpdatePreview();
             }
         }
 
         private void btnSaveImage_Click(object sender, EventArgs e)
         {
-            using (SaveFileDialog sfd = new SaveFileDialog())
+            using (Image img = ApplyEffects())
             {
-                sfd.DefaultExt = ".png";
-                sfd.Filter = "PNG image (*.png)|*.png";
-
-                if (sfd.ShowDialog() == DialogResult.OK)
-                {
-                    using (Image preview = ApplyEffects())
-                    {
-                        preview.Save(sfd.FileName, ImageFormat.Png);
-                    }
-                }
+                ImageHelpers.SaveImageFileDialog(img);
             }
         }
 

diff --git a/ImageEffectsLib/WatermarkForm.cs b/ImageEffectsLib/WatermarkForm.cs
@@ -230,14 +230,11 @@ private void txtWatermarkImageLocation_TextChanged(object sender, EventArgs e)
 
         private void btwWatermarkBrowseImage_Click(object sender, EventArgs e)
         {
-            using (OpenFileDialog ofd = new OpenFileDialog())
-            {
-                ofd.Filter = "All image types (*.jpg, *.jpeg, *.png, *.gif, *.bmp, *.tif, *.tiff)|*.jpg;*.jpeg;*.png;*.gif;*.bmp;*.tif;*.tiff";
+            string filePath = ImageHelpers.OpenImageFileDialog();
 
-                if (ofd.ShowDialog() == DialogResult.OK)
-                {
-                    txtWatermarkImageLocation.Text = ofd.FileName;
-                }
+            if (!string.IsNullOrEmpty(filePath))
+            {
+                txtWatermarkImageLocation.Text = filePath;
             }
         }
     }