Embed icon to source code

Author: ssrlive

Cargo.toml

@@ -15,7 +15,7 @@ overtls = { version = "0.3.6" }
 qrcode = "0.14.1"
 rfd = { version = "0.15.4", default-features = false, features = ["xdg-portal", "tokio"] }
 rqrr = "0.10.0"
-run-as = { version = "1.2.4", default-features = false }
+run-as = { version = "1.2.5", default-features = false }
 screenshot = { version = "0.0.7", git = "https://github.com/ssrlive/screenshot-rs.git", rev = "36f877f" }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.143"
@@ -25,3 +25,18 @@ tun2proxy = { version = "0.7.14", default-features = false }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 gtk = "0.18.2"
+
+[package.metadata.bundle]
+name = "OverTLS GUI"
+identifier = "com.ssrlive.overtlsgui"
+icon = ["assets/main.png"]
+version = "0.1.0"
+resources = ["assets"]
+copyright = "Copyright (c) ssrlive 2025. All rights reserved."
+category = "Utility"
+short_description = "OverTLS clients manager"
+long_description = """
+A graphical user interface for managing OverTLS clients.
+"""
+osx_frameworks = ["SDL2"]
+osx_url_schemes = ["com.ssrlive.overtlsgui"]

build.rs

@@ -1,45 +1 @@
-use std::fs;
-use std::path::Path;
-
-fn main() {
-    let manifest_dir = std::env::var("CARGO_MANIFEST_DIR").unwrap();
-    let src = Path::new(&manifest_dir).join("assets");
-    let out_dir = std::env::var("OUT_DIR").unwrap();
-    let profile = std::env::var("PROFILE").unwrap_or_else(|_| "debug".to_string());
-    let bin_dir = extract_matching_parent_dir(&out_dir, &profile).expect("Failed to find bin dir");
-    let dst = bin_dir.join("assets");
-    if src.exists() {
-        copy_dir_all(&src, &dst).expect("Failed to copy assets directory");
-    }
-}
-
-fn copy_dir_all(src: &Path, dst: &Path) -> std::io::Result<()> {
-    if !dst.exists() {
-        fs::create_dir_all(dst)?;
-    }
-    for entry in fs::read_dir(src)? {
-        let entry = entry?;
-        let file_type = entry.file_type()?;
-        let src_path = entry.path();
-        let dst_path = dst.join(entry.file_name());
-        if file_type.is_dir() {
-            copy_dir_all(&src_path, &dst_path)?;
-        } else {
-            fs::copy(&src_path, &dst_path)?;
-        }
-    }
-    Ok(())
-}
-
-pub fn extract_matching_parent_dir<P: AsRef<std::path::Path>>(path: P, match_name: &str) -> std::io::Result<std::path::PathBuf> {
-    path.as_ref()
-        .ancestors()
-        .find(|p| p.file_name() == Some(std::ffi::OsStr::new(match_name)))
-        .map(|p| p.to_path_buf())
-        .ok_or_else(|| {
-            std::io::Error::new(
-                std::io::ErrorKind::NotFound,
-                format!("No parent directory matching '{match_name}' found"),
-            )
-        })
-}
+fn main() {}

src/main.rs

@@ -504,11 +504,11 @@ async fn main() -> Result<(), BoxError> {
         }
     });
 
-    let icon_path = util::get_main_icon_path()?;
-    util::set_window_icon(&mut win, icon_path.clone())?;
+    let icon = util::get_embedded_main_icon()?;
+    win.set_icon(Some(icon));
 
     let tray_icon_closur = || -> Result<(tray_icon::TrayIcon, tray_icon::menu::MenuItem, tray_icon::menu::MenuItem), BoxError> {
-        let icon = util::load_icon(icon_path)?;
+        let icon = util::load_icon_from_bytes(util::MAIN_ICON_BYTES)?;
 
         let show_item = tray_icon::menu::MenuItem::new("Show main window", true, None);
         let quit_item = tray_icon::menu::MenuItem::new("Quit", true, None);

src/node_details_dialog.rs

@@ -5,7 +5,7 @@ use fltk::{
     frame::Frame,
     group::Flex,
     input::Input,
-    prelude::{ButtonExt, GroupExt, InputExt, WidgetBase, WidgetExt},
+    prelude::{ButtonExt, GroupExt, InputExt, WidgetBase, WidgetExt, WindowExt},
     window::Window,
 };
 use overtls::{ClientConfig, TunnelPath};
@@ -52,6 +52,8 @@ pub fn show_node_details(win: &Window, node_cfg: Option<OverTlsNode>, tx: std::s
     };
 
     let mut dlg = Window::new(x, y, dialog_w, dialog_h, &*title);
+    let icon = crate::util::get_embedded_main_icon().unwrap();
+    dlg.set_icon(Some(icon));
 
     let mut flex = Flex::default_fill().column();
     flex.fixed(&dlg, dialog_h);

src/qr_code_dialog.rs

@@ -21,6 +21,9 @@ pub fn qr_code_dialog(parent: &Window, title: &str, ssr_url: &str) -> std::io::R
     let x = parent.x() + (parent.width() - dlg_width) / 2;
     let y = parent.y() + (parent.height() - dlg_width) / 2;
     let mut win = Window::new(x, y, dlg_width, dlg_width, title);
+    let icon = crate::util::get_embedded_main_icon()?;
+    win.set_icon(Some(icon));
+
     let mut frame = Frame::new(72, 72, 256, 256, "");
     let png = PngImage::from_data(&png_bytes).map_err(|e| std::io::Error::other(format!("FLTK image error: {e}")))?;
     frame.set_image(Some(png));

src/settings_dialog.rs

@@ -5,7 +5,7 @@ use fltk::{
     frame::Frame,
     group::Flex,
     input::Input,
-    prelude::{ButtonExt, GroupExt, InputExt, MenuExt, WidgetBase, WidgetExt},
+    prelude::{ButtonExt, GroupExt, InputExt, MenuExt, WidgetBase, WidgetExt, WindowExt},
     window::Window,
 };
 
@@ -93,6 +93,9 @@ pub fn show_settings_dialog(win: &Window, system_settings: &SystemSettings, tx:
     let x = win.x() + (win.width() - dialog_w) / 2;
     let y = win.y() + (win.height() - dialog_h) / 2;
     let mut dlg = Window::new(x, y, dialog_w, dialog_h, "Settings");
+    let icon = crate::util::get_embedded_main_icon().unwrap();
+    dlg.set_icon(Some(icon));
+
     let mut tabs = fltk::group::Tabs::new(0, 0, dialog_w, dialog_h, "");
     tabs.set_tab_align(Align::Top);
 

src/util.rs

@@ -41,40 +41,17 @@ pub fn file_chooser_save_file(title: &str, default_path: Option<&str>, filter: &
         .save_file()
 }
 
-pub fn load_icon<P: AsRef<std::path::Path>>(path: P) -> std::io::Result<tray_icon::Icon> {
-    let (icon_rgba, icon_width, icon_height) = {
-        let image = image::open(path)
-            .map_err(|e| std::io::Error::other(format!("Failed to open icon path {e}")))?
-            .into_rgba8();
-        let (width, height) = image.dimensions();
-        let rgba = image.into_raw();
-        (rgba, width, height)
-    };
-    tray_icon::Icon::from_rgba(icon_rgba, icon_width, icon_height)
-        .map_err(|e| std::io::Error::other(format!("Failed to create tray icon: {e}")))
+pub fn load_icon_from_bytes(bytes: &[u8]) -> std::io::Result<tray_icon::Icon> {
+    let image = image::load_from_memory(bytes)
+        .map_err(|e| std::io::Error::other(format!("Failed to load icon from memory: {e}")))?
+        .into_rgba8();
+    let (width, height) = image.dimensions();
+    let rgba = image.into_raw();
+    tray_icon::Icon::from_rgba(rgba, width, height).map_err(|e| std::io::Error::other(format!("Failed to create tray icon: {e}")))
 }
 
-/// Get the path to the application icon (assets/main.png) relative to the executable.
-pub fn get_main_icon_path() -> std::io::Result<PathBuf> {
-    let exe_path = std::env::current_exe()?;
-    let exe_dir = exe_path
-        .parent()
-        .ok_or_else(|| std::io::Error::other("Failed to get executable directory"))?;
-    let icon_path = exe_dir.join("assets").join("main.png");
-    if icon_path.exists() {
-        Ok(icon_path)
-    } else {
-        Err(std::io::Error::other(format!("Icon file not found at {icon_path:?}")))
-    }
-}
+pub const MAIN_ICON_BYTES: &[u8] = include_bytes!("../assets/main.png");
 
-pub fn set_window_icon<P: AsRef<std::path::Path>>(window: &mut fltk::window::Window, icon_path: P) -> std::io::Result<()> {
-    let mut f = std::fs::File::open(icon_path.as_ref())?;
-    use std::io::Read;
-    let mut buf = Vec::new();
-    f.read_to_end(&mut buf)?;
-    let png = fltk::image::PngImage::from_data(&buf).map_err(|e| std::io::Error::other(format!("Failed to load icon data: {e}")))?;
-    use fltk::prelude::WindowExt;
-    window.set_icon(Some(png));
-    Ok(())
+pub fn get_embedded_main_icon() -> std::io::Result<fltk::image::PngImage> {
+    fltk::image::PngImage::from_data(MAIN_ICON_BYTES).map_err(|e| std::io::Error::other(format!("Failed to load embedded icon: {e}")))
 }