parent
191dd0255d
commit
2413b96791
9 changed files with 45 additions and 70 deletions
|
@ -1,13 +1,13 @@
|
|||
use cosmic::widget::image::Handle;
|
||||
use crisp::types::{Keyword, Symbol, Value};
|
||||
use miette::{IntoDiagnostic, Result};
|
||||
use mupdf::{Colorspace, Document, Matrix, Page};
|
||||
use mupdf::{Colorspace, Document, Matrix};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use sqlx::{
|
||||
pool::PoolConnection, prelude::FromRow, query, sqlite::SqliteRow,
|
||||
Row, Sqlite, SqliteConnection, SqlitePool,
|
||||
};
|
||||
use std::{path::PathBuf, sync::Arc};
|
||||
use std::path::PathBuf;
|
||||
use tracing::{debug, error};
|
||||
|
||||
use crate::{Background, Slide, SlideBuilder, TextAlignment};
|
||||
|
|
|
@ -1,12 +1,10 @@
|
|||
use std::borrow::Cow;
|
||||
use std::cmp::Ordering;
|
||||
use std::ops::Deref;
|
||||
use std::sync::{Arc, Mutex};
|
||||
|
||||
use cosmic::iced::clipboard::mime::{AllowedMimeTypes, AsMimeTypes};
|
||||
use crisp::types::{Keyword, Symbol, Value};
|
||||
use miette::{IntoDiagnostic, Result};
|
||||
use resvg::usvg::fontdb;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use tracing::{debug, error};
|
||||
|
||||
|
@ -260,7 +258,7 @@ impl From<&Song> for ServiceItem {
|
|||
kind: ServiceItemKind::Song(song.clone()),
|
||||
database_id: song.id,
|
||||
title: song.title.clone(),
|
||||
slides: slides.into(),
|
||||
slides: slides,
|
||||
..Default::default()
|
||||
}
|
||||
} else {
|
||||
|
@ -281,7 +279,7 @@ impl From<&Video> for ServiceItem {
|
|||
kind: ServiceItemKind::Video(video.clone()),
|
||||
database_id: video.id,
|
||||
title: video.title.clone(),
|
||||
slides: slides.into(),
|
||||
slides: slides,
|
||||
..Default::default()
|
||||
}
|
||||
} else {
|
||||
|
@ -302,7 +300,7 @@ impl From<&Image> for ServiceItem {
|
|||
kind: ServiceItemKind::Image(image.clone()),
|
||||
database_id: image.id,
|
||||
title: image.title.clone(),
|
||||
slides: slides.into(),
|
||||
slides: slides,
|
||||
..Default::default()
|
||||
}
|
||||
} else {
|
||||
|
@ -325,7 +323,7 @@ impl From<&Presentation> for ServiceItem {
|
|||
),
|
||||
database_id: presentation.id,
|
||||
title: presentation.title.clone(),
|
||||
slides: slides.into(),
|
||||
slides: slides,
|
||||
..Default::default()
|
||||
},
|
||||
Err(e) => {
|
||||
|
|
|
@ -3,19 +3,14 @@ use cosmic::widget::image::Handle;
|
|||
use crisp::types::{Keyword, Symbol, Value};
|
||||
use iced_video_player::Video;
|
||||
use miette::{miette, Result};
|
||||
use resvg::usvg::fontdb;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::{
|
||||
fmt::Display,
|
||||
path::{Path, PathBuf},
|
||||
sync::Arc,
|
||||
};
|
||||
use tracing::error;
|
||||
|
||||
use crate::ui::{
|
||||
pdf::PdfViewer,
|
||||
text_svg::{self, TextSvg},
|
||||
};
|
||||
use crate::ui::text_svg::TextSvg;
|
||||
|
||||
use super::songs::Song;
|
||||
|
||||
|
@ -310,7 +305,7 @@ impl Slide {
|
|||
}
|
||||
|
||||
pub fn text_alignment(&self) -> TextAlignment {
|
||||
self.text_alignment.clone()
|
||||
self.text_alignment
|
||||
}
|
||||
|
||||
pub fn font_size(&self) -> i32 {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue