chore: Migration from rstk to afrish

Cargo.toml

@@ -20,6 +20,6 @@ rhai = ["afrim/rhai"]
 afrim = { version = "0.6.0", default-features = false, git = "https://github.com/pythonbrad/afrim", rev = "5f40469" }
 anyhow = "1.0.82"
 clap = "4.5.4"
-rstk = "0.3.0"
+afrish = { version = "0.1.0", default-features = false, git = "https://github.com/fodydev/afrish", rev = "e8c4fa2" }
 serde = { version = "1.0.197", features = ["serde_derive"] }
 toml = "0.8.12"

src/lib.rs

@@ -3,32 +3,32 @@ mod window;
 
 use afrim::frontend::{Command, Frontend};
 use anyhow::{anyhow, Result};
-use rstk::*;
+use afrish::*;
 use std::sync::{
     mpsc::{Receiver, Sender},
     OnceLock,
 };
 use std::thread;
-use window::{rstk_ext::init_rstk_ext, toolkit::ToolKit, tooltip::ToolTip};
+use window::{toolkit::ToolKit, tooltip::ToolTip};
 
 pub use config::Config;
 
 pub struct Wish {
-    window: &'static rstk::TkTopLevel,
+    window: &'static afrish::TkTopLevel,
     tooltip: ToolTip,
     toolkit: ToolKit,
     tx: Option<Sender<Command>>,
     rx: Option<Receiver<Command>>,
 }
 
 impl Wish {
-    fn init() -> &'static rstk::TkTopLevel {
-        static WISH: OnceLock<rstk::TkTopLevel> = OnceLock::new();
+    fn init() -> &'static afrish::TkTopLevel {
+        static WISH: OnceLock<afrish::TkTopLevel> = OnceLock::new();
         WISH.get_or_init(|| {
             let wish = if cfg!(debug_assertions) {
-                rstk::trace_with("wish").unwrap()
+                afrish::trace_with("wish").unwrap()
             } else {
-                rstk::start_wish().unwrap()
+                afrish::start_wish().unwrap()
             };
 
             // The default behavior is to close the window.
@@ -39,8 +39,6 @@ impl Wish {
             // Note that, this close button is on the title bar.
             wish.on_close(Self::kill);
 
-            init_rstk_ext();
-
             wish
         })
     }
@@ -60,7 +58,7 @@ impl Wish {
     }
 
     pub fn raise_error<T: std::fmt::Debug>(message: &str, detail: T) {
-        rstk::message_box()
+        afrish::message_box()
             .parent(Self::init())
             .icon(IconImage::Error)
             .title("Unexpected Error")
@@ -71,15 +69,15 @@ impl Wish {
     }
 
     fn build(&mut self) {
-        self.tooltip.build(rstk::make_toplevel(self.window));
+        self.tooltip.build(afrish::make_toplevel(self.window));
         self.toolkit.build(self.window.to_owned());
     }
 
     /// End the process (wish and rust).
     ///
     /// Note that a `process::exit` is called internally.
     pub fn kill() {
-        rstk::end_wish();
+        afrish::end_wish();
     }
 }
 
@@ -97,7 +95,7 @@ impl Frontend for Wish {
         }
 
         // We shouldn't forget to listen for GUI events.
-        thread::spawn(rstk::mainloop);
+        thread::spawn(afrish::mainloop);
 
         let tx = self.tx.as_ref().unwrap();
 

src/window/mod.rs

@@ -1,4 +1,3 @@
-pub mod rstk_ext;
 pub mod toolkit;
 pub mod tooltip;
 

src/window/toolkit.rs

@@ -1,6 +1,5 @@
 use super::config::Config;
-use super::rstk_ext::*;
-use rstk::*;
+use afrish::*;
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
 
@@ -10,8 +9,8 @@ const GUI_RATIO: f64 = 0.8;
 #[derive(Clone, Default)]
 pub struct ToolKit {
     themes: HashMap<&'static str, Style>,
-    window: Option<rstk::TkTopLevel>,
-    idle_state_widget: Option<rstk::TkButton>,
+    window: Option<afrish::TkTopLevel>,
+    idle_state_widget: Option<afrish::TkButton>,
     new_idle_state: Arc<Mutex<bool>>,
     curr_idle_state: bool,
     config: Config,
@@ -108,15 +107,15 @@ impl ToolKit {
         );
 
         // Header
-        let frame = rstk::make_frame(window);
+        let frame = afrish::make_frame(window);
         frame.style(&self.themes["TFrame"]);
         // Header label
-        let label = rstk::make_label(&frame);
+        let label = afrish::make_label(&frame);
         label.text("AFRIM Toolkit");
         label.style(&self.themes["TLabel"]);
         label.pack().side(PackSide::Left).layout();
         // Header idle state button
-        let button = rstk::make_button(&frame);
+        let button = afrish::make_button(&frame);
         button.text("State");
         {
             let idle_state = Arc::clone(&self.new_idle_state);
@@ -141,12 +140,12 @@ impl ToolKit {
             .layout();
 
         // Separator
-        rstk::make_frame(window)
+        afrish::make_frame(window)
             .pack()
             .fill(PackFill::X)
             .padx((30.0 * GUI_RATIO) as u64)
             .layout();
-        let frame = rstk::make_frame(window);
+        let frame = afrish::make_frame(window);
         frame.style(&self.themes["TFrame"]);
         frame
             .pack()
@@ -155,23 +154,23 @@ impl ToolKit {
             .layout();
 
         // Body
-        let notebook = rstk::make_notebook(window);
+        let notebook = afrish::make_notebook(window);
         notebook.style(&self.themes["TNotebook"]);
 
         // Page builder
         macro_rules! make_page {
             ( $tabname: expr, $($fieldname: expr => $fieldvalue: expr => $see_more: stmt)*) => {
-                let frame = rstk::make_frame(window);
+                let frame = afrish::make_frame(window);
                 frame.style(&self.themes["TFrame"]);
 
                 $(
-                    let subframe = rstk::make_frame(&frame);
+                    let subframe = afrish::make_frame(&frame);
                     subframe.style(&self.themes["TFrame"]);
-                    let label = rstk::make_label(&subframe);
+                    let label = afrish::make_label(&subframe);
                     label.text($fieldname);
                     label.style(&self.themes["TLabel"]);
                     label.pack().side(PackSide::Left).layout();
-                    let button = rstk::make_button(&subframe);
+                    let button = afrish::make_button(&subframe);
                     button.text($fieldvalue);
                     button.width((25.0 * GUI_RATIO) as i64);
                     button.style(&self.themes["TButton"]);
@@ -204,7 +203,7 @@ impl ToolKit {
                 let config_version = info.version.clone();
 
                 move || {
-                    rstk::message_box()
+                    afrish::message_box()
                         .parent(&window)
                         .icon(IconImage::Information)
                         .title("Configuration file")
@@ -230,7 +229,7 @@ impl ToolKit {
                 let window = window.clone();
 
                 move || {
-                    rstk::message_box()
+                    afrish::message_box()
                         .parent(&window)
                         .icon(IconImage::Information)
                         .title("Keyboard shortcuts")
@@ -250,7 +249,7 @@ impl ToolKit {
                 let window = window.clone();
 
                 move || {
-                    rstk::message_box()
+                    afrish::message_box()
                         .parent(&window)
                         .icon(IconImage::Information)
                         .title("About")
@@ -283,7 +282,7 @@ impl ToolKit {
             .layout();
     }
 
-    pub fn build(&mut self, window: rstk::TkTopLevel) {
+    pub fn build(&mut self, window: afrish::TkTopLevel) {
         self.window = Some(window);
         self.build_theme();
         self.build_window();

src/window/tooltip.rs

@@ -1,15 +1,14 @@
 use super::config::Theme;
-use super::rstk_ext::*;
 use afrim::frontend::Predicate;
-use rstk::*;
+use afrish::*;
 use std::collections::HashMap;
 
 #[derive(Clone, Default)]
 pub struct ToolTip {
     themes: HashMap<&'static str, Style>,
-    window: Option<rstk::TkTopLevel>,
-    cursor_widget: Option<rstk::TkLabel>,
-    predicates_widget: Option<rstk::TkLabel>,
+    window: Option<afrish::TkTopLevel>,
+    cursor_widget: Option<afrish::TkLabel>,
+    predicates_widget: Option<afrish::TkLabel>,
     predicates: Vec<Predicate>,
     current_predicate_id: usize,
     page_size: usize,
@@ -61,20 +60,20 @@ impl ToolTip {
         window.deiconify();
 
         // Cursor
-        let cursor_widget = rstk::make_label(window);
+        let cursor_widget = afrish::make_label(window);
         cursor_widget.text("Afrim is ready for input!");
         cursor_widget.style(&self.themes["PHLabel"]);
         cursor_widget.pack().fill(PackFill::X).layout();
         self.cursor_widget = Some(cursor_widget);
 
         // Predication
-        let predicates_widget = rstk::make_label(window);
+        let predicates_widget = afrish::make_label(window);
         predicates_widget.style(&self.themes["PBLabel"]);
         predicates_widget.pack().fill(PackFill::X).layout();
         self.predicates_widget = Some(predicates_widget);
     }
 
-    pub fn build(&mut self, window: rstk::TkTopLevel) {
+    pub fn build(&mut self, window: afrish::TkTopLevel) {
         self.window = Some(window);
         self.build_theme();
         self.build_window();