A free, open source, and extensible speech-to-text application that works completely offline.
icon update + color tray when recording
CJ Pais5fc55cfcb3d8
diff --git a/.gitignore b/.gitignoreindex 9e6fbd7a..50fdfaa9 100644--- a/.gitignore+++ b/.gitignore@@ -23,4 +23,4 @@ dist-ssr*.sln*.sw?-src-tauri/resources\ No newline at end of file+src-tauri/resources/models\ No newline at end of filediff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lockindex aa6fca32..1ae6fc34 100644--- a/src-tauri/Cargo.lock+++ b/src-tauri/Cargo.lock@@ -4779,6 +4779,7 @@ dependencies = ["gtk","heck 0.5.0","http",+ "image","jni","libc","log",diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.tomlindex 2005d159..a60f1bb8 100644--- a/src-tauri/Cargo.toml+++ b/src-tauri/Cargo.toml@@ -21,7 +21,7 @@ crate-type = ["staticlib", "cdylib", "rlib"]tauri-build = { version = "2", features = [] }[dependencies]-tauri = { version = "2", features = ["tray-icon"] }+tauri = { version = "2", features = ["tray-icon", 'image-png'] }tauri-plugin-opener = "2"serde = { version = "1", features = ["derive"] }serde_json = "1"diff --git a/src-tauri/icons/128x128.png b/src-tauri/icons/128x128.pngindex 0199b1bb..56c83974 100644Binary files a/src-tauri/icons/128x128.png and b/src-tauri/icons/128x128.png differdiff --git a/src-tauri/icons/[email protected] b/src-tauri/icons/[email protected]index e81becee..d6c2f551 100644Binary files a/src-tauri/icons/[email protected] and b/src-tauri/icons/[email protected] differdiff --git a/src-tauri/icons/32x32.png b/src-tauri/icons/32x32.pngindex f246cbf2..6a656dc4 100644Binary files a/src-tauri/icons/32x32.png and b/src-tauri/icons/32x32.png differdiff --git a/src-tauri/icons/64x64.png b/src-tauri/icons/64x64.pngnew file mode 100644index 00000000..cc712d96Binary files /dev/null and b/src-tauri/icons/64x64.png differdiff --git a/src-tauri/icons/Square107x107Logo.png b/src-tauri/icons/Square107x107Logo.pngnew file mode 100644index 00000000..1bb7d9a6Binary files /dev/null and b/src-tauri/icons/Square107x107Logo.png differdiff --git a/src-tauri/icons/Square142x142Logo.png b/src-tauri/icons/Square142x142Logo.pngnew file mode 100644index 00000000..a8713efbBinary files /dev/null and b/src-tauri/icons/Square142x142Logo.png differdiff --git a/src-tauri/icons/Square150x150Logo.png b/src-tauri/icons/Square150x150Logo.pngnew file mode 100644index 00000000..d7e24003Binary files /dev/null and b/src-tauri/icons/Square150x150Logo.png differdiff --git a/src-tauri/icons/Square284x284Logo.png b/src-tauri/icons/Square284x284Logo.pngnew file mode 100644index 00000000..55df9c8fBinary files /dev/null and b/src-tauri/icons/Square284x284Logo.png differdiff --git a/src-tauri/icons/Square30x30Logo.png b/src-tauri/icons/Square30x30Logo.pngnew file mode 100644index 00000000..668cd25fBinary files /dev/null and b/src-tauri/icons/Square30x30Logo.png differdiff --git a/src-tauri/icons/Square310x310Logo.png b/src-tauri/icons/Square310x310Logo.pngnew file mode 100644index 00000000..e7e29739Binary files /dev/null and b/src-tauri/icons/Square310x310Logo.png differdiff --git a/src-tauri/icons/Square44x44Logo.png b/src-tauri/icons/Square44x44Logo.pngnew file mode 100644index 00000000..e2ff532bBinary files /dev/null and b/src-tauri/icons/Square44x44Logo.png differdiff --git a/src-tauri/icons/Square71x71Logo.png b/src-tauri/icons/Square71x71Logo.pngnew file mode 100644index 00000000..eaf61a05Binary files /dev/null and b/src-tauri/icons/Square71x71Logo.png differdiff --git a/src-tauri/icons/Square89x89Logo.png b/src-tauri/icons/Square89x89Logo.pngnew file mode 100644index 00000000..884fc674Binary files /dev/null and b/src-tauri/icons/Square89x89Logo.png differdiff --git a/src-tauri/icons/StoreLogo.png b/src-tauri/icons/StoreLogo.pngnew file mode 100644index 00000000..501217c2Binary files /dev/null and b/src-tauri/icons/StoreLogo.png differdiff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-hdpi/ic_launcher.pngnew file mode 100644index 00000000..be7c3c62Binary files /dev/null and b/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png differdiff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.pngnew file mode 100644index 00000000..e42e975aBinary files /dev/null and b/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png differdiff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.pngnew file mode 100644index 00000000..be7c3c62Binary files /dev/null and b/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png differdiff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-mdpi/ic_launcher.pngnew file mode 100644index 00000000..52afbf20Binary files /dev/null and b/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png differdiff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.pngnew file mode 100644index 00000000..934a52c5Binary files /dev/null and b/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png differdiff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.pngnew file mode 100644index 00000000..52afbf20Binary files /dev/null and b/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png differdiff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.pngnew file mode 100644index 00000000..864d25b2Binary files /dev/null and b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png differdiff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.pngnew file mode 100644index 00000000..3245c600Binary files /dev/null and b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png differdiff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.pngnew file mode 100644index 00000000..864d25b2Binary files /dev/null and b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png differdiff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.pngnew file mode 100644index 00000000..0fd5b6f0Binary files /dev/null and b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png differdiff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.pngnew file mode 100644index 00000000..6cd96e0dBinary files /dev/null and b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png differdiff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.pngnew file mode 100644index 00000000..0fd5b6f0Binary files /dev/null and b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png differdiff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.pngnew file mode 100644index 00000000..c31c4c08Binary files /dev/null and b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png differdiff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.pngnew file mode 100644index 00000000..be9c0147Binary files /dev/null and b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png differdiff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.pngnew file mode 100644index 00000000..c31c4c08Binary files /dev/null and b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png differdiff --git a/src-tauri/icons/icon.icns b/src-tauri/icons/icon.icnsindex 5e7ed618..8a7e89ac 100644Binary files a/src-tauri/icons/icon.icns and b/src-tauri/icons/icon.icns differdiff --git a/src-tauri/icons/icon.ico b/src-tauri/icons/icon.icoindex b3636e4b..66a66d06 100644Binary files a/src-tauri/icons/icon.ico and b/src-tauri/icons/icon.ico differdiff --git a/src-tauri/icons/icon.png b/src-tauri/icons/icon.pngindex fc64c2c7..fad12fef 100644Binary files a/src-tauri/icons/icon.png and b/src-tauri/icons/icon.png differdiff --git a/src-tauri/icons/ios/[email protected] b/src-tauri/icons/ios/[email protected]new file mode 100644index 00000000..90f7af8aBinary files /dev/null and b/src-tauri/icons/ios/[email protected] differdiff --git a/src-tauri/icons/ios/[email protected] b/src-tauri/icons/ios/[email protected]new file mode 100644index 00000000..edec2847Binary files /dev/null and b/src-tauri/icons/ios/[email protected] differdiff --git a/src-tauri/icons/ios/[email protected] b/src-tauri/icons/ios/[email protected]new file mode 100644index 00000000..edec2847Binary files /dev/null and b/src-tauri/icons/ios/[email protected] differdiff --git a/src-tauri/icons/ios/[email protected] b/src-tauri/icons/ios/[email protected]new file mode 100644index 00000000..fa579473Binary files /dev/null and b/src-tauri/icons/ios/[email protected] differdiff --git a/src-tauri/icons/ios/[email protected] b/src-tauri/icons/ios/[email protected]new file mode 100644index 00000000..3eef758dBinary files /dev/null and b/src-tauri/icons/ios/[email protected] differdiff --git a/src-tauri/icons/ios/[email protected] b/src-tauri/icons/ios/[email protected]new file mode 100644index 00000000..1a1aa4f9Binary files /dev/null and b/src-tauri/icons/ios/[email protected] differdiff --git a/src-tauri/icons/ios/[email protected] b/src-tauri/icons/ios/[email protected]new file mode 100644index 00000000..1a1aa4f9Binary files /dev/null and b/src-tauri/icons/ios/[email protected] differdiff --git a/src-tauri/icons/ios/[email protected] b/src-tauri/icons/ios/[email protected]new file mode 100644index 00000000..c9fd731dBinary files /dev/null and b/src-tauri/icons/ios/[email protected] differdiff --git a/src-tauri/icons/ios/[email protected] b/src-tauri/icons/ios/[email protected]new file mode 100644index 00000000..edec2847Binary files /dev/null and b/src-tauri/icons/ios/[email protected] differdiff --git a/src-tauri/icons/ios/[email protected] b/src-tauri/icons/ios/[email protected]new file mode 100644index 00000000..d832d18fBinary files /dev/null and b/src-tauri/icons/ios/[email protected] differdiff --git a/src-tauri/icons/ios/[email protected] b/src-tauri/icons/ios/[email protected]new file mode 100644index 00000000..d832d18fBinary files /dev/null and b/src-tauri/icons/ios/[email protected] differdiff --git a/src-tauri/icons/ios/[email protected] b/src-tauri/icons/ios/[email protected]new file mode 100644index 00000000..c2784239Binary files /dev/null and b/src-tauri/icons/ios/[email protected] differdiff --git a/src-tauri/icons/ios/[email protected] b/src-tauri/icons/ios/[email protected]new file mode 100644index 00000000..eec1a923Binary files /dev/null and b/src-tauri/icons/ios/[email protected] differdiff --git a/src-tauri/icons/ios/[email protected] b/src-tauri/icons/ios/[email protected]new file mode 100644index 00000000..c2784239Binary files /dev/null and b/src-tauri/icons/ios/[email protected] differdiff --git a/src-tauri/icons/ios/[email protected] b/src-tauri/icons/ios/[email protected]new file mode 100644index 00000000..ef1e7d63Binary files /dev/null and b/src-tauri/icons/ios/[email protected] differdiff --git a/src-tauri/icons/ios/[email protected] b/src-tauri/icons/ios/[email protected]new file mode 100644index 00000000..f35a0952Binary files /dev/null and b/src-tauri/icons/ios/[email protected] differdiff --git a/src-tauri/icons/ios/[email protected] b/src-tauri/icons/ios/[email protected]new file mode 100644index 00000000..d2f3c804Binary files /dev/null and b/src-tauri/icons/ios/[email protected] differdiff --git a/src-tauri/icons/ios/[email protected] b/src-tauri/icons/ios/[email protected]new file mode 100644index 00000000..84cf7065Binary files /dev/null and b/src-tauri/icons/ios/[email protected] differdiff --git a/src-tauri/icons/logo.png b/src-tauri/icons/logo.pngnew file mode 100644index 00000000..1c4b862bBinary files /dev/null and b/src-tauri/icons/logo.png differdiff --git a/src-tauri/icons/tray_32x32.png b/src-tauri/resources/tray_32x32.pngsimilarity index 100%rename from src-tauri/icons/tray_32x32.pngrename to src-tauri/resources/tray_32x32.pngdiff --git a/src-tauri/icons/tray_64x64.png b/src-tauri/resources/tray_64x64.pngsimilarity index 100%rename from src-tauri/icons/tray_64x64.pngrename to src-tauri/resources/tray_64x64.pngdiff --git a/src-tauri/resources/tray_recording_64x64.png b/src-tauri/resources/tray_recording_64x64.pngnew file mode 100644index 00000000..c5362b55Binary files /dev/null and b/src-tauri/resources/tray_recording_64x64.png differdiff --git a/src-tauri/resources/tray_transcribing_64x64.png b/src-tauri/resources/tray_transcribing_64x64.pngnew file mode 100644index 00000000..94936744Binary files /dev/null and b/src-tauri/resources/tray_transcribing_64x64.png differdiff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rsindex ced325e0..e7ef72fc 100644--- a/src-tauri/src/lib.rs+++ b/src-tauri/src/lib.rs@@ -7,6 +7,8 @@ use managers::audio::AudioRecordingManager;use managers::transcription::TranscriptionManager;use std::collections::HashMap;use std::sync::{Arc, Mutex};+use tauri::image::Image;+use tauri::menu::{Menu, MenuItem};use tauri::tray::TrayIconBuilder;use tauri::Manager;use tauri_plugin_autostart::MacosLauncher;@@ -40,15 +42,36 @@ pub fn run() {.plugin(tauri_plugin_global_shortcut::Builder::new().build()).manage(AppState::new()).setup(move |app| {- let _tray = TrayIconBuilder::new().build(app)?;+ let settings_i = MenuItem::with_id(app, "settings", "Settings", true, None::<&str>)?;+ let quit_i = MenuItem::with_id(app, "quit", "Quit", true, None::<&str>)?;+ let menu = Menu::with_items(app, &[&settings_i, &quit_i])?;+ let tray = TrayIconBuilder::new()+ .icon(Image::from_path(app.path().resolve(+ "resources/tray_64x64.png",+ tauri::path::BaseDirectory::Resource,+ )?)?)+ .menu(&menu)+ .show_menu_on_left_click(true)+ .on_menu_event(|app, event| match event.id.as_ref() {+ "settings" => {+ let settings_window = app.get_webview_window("main").unwrap();+ settings_window.show().unwrap();+ }+ "quit" => {+ app.exit(0);+ }+ _ => {}+ })+ .build(app)?;+ app.manage(tray);let vad_path = app.path().resolve(- "resources/silero_vad_v4.onnx",+ "resources/models/silero_vad_v4.onnx",tauri::path::BaseDirectory::Resource,)?;let whisper_path = app.path().resolve(- "resources/ggml-small.bin",+ "resources/models/ggml-small.bin",tauri::path::BaseDirectory::Resource,)?;@@ -75,6 +98,14 @@ pub fn run() {}).on_window_event(|window, event| match event {tauri::WindowEvent::CloseRequested { api, .. } => {+ #[cfg(target_os = "macos")]+ let res = window+ .app_handle()+ .set_activation_policy(tauri::ActivationPolicy::Accessory);+ if let Err(e) = res {+ println!("Failed to set activation policy: {}", e);+ }+api.prevent_close();// TODO may be different on windows, this works for macosdiff --git a/src-tauri/src/shortcut.rs b/src-tauri/src/shortcut.rsindex 0b08c7a1..9147984c 100644--- a/src-tauri/src/shortcut.rs+++ b/src-tauri/src/shortcut.rs@@ -1,6 +1,8 @@use std::sync::Arc;use serde::Serialize;+use tauri::image::Image;+use tauri::tray::TrayIcon;use tauri::App;use tauri::AppHandle;use tauri::Manager;@@ -14,11 +16,37 @@ use crate::settings::ShortcutBinding;use crate::utils;fn transcribe_pressed(app: &AppHandle) {+ let tray = app.state::<TrayIcon>();+ tray.set_icon(Some(+ Image::from_path(+ app.path()+ .resolve(+ "resources/tray_recording_64x64.png",+ tauri::path::BaseDirectory::Resource,+ )+ .expect("failed to resolve"),+ )+ .expect("failed to set icon"),+ ));+let rm = app.state::<Arc<AudioRecordingManager>>();rm.try_start_recording("transcribe");}fn transcribe_released(app: &AppHandle) {+ let tray = app.state::<TrayIcon>();+ tray.set_icon(Some(+ Image::from_path(+ app.path()+ .resolve(+ "resources/tray_64x64.png",+ tauri::path::BaseDirectory::Resource,+ )+ .expect("failed to resolve"),+ )+ .expect("failed to set icon"),+ ));+let ah = app.clone();let rm = Arc::clone(&app.state::<Arc<AudioRecordingManager>>());let tm = Arc::clone(&app.state::<Arc<TranscriptionManager>>());diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.jsonindex 33a31881..c5ad927b 100644--- a/src-tauri/tauri.conf.json+++ b/src-tauri/tauri.conf.json@@ -19,15 +19,12 @@],"security": {"csp": null- },- "trayIcon": {- "iconPath": "icons/tray_64x64.png"}},"bundle": {"active": true,"targets": "all",- "resources": ["resources/*"],+ "resources": ["resources/**/*"],"icon": ["icons/32x32.png","icons/128x128.png",diff --git a/src/App.tsx b/src/App.tsxindex ef3dbff8..49a91ce3 100644--- a/src/App.tsx+++ b/src/App.tsx@@ -8,6 +8,24 @@ import {import { register } from "@tauri-apps/plugin-global-shortcut";import HandyTextLogo from "./components/icons/HandyTextLogo";import { invoke } from "@tauri-apps/api/core";+// import { TrayIcon } from "@tauri-apps/api/tray";+// import { Menu } from "@tauri-apps/api/menu";+// import { defaultWindowIcon } from "@tauri-apps/api/app";++// const menu = await Menu.new({+// items: [+// {+// id: "quit",+// text: "Quit",+// },+// ],+// });++// const options = {+// icon: await defaultWindowIcon(),+// menu,+// menuOnLeftClick: true,+// };function App() {const [hasAccessibility, setHasAccessibility] = useState(false);@@ -23,6 +41,10 @@ function App() {setHasAccessibility(hasPermissions);});+ // TrayIcon.new(options).then((t) => {+ // console.log("tray init", t);+ // });+// invoke("set_binding", {// id: "test",// binding: "alt+d",