open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move get_icon_path into own impl

Browse Source
This commit is contained in:
Hilmar Gústafsson 2020-02-01 12:02:34 +01:00
parent f577504e39
commit d28d4a9479
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/ui/windows.rs
View File

@ -30,38 +30,40 @@ use winrt_notification::{Duration, IconCrop, Sound, Toast};
pub struct WindowsUIManager; pub struct WindowsUIManager;
impl WindowsUIManager {
fn get_icon_path() -> io::Result<Box<Path>> {
let path_buf = std::env::current_exe()?.parent().unwrap().to_path_buf();
let installed_ico = path_buf.join("icon.ico");
let dev_ico = path_buf
.parent()
.unwrap()
.parent()
.unwrap()
.join("packager/win/icon.ico");
if installed_ico.is_file() {
Ok(installed_ico.into_boxed_path())
} else if dev_ico.is_file() {
Ok(dev_ico.into_boxed_path())
} else {
Err(io::Error::new(
io::ErrorKind::NotFound,
"icon.ico not found",
))
}
}
}
impl super::UIManager for WindowsUIManager { impl super::UIManager for WindowsUIManager {
fn notify(&self, message: &str) { fn notify(&self, message: &str) {
fn get_icon_path() -> io::Result<Box<Path>> {
let path_buf = std::env::current_exe()?.parent().unwrap().to_path_buf();
let installed_ico = path_buf.join("icon.ico");
let dev_ico = path_buf
.parent()
.unwrap()
.parent()
.unwrap()
.join("packager/win/icon.ico");
if installed_ico.is_file() {
Ok(installed_ico.into_boxed_path())
} else if dev_ico.is_file() {
Ok(dev_ico.into_boxed_path())
} else {
Err(io::Error::new(
io::ErrorKind::NotFound,
"icon.ico not found",
))
}
}
// Create and show a window notification // Create and show a window notification
let mut toast: Toast = Toast::new(Toast::POWERSHELL_APP_ID) // TODO: Use an ID assigned during installation. let mut toast: Toast = Toast::new(Toast::POWERSHELL_APP_ID) // TODO: Use an ID assigned during installation.
.title("Espanso") .title("Espanso")
.text1(message) .text1(message)
.duration(Duration::Short); .duration(Duration::Short);
if let Ok(p) = get_icon_path() { if let Ok(ref p) = Self::get_icon_path() {
toast = toast.icon(&p, IconCrop::Circular, "espanso"); toast = toast.icon(p, IconCrop::Circular, "espanso");
} }
toast.show().expect("Unable to toast"); toast.show().expect("Unable to toast");