merge stable version #2

Merged
doryan merged 97 commits from experimental into main 2024-08-28 18:54:00 +03:00
Showing only changes of commit 21bc19e893 - Show all commits

View File

@ -11,10 +11,14 @@ use std::path::Path;
use crate::view::properties::Setters; use crate::view::properties::Setters;
#[cfg(debug_assertions)]
const PATH: &str = "./src/view/resources/logo.png";
#[cfg(not(debug_assertions))]
const PATH: &str = "./resources/logo.png";
pub fn open_about_dialogue(_action: &SimpleAction, _var: Option<&Variant>) { pub fn open_about_dialogue(_action: &SimpleAction, _var: Option<&Variant>) {
let logo = Image::from_file(Path::new("./src/view/resources/logo.png")) let logo = Image::from_file(Path::new(PATH)).paintable().unwrap();
.paintable()
.unwrap();
AboutDialog::builder() AboutDialog::builder()
.authors(vec!["Сагиев А.Д.", "Ефимов И.П."]) .authors(vec!["Сагиев А.Д.", "Ефимов И.П."])