diff --git a/crates/Cargo.lock b/crates/Cargo.lock index 6b241365f..090024269 100644 --- a/crates/Cargo.lock +++ b/crates/Cargo.lock @@ -5545,6 +5545,7 @@ dependencies = [ "qbz-playlist-import", "qbz-plex", "qbz-qobuz", + "qbz-slint-common", "qbz-text-utils", "qbz-theme", "qbz-ui", @@ -5953,6 +5954,14 @@ dependencies = [ "uuid 1.22.0", ] +[[package]] +name = "qbz-slint-common" +version = "0.1.0" +dependencies = [ + "qbz-ui", + "slint", +] + [[package]] name = "qbz-text-utils" version = "0.1.0" diff --git a/crates/Cargo.toml b/crates/Cargo.toml index 9b04efd8d..a4346bd42 100644 --- a/crates/Cargo.toml +++ b/crates/Cargo.toml @@ -25,6 +25,7 @@ members = [ "qbz-ui", "qbz-dac-wizard", "qbz-text-utils", + "qbz-slint-common", "qbz", "qbz-credentials", "qbz-media-controls", diff --git a/crates/qbz-slint-common/Cargo.toml b/crates/qbz-slint-common/Cargo.toml new file mode 100644 index 000000000..7d7d0ac07 --- /dev/null +++ b/crates/qbz-slint-common/Cargo.toml @@ -0,0 +1,11 @@ +[package] +name = "qbz-slint-common" +version.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true +description = "Shared Slint-coupled frontend helpers for the qbz app (toast; artwork primitives later)." + +[dependencies] +qbz-ui = { path = "../qbz-ui" } +slint = { version = "=1.16.1", default-features = false, features = ["std", "compat-1-2"] } diff --git a/crates/qbz-slint-common/src/lib.rs b/crates/qbz-slint-common/src/lib.rs new file mode 100644 index 000000000..a0d8a9df7 --- /dev/null +++ b/crates/qbz-slint-common/src/lib.rs @@ -0,0 +1,3 @@ +//! Shared Slint-coupled helpers extracted from the qbz binary. Depends on +//! qbz-ui for the generated types (AppWindow, the globals, structs). +pub mod toast; diff --git a/crates/qbz/src/toast.rs b/crates/qbz-slint-common/src/toast.rs similarity index 98% rename from crates/qbz/src/toast.rs rename to crates/qbz-slint-common/src/toast.rs index f33c32503..57fa61285 100644 --- a/crates/qbz/src/toast.rs +++ b/crates/qbz-slint-common/src/toast.rs @@ -16,7 +16,7 @@ use std::time::Duration; use slint::{ComponentHandle, Timer, TimerMode, Weak}; -use crate::{AppWindow, ToastKind, ToastState}; +use qbz_ui::{AppWindow, ToastKind, ToastState}; thread_local! { // Single reusable auto-hide timer. Reused (stop + start) so a fresh diff --git a/crates/qbz/Cargo.toml b/crates/qbz/Cargo.toml index 8f6d570b5..53473184b 100644 --- a/crates/qbz/Cargo.toml +++ b/crates/qbz/Cargo.toml @@ -48,6 +48,7 @@ qbz-music-link = { path = "../qbz-music-link" } qbz-ui = { path = "../qbz-ui" } qbz-dac-wizard = { path = "../qbz-dac-wizard" } qbz-text-utils = { path = "../qbz-text-utils" } +qbz-slint-common = { path = "../qbz-slint-common" } log = { workspace = true } env_logger = "0.11" tokio = { workspace = true } diff --git a/crates/qbz/src/main.rs b/crates/qbz/src/main.rs index 76b2e11cf..70ca800da 100644 --- a/crates/qbz/src/main.rs +++ b/crates/qbz/src/main.rs @@ -113,7 +113,7 @@ mod share; mod sidebar; mod suggestions; mod theme; -mod toast; +pub use qbz_slint_common::toast; mod tray; mod tray_settings; mod ui_prefs;