chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

embedding the slide_model in the slide_object

Browse source
This commit is contained in:
Chris Cochrun 2024-09-26 06:39:06 -05:00
parent 0d2b636bc9
commit 4c403d9f3c
4 changed files with 8 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main.cpp
View file

@ -102,6 +102,7 @@ int main(int argc, char *argv[])
QScopedPointer<ObsModel> obsModel(new ObsModel); QScopedPointer<ObsModel> obsModel(new ObsModel);
obsModel.get()->getObs(); obsModel.get()->getObs();
obsModel.get()->updateScenes(); obsModel.get()->updateScenes();
slideobject.get()->setSlideModel(slideModel.get());
Settings *settings = new Settings; Settings *settings = new Settings;
settings->setup(); settings->setup();

15
src/qml/presenter/MainWindow.qml
View file

@ -166,19 +166,6 @@ Controls.Page {
} }
} }
/* Loader { */
/* id: presWinLoader */
/* active: false */
/* sourceComponent: Presenter.PresentationWindow {} */
/* } */
/* Presenter.PresentationWindow { */
/* id: pWindow */
/* } */
/* SongProxyModel { id: songProxyModel } */
/* ImageProxyModel { id: imageProxyModel } */
/* PresentationProxyModel { id: presProxyModel } */
/* VideoProxyModel { id: videoProxyModel } */
SongModel { SongModel {
id: songModel id: songModel
Component.onCompleted: setup(); Component.onCompleted: setup();
@ -195,9 +182,7 @@ Controls.Page {
id: imageModel id: imageModel
Component.onCompleted: setup(); Component.onCompleted: setup();
} }
/* ServiceThing { id: serviceThing } */
FileHelper { id: fileHelper } FileHelper { id: fileHelper }
/* SlideHelper { id: slideHelper } */
SongEditor { SongEditor {
id: songEditorModel id: songEditorModel
songModel: songModel songModel: songModel

2
src/rust/slide_model.rs
View file

@ -1,5 +1,5 @@
#[cxx_qt::bridge] #[cxx_qt::bridge]
mod slide_model { pub mod slide_model {
unsafe extern "C++" { unsafe extern "C++" {
include!(< QAbstractListModel >); include!(< QAbstractListModel >);
include!("cxx-qt-lib/qhash.h"); include!("cxx-qt-lib/qhash.h");

15
src/rust/slide_object.rs
View file

@ -6,10 +6,8 @@ mod slide_object {
include!("cxx-qt-lib/qmap.h"); include!("cxx-qt-lib/qmap.h");
type QMap_QString_QVariant = type QMap_QString_QVariant =
cxx_qt_lib::QMap<cxx_qt_lib::QMapPair_QString_QVariant>; cxx_qt_lib::QMap<cxx_qt_lib::QMapPair_QString_QVariant>;
// include!("cxx-qt-lib/qvariant.h"); include!("cxx-qt-gen/slide_model.cxxqt.h");
// type QVariant = cxx_qt_lib::QVariant; type SlideModel = crate::slide_model::slide_model::SlideModel;
// #[cxx_name = "SlideModel"]
// type SlideModel = crate::slide_model::SlideModelRust;
} }
unsafe extern "RustQt" { unsafe extern "RustQt" {
@ -56,7 +54,7 @@ mod slide_object {
#[qproperty(i32, font_size)] #[qproperty(i32, font_size)]
#[qproperty(f32, video_start_time)] #[qproperty(f32, video_start_time)]
#[qproperty(f32, video_end_time)] #[qproperty(f32, video_end_time)]
// #[qproperty(*mut SlideModel, slide_model)] #[qproperty(*mut SlideModel, slide_model)]
type SlideObject = super::SlideObjectRust; type SlideObject = super::SlideObjectRust;
#[qinvokable] #[qinvokable]
@ -91,8 +89,7 @@ use cxx_qt_lib::{CaseSensitivity, QString, QVariant};
use tracing::{debug, error}; use tracing::{debug, error};
use crate::{ use crate::{
slide_types::{PresType, SlideType}, slide_model::slide_model, slide_types::{PresType, SlideType}, songs::song_model::{song_model::SongModel, SongModelRust}
songs::song_model::{song_model::SongModel, SongModelRust},
}; };
use self::slide_object::QMap_QString_QVariant; use self::slide_object::QMap_QString_QVariant;
@ -116,7 +113,7 @@ pub struct SlideObjectRust {
font_size: i32, font_size: i32,
video_start_time: f32, video_start_time: f32,
video_end_time: f32, video_end_time: f32,
// slide_model: *mut qobject::SlideModel, slide_model: *mut slide_model::SlideModel,
} }
impl Default for SlideObjectRust { impl Default for SlideObjectRust {
@ -139,7 +136,7 @@ impl Default for SlideObjectRust {
inner_slide_index: 0, inner_slide_index: 0,
video_start_time: 0.0, video_start_time: 0.0,
video_end_time: 0.0, video_end_time: 0.0,
// slide_model: std::ptr::null_mut(), slide_model: std::ptr::null_mut(),
} }
} }
} }