Skip to content

EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust

refactor(engine): move prefs, session_settings, config, shortcuts, autosave to settings/

aiongg9991466ff1e3
diff --git a/crates/engine/src/lib.rs b/crates/engine/src/lib.rs
index d70614deb..0f57917c7 100644
--- a/crates/engine/src/lib.rs
+++ b/crates/engine/src/lib.rs
@@ -11,9 +11,7 @@
#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
mod analysis;
-pub mod autosave;
pub mod cmd;
-pub mod config;
pub mod demo;
pub mod doc_path;
pub mod footage_check;
@@ -29,15 +27,13 @@ pub mod media_cache;
pub mod menus;
pub mod offload;
pub mod perf;
-pub mod prefs;
pub mod preview;
pub mod psd_import;
pub mod remote;
pub mod render_queue;
pub mod scriptui;
pub mod sequence;
-mod session_settings;
-pub mod shortcuts;
+mod settings;
pub mod storage;
pub mod sysinfo;
pub mod templates;
@@ -75,6 +71,10 @@ pub use effectcraft_time as time;
pub use effectcraft_track as track;
pub use history::{Branch, History, HistoryNode};
pub use render_queue::{ExportJob, ExportResult, Exporter, JobState};
+pub use settings::autosave;
+pub use settings::config;
+pub use settings::prefs;
+pub use settings::shortcuts;
#[derive(Debug, thiserror::Error)]
pub enum EngineError {
diff --git a/crates/engine/src/settings.rs b/crates/engine/src/settings.rs
new file mode 100644
index 000000000..5981d4591
--- /dev/null
+++ b/crates/engine/src/settings.rs
@@ -0,0 +1,5 @@
+pub mod autosave;
+pub mod config;
+pub mod prefs;
+pub(super) mod session_settings;
+pub mod shortcuts;
diff --git a/crates/engine/src/autosave.rs b/crates/engine/src/settings/autosave.rs
similarity index 100%
rename from crates/engine/src/autosave.rs
rename to crates/engine/src/settings/autosave.rs
diff --git a/crates/engine/src/config.rs b/crates/engine/src/settings/config.rs
similarity index 100%
rename from crates/engine/src/config.rs
rename to crates/engine/src/settings/config.rs
diff --git a/crates/engine/src/prefs.rs b/crates/engine/src/settings/prefs.rs
similarity index 100%
rename from crates/engine/src/prefs.rs
rename to crates/engine/src/settings/prefs.rs
diff --git a/crates/engine/src/session_settings.rs b/crates/engine/src/settings/session_settings.rs
similarity index 100%
rename from crates/engine/src/session_settings.rs
rename to crates/engine/src/settings/session_settings.rs
diff --git a/crates/engine/src/shortcuts.rs b/crates/engine/src/settings/shortcuts.rs
similarity index 100%
rename from crates/engine/src/shortcuts.rs
rename to crates/engine/src/settings/shortcuts.rs
diff --git a/crates/ui-egui/src/i18n/ui.rs b/crates/ui-egui/src/i18n/ui.rs
index d83f4237b..1aa49a4ac 100644
--- a/crates/ui-egui/src/i18n/ui.rs
+++ b/crates/ui-egui/src/i18n/ui.rs
@@ -5486,7 +5486,7 @@ mod tests {
("panels/viewers.rs", include_str!("../panels/viewers.rs")),
// Text the interface draws but does not own: the settings pages and the viewer's channel
// and Fast Previews lists come from the engine as data, so their source strings live here.
- ("engine settings pages", include_str!("../../../engine/src/prefs.rs")),
+ ("engine settings pages", include_str!("../../../engine/src/settings/prefs.rs")),
("engine viewer channels", include_str!("../../../engine/src/viewer.rs")),
("engine viewer commands", include_str!("../../../engine/src/cmd/viewer_cmds.rs")),
];