some thoughts?

This commit is contained in:
Chris Cochrun 2024-07-17 13:48:27 -05:00
parent 7302807f5f
commit bf9f65fade
2 changed files with 35 additions and 10 deletions

View file

@ -1240,22 +1240,22 @@ impl slide_model::SlideModel {
let role = SlideRoles { repr: role }; let role = SlideRoles { repr: role };
if let Some(slide) = self.slides.get(index.row() as usize) { if let Some(slide) = self.slides.get(index.row() as usize) {
return match role { return match role {
SlideRoles::Ty => QVariant::from(&slide.ty), SlideRoles::Ty => QVariant::from(&QString::from(&slide.ty)),
SlideRoles::Text => QVariant::from(&slide.text), SlideRoles::Text => QVariant::from(&QString::from(&slide.text)),
SlideRoles::Audio => QVariant::from(&slide.audio), SlideRoles::Audio => QVariant::from(&QString::from(&slide.audio)),
SlideRoles::ImageBackground => { SlideRoles::ImageBackground => {
QVariant::from(&slide.image_background) QVariant::from(&QString::from(&slide.image_background))
} }
SlideRoles::VideoBackground => { SlideRoles::VideoBackground => {
QVariant::from(&slide.video_background) QVariant::from(&QString::from(&slide.video_background))
} }
SlideRoles::HTextAlignment => { SlideRoles::HTextAlignment => {
QVariant::from(&slide.htext_alignment) QVariant::from(&QString::from(&slide.htext_alignment))
} }
SlideRoles::VTextAlignment => { SlideRoles::VTextAlignment => {
QVariant::from(&slide.vtext_alignment) QVariant::from(&QString::from(&slide.vtext_alignment))
} }
SlideRoles::Font => QVariant::from(&slide.font), SlideRoles::Font => QVariant::from(&QString::from(&slide.font)),
SlideRoles::FontSize => { SlideRoles::FontSize => {
QVariant::from(&slide.font_size) QVariant::from(&slide.font_size)
} }
@ -1274,7 +1274,7 @@ impl slide_model::SlideModel {
} }
SlideRoles::Looping => QVariant::from(&slide.looping), SlideRoles::Looping => QVariant::from(&slide.looping),
SlideRoles::VideoThumbnail => { SlideRoles::VideoThumbnail => {
QVariant::from(&slide.video_thumbnail) QVariant::from(&QString::from(&slide.video_thumbnail))
} }
SlideRoles::VideoStartTime => { SlideRoles::VideoStartTime => {
QVariant::from(&slide.video_start_time) QVariant::from(&slide.video_start_time)
@ -1284,7 +1284,7 @@ impl slide_model::SlideModel {
} }
SlideRoles::Html => QVariant::from(&slide.html), SlideRoles::Html => QVariant::from(&slide.html),
SlideRoles::ObsScene => { SlideRoles::ObsScene => {
QVariant::from(&slide.obs_scene) QVariant::from(&QString::from(&slide.obs_scene))
} }
_ => QVariant::default(), _ => QVariant::default(),
}; };

25
src/rust/slide_model_r.rs Normal file
View file

@ -0,0 +1,25 @@
enum PresType {
Html,
Pdf,
}
enum SlideType {
Song,
Video,
Image,
Presentation(PresType),
Content,
}
// /// An Image is a tuple struct with the string being a location on disk
// struct Image(String);
struct Slide {
id: i32, // This is the inner index, could be 3 inside a presentation or image gallery
kind: SlideType,
}
struct SlideModel {
index: i32,
slides: Vec<Slide>,
}