diff --git a/src/main.cpp b/src/main.cpp index 767aeb2..554ef83 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -102,6 +102,7 @@ int main(int argc, char *argv[]) QScopedPointer obsModel(new ObsModel); obsModel.get()->getObs(); obsModel.get()->updateScenes(); + slideobject.get()->setSlideModel(slideModel.get()); Settings *settings = new Settings; settings->setup(); diff --git a/src/qml/presenter/MainWindow.qml b/src/qml/presenter/MainWindow.qml index 17034ba..0c656ab 100644 --- a/src/qml/presenter/MainWindow.qml +++ b/src/qml/presenter/MainWindow.qml @@ -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 { id: songModel Component.onCompleted: setup(); @@ -195,9 +182,7 @@ Controls.Page { id: imageModel Component.onCompleted: setup(); } - /* ServiceThing { id: serviceThing } */ FileHelper { id: fileHelper } - /* SlideHelper { id: slideHelper } */ SongEditor { id: songEditorModel songModel: songModel diff --git a/src/rust/slide_model.rs b/src/rust/slide_model.rs index 8aac8bf..76c92ca 100644 --- a/src/rust/slide_model.rs +++ b/src/rust/slide_model.rs @@ -1,5 +1,5 @@ #[cxx_qt::bridge] -mod slide_model { +pub mod slide_model { unsafe extern "C++" { include!(< QAbstractListModel >); include!("cxx-qt-lib/qhash.h"); diff --git a/src/rust/slide_object.rs b/src/rust/slide_object.rs index 3142d38..9035ff8 100644 --- a/src/rust/slide_object.rs +++ b/src/rust/slide_object.rs @@ -6,10 +6,8 @@ mod slide_object { include!("cxx-qt-lib/qmap.h"); type QMap_QString_QVariant = cxx_qt_lib::QMap; - // include!("cxx-qt-lib/qvariant.h"); - // type QVariant = cxx_qt_lib::QVariant; - // #[cxx_name = "SlideModel"] - // type SlideModel = crate::slide_model::SlideModelRust; + include!("cxx-qt-gen/slide_model.cxxqt.h"); + type SlideModel = crate::slide_model::slide_model::SlideModel; } unsafe extern "RustQt" { @@ -56,7 +54,7 @@ mod slide_object { #[qproperty(i32, font_size)] #[qproperty(f32, video_start_time)] #[qproperty(f32, video_end_time)] - // #[qproperty(*mut SlideModel, slide_model)] + #[qproperty(*mut SlideModel, slide_model)] type SlideObject = super::SlideObjectRust; #[qinvokable] @@ -91,8 +89,7 @@ use cxx_qt_lib::{CaseSensitivity, QString, QVariant}; use tracing::{debug, error}; use crate::{ - slide_types::{PresType, SlideType}, - songs::song_model::{song_model::SongModel, SongModelRust}, + slide_model::slide_model, slide_types::{PresType, SlideType}, songs::song_model::{song_model::SongModel, SongModelRust} }; use self::slide_object::QMap_QString_QVariant; @@ -116,7 +113,7 @@ pub struct SlideObjectRust { font_size: i32, video_start_time: f32, video_end_time: f32, - // slide_model: *mut qobject::SlideModel, + slide_model: *mut slide_model::SlideModel, } impl Default for SlideObjectRust { @@ -139,7 +136,7 @@ impl Default for SlideObjectRust { inner_slide_index: 0, video_start_time: 0.0, video_end_time: 0.0, - // slide_model: std::ptr::null_mut(), + slide_model: std::ptr::null_mut(), } } }