mirror of
https://github.com/storytold/effectcraft.git
synced 2026-11-19 16:45:28 +00:00
Merge main
# Conflicts: # crates/ui-egui/src/menus/tests.rs
This commit is contained in:
commit
fc63da8839
3 files changed
+11
-3
No files matched your search
@@ -141,7 +141,12 @@ pub fn install_pickers(app: &mut EffectcraftApp, ctx: &egui::Context) -> Receive
|
||||
pub fn message(title: &str, description: String) {
|
||||
let shown = guarded("message", || rfd::MessageDialog::new().set_level(rfd::MessageLevel::Error).set_title(title).set_description(description).show());
|
||||
if let Err(e) = shown {
|
||||
log::error!("{e}");
|
||||
// The diagnostic helper runs before logging is installed.
|
||||
if log::log_enabled!(log::Level::Error) {
|
||||
log::error!("{e}");
|
||||
} else {
|
||||
eprintln!("effectcraft: {e}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -196,7 +196,7 @@ fn start_helpers_if_opted_in(session: &mut effectcraft_engine::Session) {
|
||||
fn main() -> eframe::Result {
|
||||
let args: Vec<_> = std::env::args_os().skip(1).collect();
|
||||
if crash_report::maybe_run(&args, |description| {
|
||||
rfd::MessageDialog::new().set_level(rfd::MessageLevel::Error).set_title("EffectCraft diagnostic report").set_description(description).show();
|
||||
file_dialogs::message("EffectCraft diagnostic report", description.to_owned());
|
||||
}) {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
@@ -884,7 +884,10 @@ fn picked_projects_report_every_error() {
|
||||
std::fs::write(&aep, b"not an aep").unwrap();
|
||||
std::fs::write(&ecproj, b"not a project").unwrap();
|
||||
let paths = vec![aep.to_string_lossy().to_string(), ecproj.to_string_lossy().to_string()];
|
||||
super::frontend::dialog_answered(&mut app, crate::DialogAnswer { command: "file.import".into(), key: "paths", params: json!({}), paths: Ok(paths.clone()) });
|
||||
super::frontend::dialog_answered(
|
||||
&mut app,
|
||||
crate::DialogAnswer { command: "file.import".into(), key: "paths", params: json!({}), paths: Ok(paths.clone()) },
|
||||
);
|
||||
let status = &app.ui.status;
|
||||
assert!(status.contains("broken.aep") && status.contains("broken.ecproj"), "{status}");
|
||||
assert!(!status.contains('"'), "messages, not quoted JSON: {status}");
|
||||
|
||||
Reference in new issue
Block a user