Message and alert dialog from main thread

src/draw_thread.rs

@@ -24,7 +24,7 @@ use crate::{
 use fltk::{
     app,
     button::Button,
-    dialog, enums,
+    enums,
     frame::Frame,
     input::{Input, MultilineInput},
     menu,
@@ -274,15 +274,10 @@ fn load_image(
         let read = match serde_json::from_str::<ImagePropertiesFile>(&read) {
             Ok(r) => r,
             Err(e) => {
-                warn!("Config is corrupt\n{:?}", e);
+                Result::<(),_>::Err(e).warn_log("Config is corrupt");
-                match dialog::choice_default("Config is corrupt, fix??", "yes", "no", "") {
-                    1 => {
                 fs::remove_file(&properties_file).warn_log("Failed to delete image properties file!");
                 ImagePropertiesFile::default()
             }
-                    _ => return,
-                }
-            }
         };
 
         let mut properties = cont.properties.write().unwrap();
@@ -377,7 +372,7 @@ fn show_images_details(images_list: Arc<RwLock<Vec<ImageInfo>>>) {
         }
     }
 
-    dialog::message_default(&format!("With Quote: {}\nWithout Quote: {}", image_with_quote, image_without_quote));
+    utils::show_message(&format!("With Quote: {}\nWithout Quote: {}", image_with_quote, image_without_quote));
 }
 
 /// Flush the Buffer from image container to drawing buffer for fltk

src/globals.rs

@@ -29,6 +29,9 @@ lazy_static! {
     pub(crate) static ref CONFIG: RwLock<config::ConfigFile> =
         RwLock::new(config::ConfigFile::load());
 
+    /// Main Sender 
+    pub(crate) static ref MAIN_SENDER: RwLock<Option<fltk::app::Sender<crate::AppMessage>>> = RwLock::new(None);
+
     /// TTF Font for Quote
     pub(crate) static ref FONT_QUOTE: Font<'static> = {
         let mut buffer = Vec::new();

src/main.rs

@@ -42,6 +42,8 @@ use std::sync::{Arc, RwLock};
 pub(crate) enum AppMessage {
     /// Copy recived image buffer from draw_thread to Buffer for fltk frame
     RedrawMainWindowImage(Option<Vec<u8>>),
+    Message(String),
+    Alert(String)
 }
 
 fn main() {
@@ -67,7 +69,8 @@ fn main() {
     let draw_buff: Arc<RwLock<Option<Vec<u8>>>> = Arc::new(RwLock::new(None));
 
     let (main_sender, main_receiver) = channel::<AppMessage>();
-    let mut main_window = MainWindow::new(main_sender, Arc::clone(&draw_buff));
+    *globals::MAIN_SENDER.write().unwrap() = Some(main_sender);
+    let mut main_window = MainWindow::new(Arc::clone(&draw_buff));
 
     while app.wait() {
         if let Some(msg) = main_receiver.recv() {
@@ -77,6 +80,12 @@ fn main() {
                     *buff = data;
                     main_window.win.redraw();
                 }
+                AppMessage::Message(msg) => {
+                    dialog::message_default(&msg);
+                }
+                AppMessage::Alert(msg) => {
+                    dialog::alert_default(&msg)
+                }
             }
         }
     }

src/main_window.rs

@@ -23,7 +23,6 @@ use crate::utils::ImageType;
 use crate::utils::ImageProperties;
 use crate::{config_window::ConfigWindow, globals};
 use fltk::{
-    app,
     button::Button,
     dialog,
     dialog::NativeFileChooser,
@@ -101,7 +100,7 @@ pub(crate) struct Page {
 
 impl MainWindow {
     pub(crate) fn new(
-        sender: app::Sender<crate::AppMessage>,
+        // sender: app::Sender<crate::AppMessage>,
         draw_buff: Arc<RwLock<Option<Vec<u8>>>>,
     ) -> Self {
         let mut win = Window::new(0, 0, 1100, 700, "Post Maker").center_screen();
@@ -394,7 +393,11 @@ impl MainWindow {
             },
             sender: rx,
         };
-        spawn_image_thread(tx, sender, Arc::clone(&properties), &main_win);
+
+        let a = globals::MAIN_SENDER.read().unwrap();
+        if let Some(a) = &*a {
+            spawn_image_thread(tx, a.to_owned(), Arc::clone(&properties), &main_win);
+        }
         main_win.menu();
         main_win.draw();
         main_win.events();

src/result_ext.rs

@@ -1,6 +1,7 @@
 use std::fmt::Debug;
 use std::panic::Location;
-use fltk::dialog;
+
+use crate::utils;
 
 pub trait ResultExt<T, E> {
     fn expect_log(self, msg: &str) -> T;
@@ -14,7 +15,7 @@ impl<T, E: Debug> ResultExt<T, E> for Result<T, E> {
         match self {
             Ok(v) => v,
             Err(e) => {
-                dialog::alert_default(msg);
+                utils::show_alert(msg);
                 error!("{}\n{:?}\n{}", msg, e, Location::caller());
                 std::process::exit(1);
             }
@@ -24,7 +25,7 @@ impl<T, E: Debug> ResultExt<T, E> for Result<T, E> {
     #[track_caller]
     fn error_log(&self, msg: &str) {
         if let Err(e) = self {
-            dialog::alert_default(msg);
+            utils::show_alert(msg);
             error!("{}\n{:?}\n{}", msg, e, Location::caller());
         }
     }
@@ -32,7 +33,7 @@ impl<T, E: Debug> ResultExt<T, E> for Result<T, E> {
     #[track_caller]
     fn warn_log(&self, msg: &str) {
         if let Err(e) = self {
-            dialog::alert_default(msg);
+            utils::show_alert(msg);
             warn!("{}\n{:?}", msg, e);
         }
     }

src/utils.rs

@@ -728,3 +728,17 @@ pub(crate) fn tag_from_height(height: f64) -> f64 {
 pub(crate) fn tag2_from_height(height: f64) -> f64 {
     (height * globals::CONFIG.read().unwrap().tag2_font_ratio) / 5000.0
 }
+
+pub(crate) fn show_message(msg: &str) {
+    let a = globals::MAIN_SENDER.read().unwrap();
+    if let Some(a) = &*a {
+        a.send(crate::AppMessage::Message(msg.to_owned()));
+    }
+}
+
+pub(crate) fn show_alert(msg: &str) {
+    let a = globals::MAIN_SENDER.read().unwrap();
+    if let Some(a) = &*a {
+        a.send(crate::AppMessage::Alert(msg.to_owned()));
+    }
+}