From a21f638432b6cee55cf93da3c7e611223aef5501 Mon Sep 17 00:00:00 2001
From: Piyush Mishra <piyush.raj.kit@gmail.com>
Date: Sat, 5 Mar 2022 19:57:26 +0530
Subject: [PATCH] Fixed missing stuffs with image formats

---
 src/config_window.rs | 15 ++++++++++++++-
 src/utils.rs         |  6 ++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/config_window.rs b/src/config_window.rs
index 889915d..7e2f689 100644
--- a/src/config_window.rs
+++ b/src/config_window.rs
@@ -504,6 +504,19 @@ impl ConfigWindow {
         utils::set_color_btn_rgba(config.color_layer, &mut self.translucent_layer_rgb);
         self.translucent_layer_alpha
             .set_value(config.color_layer[3] as f64);
+
+        match config.image_format.as_str() {
+            "png" => {
+                self.png_format.set_value(true);
+                self.jpeg_format.set_value(false)
+            }
+            "jpg" => {
+                self.png_format.set_value(false);
+                self.jpeg_format.set_value(true)
+            }
+            _ => (),
+        }
+
         *self.did_save.borrow_mut() = false;
         drop(config);
         self.win.show();
@@ -1062,7 +1075,7 @@ impl ConfigWindow {
                 .borrow_mut()
                 .get_mut(&browse.selected_text().unwrap())
             {
-                conf.image_format = "jpeg".to_owned();
+                conf.image_format = "jpg".to_owned();
             }
         });
 
diff --git a/src/utils.rs b/src/utils.rs
index 6b3b96e..cf5358b 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -263,7 +263,7 @@ impl ImageContainer {
                     warn!("Failed to export Image!\n{:?}", e);
                 }
             }
-            "jpeg" => {
+            "jpg" => {
                 let mut encoder =
                     image::codecs::jpeg::JpegEncoder::new_with_quality(&mut output, 100);
                 encoder.set_pixel_density(image::codecs::jpeg::PixelDensity::dpi(300));
@@ -317,6 +317,8 @@ impl ImageContainer {
 
     pub(crate) fn delete(&self) {
         let prop = self.properties.read().unwrap();
+        let config = globals::CONFIG.read().unwrap();
+        let export_format = config.image_format.as_str();
 
         let path_original = match &prop.path {
             Some(p) => Path::new(p),
@@ -325,7 +327,7 @@ impl ImageContainer {
         let path_properties = path_original.with_extension("prop");
         let export = path_original.parent().unwrap().join("export").join(
             path_original
-                .with_extension("jpg")
+                .with_extension(export_format)
                 .file_name()
                 .unwrap()
                 .to_str()