Merge pull request #719 from GyulyVGC/window-icon

Add icon to window title bar

Author: GyulyVGC

CHANGELOG.md

@@ -10,6 +10,7 @@ All Sniffnet releases with the relative changes are documented in this file.
   - Ukrainian ([#692](https://github.com/GyulyVGC/sniffnet/pull/692))
 - Added new themes _OLED (Night)_ and _OLED (Day)_ based on palettes optimized for OLED displays and users with visual impairments ([#708](https://github.com/GyulyVGC/sniffnet/pull/708))
 - Fix _crates.io_ package for Windows ([#718](https://github.com/GyulyVGC/sniffnet/pull/718) — fixes [#681](https://github.com/GyulyVGC/sniffnet/issues/681))
+- Add icon to window title bar ([#719](https://github.com/GyulyVGC/sniffnet/pull/719) — fixes [#715](https://github.com/GyulyVGC/sniffnet/issues/715))
 
 ## [1.3.2] - 2025-01-06
 - Dropdown menus for network host filters ([#659](https://github.com/GyulyVGC/sniffnet/pull/659) — fixes [#354](https://github.com/GyulyVGC/sniffnet/issues/354))

Cargo.lock

@@ -20,6 +20,8 @@ include = [
     "/resources/countries_flags/**/*.svg",
     "/resources/DB/*.mmdb",
     "/resources/fonts/subset/*.ttf",
+    "/resources/logos/raw/icon.png",
+    "/resources/packaging/windows/graphics/sniffnet.ico",
     "/resources/sounds/*.mp3",
     "/services.txt",
     "/build.rs",
@@ -39,7 +41,7 @@ pcap = "2.2.0"
 etherparse = "0.17.0"
 chrono = { version = "0.4.39", default-features = false, features = ["clock"] }
 plotters = { version = "0.3.7", default-features = false, features = ["area_series"] }
-iced = { version = "0.13.1", features = ["tokio", "svg", "advanced", "lazy"] }
+iced = { version = "0.13.1", features = ["tokio", "svg", "advanced", "lazy", "image"] }
 plotters-iced = "0.11.0"
 maxminddb = "0.24.0"
 confy = "0.6.1"
@@ -79,6 +81,9 @@ phf_shared = "0.11.3"
 rustrict = { version = "0.7.33", default-features = false, features = ["censor"] }
 once_cell = "1.20.3"
 
+[target."cfg(windows)".build-dependencies]
+winres = "0.1.12"
+
 #═══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════
 
 [badges]

Cargo.toml

@@ -1,3 +1,6 @@
+#[cfg(windows)]
+extern crate winres;
+
 use std::env;
 use std::fs::File;
 use std::io::{BufRead, BufReader, BufWriter, Write};
@@ -16,9 +19,19 @@ fn main() {
     println!("cargo:rerun-if-changed={WINDOWS_ICON_PATH}");
     println!("cargo:rerun-if-changed={SERVICES_LIST_PATH}");
 
+    set_icon();
     build_services_phf();
 }
 
+fn set_icon() {
+    #[cfg(windows)]
+    {
+        let mut res = winres::WindowsResource::new();
+        res.set_icon(WINDOWS_ICON_PATH);
+        res.compile().unwrap();
+    }
+}
+
 fn build_services_phf() {
     let out_path = Path::new(&env::var("OUT_DIR").unwrap()).join("services.rs");
     let mut output = BufWriter::new(File::create(out_path).unwrap());

build.rs

@@ -6,6 +6,7 @@ use std::borrow::Cow;
 use std::sync::{Arc, Mutex};
 use std::{panic, process, thread};
 
+use iced::advanced::graphics::image::image_rs::ImageFormat;
 #[cfg(target_os = "linux")]
 use iced::window::settings::PlatformSpecific;
 use iced::{application, window, Font, Pixels, Settings};
@@ -51,6 +52,8 @@ mod utils;
 pub const SNIFFNET_LOWERCASE: &str = "sniffnet";
 pub const SNIFFNET_TITLECASE: &str = "Sniffnet";
 
+const WINDOW_ICON: &[u8] = include_bytes!("../resources/logos/raw/icon.png");
+
 /// Entry point of application execution
 ///
 /// It initializes shared variables and loads configuration parameters
@@ -122,7 +125,7 @@ pub fn main() -> iced::Result {
             resizable: true,
             decorations: true,
             transparent: false,
-            icon: None,
+            icon: window::icon::from_file_data(WINDOW_ICON, Some(ImageFormat::Png)).ok(),
             #[cfg(target_os = "linux")]
             platform_specific: PlatformSpecific {
                 application_id: String::from(SNIFFNET_LOWERCASE),