some prelim movement of slide_model controlling changes
This commit is contained in:
parent
0a2b3259c9
commit
7302807f5f
1 changed files with 14 additions and 0 deletions
|
@ -116,6 +116,9 @@ mod slide_model {
|
||||||
index: i32,
|
index: i32,
|
||||||
) -> QMap_QString_QVariant;
|
) -> QMap_QString_QVariant;
|
||||||
|
|
||||||
|
#[qinvokable]
|
||||||
|
fn next(self: Pin<&mut SlideModel>) -> QMap_QString_QVariant;
|
||||||
|
|
||||||
#[qinvokable]
|
#[qinvokable]
|
||||||
fn get_slide_from_service(
|
fn get_slide_from_service(
|
||||||
self: Pin<&mut SlideModel>,
|
self: Pin<&mut SlideModel>,
|
||||||
|
@ -218,6 +221,7 @@ use cxx_qt::{CxxQtType, Threading};
|
||||||
use cxx_qt_lib::{
|
use cxx_qt_lib::{
|
||||||
CaseSensitivity, QByteArray, QMap, QModelIndex, QString, QStringList, QVariant
|
CaseSensitivity, QByteArray, QMap, QModelIndex, QString, QStringList, QVariant
|
||||||
};
|
};
|
||||||
|
use std::any::Any;
|
||||||
use std::thread;
|
use std::thread;
|
||||||
use std::{path::PathBuf, pin::Pin};
|
use std::{path::PathBuf, pin::Pin};
|
||||||
use tracing::{debug, error};
|
use tracing::{debug, error};
|
||||||
|
@ -1127,6 +1131,16 @@ impl slide_model::SlideModel {
|
||||||
qvariantmap
|
qvariantmap
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn next(self: Pin<&mut Self>) -> QMap_QString_QVariant {
|
||||||
|
if let Some(slide) = self.rust().slides.get(self.id as usize) {
|
||||||
|
if slide.html {
|
||||||
|
// conditional logic for html slides
|
||||||
|
}
|
||||||
|
return self.get_item(self.id + 1);
|
||||||
|
}
|
||||||
|
self.get_item(self.id + 1)
|
||||||
|
}
|
||||||
|
|
||||||
pub fn get_slide_from_service(
|
pub fn get_slide_from_service(
|
||||||
self: Pin<&mut Self>,
|
self: Pin<&mut Self>,
|
||||||
index: i32,
|
index: i32,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue