From fa4d44488e6e42cdff7f3d4333984a7b75514603 Mon Sep 17 00:00:00 2001 From: Djkato Date: Mon, 29 May 2023 16:39:10 +0200 Subject: [PATCH] Fix app not closing and add Zbrush (General supp.) --- Cargo.lock | 2 +- Cargo.toml | 6 +++--- program icons/zmanorig.png | Bin 0 -> 24792 bytes src/app.rs | 19 +++++++++++++++---- src/main.rs | 18 +++++++++++++++--- 5 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 program icons/zmanorig.png diff --git a/Cargo.lock b/Cargo.lock index a05ac90..ef1eb7b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -251,7 +251,7 @@ dependencies = [ [[package]] name = "drp_creative" -version = "1.0.0" +version = "1.0.1" dependencies = [ "discord-rich-presence", "lazy_static", diff --git a/Cargo.toml b/Cargo.toml index 5b1e7a4..69604d6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "drp_creative" -version = "1.0.0" +version = "1.0.1" edition = "2021" author = "https://djkato.net" @@ -9,7 +9,7 @@ discord-rich-presence = "0.2.2" regex = "1.6.0" tray-item = "0.7.0" lazy_static = "1.4.0" -self_update = {version= "0.36.0", features= ["archive-zip"]} +self_update = { version = "0.36.0", features = ["archive-zip"] } win-msgbox = "0.1.2" [dependencies.windows] @@ -28,4 +28,4 @@ windres = "0.2.2" # prefix binary with x86_64-pc-windows-msvc for self_updater [[bin]] name = "DRP_Creative--x86_64-pc-windows-msvc" -path = "src/main.rs" \ No newline at end of file +path = "src/main.rs" diff --git a/program icons/zmanorig.png b/program icons/zmanorig.png new file mode 100644 index 0000000000000000000000000000000000000000..da61861e18daa0ea4fdc3226e4a40c8a0daef9c0 GIT binary patch literal 24792 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 literal 0 HcmV?d00001 diff --git a/src/app.rs b/src/app.rs index 29fe02b..739237d 100644 --- a/src/app.rs +++ b/src/app.rs @@ -30,6 +30,7 @@ pub enum AppKind { SubstancePainter, SubstanceDesigner, Vegas, + ZBrush, } pub struct Apps { @@ -52,10 +53,11 @@ pub struct Apps { SubstancePainter: App, SubstanceDesigner: App, Vegas: App, + ZBrush: App, } impl Apps { - pub fn as_iter(&self) -> [&App; 19] { - let APPS: [&App; 19] = [ + pub fn as_iter(&self) -> [&App; 20] { + let APPS: [&App; 20] = [ &self.C4d, &self.Maya, &self.ThreeDsMax, @@ -75,13 +77,14 @@ impl Apps { &self.SubstancePainter, &self.SubstanceDesigner, &self.Vegas, + &self.ZBrush, ]; APPS } } impl AppKind { - pub fn as_iter() -> [AppKind; 19] { - let APPKINDS: [AppKind; 19] = [ + pub fn as_iter() -> [AppKind; 20] { + let APPKINDS: [AppKind; 20] = [ AppKind::C4d, AppKind::Maya, AppKind::ThreeDsMax, @@ -101,6 +104,7 @@ impl AppKind { AppKind::SubstancePainter, AppKind::SubstanceDesigner, AppKind::Vegas, + AppKind::ZBrush, ]; APPKINDS } @@ -222,6 +226,12 @@ impl Apps { drp_client_id: "1017882355723153448".to_string(), process_search_string: "VEGAS Pro".to_string(), }, + ZBrush: App { + kind: AppKind::Vegas, + default_project_name: "ZBrush Project".to_string(), + drp_client_id: "1112734356855865425".to_string(), + process_search_string: "ZBrush".to_string(), + }, } } } @@ -456,6 +466,7 @@ impl App { }; return window_title[..match_index as usize].to_string(); } + AppKind::ZBrush => self.default_project_name.clone(), } } } diff --git a/src/main.rs b/src/main.rs index 4fd7f8b..af34810 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,4 @@ -#![windows_subsystem = "windows"] //UNCOMMENT ONLY WHEN BUILDING FOR RELEASE TO NOT SHOW TERMINAL WINDOW! +#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] #[macro_use] extern crate self_update; @@ -12,6 +12,7 @@ use crate::program_status::*; use crate::self_updater::try_update; use app::{App, Apps}; use discord_rich_presence::{activity, DiscordIpc, DiscordIpcClient}; +use std::process::exit; use std::time::{SystemTime, UNIX_EPOCH}; use std::{thread, time}; fn main() { @@ -32,7 +33,7 @@ fn main() { let mut drp_is_running = false; let mut discord_client: Option = None; let mut current_app_option: Option<&App> = None; - 'main: loop { + loop { if let Some(current_app) = current_app_option { if let Some(real_project_name) = is_program_still_running(¤t_app) { //if project name includes filtered words, use default project name @@ -108,11 +109,22 @@ fn main() { } } } - tray_icon::Message::Quit => panic!(), + tray_icon::Message::Quit => { + println!("qiuitting!"); + exit(0) + } }, Err(_err) => (), } } else { + //respond to tray icon messages + match tray_receiver.try_recv() { + Ok(msg) => match msg { + tray_icon::Message::AnonymiseProject => {} + tray_icon::Message::Quit => exit(0), + }, + Err(_err) => (), + } //If nothing is running try to find it if let Some(proj_name) = get_running_program(&apps) { let temp_curr_app: &App;