Merge pull request #60 from ardura/1.4.1

Update to 1.4.1

Author: ardura

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "Actuate"
-version = "1.4.0"
+version = "1.4.1"
 edition = "2021"
 authors = ["Ardura <azviscarra@gmail.com>"]
 license = "GPL-3.0-or-later"
@@ -21,9 +21,6 @@ lazy_static = "1.4.0"
 nih_plug = { git = "https://github.com/Ardura/nih-plug.git", rev = "ce77d8c6daeebcdcc15e84a178ddce617ee6a3d3", features = ["assert_process_allocs"] }
 nih_plug_egui = { git = "https://github.com/Ardura/nih-plug.git", rev = "ce77d8c6daeebcdcc15e84a178ddce617ee6a3d3" }
 
-# egui_file fork for nih-plug/Actuate
-egui_file = { git = "https://github.com/Barugon/egui_file.git", rev = "28a242a7e921144e9ac442cc00fad6eca01b59e6" }
-
 num-complex = "0.4.4"
 num-traits = "0.2.17"
 once_cell = "1.18.0"

Cargo.toml

@@ -1,4 +1,5 @@
-# Actuate (Latest is v1.4.0)
+# Actuate (Latest is v1.4.1)
+
 A Subtractive and Additive Synthesizer, Sampler, and Granulizer built in Rust + Nih-Plug
 Written by Ardura
 

README.md

@@ -0,0 +1,146 @@
+use std::fs;
+use std::path::{Path, PathBuf};
+
+use nih_plug::nih_log;
+use nih_plug_egui::egui::{self, Id, Ui, Vec2};
+
+pub struct FileDialog {
+    current_dir: PathBuf,
+    selected: Option<PathBuf>,
+    input_filename: String,
+    pub open: bool,
+    save_mode: bool,
+    result: Option<PathBuf>,
+    id: Id,
+}
+
+impl FileDialog {
+    pub fn new(start_path: PathBuf, save_mode: bool) -> Self {
+        let dir = if start_path.is_dir() {
+            start_path
+        } else {
+            start_path.parent().unwrap_or(Path::new(".")).to_path_buf()
+        };
+
+        FileDialog {
+            current_dir: dir,
+            selected: None,
+            input_filename: String::new(),
+            open: true,
+            save_mode,
+            result: None,
+            id: egui::Id::new(format!("file_dialog_{}", rand::random::<u64>()))
+        }
+    }
+
+    pub fn show(&mut self, ctx: &egui::Context) -> Option<PathBuf> {
+        let mut result = None;
+
+        if self.open {
+            egui::Window::new(if self.save_mode { "Save File" } else { "Open File" })
+                .collapsible(false)
+                .resizable(true)
+                 .id(self.id)
+                .max_size(Vec2::new(800.0,480.0))
+                .show(ctx, |ui| {
+                    self.ui_contents(ui);
+
+                    ui.separator();
+
+                    ui.horizontal(|ui| {
+                        if ui.button("Cancel").clicked() {
+                            self.open = false;
+                            self.selected = None;
+                            // Kind of jank, but it works with the structure outside this
+                            Some(PathBuf::new());
+                        }
+
+                        if self.save_mode {
+                            if ui.button("Save").clicked() {
+                                if !self.input_filename.is_empty() {
+                                    let path = self.current_dir.join(&self.input_filename);
+                                    nih_log!("Path: {:?}", path.clone());
+                                    self.result = Some(path.clone());
+                                    result = Some(path);
+                                    self.selected = None;
+                                    nih_log!("Filename: {:?}", self.input_filename);
+                                }
+                            }
+                        } else {
+                            if ui.button("Open").clicked() {
+                                if let Some(sel) = &self.selected {
+                                    self.result = Some(sel.clone());
+                                    result = Some(sel.clone());
+                                    self.selected = None;
+                                }
+                            }
+                        }
+                    });
+                });
+        }
+
+        if self.result.is_some() {
+            let r = self.result.clone();
+            self.result = None;
+            return r;
+        }
+
+        result
+    }
+
+    fn ui_contents(&mut self, ui: &mut Ui) {
+        ui.label(format!("Current directory: {}", self.current_dir.display()));
+
+        // List directory contents
+        let mut entries: Vec<PathBuf> = Vec::new();
+        let mut cloned_back_dir = self.current_dir.clone();
+        cloned_back_dir.pop();
+        entries.push(cloned_back_dir);
+
+        let main_entries = fs::read_dir(&self.current_dir)
+            .map(|rd| {
+                rd.filter_map(|e| e.ok())
+                    .map(|e| e.path())
+                    .collect::<Vec<_>>()
+            })
+            .unwrap_or_default();
+
+        for entry in main_entries {
+            entries.push(entry);
+        }
+
+        egui::ScrollArea::vertical()
+            .max_height(480.0)
+            .show(ui, |ui| {
+            for entry in entries {
+                let is_dir = entry.is_dir();
+                let name = entry.file_name().unwrap_or_default().to_string_lossy();
+
+                if is_dir {
+                    if ui.button(format!("[{}]", name)).clicked() {
+                        self.current_dir = entry;
+                        self.selected = None;
+                    }
+                } else {
+                    let selected = self.selected.as_ref() == Some(&entry);
+                    if ui.selectable_label(selected, name).clicked() {
+                        self.selected = Some(entry.clone());
+                        self.input_filename =
+                            entry.file_name().unwrap_or_default().to_string_lossy().into();
+                    }
+                }
+            }
+        });
+
+        if self.save_mode {
+            ui.separator();
+            ui.label("File name:");
+            ui.scope(|ui| {
+                ui.push_id("file_name_input", |ui| {
+                    ui.text_edit_singleline(&mut self.input_filename);
+                });
+            });
+            //ui.text_edit_singleline(&mut self.input_filename);
+        }
+    }
+}