Merge pull request #14 from MoAlyousef/main

0.1.11

.github/workflows/bundle.yml

@@ -0,0 +1,25 @@
+name: bundle
+
+on:
+  push:
+    branches: [ release ]
+  pull_request:
+    branches: [ release ]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build
+      run: cargo install cargo-bundle && cargo bundle --release --features=fltk/fltk-bundled
+    - name: Upload a Build Artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: sysinfo-gui-bundle
+        path: target/release/bundle/osx/sysinfo-gui.app

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sysinfo-gui"
-version = "0.1.10"
+version = "0.1.11"
 edition = "2021"
 repository = "https://github.com/MoAlyousef/sysinfo-gui"
 keywords = ["cross-platform", "monitoring", "gui"]
@@ -9,6 +9,11 @@ categories = ["visualization"]
 description = "A cross-platform system-monitoring gui application based on sysinfo and fltk"
 documentation = "https://docs.rs/sysinfo-gui"
 readme = "README.md"
+build = "build.rs"
+
+[package.metadata.bundle]
+identifier = "io.github.moalyousef"
+icon = ["assets/icon.png"]
 
 [dependencies]
 sysinfo = { version = "0.23.10", default-features = false }
@@ -17,6 +22,9 @@ fltk-grid = "0.1"
 parking_lot = "0.12"
 dark-light = { version = "0.2.2", optional = true }
 
+[target.'cfg(target_os = "windows")'.build-dependencies]
+winres = "0.1"
+
 [profile.release]
 opt-level = 3
 strip = true

README.md

@@ -1,5 +1,7 @@
 # Sysinfo-gui
 
+![alt_test](https://github.com/MoAlyousef/sysinfo-gui/raw/main/assets/icon.png)
+
 A lightweight cross-platform system-monitoring [fltk](https://github.com/fltk-rs/fltk-rs) gui application based on [sysinfo](https://github.com/GuillaumeGomez/sysinfo).
 
 The UI design is inspired by [stacer](https://github.com/oguzhaninan/Stacer).

assets/sysinfo-gui.desktop

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=sysinfo-gui
+Comment=A cross-platform system-monitoring gui application based on sysinfo and fltk
+Exec=sysinfo-gui
+Icon=icon
+Terminal=false
+Categories=System;

build.rs

@@ -0,0 +1,10 @@
+#[cfg(target_os = "windows")]
+fn main() {
+    let mut res = winres::WindowsResource::new();
+    res.set_icon("assets/icon.ico");
+    res.compile().unwrap();
+}
+
+#[cfg(not(target_os = "windows"))]
+fn main() {
+}

src/gui/app.rs

@@ -4,6 +4,8 @@ use super::widgets::*;
 use super::{message::Message, View};
 use fltk::{enums::*, prelude::*, *};
 
+const ICON: &[u8] = include_bytes!("../../assets/icon.png");
+
 pub struct App {
     a: app::App,
     r: app::Receiver<Message>,
@@ -37,7 +39,7 @@ impl App {
         app::set_font_size(18);
         let temp = std::env::temp_dir().join("Roboto-Medium.ttf");
         if !temp.exists() {
-            let bytes = include_bytes!("../../Roboto-Medium.ttf");
+            let bytes = include_bytes!("../../assets/Roboto-Medium.ttf");
             std::fs::write(&temp, bytes).ok();
         }
         if let Ok(f) = Font::load_font(temp) {
@@ -48,6 +50,7 @@ impl App {
             .with_size(800, 600)
             .with_label("sysinfo-gui");
         win.set_xclass("sysinfo");
+        win.set_icon(Some(image::PngImage::from_data(ICON).unwrap()));
         let mut grp = group::Group::default().with_size(60, 600);
         grp.set_frame(FrameType::FlatBox);
         grp.set_color(BLUE);