diff --git a/Cargo.lock b/Cargo.lock index 1ca4e04..9b0a4b3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3413,7 +3413,7 @@ dependencies = [ [[package]] name = "tiny4linux_assets" version = "1.0.0" -source = "git+https://github.com/OpenFoxes/Tiny4Linux-Icons?rev=ba11e78#ba11e780cc72c3df8f4fe82be76aaff08c8c30e2" +source = "git+https://github.com/OpenFoxes/Tiny4Linux-Icons?rev=fe298f3c30d21326a918f3510a85669219001a01#fe298f3c30d21326a918f3510a85669219001a01" dependencies = [ "iced", "once_cell", diff --git a/Cargo.toml b/Cargo.toml index 3b844ed..66b7b8f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ gui = ["iced", "iced_font_awesome", "tiny4linux_assets"] cli = ["clap", "clap_complete", "dialoguer"] [dependencies] -tiny4linux_assets = { git = "https://github.com/OpenFoxes/Tiny4Linux-Icons", rev = "ba11e78", optional = true } +tiny4linux_assets = { git = "https://github.com/OpenFoxes/Tiny4Linux-Icons", rev = "fe298f3c30d21326a918f3510a85669219001a01", optional = true } iced = { version = "0.13.0", features = ["image", "tokio"], optional = true } iced_font_awesome = { version = "0.2.1", optional = true } nix = { version = "0.30.0", features = ["ioctl"] } @@ -33,7 +33,7 @@ clap_complete = { version = "4.5.59", optional = true } dialoguer = { version = "0.12.0", features = ["fuzzy-select"], optional = true } [build-dependencies] -tiny4linux_assets = { git = "https://github.com/OpenFoxes/Tiny4Linux-Icons", rev = "ba11e78", optional = true } +tiny4linux_assets = { git = "https://github.com/OpenFoxes/Tiny4Linux-Icons", rev = "fe298f3c30d21326a918f3510a85669219001a01", optional = true } [[bin]] name = "tiny4linux-gui" diff --git a/build.rs b/build.rs index f96e385..e390f19 100644 --- a/build.rs +++ b/build.rs @@ -10,26 +10,34 @@ fn main() { #[cfg(feature = "gui")] fn build_gui_assets() { + copy_asset( + "generated/png/title-icon/v2.0-soft-shadow.png", + "assets/icon.png", + ); + copy_asset( + "generated/png/title-icon/v2.0-widget.png", + "assets/icon-widget.png", + ); +} + +#[cfg(not(feature = "gui"))] +fn build_gui_assets() { + // Noop +} + +#[cfg(feature = "gui")] +fn copy_asset(src: &str, dst: &str) { use std::fs; use std::path::Path; use tiny4linux_assets::absolute_path_for_t4l_asset; - let asset_src = absolute_path_for_t4l_asset("generated/png/title-icon/v2.0-soft-shadow.png"); + let asset_src = absolute_path_for_t4l_asset(src); let out_dir = std::env::var("OUT_DIR").unwrap(); - let target_dir = Path::new(&out_dir) - .ancestors() - .nth(3) - .unwrap() - .join("assets/icon.png"); + let target_dir = Path::new(&out_dir).ancestors().nth(3).unwrap().join(dst); fs::create_dir_all(target_dir.parent().unwrap()).unwrap(); fs::copy(&asset_src, &target_dir).unwrap(); println!("cargo:rerun-if-changed={}", asset_src.display()); } - -#[cfg(not(feature = "gui"))] -fn build_gui_assets() { - // Noop -} diff --git a/deployment/gui/aur/PKGBUILD b/deployment/gui/aur/PKGBUILD index f86a7c0..47be7d8 100644 --- a/deployment/gui/aur/PKGBUILD +++ b/deployment/gui/aur/PKGBUILD @@ -21,6 +21,7 @@ package() { install -Dm755 "target/release/$pkgname" "$pkgdir/usr/bin/$pkgname" install -Dm755 "target/release/assets/icon.png" "$pkgdir/usr/share/icons/hicolor/256x256/apps/tiny4linux.png" + install -Dm755 "target/release/assets/icon-widget.png" "$pkgdir/usr/share/icons/hicolor/256x256/apps/tiny4linux-widget.png" install -Dm755 "src/gui/tiny4linux-dashboard.desktop" "$pkgdir/usr/share/applications/tiny4linux-dashboard.desktop" install -Dm755 "src/gui/tiny4linux-widget.desktop" "$pkgdir/usr/share/applications/tiny4linux-widget.desktop" } \ No newline at end of file diff --git a/src/assets/icon.png b/src/assets/icon.png deleted file mode 100644 index e911f9b..0000000 Binary files a/src/assets/icon.png and /dev/null differ diff --git a/src/assets/obsbot-tiny-2-side.png b/src/assets/obsbot-tiny-2-side.png deleted file mode 100644 index 544f846..0000000 Binary files a/src/assets/obsbot-tiny-2-side.png and /dev/null differ diff --git a/src/assets/obsbot-tiny-2.png b/src/assets/obsbot-tiny-2.png deleted file mode 100644 index 8feeef4..0000000 Binary files a/src/assets/obsbot-tiny-2.png and /dev/null differ diff --git a/src/assets/sources.md b/src/assets/sources.md index c62e6e0..9859b2b 100644 --- a/src/assets/sources.md +++ b/src/assets/sources.md @@ -1,4 +1,2 @@ | Element | Source | Files | |--------------|---------------------------------------------------|-------------------------------------------| -| OBSBOT-Logos | https://www.obsbot.com/de/media-kit/obsbot-tiny-2 | obsbot-tiny-2.png, obsbot-tiny-2-side.png | -| Icon | https://www.flaticon.com/free-icons/lens | icon.png | \ No newline at end of file diff --git a/src/gui/tiny4linux-widget.desktop b/src/gui/tiny4linux-widget.desktop index 7b3ed60..9569b03 100644 --- a/src/gui/tiny4linux-widget.desktop +++ b/src/gui/tiny4linux-widget.desktop @@ -4,7 +4,7 @@ Type=Application Name=Tiny4Linux (Widget) Comment=A graphical user interface for OBSBOT Tiny devices opened in widget mode Exec=tiny4linux-gui --start-as widget -Icon=tiny4linux +Icon=tiny4linux-widget Terminal=false Categories=Utility;System; Keywords=linux;obsbot;tiny;utility; \ No newline at end of file